#711 JSON icons and support in PG

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java

@@ -1296,16 +1296,20 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
         @Override
         public DBPImage getCellImage(Object colElement, Object rowElement)
         {
+            // TODO: tired from cell icons. But maybe they make some sense - let's keep them commented
+/*
             if (!showCelIcons) {
                 return null;
             }
             Object cellValue = getCellValue(colElement, rowElement, false);
             if (cellValue instanceof DBDContent || cellValue instanceof DBDReference) {
                 DBDAttributeBinding attr = (DBDAttributeBinding)(controller.isRecordMode() ? rowElement : colElement);
-                return DBUtils.getObjectImage(attr.getMetaAttribute());
+                return DBUtils.getObjectImage(attr);
             } else {
                 return null;
             }
+*/
+            return null;
         }
 
         @NotNull
@@ -1381,7 +1385,7 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
         public Image getImage(Object element)
         {
             if (element instanceof DBDAttributeBinding/* && (!isRecordMode() || !model.isDynamicMetadata())*/) {
-                return DBeaverIcons.getImage(DBUtils.getObjectImage(((DBDAttributeBinding) element).getMetaAttribute()));
+                return DBeaverIcons.getImage(DBUtils.getObjectImage(((DBDAttributeBinding) element).getAttribute()));
             }
             return null;
         }

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataType.java

@@ -23,10 +23,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.ext.postgresql.PostgreConstants;
 import org.jkiss.dbeaver.ext.postgresql.PostgreUtils;
-import org.jkiss.dbeaver.model.DBPDataKind;
-import org.jkiss.dbeaver.model.DBPEvaluationContext;
-import org.jkiss.dbeaver.model.DBPQualifiedObject;
-import org.jkiss.dbeaver.model.DBUtils;
+import org.jkiss.dbeaver.model.*;
 import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.exec.DBCLogicalOperator;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
@@ -53,7 +50,7 @@ import java.util.Locale;
 /**
  * PostgreTypeType
  */
-public class PostgreDataType extends JDBCDataType<PostgreSchema> implements PostgreClass, DBPQualifiedObject
+public class PostgreDataType extends JDBCDataType<PostgreSchema> implements PostgreClass, DBPQualifiedObject, DBPImageProvider
 {
     private static final Log log = Log.getLog(PostgreDataType.class);
 
@@ -441,6 +438,15 @@ public class PostgreDataType extends JDBCDataType<PostgreSchema> implements Post
         }
     }
 
+    @Nullable
+    @Override
+    public DBPImage getObjectImage() {
+        if (PostgreConstants.TYPE_JSONB.equals(getName()) || PostgreConstants.TYPE_JSON.equals(getName())) {
+            return DBIcon.TYPE_JSON;
+        }
+        return null;
+    }
+
     class AttributeCache extends JDBCObjectCache<PostgreDataType, PostgreDataTypeAttribute> {
 
         @Override

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBIcon.java

@@ -109,6 +109,7 @@ public class DBIcon implements DBPImage
     public static final DBIcon TYPE_DATETIME = new DBIcon("datetime", "types/datetime.png"); //$NON-NLS-1$ //$NON-NLS-2$
     public static final DBIcon TYPE_BINARY = new DBIcon("binary", "types/binary.png"); //$NON-NLS-1$ //$NON-NLS-2$
     public static final DBIcon TYPE_TEXT = new DBIcon("text", "types/text.png"); //$NON-NLS-1$ //$NON-NLS-2$
+    public static final DBIcon TYPE_JSON = new DBIcon("json", "types/json.png"); //$NON-NLS-1$ //$NON-NLS-2$
     public static final DBIcon TYPE_XML = new DBIcon("xml", "types/xml.png"); //$NON-NLS-1$ //$NON-NLS-2$
     public static final DBIcon TYPE_LOB = new DBIcon("lob", "types/lob.png"); //$NON-NLS-1$ //$NON-NLS-2$
     public static final DBIcon TYPE_ARRAY = new DBIcon("array", "types/array.png"); //$NON-NLS-1$ //$NON-NLS-2$