#6541 Navigator filters management fixes

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLCatalog.java

@@ -428,8 +428,8 @@ public class MySQLCatalog implements DBSCatalog, DBPSaveableObject, DBPRefreshab
                 if (object != null || objectName != null) {
                     sql.append(" WHERE ").append(tableNameCol).append(" LIKE ").append(SQLUtils.quoteString(session.getDataSource(), object != null ? object.getName() : objectName));
                 } else {
-                    DBSObjectFilter tableFilters = owner.getDataSource().getContainer().getObjectFilter(MySQLTable.class, owner, false);
-                    if (tableFilters != null && !tableFilters.isEmpty()) {
+                    DBSObjectFilter tableFilters = owner.getDataSource().getContainer().getObjectFilter(MySQLTable.class, owner, true);
+                    if (tableFilters != null && !tableFilters.isNotApplicable()) {
                         sql.append(" WHERE ");
                         if (!CommonUtils.isEmpty(tableFilters.getInclude())) {
                             sql.append("(");

plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java

@@ -523,7 +523,7 @@ public class DataSourceDescriptor
         }
         if (filterMapping != null) {
             filter = filterMapping.getFilter(parentObject, firstMatch);
-            if (filter != null && (firstMatch || !filter.isNotApplicable())) {
+            if (filter != null && (firstMatch || filter.isEnabled())) {
                 return filterMapping;
             }
         }

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerFilterConfig.java

@@ -82,7 +82,7 @@ public class NavigatorHandlerFilterConfig extends NavigatorHandlerObjectCreateBa
                     NavigatorHandlerRefresh.refreshNavigator(Collections.singletonList(folder));
                     break;
                 case EditObjectFilterDialog.SHOW_GLOBAL_FILTERS_ID:
-                    objectFilter = folder.getDataSource().getContainer().getObjectFilter(folder.getChildrenClass(), null, false);
+                    objectFilter = folder.getDataSource().getContainer().getObjectFilter(folder.getChildrenClass(), null, true);
                     dialog = new EditObjectFilterDialog(
                         shell,
                             dsRegistry, "All " + node.getNodeType(),

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/StringEditorTable.java

@@ -174,7 +174,7 @@ public class StringEditorTable {
         List<String> values = new ArrayList<>();
         for (TableItem item : table.getItems()) {
             String value = item.getText().trim();
-            if (value.isEmpty() || value.equals("%")) { //$NON-NLS-1$
+            if (value.isEmpty()) { //$NON-NLS-1$
                 continue;
             }
             values.add(value);