#4222 GIS ui bundle refactoring

Former-commit-id: 8e156803

plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-Version: 1.0.2.qualifier
 Bundle-Release-Date: 20190422
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.jkiss.dbeaver.ui.data.managers.gis.internal.GISViewerActivator
+Bundle-Activator: org.jkiss.dbeaver.ui.gis.internal.GISViewerActivator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,

plugins/org.jkiss.dbeaver.data.gis.view/plugin.xml

@@ -6,7 +6,7 @@
     <extension-point id="org.jkiss.dbeaver.data.gis.geometryViewer" name="Geometry viewer" schema="schema/org.jkiss.dbeaver.data.gis.geometryViewer.exsd"/>
 
     <extension point="org.jkiss.dbeaver.dataManager">
-        <manager class="org.jkiss.dbeaver.ui.data.managers.gis.GeometryValueManager" id="org.jkiss.dbeaver.ui.data.managers.gis.GeometryValueManager">
+        <manager class="org.jkiss.dbeaver.ui.gis.GeometryValueManager" id="org.jkiss.dbeaver.ui.gis.GeometryValueManager">
             <supports type="com.vividsolutions.jts.geom.Geometry" forceCheck="true"/>
         </manager>
     </extension>
@@ -16,15 +16,15 @@
                 label="Text"
                 description="View GIS object in text form"
                 icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/text.png"
-                id="org.jkiss.dbeaver.ui.data.managers.gis.view.GeometryTextViewer"
-                class="org.jkiss.dbeaver.ui.data.managers.gis.view.GeometryTextViewer"
+                id="org.jkiss.dbeaver.ui.gis.panel.GeometryTextViewer"
+                class="org.jkiss.dbeaver.ui.gis.panel.GeometryTextViewer"
                 supportsInline="true"/>
         <geometryViewer
                 label="Map"
                 description="View GIS object on map"
                 icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/image.png"
-                id="org.jkiss.dbeaver.ui.data.managers.gis.view.GISBrowserViewer"
-                class="org.jkiss.dbeaver.ui.data.managers.gis.view.GISBrowserViewer"/>
+                id="org.jkiss.dbeaver.ui.gis.panel.GISBrowserViewer"
+                class="org.jkiss.dbeaver.ui.gis.panel.GISBrowserViewer"/>
     </extension>
 
 </plugin>

plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/data/managers/gis/GeometryValueManager.java → plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/GeometryValueManager.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.gis;
+package org.jkiss.dbeaver.ui.gis;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
@@ -23,6 +23,7 @@ import org.jkiss.dbeaver.ui.data.IValueController;
 import org.jkiss.dbeaver.ui.data.IValueEditor;
 import org.jkiss.dbeaver.ui.data.dialogs.DefaultValueViewDialog;
 import org.jkiss.dbeaver.ui.data.managers.BaseValueManager;
