Object manager refactoring

Former-commit-id: fda3a555

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/edit/DBERegistry.java

@@ -17,8 +17,6 @@
 
 package org.jkiss.dbeaver.model.edit;
 
-import org.jkiss.dbeaver.model.DBPObject;
-
 /**
  * Editors editor
  */
@@ -28,6 +26,4 @@ public interface DBERegistry {
 
     <T> T getObjectManager(Class<?> objectClass, Class<T> managerType);
 
-    DBEObjectConfigurator<?, ?> getObjectConfigurator(DBPObject object);
-
 }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java

@@ -29,6 +29,7 @@ import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
+import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.ArrayList;
@@ -182,7 +183,7 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject, CONTAINER_T
     }
 
     protected OBJECT_TYPE configureObject(DBRProgressMonitor monitor, CONTAINER_TYPE parent, OBJECT_TYPE object) {
-        DBEObjectConfigurator<CONTAINER_TYPE, OBJECT_TYPE> configurator = (DBEObjectConfigurator<CONTAINER_TYPE, OBJECT_TYPE>) DBWorkbench.getPlatform().getEditorsRegistry().getObjectConfigurator(object);
+        DBEObjectConfigurator<CONTAINER_TYPE, OBJECT_TYPE> configurator = GeneralUtils.adapt(object, DBEObjectConfigurator.class);
         if (configurator != null) {
             return configurator.configureObject(monitor, parent, object);
         }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/ObjectManagerRegistry.java → plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/ObjectManagerRegistry.java

@@ -20,12 +20,8 @@ package org.jkiss.dbeaver.registry;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
-import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.edit.DBEObjectConfigurator;
 import org.jkiss.dbeaver.model.edit.DBEObjectManager;
 import org.jkiss.dbeaver.model.edit.DBERegistry;
-import org.jkiss.dbeaver.ui.editors.entity.EntityConfiguratorDescriptor;
-import org.jkiss.dbeaver.ui.editors.entity.EntityEditorsRegistry;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -112,10 +108,4 @@ public class ObjectManagerRegistry implements DBERegistry {
         }
     }
 
-    @Override
-    public DBEObjectConfigurator getObjectConfigurator(DBPObject object) {
-        EntityConfiguratorDescriptor configurator = EntityEditorsRegistry.getInstance().getEntityConfigurator(object);
-        return configurator == null ? null : configurator.createConfigurator();
-    }
-
 }

plugins/org.jkiss.dbeaver.ui.navigator/plugin.xml

@@ -25,6 +25,10 @@
             <adapter type="org.eclipse.core.resources.IFolder"/>
             <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
         </factory>
+
+        <factory adaptableType="org.jkiss.dbeaver.model.struct.DBSObject" class="org.jkiss.dbeaver.ui.navigator.NavigatorConfiguratorFactory">
+            <adapter type="org.jkiss.dbeaver.model.edit.DBEObjectConfigurator"/>
+        </factory>
     </extension>
 
     <extension point="org.eclipse.ui.views">

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/NavigatorConfiguratorFactory.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jkiss.dbeaver.ui.navigator;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.jkiss.dbeaver.model.edit.DBEObjectConfigurator;
+import org.jkiss.dbeaver.model.struct.DBSObject;
+import org.jkiss.dbeaver.ui.editors.entity.EntityConfiguratorDescriptor;
+import org.jkiss.dbeaver.ui.editors.entity.EntityEditorsRegistry;
+
+/**
+ * Adapts objects to their UI configurators
+ */
+public class NavigatorConfiguratorFactory implements IAdapterFactory
+{
+    private static final Class<?>[] ADAPTER_LIST = {
+        DBEObjectConfigurator.class
+    };
+
+    @Override
+    public <T> T getAdapter(Object adaptableObject, Class<T> adapterType)
+    {
+        if (adapterType == DBEObjectConfigurator.class && adaptableObject instanceof DBSObject) {
+            EntityConfiguratorDescriptor configurator = EntityEditorsRegistry.getInstance().getEntityConfigurator((DBSObject) adaptableObject);
+            return configurator == null ? null : adapterType.cast(configurator.createConfigurator());
+        }
+        return null;
+    }
+
+    @Override
+    public Class[] getAdapterList()
+    {
+        return ADAPTER_LIST;
+    }
+}
\ No newline at end of file