Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
6e30b799
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
6e30b799
编写于
3月 06, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ER diagram create wizard redesign + menu element for entities
上级
83188be9
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
43 addition
and
7 deletion
+43
-7
plugins/org.jkiss.dbeaver.core/plugin.xml
plugins/org.jkiss.dbeaver.core/plugin.xml
+1
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreCommands.java
...dbeaver.core/src/org/jkiss/dbeaver/core/CoreCommands.java
+1
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/NavigatorAdapterFactory.java
...g/jkiss/dbeaver/ui/navigator/NavigatorAdapterFactory.java
+2
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java
...re/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java
+1
-0
plugins/org.jkiss.dbeaver.ext.erd/plugin.xml
plugins/org.jkiss.dbeaver.ext.erd/plugin.xml
+13
-0
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DiagramCreateWizard.java
.../jkiss/dbeaver/ext/erd/navigator/DiagramCreateWizard.java
+9
-1
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DiagramCreateWizardPage.java
...ss/dbeaver/ext/erd/navigator/DiagramCreateWizardPage.java
+16
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/plugin.xml
浏览文件 @
6e30b799
...
@@ -2802,6 +2802,7 @@
...
@@ -2802,6 +2802,7 @@
<adapter
type=
"org.jkiss.dbeaver.model.DBPNamedObject"
/>
<adapter
type=
"org.jkiss.dbeaver.model.DBPNamedObject"
/>
<adapter
type=
"org.jkiss.dbeaver.model.DBPQualifiedObject"
/>
<adapter
type=
"org.jkiss.dbeaver.model.DBPQualifiedObject"
/>
<adapter
type=
"org.jkiss.dbeaver.model.struct.DBSObject"
/>
<adapter
type=
"org.jkiss.dbeaver.model.struct.DBSObject"
/>
<adapter
type=
"org.jkiss.dbeaver.model.struct.DBSEntity"
/>
<adapter
type=
"org.jkiss.dbeaver.model.struct.DBSDataContainer"
/>
<adapter
type=
"org.jkiss.dbeaver.model.struct.DBSDataContainer"
/>
<adapter
type=
"org.jkiss.dbeaver.model.struct.DBSDataManipulator"
/>
<adapter
type=
"org.jkiss.dbeaver.model.struct.DBSDataManipulator"
/>
<adapter
type=
"org.jkiss.dbeaver.model.struct.rdb.DBSProcedure"
/>
<adapter
type=
"org.jkiss.dbeaver.model.struct.rdb.DBSProcedure"
/>
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreCommands.java
浏览文件 @
6e30b799
...
@@ -22,6 +22,7 @@ package org.jkiss.dbeaver.core;
...
@@ -22,6 +22,7 @@ package org.jkiss.dbeaver.core;
public
interface
CoreCommands
public
interface
CoreCommands
{
{
String
GROUP_TOOLS
=
"tools"
;
String
GROUP_TOOLS
=
"tools"
;
String
GROUP_TOOLS_END
=
"tools_end"
;
String
GROUP_NAVIGATOR_ADDITIONS
=
"navigator_additions"
;
String
GROUP_NAVIGATOR_ADDITIONS
=
"navigator_additions"
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/NavigatorAdapterFactory.java
浏览文件 @
6e30b799
...
@@ -32,10 +32,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDataSource;
...
@@ -32,10 +32,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDataSource;
import
org.jkiss.dbeaver.model.navigator.DBNNode
;
import
org.jkiss.dbeaver.model.navigator.DBNNode
;
import
org.jkiss.dbeaver.model.navigator.DBNResource
;
import
org.jkiss.dbeaver.model.navigator.DBNResource
;
import
org.jkiss.dbeaver.model.preferences.DBPPropertySource
;
import
org.jkiss.dbeaver.model.preferences.DBPPropertySource
;
import
org.jkiss.dbeaver.model.struct.DBSDataContainer
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.model.struct.DBSDataManipulator
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSWrapper
;
import
org.jkiss.dbeaver.runtime.properties.PropertyCollector
;
import
org.jkiss.dbeaver.runtime.properties.PropertyCollector
;
import
org.jkiss.dbeaver.ui.DBeaverIcons
;
import
org.jkiss.dbeaver.ui.DBeaverIcons
;
import
org.jkiss.dbeaver.ui.properties.PropertySourceDelegate
;
import
org.jkiss.dbeaver.ui.properties.PropertySourceDelegate
;
...
@@ -50,6 +47,7 @@ public class NavigatorAdapterFactory implements IAdapterFactory
...
@@ -50,6 +47,7 @@ public class NavigatorAdapterFactory implements IAdapterFactory
DBPQualifiedObject
.
class
,
DBPQualifiedObject
.
class
,
DBPObject
.
class
,
DBPObject
.
class
,
DBSObject
.
class
,
DBSObject
.
class
,
DBSEntity
.
class
,
DBSDataContainer
.
class
,
DBSDataContainer
.
class
,
DBSDataManipulator
.
class
,
DBSDataManipulator
.
class
,
DBPDataSourceContainer
.
class
,
DBPDataSourceContainer
.
class
,
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/NavigatorUtils.java
浏览文件 @
6e30b799
...
@@ -231,6 +231,7 @@ public class NavigatorUtils {
...
@@ -231,6 +231,7 @@ public class NavigatorUtils {
}
}
manager
.
add
(
new
GroupMarker
(
CoreCommands
.
GROUP_TOOLS
));
manager
.
add
(
new
GroupMarker
(
CoreCommands
.
GROUP_TOOLS
));
manager
.
add
(
new
GroupMarker
(
CoreCommands
.
GROUP_TOOLS_END
));
if
(
menuListener
!=
null
)
{
if
(
menuListener
!=
null
)
{
menuListener
.
menuAboutToShow
(
manager
);
menuListener
.
menuAboutToShow
(
manager
);
...
...
plugins/org.jkiss.dbeaver.ext.erd/plugin.xml
浏览文件 @
6e30b799
...
@@ -318,6 +318,19 @@
...
@@ -318,6 +318,19 @@
</command>
</command>
</menuContribution>
</menuContribution>
<menuContribution
allPopups=
"false"
locationURI=
"popup:org.eclipse.ui.popup.any?before=generate"
>
<command
commandId=
"org.jkiss.dbeaver.erd.diagram.create"
label=
"%menu.create.new.diagram"
>
<visibleWhen>
<with
variable=
"selection"
>
<count
value=
"(1-"
/>
<iterate
operator=
"and"
>
<adapt
type=
"org.jkiss.dbeaver.model.struct.DBSEntity"
/>
</iterate>
</with>
</visibleWhen>
</command>
</menuContribution>
<menuContribution
allPopups=
"false"
locationURI=
"popup:org.jkiss.dbeaver.ext.erd.editor.ERDEditorPart.EditorContext?after=additions"
>
<menuContribution
allPopups=
"false"
locationURI=
"popup:org.jkiss.dbeaver.ext.erd.editor.ERDEditorPart.EditorContext?after=additions"
>
<command
commandId=
"org.eclipse.ui.edit.undo"
/>
<command
commandId=
"org.eclipse.ui.edit.undo"
/>
<command
commandId=
"org.eclipse.ui.edit.redo"
/>
<command
commandId=
"org.eclipse.ui.edit.redo"
/>
...
...
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DiagramCreateWizard.java
浏览文件 @
6e30b799
...
@@ -52,6 +52,7 @@ public class DiagramCreateWizard extends Wizard implements INewWizard {
...
@@ -52,6 +52,7 @@ public class DiagramCreateWizard extends Wizard implements INewWizard {
private
EntityDiagram
diagram
=
new
EntityDiagram
(
null
,
""
);
private
EntityDiagram
diagram
=
new
EntityDiagram
(
null
,
""
);
private
DiagramCreateWizardPage
pageContent
;
private
DiagramCreateWizardPage
pageContent
;
private
String
errorMessage
;
private
String
errorMessage
;
private
IStructuredSelection
entitySelection
;
public
DiagramCreateWizard
()
{
public
DiagramCreateWizard
()
{
}
}
...
@@ -78,6 +79,13 @@ public class DiagramCreateWizard extends Wizard implements INewWizard {
...
@@ -78,6 +79,13 @@ public class DiagramCreateWizard extends Wizard implements INewWizard {
errorMessage
=
e
.
getMessage
();
errorMessage
=
e
.
getMessage
();
}
}
}
}
// Check for entity selection
if
(
selection
!=
null
&&
!
selection
.
isEmpty
())
{
if
(
Platform
.
getAdapterManager
().
getAdapter
(
selection
.
getFirstElement
(),
DBSEntity
.
class
)
!=
null
)
{
entitySelection
=
selection
;
}
}
}
}
this
.
folder
=
diagramFolder
;
this
.
folder
=
diagramFolder
;
}
}
...
@@ -85,7 +93,7 @@ public class DiagramCreateWizard extends Wizard implements INewWizard {
...
@@ -85,7 +93,7 @@ public class DiagramCreateWizard extends Wizard implements INewWizard {
@Override
@Override
public
void
addPages
()
{
public
void
addPages
()
{
super
.
addPages
();
super
.
addPages
();
pageContent
=
new
DiagramCreateWizardPage
(
diagram
);
pageContent
=
new
DiagramCreateWizardPage
(
diagram
,
entitySelection
);
addPage
(
pageContent
);
addPage
(
pageContent
);
if
(
getContainer
()
!=
null
)
{
if
(
getContainer
()
!=
null
)
{
//WizardDialog call
//WizardDialog call
...
...
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/navigator/DiagramCreateWizardPage.java
浏览文件 @
6e30b799
...
@@ -19,6 +19,7 @@ package org.jkiss.dbeaver.ext.erd.navigator;
...
@@ -19,6 +19,7 @@ package org.jkiss.dbeaver.ext.erd.navigator;
import
org.eclipse.jface.viewers.CheckboxTreeViewer
;
import
org.eclipse.jface.viewers.CheckboxTreeViewer
;
import
org.eclipse.jface.viewers.ICheckStateProvider
;
import
org.eclipse.jface.viewers.ICheckStateProvider
;
import
org.eclipse.jface.viewers.IStructuredSelection
;
import
org.eclipse.jface.wizard.WizardPage
;
import
org.eclipse.jface.wizard.WizardPage
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.events.ModifyEvent
;
import
org.eclipse.swt.events.ModifyEvent
;
...
@@ -50,11 +51,13 @@ class DiagramCreateWizardPage extends WizardPage {
...
@@ -50,11 +51,13 @@ class DiagramCreateWizardPage extends WizardPage {
private
EntityDiagram
diagram
;
private
EntityDiagram
diagram
;
private
DatabaseNavigatorTree
contentTree
;
private
DatabaseNavigatorTree
contentTree
;
private
IStructuredSelection
entitySelection
;
protected
DiagramCreateWizardPage
(
EntityDiagram
diagram
)
protected
DiagramCreateWizardPage
(
EntityDiagram
diagram
,
IStructuredSelection
entitySelection
)
{
{
super
(
ERDMessages
.
wizard_page_diagram_create_name
);
super
(
ERDMessages
.
wizard_page_diagram_create_name
);
this
.
diagram
=
diagram
;
this
.
diagram
=
diagram
;
this
.
entitySelection
=
entitySelection
;
setTitle
(
ERDMessages
.
wizard_page_diagram_create_title
);
setTitle
(
ERDMessages
.
wizard_page_diagram_create_title
);
setDescription
(
ERDMessages
.
wizard_page_diagram_create_description
);
setDescription
(
ERDMessages
.
wizard_page_diagram_create_description
);
...
@@ -63,10 +66,16 @@ class DiagramCreateWizardPage extends WizardPage {
...
@@ -63,10 +66,16 @@ class DiagramCreateWizardPage extends WizardPage {
@Override
@Override
public
boolean
isPageComplete
()
public
boolean
isPageComplete
()
{
{
boolean
hasName
=
!
CommonUtils
.
isEmpty
(
diagram
.
getName
());
if
(!
hasName
)
{
setErrorMessage
(
"Set diagram name"
);
}
else
{
setErrorMessage
(
null
);
}
if
(
getErrorMessage
()
!=
null
)
{
if
(
getErrorMessage
()
!=
null
)
{
return
false
;
return
false
;
}
}
return
!
CommonUtils
.
isEmpty
(
diagram
.
getName
())
;
return
hasName
;
}
}
@Override
@Override
...
@@ -122,6 +131,11 @@ class DiagramCreateWizardPage extends WizardPage {
...
@@ -122,6 +131,11 @@ class DiagramCreateWizardPage extends WizardPage {
}
}
});
});
if
(
entitySelection
!=
null
)
{
viewer
.
setSelection
(
entitySelection
,
true
);
viewer
.
setCheckedElements
(
entitySelection
.
toArray
());
}
setControl
(
placeholder
);
setControl
(
placeholder
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录