From ce3966df0217d4f23259acf72b8f9b432cebb353 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Tue, 26 Mar 2019 22:36:01 +0300
Subject: [PATCH] #4222 GIS inline editor config

Former-commit-id: 7b69d268550f634be3e8f982320e857cb0ca492b
---
 .../META-INF/MANIFEST.MF                      |  1 +
 .../org.jkiss.dbeaver.data.gis.view/pom.xml   | 34 +++++++++++++------
 plugins/org.jkiss.dbeaver.data.gis/plugin.xml |  2 +-
 .../managers/gis/GeometryPanelEditor.java     |  4 +++
 .../registry/GeometryViewerDescriptor.java    | 14 +++++---
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF
index b5190382f9..50af22c34e 100644
--- a/plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
+ org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.editors,
  org.jkiss.dbeaver.model,
diff --git a/plugins/org.jkiss.dbeaver.data.gis.view/pom.xml b/plugins/org.jkiss.dbeaver.data.gis.view/pom.xml
index c49a55d27f..fdd7ffe341 100644
--- a/plugins/org.jkiss.dbeaver.data.gis.view/pom.xml
+++ b/plugins/org.jkiss.dbeaver.data.gis.view/pom.xml
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>plugins</artifactId>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jkiss.dbeaver</groupId>
+        <artifactId>plugins</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <artifactId>org.jkiss.dbeaver.data.gis.view</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-     <relativePath>../</relativePath>
-  </parent>
-  <artifactId>org.jkiss.dbeaver.data.gis.view</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+    <packaging>eclipse-plugin</packaging>
+
+<!--
+    <repositories>
+        <repository>
+            <id>udig-platform-repo</id>
+            <url>http://udig.refractions.net/files/update/2.0.0.RC1/udig/</url>
+            <layout>p2</layout>
+        </repository>
+    </repositories>
+-->
+
 </project>
diff --git a/plugins/org.jkiss.dbeaver.data.gis/plugin.xml b/plugins/org.jkiss.dbeaver.data.gis/plugin.xml
index f53747aa89..e0a38311b2 100644
--- a/plugins/org.jkiss.dbeaver.data.gis/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.data.gis/plugin.xml
@@ -11,7 +11,7 @@
     </extension>
 
     <extension point="org.jkiss.dbeaver.data.gis.geometryViewer">
-        <geometryViewer label="Text" id="org.jkiss.dbeaver.ui.data.managers.gis.GeometryTextViewer" class="org.jkiss.dbeaver.ui.data.managers.gis.GeometryTextViewer"/>
+        <geometryViewer label="Text" id="org.jkiss.dbeaver.ui.data.managers.gis.GeometryTextViewer" class="org.jkiss.dbeaver.ui.data.managers.gis.GeometryTextViewer" supportsInline="true"/>
         <!--<geometryViewer label="Text2" id="org.jkiss.dbeaver.ui.data.managers.gis.GeometryTextViewer2" class="org.jkiss.dbeaver.ui.data.managers.gis.GeometryTextViewer"/>-->
     </extension>
 
diff --git a/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/gis/GeometryPanelEditor.java b/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/gis/GeometryPanelEditor.java
index 554f3fe26f..8fcb0faec0 100644
--- a/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/gis/GeometryPanelEditor.java
+++ b/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/gis/GeometryPanelEditor.java
@@ -186,6 +186,10 @@ public class GeometryPanelEditor extends BaseValueEditor<Control> {
             viewerId = DEFAULT_VIEWER_ID;
         }
         GeometryViewerDescriptor viewerDescriptor = GeometryViewerRegistry.getInstance().getViewer(viewerId);
+        if (valueController.getEditType() == IValueController.EditType.INLINE && !viewerDescriptor.supportsInlineView()) {
+            viewerId = DEFAULT_VIEWER_ID;
+            viewerDescriptor = GeometryViewerRegistry.getInstance().getViewer(viewerId);
+        }
         if (viewerDescriptor != null) {
             setViewer(viewerDescriptor);
         }
diff --git a/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/gis/registry/GeometryViewerDescriptor.java b/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/gis/registry/GeometryViewerDescriptor.java
index 07214fc549..6dddb57bce 100644
--- a/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/gis/registry/GeometryViewerDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/gis/registry/GeometryViewerDescriptor.java
@@ -25,6 +25,7 @@ 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.utils.CommonUtils;
 
 public class GeometryViewerDescriptor extends AbstractDescriptor {
 
@@ -34,13 +35,15 @@ public class GeometryViewerDescriptor extends AbstractDescriptor {
     private final String id;
     private final String label;
     private final DBPImage icon;
+    private boolean supportsInline;
 
     GeometryViewerDescriptor(IConfigurationElement config) {
         super(config);
-        type = new ObjectType(config.getAttribute(RegistryConstants.ATTR_CLASS));
-        id = config.getAttribute(RegistryConstants.ATTR_ID);
-        label = config.getAttribute(RegistryConstants.ATTR_LABEL);
-        icon = iconToImage(config.getAttribute(RegistryConstants.ATTR_ICON));
+        this.type = new ObjectType(config.getAttribute(RegistryConstants.ATTR_CLASS));
+        this.id = config.getAttribute(RegistryConstants.ATTR_ID);
+        this.label = config.getAttribute(RegistryConstants.ATTR_LABEL);
+        this.icon = iconToImage(config.getAttribute(RegistryConstants.ATTR_ICON));
+        this.supportsInline = CommonUtils.getBoolean(config.getAttribute("supportsInline"), false);
     }
 
     public String getId() {
@@ -63,4 +66,7 @@ public class GeometryViewerDescriptor extends AbstractDescriptor {
         }
     }
 
+    public boolean supportsInlineView() {
+        return supportsInline;
+    }
 }
-- 
GitLab