Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
6c937032
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,发现更多精彩内容 >>
提交
6c937032
编写于
9月 13, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Driver files download wizard
Former-commit-id:
ab5cf90f
上级
04f1b8d9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
24 deletion
+36
-24
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverFileSource.java
...core/src/org/jkiss/dbeaver/registry/DriverFileSource.java
+7
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadManualPage.java
...s/dbeaver/ui/dialogs/driver/DriverDownloadManualPage.java
+24
-19
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadWizard.java
...jkiss/dbeaver/ui/dialogs/driver/DriverDownloadWizard.java
+1
-1
plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
+4
-4
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverFileSource.java
浏览文件 @
6c937032
...
@@ -20,6 +20,7 @@ package org.jkiss.dbeaver.registry;
...
@@ -20,6 +20,7 @@ package org.jkiss.dbeaver.registry;
import
org.eclipse.core.runtime.IConfigurationElement
;
import
org.eclipse.core.runtime.IConfigurationElement
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.model.DBPDriverFile
;
import
org.jkiss.dbeaver.model.DBPDriverFile
;
import
org.jkiss.utils.CommonUtils
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -34,10 +35,12 @@ public class DriverFileSource implements DBPDriverFile.FileSource
...
@@ -34,10 +35,12 @@ public class DriverFileSource implements DBPDriverFile.FileSource
public
static
class
FileInfo
{
public
static
class
FileInfo
{
private
final
String
name
;
private
final
String
name
;
private
final
String
description
;
private
final
String
description
;
private
final
boolean
optional
;
FileInfo
(
IConfigurationElement
config
)
{
FileInfo
(
IConfigurationElement
config
)
{
this
.
name
=
config
.
getAttribute
(
RegistryConstants
.
ATTR_NAME
);
this
.
name
=
config
.
getAttribute
(
RegistryConstants
.
ATTR_NAME
);
this
.
description
=
config
.
getAttribute
(
RegistryConstants
.
ATTR_DESCRIPTION
);
this
.
description
=
config
.
getAttribute
(
RegistryConstants
.
ATTR_DESCRIPTION
);
this
.
optional
=
CommonUtils
.
getBoolean
(
config
.
getAttribute
(
RegistryConstants
.
ATTR_OPTIONAL
),
false
);
}
}
public
String
getName
()
{
public
String
getName
()
{
...
@@ -47,6 +50,10 @@ public class DriverFileSource implements DBPDriverFile.FileSource
...
@@ -47,6 +50,10 @@ public class DriverFileSource implements DBPDriverFile.FileSource
public
String
getDescription
()
{
public
String
getDescription
()
{
return
description
;
return
description
;
}
}
public
boolean
isOptional
()
{
return
optional
;
}
}
}
private
final
String
url
;
private
final
String
url
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadManualPage.java
浏览文件 @
6c937032
...
@@ -21,10 +21,7 @@ import org.eclipse.swt.SWT;
...
@@ -21,10 +21,7 @@ import org.eclipse.swt.SWT;
import
org.eclipse.swt.events.SelectionAdapter
;
import
org.eclipse.swt.events.SelectionAdapter
;
import
org.eclipse.swt.events.SelectionEvent
;
import
org.eclipse.swt.events.SelectionEvent
;
import
org.eclipse.swt.layout.GridData
;
import
org.eclipse.swt.layout.GridData
;
import
org.eclipse.swt.layout.GridLayout
;
import
org.eclipse.swt.widgets.*
;
import
org.eclipse.swt.widgets.Composite
;
import
org.eclipse.swt.widgets.Link
;
import
org.eclipse.swt.widgets.Text
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.registry.DriverDescriptor
;
import
org.jkiss.dbeaver.registry.DriverDescriptor
;
import
org.jkiss.dbeaver.registry.DriverFileSource
;
import
org.jkiss.dbeaver.registry.DriverFileSource
;
...
@@ -33,8 +30,6 @@ import org.jkiss.dbeaver.ui.UIUtils;
...
@@ -33,8 +30,6 @@ import org.jkiss.dbeaver.ui.UIUtils;
import
org.jkiss.dbeaver.ui.preferences.PrefPageDrivers
;
import
org.jkiss.dbeaver.ui.preferences.PrefPageDrivers
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.util.List
;
class
DriverDownloadManualPage
extends
DriverDownloadPage
{
class
DriverDownloadManualPage
extends
DriverDownloadPage
{
private
DriverFileSource
fileSource
;
private
DriverFileSource
fileSource
;
...
@@ -51,23 +46,17 @@ class DriverDownloadManualPage extends DriverDownloadPage {
...
@@ -51,23 +46,17 @@ class DriverDownloadManualPage extends DriverDownloadPage {
setMessage
(
"Download & configure "
+
driver
.
getFullName
()
+
" driver files"
);
setMessage
(
"Download & configure "
+
driver
.
getFullName
()
+
" driver files"
);
initializeDialogUnits
(
parent
);
Composite
composite
=
UIUtils
.
createPlaceholder
(
parent
,
1
);
Composite
composite
=
UIUtils
.
createPlaceholder
(
parent
,
1
);
composite
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
composite
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
StringBuilder
message
=
new
StringBuilder
();
StringBuilder
message
=
new
StringBuilder
();
message
.
append
(
"
Driver
"
).
append
(
driver
.
getFullName
());
message
.
append
(
""
).
append
(
driver
.
getFullName
());
message
.
append
(
"files missing.\n\n"
+
message
.
append
(
"
driver
files missing.\n\n"
+
"According to vendor policy this driver isn'
't publicly available and you have to download it manually from vendor'
's web site.\n\n"
+
"According to vendor policy this driver isn'
t publicly available and you have to download it manually from vendor
's web site.\n\n"
+
"After successful driver download you will need to add JAR files in DBeaver libraries list."
);
"After successful driver download you will need to add JAR files in DBeaver libraries list."
);
if
(!
CommonUtils
.
isEmpty
(
fileSource
.
getInstructions
()))
{
if
(!
CommonUtils
.
isEmpty
(
fileSource
.
getInstructions
()))
{
message
.
append
(
"\n"
).
append
(
fileSource
.
getInstructions
());
message
.
append
(
"\n"
).
append
(
fileSource
.
getInstructions
());
}
}
message
.
append
(
"\n\nFiles to download: "
);
for
(
DriverFileSource
.
FileInfo
file
:
fileSource
.
getFiles
())
{
message
.
append
(
"\n\t"
).
append
(
file
.
getName
());
}
Text
infoText
=
new
Text
(
composite
,
SWT
.
MULTI
|
SWT
.
READ_ONLY
|
SWT
.
WRAP
);
Text
infoText
=
new
Text
(
composite
,
SWT
.
MULTI
|
SWT
.
READ_ONLY
|
SWT
.
WRAP
);
infoText
.
setText
(
message
.
toString
());
infoText
.
setText
(
message
.
toString
());
...
@@ -75,13 +64,29 @@ class DriverDownloadManualPage extends DriverDownloadPage {
...
@@ -75,13 +64,29 @@ class DriverDownloadManualPage extends DriverDownloadPage {
gd
.
widthHint
=
200
;
gd
.
widthHint
=
200
;
infoText
.
setLayoutData
(
gd
);
infoText
.
setLayoutData
(
gd
);
//UIUtils.createHorizontalLine(composite);
Group
filesGroup
=
UIUtils
.
createControlGroup
(
composite
,
"Driver files"
,
1
,
-
1
,
-
1
);
UIUtils
.
createPlaceholder
(
composite
,
1
).
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
gd
=
new
GridData
(
GridData
.
FILL_HORIZONTAL
);
gd
.
verticalIndent
=
10
;
filesGroup
.
setLayoutData
(
gd
);
Table
filesTable
=
new
Table
(
filesGroup
,
SWT
.
BORDER
|
SWT
.
FULL_SELECTION
);
filesTable
.
setHeaderVisible
(
true
);
filesTable
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_HORIZONTAL
));
UIUtils
.
createTableColumn
(
filesTable
,
SWT
.
LEFT
,
"File"
);
UIUtils
.
createTableColumn
(
filesTable
,
SWT
.
LEFT
,
"Required"
);
UIUtils
.
createTableColumn
(
filesTable
,
SWT
.
LEFT
,
"Description"
);
for
(
DriverFileSource
.
FileInfo
file
:
fileSource
.
getFiles
())
{
new
TableItem
(
filesTable
,
SWT
.
NONE
).
setText
(
new
String
[]
{
file
.
getName
(),
!
file
.
isOptional
()
?
"Yes"
:
"No"
,
CommonUtils
.
notEmpty
(
file
.
getDescription
())
});
}
UIUtils
.
packColumns
(
filesTable
,
true
);
{
{
Composite
linksGroup
=
UIUtils
.
createPlaceholder
(
composite
,
2
);
Composite
linksGroup
=
UIUtils
.
createPlaceholder
(
composite
,
2
);
((
GridLayout
)
linksGroup
.
getLayout
()).
makeColumnsEqualWidth
=
true
;
gd
=
new
GridData
(
GridData
.
FILL_HORIZONTAL
);
linksGroup
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_HORIZONTAL
));
gd
.
verticalIndent
=
10
;
linksGroup
.
setLayoutData
(
gd
);
// Vendor site
// Vendor site
if
(!
CommonUtils
.
isEmpty
(
driver
.
getWebURL
()))
{
if
(!
CommonUtils
.
isEmpty
(
driver
.
getWebURL
()))
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadWizard.java
浏览文件 @
6c937032
...
@@ -42,7 +42,7 @@ public class DriverDownloadWizard extends Wizard implements IExportWizard {
...
@@ -42,7 +42,7 @@ public class DriverDownloadWizard extends Wizard implements IExportWizard {
this
.
driver
=
driver
;
this
.
driver
=
driver
;
this
.
files
=
files
;
this
.
files
=
files
;
setWindowTitle
(
"Setup driver files"
);
setWindowTitle
(
"Setup driver files"
);
setNeedsProgressMonitor
(
true
);
setNeedsProgressMonitor
(
hasPredefinedFiles
()
);
loadSettings
();
loadSettings
();
}
}
...
...
plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
浏览文件 @
6c937032
...
@@ -283,13 +283,13 @@
...
@@ -283,13 +283,13 @@
<fileSource
url=
"http://www.oracle.com/technetwork/apps-tech/jdbc-112010-090769.html"
name=
"Oracle 11g drivers"
>
<fileSource
url=
"http://www.oracle.com/technetwork/apps-tech/jdbc-112010-090769.html"
name=
"Oracle 11g drivers"
>
<file
name=
"ojdbc6.jar"
description=
"JDBC driver"
/>
<file
name=
"ojdbc6.jar"
description=
"JDBC driver"
/>
<file
name=
"orai18n.jar"
description=
"NLS classes"
/>
<file
name=
"orai18n.jar"
optional=
"true"
description=
"NLS classes"
/>
<file
name=
"xdb6.jar"
description=
"SQLXML support"
/>
<file
name=
"xdb6.jar"
optional=
"true"
description=
"SQLXML support"
/>
</fileSource>
</fileSource>
<fileSource
url=
"http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html"
name=
"Oracle 12g drivers"
>
<fileSource
url=
"http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html"
name=
"Oracle 12g drivers"
>
<file
name=
"ojdbc7.jar"
description=
"JDBC driver"
/>
<file
name=
"ojdbc7.jar"
description=
"JDBC driver"
/>
<file
name=
"orai18n.jar"
description=
"NLS classes"
/>
<file
name=
"orai18n.jar"
optional=
"true"
description=
"NLS classes"
/>
<file
name=
"xdb6.jar"
description=
"SQLXML support"
/>
<file
name=
"xdb6.jar"
optional=
"true"
description=
"SQLXML support"
/>
</fileSource>
</fileSource>
</driver>
</driver>
</drivers>
</drivers>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录