Navigator API refactoring

Former-commit-id: a412f6b2

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java

@@ -21,7 +21,6 @@ package org.jkiss.dbeaver.core;
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IWorkbenchPart;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPApplication;
@@ -34,7 +33,6 @@ import org.jkiss.dbeaver.registry.OSDescriptor;
 import org.jkiss.dbeaver.registry.ProjectRegistry;
 import org.jkiss.dbeaver.runtime.qm.QMControllerImpl;
 import org.jkiss.dbeaver.runtime.qm.QMLogFileWriter;
-import org.jkiss.dbeaver.ui.editors.DatabaseEditorAdapterFactory;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Version;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNModel.java

@@ -53,8 +53,8 @@ public class DBNModel implements IResourceChangeListener {
     static final Log log = Log.getLog(DBNModel.class);
 
     private DBNRoot root;
-    private final List<IDBNListener> listeners = new ArrayList<IDBNListener>();
-    private transient IDBNListener[] listenersCopy = null;
+    private final List<INavigatorListener> listeners = new ArrayList<INavigatorListener>();
+    private transient INavigatorListener[] listenersCopy = null;
     private final Map<DBSObject, Object> nodeMap = new HashMap<DBSObject, Object>();
 
     public DBNModel()
@@ -96,7 +96,7 @@ public class DBNModel implements IResourceChangeListener {
         }
         synchronized (this.listeners) {
             if (!listeners.isEmpty()) {
-                for (IDBNListener listener : listeners) {
+                for (INavigatorListener listener : listeners) {
                     log.warn("Listener '" + listener + "' is not unregistered from DBM model");
                 }
             }
@@ -389,7 +389,7 @@ public class DBNModel implements IResourceChangeListener {
         }
     }
 
-    public void addListener(IDBNListener listener)
+    public void addListener(INavigatorListener listener)
     {
         synchronized (this.listeners) {
             if (this.listeners.contains(listener)) {
@@ -397,17 +397,17 @@ public class DBNModel implements IResourceChangeListener {
             } else {
                 this.listeners.add(listener);
             }
-            this.listenersCopy = this.listeners.toArray(new IDBNListener[this.listeners.size()]);
+            this.listenersCopy = this.listeners.toArray(new INavigatorListener[this.listeners.size()]);
         }
     }
 
-    public void removeListener(IDBNListener listener)
+    public void removeListener(INavigatorListener listener)
     {
         synchronized (this.listeners) {
             if (!this.listeners.remove(listener)) {
                 log.warn("Listener " + listener + " wasn't registered in model");
             }
-            this.listenersCopy = this.listeners.toArray(new IDBNListener[this.listeners.size()]);
+            this.listenersCopy = this.listeners.toArray(new INavigatorListener[this.listeners.size()]);
         }
     }
 
@@ -418,14 +418,14 @@ public class DBNModel implements IResourceChangeListener {
 
     void fireNodeEvent(final DBNEvent event)
     {
-        IDBNListener[] listenersCopy;
+        INavigatorListener[] listenersCopy;
         synchronized (this.listeners) {
             if (listeners.isEmpty()) {
                 return;
             }
             listenersCopy = this.listenersCopy;
         }
-        for (IDBNListener listener :  listenersCopy) {
+        for (INavigatorListener listener :  listenersCopy) {
             listener.nodeChanged(event);
         }
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/IDBNListener.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/INavigatorListener.java

@@ -19,9 +19,9 @@
 package org.jkiss.dbeaver.model.navigator;
 
 /**
- * IDBNListener
+ * INavigatorListener
  */
-public interface IDBNListener
+public interface INavigatorListener
 {
     void nodeChanged(DBNEvent event);
 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/NodeListControl.java

@@ -34,7 +34,7 @@ import org.jkiss.dbeaver.model.edit.DBEObjectEditor;
 import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
 import org.jkiss.dbeaver.model.navigator.DBNEvent;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
-import org.jkiss.dbeaver.model.navigator.IDBNListener;
+import org.jkiss.dbeaver.model.navigator.INavigatorListener;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSWrapper;
@@ -61,7 +61,7 @@ import java.util.Set;
 /**
  * NodeListControl
  */
-public abstract class NodeListControl extends ObjectListControl<DBNNode> implements IDataSourceContainerProvider, INavigatorModelView, IDBNListener, IMenuListener {
+public abstract class NodeListControl extends ObjectListControl<DBNNode> implements IDataSourceContainerProvider, INavigatorModelView, INavigatorListener, IMenuListener {
     //static final Log log = Log.getLog(NodeListControl.class);
 
     private final IWorkbenchSite workbenchSite;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorListener.java

@@ -22,14 +22,14 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.navigator.DBNEvent;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
-import org.jkiss.dbeaver.model.navigator.IDBNListener;
+import org.jkiss.dbeaver.model.navigator.INavigatorListener;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
 import org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerRefresh;
 
 /**
  * DatabaseEditorListener
  */
-public class DatabaseEditorListener implements IDBNListener
+public class DatabaseEditorListener implements INavigatorListener
 {
 
     private final IDatabaseEditor databaseEditor;

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

@@ -17,7 +17,6 @@
  */
 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;
@@ -49,7 +48,7 @@ import org.jkiss.utils.CommonUtils;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-public class DatabaseNavigatorTree extends Composite implements IDBNListener
+public class DatabaseNavigatorTree extends Composite implements INavigatorListener
 {
     static final Log log = Log.getLog(DatabaseNavigatorTree.class);