Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
fb259dc9
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,发现更多精彩内容 >>
提交
fb259dc9
编写于
5月 18, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#5867 NAvigator tree: child nodes reading fix
Former-commit-id:
45998281
上级
3005a934
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
12 addition
and
16 deletion
+12
-16
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java
...rg/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeFolder.java
...org/jkiss/dbeaver/model/navigator/meta/DBXTreeFolder.java
+2
-2
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeItem.java
...c/org/jkiss/dbeaver/model/navigator/meta/DBXTreeItem.java
+3
-3
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeNode.java
...c/org/jkiss/dbeaver/model/navigator/meta/DBXTreeNode.java
+2
-2
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeObject.java
...org/jkiss/dbeaver/model/navigator/meta/DBXTreeObject.java
+2
-2
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerLocalFolderCreate.java
.../navigator/actions/NavigatorHandlerLocalFolderCreate.java
+1
-6
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorView.java
.../dbeaver/ui/navigator/database/DatabaseNavigatorView.java
+1
-0
未找到文件。
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java
浏览文件 @
fb259dc9
...
...
@@ -133,7 +133,7 @@ public class DBNProjectDatabases extends DBNNode implements DBNContainer, DBPEve
@Override
public
boolean
allowsChildren
()
{
return
!
dataSources
.
isEmpty
();
return
!
dataSources
.
isEmpty
()
||
!
dataSourceRegistry
.
getRootFolders
().
isEmpty
()
;
}
@Override
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeFolder.java
浏览文件 @
fb259dc9
...
...
@@ -65,7 +65,7 @@ public class DBXTreeFolder extends DBXTreeNode {
}
@Override
public
String
getNodeType
(
@N
otNull
DBPDataSource
dataSource
,
@Nullable
String
locale
)
{
public
String
getNodeType
(
@N
ullable
DBPDataSource
dataSource
,
@Nullable
String
locale
)
{
if
(
locale
==
null
)
{
return
label
;
}
else
{
...
...
@@ -74,7 +74,7 @@ public class DBXTreeFolder extends DBXTreeNode {
}
@Override
public
String
getChildrenType
(
DBPDataSource
dataSource
,
String
locale
)
{
public
String
getChildrenType
(
@Nullable
DBPDataSource
dataSource
,
String
locale
)
{
return
getNodeType
(
dataSource
,
locale
);
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeItem.java
浏览文件 @
fb259dc9
...
...
@@ -86,7 +86,7 @@ public class DBXTreeItem extends DBXTreeNode
}
@Override
public
String
getChildrenType
(
DBPDataSource
dataSource
,
String
locale
)
public
String
getChildrenType
(
@Nullable
DBPDataSource
dataSource
,
String
locale
)
{
final
String
term
=
getNodeTerm
(
dataSource
,
label
,
true
);
if
(
term
!=
null
)
{
...
...
@@ -96,7 +96,7 @@ public class DBXTreeItem extends DBXTreeNode
}
@Override
public
String
getNodeType
(
@N
otNull
DBPDataSource
dataSource
,
@Nullable
String
locale
)
public
String
getNodeType
(
@N
ullable
DBPDataSource
dataSource
,
@Nullable
String
locale
)
{
final
String
term
=
getNodeTerm
(
dataSource
,
itemLabel
,
false
);
if
(
term
!=
null
)
{
...
...
@@ -105,7 +105,7 @@ public class DBXTreeItem extends DBXTreeNode
return
itemLabel
;
}
private
String
getNodeTerm
(
DBPDataSource
dataSource
,
String
termId
,
boolean
multiple
)
private
String
getNodeTerm
(
@Nullable
DBPDataSource
dataSource
,
String
termId
,
boolean
multiple
)
{
if
(
termId
.
startsWith
(
"#"
)
&&
dataSource
instanceof
DBPTermProvider
)
{
final
String
term
=
((
DBPTermProvider
)
dataSource
).
getObjectTypeTerm
(
getPath
(),
termId
.
substring
(
1
),
multiple
);
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeNode.java
浏览文件 @
fb259dc9
...
...
@@ -142,12 +142,12 @@ public abstract class DBXTreeNode
/**
* Human readable node type
*/
public
abstract
String
getNodeType
(
@N
otNull
DBPDataSource
dataSource
,
@Nullable
String
locale
);
public
abstract
String
getNodeType
(
@N
ullable
DBPDataSource
dataSource
,
@Nullable
String
locale
);
/**
* Human readable child nodes type
*/
public
abstract
String
getChildrenType
(
@N
otNull
DBPDataSource
dataSource
,
@Nullable
String
locale
);
public
abstract
String
getChildrenType
(
@N
ullable
DBPDataSource
dataSource
,
@Nullable
String
locale
);
public
boolean
isNavigable
()
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/meta/DBXTreeObject.java
浏览文件 @
fb259dc9
...
...
@@ -52,13 +52,13 @@ public class DBXTreeObject extends DBXTreeNode
}
@Override
public
String
getNodeType
(
@N
otNull
DBPDataSource
dataSource
,
@Nullable
String
locale
)
public
String
getNodeType
(
@N
ullable
DBPDataSource
dataSource
,
@Nullable
String
locale
)
{
return
label
;
}
@Override
public
String
getChildrenType
(
DBPDataSource
dataSource
,
String
locale
)
public
String
getChildrenType
(
@Nullable
DBPDataSource
dataSource
,
String
locale
)
{
return
label
;
}
...
...
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerLocalFolderCreate.java
浏览文件 @
fb259dc9
...
...
@@ -92,12 +92,7 @@ public class NavigatorHandlerLocalFolderCreate extends AbstractHandler {
if
(
parentFolder
!=
null
&&
activePart
instanceof
NavigatorViewBase
)
{
final
TreeViewer
viewer
=
((
NavigatorViewBase
)
activePart
).
getNavigatorViewer
();
if
(
viewer
!=
null
)
{
UIUtils
.
asyncExec
(
new
Runnable
()
{
@Override
public
void
run
()
{
viewer
.
expandToLevel
(
parentFolder
,
1
);
}
});
UIUtils
.
asyncExec
(()
->
viewer
.
expandToLevel
(
parentFolder
,
1
));
}
}
DBNModel
.
updateConfigAndRefreshDatabases
(
databases
);
...
...
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorView.java
浏览文件 @
fb259dc9
...
...
@@ -67,6 +67,7 @@ public class DatabaseNavigatorView extends NavigatorViewBase implements DBPProje
{
UIUtils
.
asyncExec
(()
->
{
getNavigatorTree
().
getViewer
().
setInput
(
new
DatabaseNavigatorContent
(
getRootNode
()));
getSite
().
getSelectionProvider
().
setSelection
(
getNavigatorTree
().
getViewer
().
getSelection
());
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录