#500 Keep geometry SRID in editor

plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/GeometryInlineEditor.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2017 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.data.managers;
+
+import com.vividsolutions.jts.geom.Geometry;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.data.DBDDisplayFormat;
+import org.jkiss.dbeaver.model.exec.DBCException;
+import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose;
+import org.jkiss.dbeaver.model.exec.DBCSession;
+import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
+import org.jkiss.dbeaver.ui.data.IValueController;
+import org.jkiss.dbeaver.ui.data.editors.BaseValueEditor;
+import org.jkiss.dbeaver.ui.data.editors.StringInlineEditor;
+
+/**
+* StringInlineEditor.
+ * TODO: use StyledText instead of Text? with fillDefaultStyledTextContextMenu it works better than Text
+ * TODO: however Text is native and has extra features. Can't decide.
+*/
+public class GeometryInlineEditor extends StringInlineEditor {
+
+    private int valueSRID;
+
+    public GeometryInlineEditor(IValueController controller) {
+        super(controller);
+    }
+
+    @Override
+    public void primeEditorValue(Object value) throws DBException {
+        super.primeEditorValue(value);
+        if (value instanceof Geometry) {
+            this.valueSRID = ((Geometry) value).getSRID();
+        }
+    }
+
+    @Override
+    public Object extractEditorValue() throws DBCException {
+        Object geometry = super.extractEditorValue();
+        if (geometry instanceof Geometry && valueSRID != 0) {
+            ((Geometry) geometry).setSRID(valueSRID);
+        }
+        return geometry;
+    }
+}

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

@@ -18,13 +18,10 @@ package org.jkiss.dbeaver.ui.data.managers;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.DBeaverPreferences;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.ui.data.IValueController;
 import org.jkiss.dbeaver.ui.data.IValueEditor;
-import org.jkiss.dbeaver.ui.data.editors.StringInlineEditor;
 import org.jkiss.dbeaver.ui.dialogs.data.TextViewDialog;
-import org.jkiss.dbeaver.ui.editors.content.ContentEditor;
 
 /**
  * Geometry value manager
@@ -46,7 +43,7 @@ public class GeometryValueManager extends BaseValueManager {
         switch (controller.getEditType()) {
             case INLINE:
             case PANEL:
-                return new StringInlineEditor(controller);
+                return new GeometryInlineEditor(controller);
             case EDITOR:
                 return new TextViewDialog(controller);
             default: