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 b5190382f90d916546e6fe9d60bffbd482538b0d..50af22c34ebc931f057cb47d5eaa04de5516b516 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 c49a55d27f3dac25abf88a41df7cbc3f51ae0da1..fdd7ffe341e3d1f868278293856602ea5ba7ac75 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 @@
-
- 4.0.0
-
- org.jkiss.dbeaver
- plugins
+
+ 4.0.0
+
+ org.jkiss.dbeaver
+ plugins
+ 1.0.0-SNAPSHOT
+ ../
+
+ org.jkiss.dbeaver.data.gis.view
1.0.0-SNAPSHOT
- ../
-
- org.jkiss.dbeaver.data.gis.view
- 1.0.0-SNAPSHOT
- eclipse-plugin
+ eclipse-plugin
+
+
+
diff --git a/plugins/org.jkiss.dbeaver.data.gis/plugin.xml b/plugins/org.jkiss.dbeaver.data.gis/plugin.xml
index f53747aa8903126609a13b959e526ab6bb177e78..e0a38311b217d5f9efb3ab48f69d514984f3e511 100644
--- a/plugins/org.jkiss.dbeaver.data.gis/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.data.gis/plugin.xml
@@ -11,7 +11,7 @@
-
+
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 554f3fe26fbd71d5d29362e21078754c0bed24a3..8fcb0faec0b713156ea12431b90923326d307a64 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 {
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 07214fc5491e87916c250ceed737bd82f6c72868..6dddb57bce3af9d548050fcf5099a881e519c4a3 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;
+ }
}