Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
dd3e953e
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,发现更多精彩内容 >>
提交
dd3e953e
编写于
6月 30, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Runtime refactoring
上级
d34bf42f
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
24 addition
and
24 deletion
+24
-24
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNDataSource.java
.../src/org/jkiss/dbeaver/model/navigator/DBNDataSource.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNDatabaseNode.java
...rc/org/jkiss/dbeaver/model/navigator/DBNDatabaseNode.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRProgressListener.java
.../org/jkiss/dbeaver/model/runtime/DBRProgressListener.java
+2
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/compare/CompareObjectsExecutor.java
...g/jkiss/dbeaver/tools/compare/CompareObjectsExecutor.java
+4
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java
...eaver/ui/actions/datasource/DataSourceConnectHandler.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorInputFactory.java
.../jkiss/dbeaver/ui/editors/DatabaseEditorInputFactory.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/resources/bookmarks/BookmarksHandlerImpl.java
.../dbeaver/ui/resources/bookmarks/BookmarksHandlerImpl.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/metadata/SearchMetadataPage.java
.../jkiss/dbeaver/ui/search/metadata/SearchMetadataPage.java
+3
-3
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNDataSource.java
浏览文件 @
dd3e953e
...
...
@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.DBIcon;
import
org.jkiss.dbeaver.model.DBIconComposite
;
import
org.jkiss.dbeaver.model.DBPEvent
;
import
org.jkiss.dbeaver.model.DBPImage
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
c
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
gr
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSDataSourceContainer
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
...
...
@@ -122,7 +122,7 @@ public class DBNDataSource extends DBNDatabaseNode implements IAdaptable
}
@Override
public
boolean
initializeNode
(
@Nullable
DBRProgressMonitor
monitor
,
DBRPro
c
essListener
onFinish
)
public
boolean
initializeNode
(
@Nullable
DBRProgressMonitor
monitor
,
DBRPro
gr
essListener
onFinish
)
{
if
(
dataSource
==
null
)
{
return
false
;
...
...
@@ -132,7 +132,7 @@ public class DBNDataSource extends DBNDatabaseNode implements IAdaptable
//dataSource.connect(monitor);
}
else
{
if
(
onFinish
!=
null
)
{
onFinish
.
on
ProcessFinish
(
Status
.
OK_STATUS
);
onFinish
.
on
TaskFinished
(
Status
.
OK_STATUS
);
}
}
return
dataSource
.
isConnected
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNDatabaseNode.java
浏览文件 @
dd3e953e
...
...
@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.DBException;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.model.*
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionContext
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
c
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
gr
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObjectFilter
;
...
...
@@ -224,10 +224,10 @@ public abstract class DBNDatabaseNode extends DBNNode implements DBSWrapper, DBP
return
locked
||
super
.
isLocked
();
}
public
boolean
initializeNode
(
DBRProgressMonitor
monitor
,
DBRPro
c
essListener
onFinish
)
public
boolean
initializeNode
(
DBRProgressMonitor
monitor
,
DBRPro
gr
essListener
onFinish
)
{
if
(
onFinish
!=
null
)
{
onFinish
.
on
ProcessFinish
(
Status
.
OK_STATUS
);
onFinish
.
on
TaskFinished
(
Status
.
OK_STATUS
);
}
return
true
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRPro
c
essListener.java
→
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRPro
gr
essListener.java
浏览文件 @
dd3e953e
...
...
@@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IStatus;
/**
* Process execution listener
*/
public
interface
DBRPro
c
essListener
{
public
interface
DBRPro
gr
essListener
{
void
on
ProcessFinish
(
IStatus
status
);
void
on
TaskFinished
(
IStatus
status
);
}
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/compare/CompareObjectsExecutor.java
浏览文件 @
dd3e953e
...
...
@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.DBPPropertyDescriptor;
import
org.jkiss.dbeaver.model.DBPSystemObject
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseFolder
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
c
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
gr
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObjectContainer
;
...
...
@@ -48,7 +48,7 @@ public class CompareObjectsExecutor {
private
final
List
<
DBNDatabaseNode
>
rootNodes
;
private
final
Map
<
DBPDataSource
,
DataSourcePropertyFilter
>
dataSourceFilters
=
new
IdentityHashMap
<
DBPDataSource
,
DataSourcePropertyFilter
>();
private
final
DBRPro
c
essListener
initializeFinisher
;
private
final
DBRPro
gr
essListener
initializeFinisher
;
private
final
ILazyPropertyLoadListener
lazyPropertyLoadListener
;
private
volatile
int
initializedCount
=
0
;
...
...
@@ -121,9 +121,9 @@ public class CompareObjectsExecutor {
this
.
settings
=
settings
;
this
.
rootNodes
=
settings
.
getNodes
();
initializeFinisher
=
new
DBRPro
c
essListener
()
{
initializeFinisher
=
new
DBRPro
gr
essListener
()
{
@Override
public
void
on
ProcessFinish
(
IStatus
status
)
public
void
on
TaskFinished
(
IStatus
status
)
{
if
(!
status
.
isOK
())
{
initializeError
=
status
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceConnectHandler.java
浏览文件 @
dd3e953e
...
...
@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
import
org.jkiss.dbeaver.model.DBPEvent
;
import
org.jkiss.dbeaver.model.access.DBAAuthInfo
;
import
org.jkiss.dbeaver.model.net.DBWHandlerConfiguration
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
c
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
gr
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSDataSourceContainer
;
import
org.jkiss.dbeaver.runtime.ui.DBUserInterface
;
...
...
@@ -51,7 +51,7 @@ public class DataSourceConnectHandler extends DataSourceHandler
public
static
void
execute
(
@Nullable
DBRProgressMonitor
monitor
,
@NotNull
DBSDataSourceContainer
dataSourceContainer
,
@Nullable
final
DBRPro
c
essListener
onFinish
)
@Nullable
final
DBRPro
gr
essListener
onFinish
)
{
if
(
dataSourceContainer
instanceof
DataSourceDescriptor
&&
!
dataSourceContainer
.
isConnected
())
{
final
DataSourceDescriptor
dataSourceDescriptor
=
(
DataSourceDescriptor
)
dataSourceContainer
;
...
...
@@ -95,7 +95,7 @@ public class DataSourceConnectHandler extends DataSourceHandler
}
}
if
(
onFinish
!=
null
)
{
onFinish
.
on
ProcessFinish
(
result
);
onFinish
.
on
TaskFinished
(
result
);
}
else
if
(!
result
.
isOK
())
{
DBUserInterface
.
getInstance
().
showError
(
connectJob
.
getName
(),
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorInputFactory.java
浏览文件 @
dd3e953e
...
...
@@ -33,7 +33,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import
org.jkiss.dbeaver.model.navigator.DBNDataSource
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.model.navigator.DBNNode
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
c
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
gr
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableWithResult
;
import
org.jkiss.dbeaver.model.struct.DBSDataSourceContainer
;
...
...
@@ -112,9 +112,9 @@ public class DatabaseEditorInputFactory implements IElementFactory
try
{
dsNode
=
(
DBNDataSource
)
DBeaverCore
.
getInstance
().
getNavigatorModel
().
getNodeByObject
(
dsObject
);
if
(
dsNode
!=
null
)
{
dsNode
.
initializeNode
(
monitor
,
new
DBRPro
c
essListener
()
{
dsNode
.
initializeNode
(
monitor
,
new
DBRPro
gr
essListener
()
{
@Override
public
void
on
ProcessFinish
(
IStatus
status
)
public
void
on
TaskFinished
(
IStatus
status
)
{
if
(!
status
.
isOK
())
{
errorStatus
=
status
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/resources/bookmarks/BookmarksHandlerImpl.java
浏览文件 @
dd3e953e
...
...
@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.core.DBeaverCore;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.ui.resources.AbstractResourceHandler
;
import
org.jkiss.dbeaver.model.navigator.*
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
c
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
gr
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress
;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
...
...
@@ -110,9 +110,9 @@ public class BookmarksHandlerImpl extends AbstractResourceHandler {
if
(
dsNode
==
null
)
{
throw
new
DBException
(
"Can't find datasource node for '"
+
dataSourceContainer
.
getName
()
+
"'"
);
//$NON-NLS-2$
}
dsNode
.
initializeNode
(
null
,
new
DBRPro
c
essListener
()
{
dsNode
.
initializeNode
(
null
,
new
DBRPro
gr
essListener
()
{
@Override
public
void
on
ProcessFinish
(
IStatus
status
)
public
void
on
TaskFinished
(
IStatus
status
)
{
if
(
status
.
isOK
())
{
UIUtils
.
runInUI
(
null
,
new
Runnable
()
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/metadata/SearchMetadataPage.java
浏览文件 @
dd3e953e
...
...
@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.DBPDataSource;
import
org.jkiss.dbeaver.model.DBPPreferenceStore
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.navigator.*
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
c
essListener
;
import
org.jkiss.dbeaver.model.runtime.DBRPro
gr
essListener
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.ui.DBeaverIcons
;
import
org.jkiss.dbeaver.ui.UIUtils
;
...
...
@@ -155,9 +155,9 @@ public class SearchMetadataPage extends AbstractSearchPage {
for
(
DBNNode
node
=
(
DBNNode
)
object
;
node
!=
null
;
node
=
node
.
getParentNode
())
{
if
(
node
instanceof
DBNDataSource
)
{
DBNDataSource
dsNode
=
(
DBNDataSource
)
node
;
dsNode
.
initializeNode
(
null
,
new
DBRPro
c
essListener
()
{
dsNode
.
initializeNode
(
null
,
new
DBRPro
gr
essListener
()
{
@Override
public
void
on
ProcessFinish
(
IStatus
status
)
public
void
on
TaskFinished
(
IStatus
status
)
{
if
(
status
.
isOK
())
{
Display
.
getDefault
().
asyncExec
(
new
Runnable
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录