Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
9b9aba34
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9b9aba34
编写于
2月 13, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#1676 GIS geometry editor support
上级
3d2359f0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
11 deletion
+23
-11
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/editors/BaseValueEditor.java
...rc/org/jkiss/dbeaver/ui/data/editors/BaseValueEditor.java
+3
-1
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java
...ss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java
+2
-0
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GeometryConverter.java
...rg/jkiss/dbeaver/data/gis/handlers/GeometryConverter.java
+9
-6
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/GeometryValueManager.java
.../jkiss/dbeaver/ui/data/managers/GeometryValueManager.java
+9
-4
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/editors/BaseValueEditor.java
浏览文件 @
9b9aba34
...
@@ -170,7 +170,9 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
...
@@ -170,7 +170,9 @@ public abstract class BaseValueEditor<T extends Control> implements IValueEditor
valueController
.
updateSelectionValue
(
newValue
);
valueController
.
updateSelectionValue
(
newValue
);
}
}
}
catch
(
DBException
e
)
{
}
catch
(
DBException
e
)
{
((
IMultiController
)
valueController
).
closeInlineEditor
();
if
(
valueController
instanceof
IMultiController
)
{
((
IMultiController
)
valueController
).
closeInlineEditor
();
}
DBUserInterface
.
getInstance
().
showError
(
"Value save"
,
"Can't save edited value"
,
e
);
DBUserInterface
.
getInstance
().
showError
(
"Value save"
,
"Can't save edited value"
,
e
);
}
}
}
}
...
...
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java
浏览文件 @
9b9aba34
...
@@ -63,6 +63,8 @@ public class GISGeometryValueHandler extends JDBCAbstractValueHandler {
...
@@ -63,6 +63,8 @@ public class GISGeometryValueHandler extends JDBCAbstractValueHandler {
return
object
;
return
object
;
}
else
if
(
object
instanceof
byte
[])
{
}
else
if
(
object
instanceof
byte
[])
{
return
GeometryConverter
.
getInstance
().
from
((
byte
[])
object
);
return
GeometryConverter
.
getInstance
().
from
((
byte
[])
object
);
}
else
if
(
object
instanceof
String
)
{
return
GeometryConverter
.
getInstance
().
from
((
String
)
object
);
}
else
{
}
else
{
throw
new
DBCException
(
"Unsupported geometry value: "
+
object
);
throw
new
DBCException
(
"Unsupported geometry value: "
+
object
);
}
}
...
...
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GeometryConverter.java
浏览文件 @
9b9aba34
...
@@ -5,12 +5,7 @@ import com.vividsolutions.jts.geom.Geometry;
...
@@ -5,12 +5,7 @@ import com.vividsolutions.jts.geom.Geometry;
import
com.vividsolutions.jts.geom.GeometryFactory
;
import
com.vividsolutions.jts.geom.GeometryFactory
;
import
com.vividsolutions.jts.geom.PrecisionModel
;
import
com.vividsolutions.jts.geom.PrecisionModel
;
import
com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory
;
import
com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory
;
import
com.vividsolutions.jts.io.ByteOrderValues
;
import
com.vividsolutions.jts.io.*
;
import
com.vividsolutions.jts.io.InputStreamInStream
;
import
com.vividsolutions.jts.io.OutputStreamOutStream
;
import
com.vividsolutions.jts.io.ParseException
;
import
com.vividsolutions.jts.io.WKBReader
;
import
com.vividsolutions.jts.io.WKBWriter
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.ByteArrayOutputStream
;
...
@@ -71,6 +66,14 @@ public class GeometryConverter {
...
@@ -71,6 +66,14 @@ public class GeometryConverter {
}
}
}
}
public
Geometry
from
(
String
str
)
{
try
{
return
new
WKTReader
().
read
(
str
);
}
catch
(
ParseException
e
)
{
throw
new
IllegalArgumentException
(
e
);
}
}
/**
/**
* Convert Geometry object into byte array containing SRID + WKB Geometry
* Convert Geometry object into byte array containing SRID + WKB Geometry
*/
*/
...
...
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/ui/data/managers/GeometryValueManager.java
浏览文件 @
9b9aba34
...
@@ -18,9 +18,13 @@ package org.jkiss.dbeaver.ui.data.managers;
...
@@ -18,9 +18,13 @@ package org.jkiss.dbeaver.ui.data.managers;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.ui.data.IValueController
;
import
org.jkiss.dbeaver.ui.data.IValueController
;
import
org.jkiss.dbeaver.ui.data.IValueEditor
;
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
* Geometry value manager
...
@@ -32,7 +36,7 @@ public class GeometryValueManager extends BaseValueManager {
...
@@ -32,7 +36,7 @@ public class GeometryValueManager extends BaseValueManager {
@NotNull
@NotNull
@Override
@Override
public
IValueController
.
EditType
[]
getSupportedEditTypes
()
{
public
IValueController
.
EditType
[]
getSupportedEditTypes
()
{
return
new
IValueController
.
EditType
[]
{
IValueController
.
EditType
.
PANEL
,
IValueController
.
EditType
.
EDITOR
};
return
new
IValueController
.
EditType
[]
{
IValueController
.
EditType
.
INLINE
,
IValueController
.
EditType
.
PANEL
,
IValueController
.
EditType
.
EDITOR
};
}
}
@Override
@Override
...
@@ -40,10 +44,11 @@ public class GeometryValueManager extends BaseValueManager {
...
@@ -40,10 +44,11 @@ public class GeometryValueManager extends BaseValueManager {
throws
DBException
throws
DBException
{
{
switch
(
controller
.
getEditType
())
{
switch
(
controller
.
getEditType
())
{
case
EDITOR:
case
INLINE:
return
null
;
case
PANEL:
case
PANEL:
return
null
;
return
new
StringInlineEditor
(
controller
);
case
EDITOR:
return
new
TextViewDialog
(
controller
);
default
:
default
:
return
null
;
return
null
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录