#6216 Filters management enhancement (save, customize, menu redesign)

Former-commit-id: 406574cc

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBindingElement.java

@@ -21,6 +21,7 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.*;
 import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
+import org.jkiss.utils.CommonUtils;
 
 /**
  * Collection element binding info
@@ -154,4 +155,23 @@ public class DBDAttributeBindingElement extends DBDAttributeBindingNested implem
     public DBPImage getObjectImage() {
         return DBValueFormatting.getObjectImage(collection.getComponentType());
     }
+
+    @Override
+    public String toString() {
+        return collection.toString() + "@" + index;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) && obj instanceof DBDAttributeBindingElement &&
+            CommonUtils.equalObjects(collection, ((DBDAttributeBindingElement) obj).collection) &&
+            index == ((DBDAttributeBindingElement) obj).index;
+    }
+
+    @Override
+    public int hashCode() {
+        return collection.hashCode() + index;
+    }
+
+
 }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBindingMeta.java

@@ -65,7 +65,6 @@ public class DBDAttributeBindingMeta extends DBDAttributeBinding {
         showLabel = dataSource == null || !dataSource.getContainer().getPreferenceStore().getBoolean(ModelPreferences.RESULT_SET_IGNORE_COLUMN_LABEL);
     }
 
-    @Nullable
     @Override
     public DBPDataSource getDataSource() {
         return dataContainer.getDataSource();
@@ -102,6 +101,7 @@ public class DBDAttributeBindingMeta extends DBDAttributeBinding {
         return pseudoAttribute != null;
     }
 
+    @NotNull
     @Override
     public DBSDataContainer getDataContainer() {
         return dataContainer;
@@ -252,6 +252,11 @@ public class DBDAttributeBindingMeta extends DBDAttributeBinding {
         this.pseudoAttribute = pseudoAttribute;
     }
 
+    @Override
+    public String toString() {
+        return metaAttribute.toString();
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof DBDAttributeBindingMeta) {
@@ -267,4 +272,15 @@ public class DBDAttributeBindingMeta extends DBDAttributeBinding {
         }
         return false;
     }
+
+    @Override
+    public int hashCode() {
+        return
+            CommonUtils.notEmpty(metaAttribute.getName()).hashCode() +
+            CommonUtils.notEmpty(metaAttribute.getLabel()).hashCode() +
+            CommonUtils.notEmpty(metaAttribute.getEntityName()).hashCode() +
+            metaAttribute.getOrdinalPosition() +
+            metaAttribute.getTypeID() +
+            CommonUtils.notEmpty(metaAttribute.getTypeName()).hashCode();
+    }
 }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBindingNested.java

@@ -22,6 +22,7 @@ import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.exec.DBCAttributeMetaData;
 import org.jkiss.dbeaver.model.exec.DBCEntityMetaData;
 import org.jkiss.dbeaver.model.struct.DBSEntityReferrer;
+import org.jkiss.utils.CommonUtils;
 
 import java.util.List;
 
@@ -86,5 +87,9 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl
         return null;
     }
 
-
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof DBDAttributeBindingNested &&
+            CommonUtils.equalObjects(parent, ((DBDAttributeBindingNested) obj).parent);
+    }
 }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/data/DBDAttributeBindingType.java

@@ -18,21 +18,19 @@ package org.jkiss.dbeaver.model.data;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.*;
 import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.struct.DBSAttributeBase;
 import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
 import org.jkiss.dbeaver.model.struct.DBSObject;
+import org.jkiss.utils.CommonUtils;
 
 /**
  * Type attribute value binding info
  */
 public class DBDAttributeBindingType extends DBDAttributeBindingNested implements DBPImageProvider {
 
-    private static final Log log = Log.getLog(DBDAttributeBindingType.class);
-
     @NotNull
     private final DBSAttributeBase attribute;
 
@@ -191,4 +189,21 @@ public class DBDAttributeBindingType extends DBDAttributeBindingNested implement
     public long getMaxLength() {
         return attribute.getMaxLength();
     }
+
+    @Override
+    public String toString() {
+        return attribute.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) && obj instanceof DBDAttributeBindingType &&
+            CommonUtils.equalObjects(attribute, ((DBDAttributeBindingType) obj).attribute);
+    }
+
+    @Override
+    public int hashCode() {
+        return attribute.hashCode();
+    }
+
 }

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java

@@ -492,13 +492,13 @@ public abstract class LightGrid extends Canvas {
         int savedHSB = keepState ? hScroll.getSelection() : -1;
         int savedVSB = keepState ? vScroll.getSelection() : -1;
 
-        int[] oldWidths = null;
+        Map<Object, Integer> oldWidths = null;
         if (keepState && !controlWasHidden) {
             // Save widths
-            oldWidths = new int[columns.size()];
+            oldWidths = new HashMap<>();
             if (!columns.isEmpty()) {
-                for (int i = 0; i < columns.size(); i++) {
-                    oldWidths[i] = columns.get(i).getWidth();
+                for (GridColumn column : columns) {
+                    oldWidths.put(column.getElement(), column.getWidth());
                 }
             }
         }
@@ -595,9 +595,12 @@ public abstract class LightGrid extends Canvas {
 
             if (oldWidths != null) {
                 // Restore widths
-                if (oldWidths.length == columns.size()) {
-                    for (int i = 0; i < oldWidths.length; i++) {
-                        columns.get(i).setWidth(oldWidths[i]);
+                if (oldWidths.size() == columns.size()) {
+                    for (GridColumn column : columns) {
+                        Integer newWidth = oldWidths.get(column.getElement());
+                        if (newWidth != null) {
+                            column.setWidth(newWidth);
+                        }
                     }
                 }
             }

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java

@@ -145,6 +145,7 @@ public class ResultSetViewer extends Viewer
     public static final String DEFAULT_QUERY_TEXT = "SQL";
 
     private static final DecimalFormat ROW_COUNT_FORMAT = new DecimalFormat("###,###,###,###,###,##0");
+    private static final String CUSTOM_FILTER_VALUE_STRING = "..";
     private static final IResultSetListener[] EMPTY_LISTENERS = new IResultSetListener[0];
 
     private IResultSetFilterManager filterManager;
@@ -4100,7 +4101,7 @@ public class ResultSetViewer extends Viewer
             Object getValue(@NotNull ResultSetViewer viewer, @NotNull DBDAttributeBinding attribute, @NotNull DBCLogicalOperator operator, boolean useDefault)
             {
                 if (useDefault) {
-                    return "..";
+                    return CUSTOM_FILTER_VALUE_STRING;
                 } else {
                     ResultSetRow[] rows = null;
                     if (operator.getArgumentCount() < 0) {
@@ -4146,15 +4147,18 @@ public class ResultSetViewer extends Viewer
     private String translateFilterPattern(DBCLogicalOperator operator, FilterByAttributeType type, DBDAttributeBinding attribute)
     {
         Object value = type.getValue(this, attribute, operator, true);
+
         DBCExecutionContext executionContext = getExecutionContext();
         String strValue = executionContext == null ? String.valueOf(value) : attribute.getValueHandler().getValueDisplayString(attribute, value, DBDDisplayFormat.UI);
-        strValue = strValue.trim();
-        strValue = CommonUtils.cutExtraLines(strValue, 1);
-        strValue = CommonUtils.truncateString(strValue, 30);
+        strValue = strValue.replaceAll("\\s+", " ").replace("@", "^").trim();
+        strValue = UITextUtils.getShortText(sizingGC, strValue, 150);
         if (operator.getArgumentCount() == 0) {
             return operator.getStringValue();
         } else {
-            return operator.getStringValue() + " " + CommonUtils.truncateString(strValue, 64);
+            if (!CUSTOM_FILTER_VALUE_STRING.equals(strValue)) {
+                strValue = "'" + strValue + "'";
+            }
+            return operator.getStringValue() + " " + strValue;
         }
     }