+import org.jkiss.dbeaver.ui.gis.panel.GeometryPanelEditor;
 
 /**
  * Geometry value manager

plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/data/managers/gis/IGeometryViewer.java → plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/IGeometryViewer.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.gis;
+package org.jkiss.dbeaver.ui.gis;
 
 import org.jkiss.dbeaver.ui.data.IValueEditor;
 

plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/data/managers/gis/internal/GISViewerActivator.java → plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/internal/GISViewerActivator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.gis.internal;
+package org.jkiss.dbeaver.ui.gis.internal;
 
 import org.eclipse.core.runtime.Plugin;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;

plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/data/managers/gis/view/GISBrowserViewer.java → plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/GISBrowserViewer.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.gis.view;
+package org.jkiss.dbeaver.ui.gis.panel;
 
 import com.vividsolutions.jts.geom.Geometry;
 import org.eclipse.swt.SWT;
@@ -33,8 +33,8 @@ import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.ui.data.IValueController;
 import org.jkiss.dbeaver.ui.data.editors.BaseValueEditor;
-import org.jkiss.dbeaver.ui.data.managers.gis.IGeometryViewer;
-import org.jkiss.dbeaver.ui.data.managers.gis.internal.GISViewerActivator;
+import org.jkiss.dbeaver.ui.gis.IGeometryViewer;
+import org.jkiss.dbeaver.ui.gis.internal.GISViewerActivator;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/data/managers/gis/view/GISBrowserViewerConstants.java → plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/GISBrowserViewerConstants.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.gis.view;
+package org.jkiss.dbeaver.ui.gis.panel;
 
 public class GISBrowserViewerConstants {
 

plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/data/managers/gis/GeometryPanelEditor.java → plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/GeometryPanelEditor.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.gis;
+package org.jkiss.dbeaver.ui.gis.panel;
 
 import org.eclipse.jface.action.*;
 import org.eclipse.swt.SWT;
@@ -32,9 +32,9 @@ import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.UIIcon;
 import org.jkiss.dbeaver.ui.data.IValueController;
 import org.jkiss.dbeaver.ui.data.editors.BaseValueEditor;
-import org.jkiss.dbeaver.ui.data.managers.gis.registry.GeometryViewerDescriptor;
-import org.jkiss.dbeaver.ui.data.managers.gis.registry.GeometryViewerRegistry;
-import org.jkiss.dbeaver.ui.data.managers.gis.view.GeometryTextViewer;
+import org.jkiss.dbeaver.ui.gis.registry.GeometryViewerDescriptor;
+import org.jkiss.dbeaver.ui.gis.registry.GeometryViewerRegistry;
+import org.jkiss.dbeaver.ui.gis.IGeometryViewer;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.List;

plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/data/managers/gis/view/GeometryTextViewer.java → plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/panel/GeometryTextViewer.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.gis.view;
+package org.jkiss.dbeaver.ui.gis.panel;
 
 import com.vividsolutions.jts.geom.Geometry;
 import org.jkiss.dbeaver.DBException;
@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;
 import org.jkiss.dbeaver.ui.data.IValueController;
 import org.jkiss.dbeaver.ui.data.editors.StringInlineEditor;
-import org.jkiss.dbeaver.ui.data.managers.gis.IGeometryViewer;
+import org.jkiss.dbeaver.ui.gis.IGeometryViewer;
 
 /**
  * GisAttribute.

plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/data/managers/gis/registry/GeometryViewerDescriptor.java → plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/registry/GeometryViewerDescriptor.java

@@ -14,17 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.gis.registry;
+package org.jkiss.dbeaver.ui.gis.registry;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
-import org.jkiss.dbeaver.model.struct.DBSTypedObject;
 import org.jkiss.dbeaver.registry.RegistryConstants;
 import org.jkiss.dbeaver.ui.data.IValueController;
-import org.jkiss.dbeaver.ui.data.managers.gis.IGeometryViewer;
+import org.jkiss.dbeaver.ui.gis.IGeometryViewer;
 import org.jkiss.utils.CommonUtils;
 
 public class GeometryViewerDescriptor extends AbstractDescriptor {

plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/data/managers/gis/registry/GeometryViewerRegistry.java → plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/registry/GeometryViewerRegistry.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ui.data.managers.gis.registry;
+package org.jkiss.dbeaver.ui.gis.registry;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
@@ -38,21 +38,21 @@ public class GeometryViewerRegistry {
 
     private static GeometryViewerRegistry instance = null;
 
-    private final Map<String, org.jkiss.dbeaver.ui.data.managers.gis.registry.GeometryViewerDescriptor> viewers = new HashMap<>();
+    private final Map<String, org.jkiss.dbeaver.ui.gis.registry.GeometryViewerDescriptor> viewers = new HashMap<>();
 
     private GeometryViewerRegistry(IExtensionRegistry registry) {
         IConfigurationElement[] extElements = registry.getConfigurationElementsFor(EXTENSION_ID);
         for (IConfigurationElement ext : extElements) {
-            org.jkiss.dbeaver.ui.data.managers.gis.registry.GeometryViewerDescriptor type = new org.jkiss.dbeaver.ui.data.managers.gis.registry.GeometryViewerDescriptor(ext);
+            org.jkiss.dbeaver.ui.gis.registry.GeometryViewerDescriptor type = new org.jkiss.dbeaver.ui.gis.registry.GeometryViewerDescriptor(ext);
             viewers.put(type.getId(), type);
         }
     }
 
-    public List<org.jkiss.dbeaver.ui.data.managers.gis.registry.GeometryViewerDescriptor> getViewers() {
+    public List<org.jkiss.dbeaver.ui.gis.registry.GeometryViewerDescriptor> getViewers() {
         return new ArrayList<>(viewers.values());
     }
 
-    public org.jkiss.dbeaver.ui.data.managers.gis.registry.GeometryViewerDescriptor getViewer(String id) {
+    public org.jkiss.dbeaver.ui.gis.registry.GeometryViewerDescriptor getViewer(String id) {
         return viewers.get(id);
     }