Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
2144af05
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,发现更多精彩内容 >>
提交
2144af05
编写于
8月 23, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#6570 Embedded ERD save/load
Former-commit-id:
9ed7d106
上级
6c4eb887
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
52 addition
and
19 deletion
+52
-19
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
...c/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
+33
-16
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/DiagramLoader.java
...rd/src/org/jkiss/dbeaver/ext/erd/model/DiagramLoader.java
+5
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java
...l/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java
+4
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/virtual/DBVContainer.java
...del/src/org/jkiss/dbeaver/model/virtual/DBVContainer.java
+1
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/virtual/DBVObject.java
....model/src/org/jkiss/dbeaver/model/virtual/DBVObject.java
+2
-2
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
.../src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+7
-0
未找到文件。
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
浏览文件 @
2144af05
...
...
@@ -26,6 +26,7 @@ import org.jkiss.dbeaver.Log;
import
org.jkiss.dbeaver.ext.erd.ERDActivator
;
import
org.jkiss.dbeaver.ext.erd.ERDConstants
;
import
org.jkiss.dbeaver.ext.erd.model.DiagramLoader
;
import
org.jkiss.dbeaver.ext.erd.model.ERDEntity
;
import
org.jkiss.dbeaver.ext.erd.model.EntityDiagram
;
import
org.jkiss.dbeaver.model.DBPDataSourceContainer
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionContext
;
...
...
@@ -42,7 +43,11 @@ import org.jkiss.dbeaver.ui.editors.IDatabaseEditor;
import
org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput
;
import
org.jkiss.dbeaver.ui.editors.entity.IEntityStructureEditor
;
import
org.jkiss.dbeaver.utils.RuntimeUtils
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.xml.XMLUtils
;
import
org.w3c.dom.Document
;
import
java.io.StringReader
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.*
;
...
...
@@ -142,19 +147,7 @@ public class ERDEditorEmbedded extends ERDEditorPart implements IDatabaseEditor,
diagramLoadingJob
=
LoadingJob
.
createService
(
new
DatabaseLoadService
<
EntityDiagram
>(
"Load diagram '"
+
object
.
getName
()
+
"'"
,
object
.
getDataSource
())
{
@Override
public
EntityDiagram
evaluate
(
DBRProgressMonitor
monitor
)
throws
InvocationTargetException
,
InterruptedException
{
// Do not refresh actual metadata. It is slow and it may corrupt diagram state
/*
if (refreshMetadata && object instanceof DBPRefreshableObject) {
try {
getEditorInput().getNavigatorNode().refreshNode(monitor, ERDEditorEmbedded.this);
} catch (DBException e) {
log.warn("Error refreshing database metadata", e);
}
}
*/
public
EntityDiagram
evaluate
(
DBRProgressMonitor
monitor
)
{
try
{
return
loadFromDatabase
(
monitor
);
}
catch
(
DBException
e
)
{
...
...
@@ -195,19 +188,38 @@ public class ERDEditorEmbedded extends ERDEditorPart implements IDatabaseEditor,
}
else
{
diagram
=
new
EntityDiagram
(
getDecorator
(),
dbObject
,
dbObject
.
getName
());
boolean
hasPersistedState
=
false
;
try
{
// Load persisted state
DBVObject
vObject
=
this
.
getVirtualObject
();
if
(
vObject
!=
null
)
{
Map
<
String
,
Object
>
diagramState
=
vObject
.
getProperty
(
PROP_DIAGRAM_STATE
);
if
(
diagramState
!=
null
)
{
String
serializedDiagram
=
(
String
)
diagramState
.
get
(
PROPS_DIAGRAM_SERIALIZED
);
if
(!
CommonUtils
.
isEmpty
(
serializedDiagram
))
{
Document
xmlDocument
=
XMLUtils
.
parseDocument
(
new
StringReader
(
serializedDiagram
));
DiagramLoader
.
loadDiagram
(
monitor
,
xmlDocument
,
dbObject
.
getDataSource
().
getContainer
().
getProject
(),
diagram
);
hasPersistedState
=
true
;
}
}
}
}
catch
(
Exception
e
)
{
log
.
error
(
"Error loading ER diagram from saved state"
,
e
);
}
diagram
.
setLayoutManualAllowed
(
true
);
diagram
.
setNeedsAutoLayout
(
tru
e
);
diagram
.
setNeedsAutoLayout
(
!
hasPersistedStat
e
);
// Fill from database even if we loaded from state (something could change since last view)
diagram
.
fillEntities
(
monitor
,
collectDatabaseTables
(
monitor
,
dbObject
),
collectDatabaseTables
(
monitor
,
dbObject
,
diagram
),
dbObject
);
}
return
diagram
;
}
private
Collection
<
DBSEntity
>
collectDatabaseTables
(
DBRProgressMonitor
monitor
,
DBSObject
root
)
throws
DBException
private
Collection
<
DBSEntity
>
collectDatabaseTables
(
DBRProgressMonitor
monitor
,
DBSObject
root
,
EntityDiagram
diagram
)
throws
DBException
{
Set
<
DBSEntity
>
result
=
new
LinkedHashSet
<>();
...
...
@@ -315,6 +327,11 @@ public class ERDEditorEmbedded extends ERDEditorPart implements IDatabaseEditor,
monitor
.
done
();
}
// Remove entities already loaded in the diagram
for
(
ERDEntity
diagramEntity
:
diagram
.
getEntities
())
{
result
.
remove
(
diagramEntity
.
getObject
());
}
return
result
;
}
...
...
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/DiagramLoader.java
浏览文件 @
2144af05
...
...
@@ -187,7 +187,7 @@ public class DiagramLoader
}
public
static
void
load
(
DBRProgressMonitor
monitor
,
IProject
project
,
DiagramPart
diagramPart
,
InputStream
in
)
throws
IOException
,
XMLException
,
DBException
throws
XMLException
,
DBException
{
monitor
.
beginTask
(
"Parse diagram"
,
1
);
final
EntityDiagram
diagram
=
diagramPart
.
getDiagram
();
...
...
@@ -199,6 +199,10 @@ public class DiagramLoader
final
Document
document
=
XMLUtils
.
parseDocument
(
in
);
loadDiagram
(
monitor
,
document
,
projectMeta
,
diagram
);
}
public
static
void
loadDiagram
(
DBRProgressMonitor
monitor
,
Document
document
,
DBPProject
projectMeta
,
EntityDiagram
diagram
)
throws
DBException
{
final
Element
diagramElem
=
document
.
getDocumentElement
();
monitor
.
done
();
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java
浏览文件 @
2144af05
...
...
@@ -22,6 +22,7 @@ import org.jkiss.code.Nullable;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.app.DBPDataSourceRegistry
;
import
org.jkiss.dbeaver.model.app.DBPPlatform
;
import
org.jkiss.dbeaver.model.app.DBPProject
;
import
org.jkiss.dbeaver.model.connection.DBPNativeClientLocation
;
import
org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration
;
import
org.jkiss.dbeaver.model.connection.DBPDriver
;
...
...
@@ -193,6 +194,9 @@ public interface DBPDataSourceContainer extends DBSObject, DBDPreferences, DBPNa
@NotNull
DBPDataSourceRegistry
getRegistry
();
@NotNull
DBPProject
getProject
();
void
persistConfiguration
();
@NotNull
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/virtual/DBVContainer.java
浏览文件 @
2144af05
...
...
@@ -70,6 +70,7 @@ public class DBVContainer extends DBVObject implements DBSObjectContainer {
String
id
=
element
.
getKey
();
if
(
id
.
startsWith
(
ENTITY_PREFIX
))
{
DBVEntity
entity
=
new
DBVEntity
(
this
,
id
.
substring
(
ENTITY_PREFIX
.
length
()),
(
Map
<
String
,
Object
>)
element
.
getValue
());
entities
.
put
(
entity
.
getName
(),
entity
);
}
else
if
(
id
.
startsWith
(
CONFIG_PREFIX
))
{
String
configMap
=
id
.
substring
(
CONFIG_PREFIX
.
length
());
if
(
configMap
.
equals
(
"properties"
))
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/virtual/DBVObject.java
浏览文件 @
2144af05
...
...
@@ -62,8 +62,8 @@ public abstract class DBVObject implements DBSObject {
* @param name property name
*/
@Nullable
public
Object
getProperty
(
@NotNull
String
name
)
{
return
CommonUtils
.
isEmpty
(
properties
)
?
null
:
properties
.
get
(
name
);
public
<
T
>
T
getProperty
(
@NotNull
String
name
)
{
return
CommonUtils
.
isEmpty
(
properties
)
?
null
:
(
T
)
properties
.
get
(
name
);
}
public
void
setProperty
(
String
name
,
@Nullable
Object
value
)
{
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
浏览文件 @
2144af05
...
...
@@ -28,6 +28,7 @@ import org.jkiss.dbeaver.DBException;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.ModelPreferences
;
import
org.jkiss.dbeaver.model.*
;
import
org.jkiss.dbeaver.model.app.DBPProject
;
import
org.jkiss.dbeaver.model.connection.DBPAuthInfo
;
import
org.jkiss.dbeaver.model.app.DBPDataSourceRegistry
;
import
org.jkiss.dbeaver.model.app.DBPPlatform
;
...
...
@@ -706,6 +707,12 @@ public class DataSourceDescriptor
return
registry
;
}
@NotNull
@Override
public
DBPProject
getProject
()
{
return
registry
.
getProject
();
}
@Override
public
void
persistConfiguration
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录