Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
14234a05
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,发现更多精彩内容 >>
提交
14234a05
编写于
6月 05, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3557 Export wizard - buttons enablement fix
Former-commit-id:
901affce
上级
6ead48df
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
45 addition
and
43 deletion
+45
-43
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/tools/AbstractToolWizardPage.java
...kiss/dbeaver/ui/dialogs/tools/AbstractToolWizardPage.java
+7
-2
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLExportWizardPageObjects.java
...dbeaver/ext/mysql/tools/MySQLExportWizardPageObjects.java
+2
-1
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLExportWizardPageSettings.java
...beaver/ext/mysql/tools/MySQLExportWizardPageSettings.java
+2
-1
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizardPageSettings.java
...ext/mysql/tools/MySQLScriptExecuteWizardPageSettings.java
+2
-1
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleScriptExecuteWizardPageSettings.java
...t/oracle/tools/OracleScriptExecuteWizardPageSettings.java
+2
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizardPageObjects.java
.../ext/postgresql/tools/PostgreBackupWizardPageObjects.java
+24
-34
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizardPageSettings.java
...ext/postgresql/tools/PostgreBackupWizardPageSettings.java
+2
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreRestoreWizardPageSettings.java
...xt/postgresql/tools/PostgreRestoreWizardPageSettings.java
+2
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreScriptExecuteWizardPageSettings.java
...tgresql/tools/PostgreScriptExecuteWizardPageSettings.java
+2
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/tools/AbstractToolWizardPage.java
浏览文件 @
14234a05
...
...
@@ -48,7 +48,7 @@ public abstract class AbstractToolWizardPage<WIZARD extends AbstractToolWizard>
}
protected
static
void
createCheckButtons
(
Composite
buttonsPanel
,
final
Table
table
)
{
protected
void
createCheckButtons
(
Composite
buttonsPanel
,
final
Table
table
)
{
UIUtils
.
createPushButton
(
buttonsPanel
,
"All"
,
null
,
new
CheckListener
(
table
,
true
));
UIUtils
.
createPushButton
(
buttonsPanel
,
"None"
,
null
,
new
CheckListener
(
table
,
false
));
}
...
...
@@ -64,7 +64,11 @@ public abstract class AbstractToolWizardPage<WIZARD extends AbstractToolWizard>
}
private
static
class
CheckListener
extends
SelectionAdapter
{
protected
void
updateState
()
{
setPageComplete
(
true
);
}
private
class
CheckListener
extends
SelectionAdapter
{
private
final
Table
table
;
private
final
boolean
check
;
...
...
@@ -78,6 +82,7 @@ public abstract class AbstractToolWizardPage<WIZARD extends AbstractToolWizard>
for
(
TableItem
item
:
table
.
getItems
())
{
item
.
setChecked
(
check
);
}
updateState
();
}
}
...
...
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLExportWizardPageObjects.java
浏览文件 @
14234a05
...
...
@@ -262,7 +262,8 @@ class MySQLExportWizardPageObjects extends MySQLWizardPageSettings<MySQLExportWi
}
}
private
void
updateState
()
@Override
protected
void
updateState
()
{
boolean
complete
=
false
;
if
(!
checkedObjects
.
isEmpty
())
{
...
...
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLExportWizardPageSettings.java
浏览文件 @
14234a05
...
...
@@ -136,7 +136,8 @@ class MySQLExportWizardPageSettings extends MySQLWizardPageSettings<MySQLExportW
setControl
(
composite
);
}
private
void
updateState
()
@Override
protected
void
updateState
()
{
String
fileName
=
outputFolderText
.
getText
();
wizard
.
setOutputFolder
(
CommonUtils
.
isEmpty
(
fileName
)
?
null
:
new
File
(
fileName
));
...
...
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizardPageSettings.java
浏览文件 @
14234a05
...
...
@@ -121,7 +121,8 @@ public class MySQLScriptExecuteWizardPageSettings extends MySQLWizardPageSetting
updateState
();
}
private
void
updateState
()
@Override
protected
void
updateState
()
{
String
fileName
=
inputFileText
.
getText
();
wizard
.
setInputFile
(
CommonUtils
.
isEmpty
(
fileName
)
?
null
:
new
File
(
fileName
));
...
...
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleScriptExecuteWizardPageSettings.java
浏览文件 @
14234a05
...
...
@@ -80,7 +80,8 @@ public class OracleScriptExecuteWizardPageSettings extends AbstractToolWizardPag
//updateState();
}
private
void
updateState
()
@Override
protected
void
updateState
()
{
String
fileName
=
inputFileText
.
getText
();
wizard
.
setInputFile
(
CommonUtils
.
isEmpty
(
fileName
)
?
null
:
new
File
(
fileName
));
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizardPageObjects.java
浏览文件 @
14234a05
...
...
@@ -85,17 +85,15 @@ class PostgreBackupWizardPageObjects extends PostgreWizardPageSettings<PostgreBa
Composite
catPanel
=
UIUtils
.
createPlaceholder
(
sash
,
1
);
catPanel
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
schemasTable
=
new
Table
(
catPanel
,
SWT
.
BORDER
|
SWT
.
CHECK
);
schemasTable
.
addListener
(
SWT
.
Selection
,
new
Listener
()
{
public
void
handleEvent
(
Event
event
)
{
TableItem
item
=
(
TableItem
)
event
.
item
;
PostgreSchema
catalog
=
(
PostgreSchema
)
item
.
getData
();
if
(
event
.
detail
==
SWT
.
CHECK
)
{
schemasTable
.
select
(
schemasTable
.
indexOf
(
item
));
checkedObjects
.
remove
(
catalog
);
}
loadTables
(
catalog
);
updateState
();
schemasTable
.
addListener
(
SWT
.
Selection
,
event
->
{
TableItem
item
=
(
TableItem
)
event
.
item
;
PostgreSchema
catalog
=
(
PostgreSchema
)
item
.
getData
();
if
(
event
.
detail
==
SWT
.
CHECK
)
{
schemasTable
.
select
(
schemasTable
.
indexOf
(
item
));
checkedObjects
.
remove
(
catalog
);
}
loadTables
(
catalog
);
updateState
();
});
GridData
gd
=
new
GridData
(
GridData
.
FILL_BOTH
);
gd
.
heightHint
=
50
;
...
...
@@ -116,12 +114,10 @@ class PostgreBackupWizardPageObjects extends PostgreWizardPageSettings<PostgreBa
GridData
gd
=
new
GridData
(
GridData
.
FILL_BOTH
);
gd
.
heightHint
=
50
;
tablesTable
.
setLayoutData
(
gd
);
tablesTable
.
addListener
(
SWT
.
Selection
,
new
Listener
()
{
public
void
handleEvent
(
Event
event
)
{
if
(
event
.
detail
==
SWT
.
CHECK
)
{
updateCheckedTables
();
updateState
();
}
tablesTable
.
addListener
(
SWT
.
Selection
,
event
->
{
if
(
event
.
detail
==
SWT
.
CHECK
)
{
updateCheckedTables
();
updateState
();
}
});
...
...
@@ -149,11 +145,7 @@ class PostgreBackupWizardPageObjects extends PostgreWizardPageSettings<PostgreBa
PostgreSchema
catalog
=
((
PostgreTableBase
)
object
).
getContainer
();
dataSource
=
catalog
.
getDataSource
();
activeCatalogs
.
add
(
catalog
);
Set
<
PostgreTableBase
>
tables
=
checkedObjects
.
get
(
catalog
);
if
(
tables
==
null
)
{
tables
=
new
HashSet
<>();
checkedObjects
.
put
(
catalog
,
tables
);
}
Set
<
PostgreTableBase
>
tables
=
checkedObjects
.
computeIfAbsent
(
catalog
,
k
->
new
HashSet
<>());
tables
.
add
((
PostgreTableBase
)
object
);
if
(((
PostgreTableBase
)
object
).
isView
())
{
wizard
.
showViews
=
true
;
...
...
@@ -238,18 +230,15 @@ class PostgreBackupWizardPageObjects extends PostgreWizardPageSettings<PostgreBa
if
(
wizard
.
showViews
)
{
objects
.
addAll
(
curSchema
.
getViews
(
monitor
));
}
Collections
.
sort
(
objects
,
DBUtils
.
nameComparator
());
UIUtils
.
syncExec
(
new
Runnable
()
{
@Override
public
void
run
()
{
tablesTable
.
removeAll
();
for
(
PostgreTableBase
table
:
objects
)
{
TableItem
item
=
new
TableItem
(
tablesTable
,
SWT
.
NONE
);
item
.
setImage
(
DBeaverIcons
.
getImage
(
table
.
isView
()
?
DBIcon
.
TREE_VIEW
:
DBIcon
.
TREE_TABLE
));
item
.
setText
(
0
,
table
.
getName
());
item
.
setData
(
table
);
item
.
setChecked
(
isCatalogChecked
&&
(
checkedObjects
==
null
||
checkedObjects
.
contains
(
table
)));
}
objects
.
sort
(
DBUtils
.
nameComparator
());
UIUtils
.
syncExec
(()
->
{
tablesTable
.
removeAll
();
for
(
PostgreTableBase
table
:
objects
)
{
TableItem
item
=
new
TableItem
(
tablesTable
,
SWT
.
NONE
);
item
.
setImage
(
DBeaverIcons
.
getImage
(
table
.
isView
()
?
DBIcon
.
TREE_VIEW
:
DBIcon
.
TREE_TABLE
));
item
.
setText
(
0
,
table
.
getName
());
item
.
setData
(
table
);
item
.
setChecked
(
isCatalogChecked
&&
(
checkedObjects
==
null
||
checkedObjects
.
contains
(
table
)));
}
});
}
catch
(
DBException
e
)
{
...
...
@@ -281,7 +270,8 @@ class PostgreBackupWizardPageObjects extends PostgreWizardPageSettings<PostgreBa
wizard
.
objects
.
add
(
info
);
}
private
void
updateState
()
@Override
protected
void
updateState
()
{
boolean
complete
=
false
;
if
(!
checkedObjects
.
isEmpty
())
{
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizardPageSettings.java
浏览文件 @
14234a05
...
...
@@ -145,7 +145,8 @@ class PostgreBackupWizardPageSettings extends PostgreWizardPageSettings<PostgreB
setControl
(
composite
);
}
private
void
updateState
()
@Override
protected
void
updateState
()
{
String
fileName
=
outputFolderText
.
getText
();
wizard
.
setOutputFolder
(
CommonUtils
.
isEmpty
(
fileName
)
?
null
:
new
File
(
fileName
));
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreRestoreWizardPageSettings.java
浏览文件 @
14234a05
...
...
@@ -85,7 +85,8 @@ class PostgreRestoreWizardPageSettings extends PostgreWizardPageSettings<Postgre
setControl
(
composite
);
}
private
void
updateState
()
@Override
protected
void
updateState
()
{
wizard
.
format
=
PostgreBackupWizard
.
ExportFormat
.
values
()[
formatCombo
.
getSelectionIndex
()];
wizard
.
inputFile
=
inputFileText
.
getText
();
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreScriptExecuteWizardPageSettings.java
浏览文件 @
14234a05
...
...
@@ -124,7 +124,8 @@ public class PostgreScriptExecuteWizardPageSettings extends PostgreWizardPageSet
updateState
();
}
private
void
updateState
()
@Override
protected
void
updateState
()
{
String
fileName
=
inputFileText
.
getText
();
wizard
.
setInputFile
(
CommonUtils
.
isEmpty
(
fileName
)
?
null
:
new
File
(
fileName
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录