ISingleControlEditor fix

Former-commit-id: a36fe0a6

docs/todo.txt

+quick-search in navigator tree
 Extract non-visual part to a separate plugin
 RSV find/replace action
 Vertica keywords

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/ISingleControlEditor.java

@@ -15,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-package org.jkiss.dbeaver.ext.ui;
+package org.jkiss.dbeaver.ui;
 
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IEditorPart;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditorPart.java

@@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorActionBarContributor;
 import org.eclipse.ui.IEditorPart;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.ext.ui.ISingleControlEditor;
+import org.jkiss.dbeaver.ui.ISingleControlEditor;
 
 import javax.activation.MimeType;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/FolderPageEditor.java

@@ -35,7 +35,7 @@ import org.jkiss.dbeaver.core.Log;
 import org.jkiss.dbeaver.ui.IActiveWorkbenchPart;
 import org.jkiss.dbeaver.ui.IPropertyChangeReflector;
 import org.jkiss.dbeaver.ui.IRefreshablePart;
-import org.jkiss.dbeaver.ext.ui.ISingleControlEditor;
+import org.jkiss.dbeaver.ui.ISingleControlEditor;
 import org.jkiss.dbeaver.registry.editor.EntityEditorDescriptor;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.folders.FolderPage;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/text/BaseTextEditor.java

@@ -48,7 +48,7 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ui.ICommentsSupport;
-import org.jkiss.dbeaver.ext.ui.ISingleControlEditor;
+import org.jkiss.dbeaver.ui.ISingleControlEditor;
 import org.jkiss.dbeaver.model.impl.resources.ScriptsHandlerImpl;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/DatabaseNavigatorTree.java

@@ -17,6 +17,8 @@
  */
 package org.jkiss.dbeaver.ui.views.navigator.database;
 
+import org.eclipse.ui.dialogs.FilteredTree;
+import org.eclipse.ui.dialogs.PatternFilter;
 import org.jkiss.dbeaver.core.Log;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -102,6 +104,7 @@ public class DatabaseNavigatorTree extends Composite implements IDBNListener
 //                }
 //            });
         } else {
+            //FilteredTree filteredTree = new FilteredTree(this, treeStyle, new TreeFilter(), true);
             this.viewer = new TreeViewer(this, treeStyle) {
                 @Override
                 public ISelection getSelection()
@@ -406,4 +409,15 @@ public class DatabaseNavigatorTree extends Composite implements IDBNListener
         if (oldEditor != null) oldEditor.dispose();
     }
 
+    private static class TreeFilter extends PatternFilter {
+        @Override
+        public boolean isElementVisible(Viewer viewer, Object element) {
+            Object parent = ((ITreeContentProvider) ((AbstractTreeViewer) viewer)
+                .getContentProvider()).getParent(element);
+            if (parent != null && isLeafMatch(viewer, parent)) {
+                return true;
+            }
+            return isParentMatch(viewer, element) || isLeafMatch(viewer, element);
+        }
+    }
 }