Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
14ed345a
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,发现更多精彩内容 >>
提交
14ed345a
编写于
5月 12, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Object editor fix
上级
0af7d786
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
89 addition
and
3 deletion
+89
-3
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/SimpleTypedObject.java
...l/src/org/jkiss/dbeaver/model/impl/SimpleTypedObject.java
+79
-0
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/dialogs/ComplexObjectEditor.java
...rg/jkiss/dbeaver/ui/data/dialogs/ComplexObjectEditor.java
+9
-2
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/managers/StringValueManager.java
...rg/jkiss/dbeaver/ui/data/managers/StringValueManager.java
+1
-1
未找到文件。
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/SimpleTypedObject.java
0 → 100644
浏览文件 @
14ed345a
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2019 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.model.impl
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.DBPDataKind
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.List
;
/**
* SimpleTypedObject
*/
public
class
SimpleTypedObject
implements
DBSTypedObject
{
public
static
final
SimpleTypedObject
DEFAULT_TYPE
=
new
SimpleTypedObject
(
"Object"
);
private
String
typeName
;
public
SimpleTypedObject
(
String
typeName
)
{
this
.
typeName
=
typeName
;
}
@Override
public
String
getTypeName
()
{
return
typeName
;
}
@Override
public
String
getFullTypeName
()
{
return
getTypeName
();
}
@Override
public
int
getTypeID
()
{
return
0
;
}
@Override
public
DBPDataKind
getDataKind
()
{
return
DBPDataKind
.
OBJECT
;
}
@Override
public
Integer
getScale
()
{
return
null
;
}
@Override
public
Integer
getPrecision
()
{
return
null
;
}
@Override
public
long
getMaxLength
()
{
return
0
;
}
}
\ No newline at end of file
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/dialogs/ComplexObjectEditor.java
浏览文件 @
14ed345a
...
...
@@ -44,6 +44,7 @@ import org.jkiss.dbeaver.model.exec.DBCException;
import
org.jkiss.dbeaver.model.exec.DBCExecutionContext
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionPurpose
;
import
org.jkiss.dbeaver.model.exec.DBCSession
;
import
org.jkiss.dbeaver.model.impl.SimpleTypedObject
;
import
org.jkiss.dbeaver.model.impl.data.DefaultValueHandler
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableWithResult
;
...
...
@@ -58,6 +59,7 @@ import org.jkiss.dbeaver.ui.UIUtils;
import
org.jkiss.dbeaver.ui.controls.resultset.ResultSetPreferences
;
import
org.jkiss.dbeaver.ui.controls.resultset.ThemeConstants
;
import
org.jkiss.dbeaver.ui.data.*
;
import
org.jkiss.dbeaver.ui.data.managers.DefaultValueManager
;
import
org.jkiss.dbeaver.ui.data.registry.ValueManagerRegistry
;
import
org.jkiss.dbeaver.ui.internal.UIMessages
;
import
org.jkiss.utils.ArrayUtils
;
...
...
@@ -438,9 +440,14 @@ public class ComplexObjectEditor extends TreeViewer {
value
=
arrayItem
.
value
;
}
else
if
(
this
.
item
instanceof
MapEntry
)
{
valueHandler
=
DefaultValueHandler
.
INSTANCE
;
type
=
null
;
type
=
SimpleTypedObject
.
DEFAULT_TYPE
;
name
=
((
MapEntry
)
this
.
item
).
name
;
value
=
((
MapEntry
)
this
.
item
).
value
;
}
else
if
(
this
.
item
instanceof
CollItem
)
{
valueHandler
=
DefaultValueHandler
.
INSTANCE
;
type
=
SimpleTypedObject
.
DEFAULT_TYPE
;
name
=
String
.
valueOf
(((
CollItem
)
this
.
item
).
index
);
value
=
((
CollItem
)
this
.
item
).
value
;
}
else
{
throw
new
DBCException
(
"Unsupported complex object element: "
+
this
.
item
);
}
...
...
@@ -507,7 +514,7 @@ public class ComplexObjectEditor extends TreeViewer {
public
IValueManager
getValueManager
()
{
DBSTypedObject
valueType
=
getValueType
();
if
(
valueType
==
null
)
{
return
null
;
return
DefaultValueManager
.
INSTANCE
;
}
return
ValueManagerRegistry
.
findValueManager
(
getExecutionContext
().
getDataSource
(),
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/managers/StringValueManager.java
浏览文件 @
14ed345a
...
...
@@ -52,7 +52,7 @@ public class StringValueManager extends ContentValueManager {
case
INLINE:
// Open inline/panel editor
Object
value
=
controller
.
getValue
();
if
(
dataKind
==
DBPDataKind
.
STRING
||
dataKind
==
DBPDataKind
.
NUMERIC
||
dataKind
==
DBPDataKind
.
DATETIME
||
dataKind
==
DBPDataKind
.
BOOLEAN
)
{
if
(
dataKind
==
DBPDataKind
.
STRING
||
dataKind
==
DBPDataKind
.
NUMERIC
||
dataKind
==
DBPDataKind
.
DATETIME
||
dataKind
==
DBPDataKind
.
BOOLEAN
||
dataKind
==
DBPDataKind
.
OBJECT
)
{
return
new
StringInlineEditor
(
controller
);
}
else
if
(
value
instanceof
DBDContentCached
&&
ContentUtils
.
isTextValue
(((
DBDContentCached
)
value
).
getCachedValue
()))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录