Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
0efb9a11
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,发现更多精彩内容 >>
提交
0efb9a11
编写于
10月 16, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Driver download UI
上级
bc62e96d
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
16 addition
and
20 deletion
+16
-20
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
...c/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
+4
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryLocal.java
...org/jkiss/dbeaver/registry/driver/DriverLibraryLocal.java
+0
-5
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenArtifact.java
...s/dbeaver/registry/driver/DriverLibraryMavenArtifact.java
+3
-5
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenDependency.java
...dbeaver/registry/driver/DriverLibraryMavenDependency.java
+0
-5
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
...rg/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
+3
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadAutoPage.java
...iss/dbeaver/ui/dialogs/driver/DriverDownloadAutoPage.java
+4
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java
...org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriverLibrary.java
.../org/jkiss/dbeaver/model/connection/DBPDriverLibrary.java
+1
-3
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
浏览文件 @
0efb9a11
...
...
@@ -965,6 +965,10 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
return
result
;
}
public
boolean
isLibraryResolved
(
DBPDriverLibrary
library
)
{
return
!
library
.
isDownloadable
()
||
!
CommonUtils
.
isEmpty
(
resolvedFiles
.
get
(
library
));
}
private
void
collectLibraryFiles
(
DBPDriverDependencies
.
DependencyNode
node
,
List
<
DriverFileInfo
>
files
)
{
if
(
node
.
duplicate
)
{
return
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryLocal.java
浏览文件 @
0efb9a11
...
...
@@ -52,11 +52,6 @@ public class DriverLibraryLocal extends DriverLibraryAbstract
return
false
;
}
@Override
public
boolean
isResolved
()
{
return
true
;
}
@Override
public
void
resetVersion
()
{
// do nothing
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenArtifact.java
浏览文件 @
0efb9a11
...
...
@@ -59,6 +59,9 @@ public class DriverLibraryMavenArtifact extends DriverLibraryAbstract
@Override
public
String
getDescription
()
{
if
(
localVersion
!=
null
)
{
return
localVersion
.
getDescription
();
}
return
null
;
}
...
...
@@ -68,11 +71,6 @@ public class DriverLibraryMavenArtifact extends DriverLibraryAbstract
return
true
;
}
@Override
public
boolean
isResolved
()
{
return
localVersion
!=
null
;
}
@Override
public
void
resetVersion
()
{
this
.
localVersion
=
null
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenDependency.java
浏览文件 @
0efb9a11
...
...
@@ -39,11 +39,6 @@ public class DriverLibraryMavenDependency extends DriverLibraryMavenArtifact
this
.
source
=
source
;
}
@Override
public
boolean
isResolved
()
{
return
true
;
}
protected
boolean
isDependencyExcluded
(
DBRProgressMonitor
monitor
,
MavenArtifactDependency
dependency
)
{
List
<
MavenArtifactReference
>
exclusions
=
source
.
getExclusions
();
if
(
exclusions
!=
null
)
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifactVersion.java
浏览文件 @
0efb9a11
...
...
@@ -217,6 +217,9 @@ public class MavenArtifactVersion {
url
=
XMLUtils
.
getChildElementBody
(
root
,
"url"
);
version
=
XMLUtils
.
getChildElementBody
(
root
,
"version"
);
description
=
XMLUtils
.
getChildElementBody
(
root
,
"description"
);
if
(
description
!=
null
)
{
description
=
description
.
trim
().
replaceAll
(
"\\s+"
,
" "
);
}
{
// Parent
Element
parentElement
=
XMLUtils
.
getChildElement
(
root
,
"parent"
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadAutoPage.java
浏览文件 @
0efb9a11
...
...
@@ -74,6 +74,7 @@ class DriverDownloadAutoPage extends DriverDownloadPage {
filesTree
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
UIUtils
.
createTreeColumn
(
filesTree
,
SWT
.
LEFT
,
"File"
);
UIUtils
.
createTreeColumn
(
filesTree
,
SWT
.
LEFT
,
"Version"
);
UIUtils
.
createTreeColumn
(
filesTree
,
SWT
.
LEFT
,
"Description"
);
}
if
(!
wizard
.
isForceDownload
())
{
...
...
@@ -110,13 +111,14 @@ class DriverDownloadAutoPage extends DriverDownloadPage {
return
;
}
int
totalItems
=
0
;
int
totalItems
=
1
;
for
(
DBPDriverDependencies
.
DependencyNode
node
:
getWizard
().
getDependencies
().
getLibraryMap
())
{
DBPDriverLibrary
library
=
node
.
library
;
TreeItem
item
=
new
TreeItem
(
filesTree
,
SWT
.
NONE
);
item
.
setImage
(
DBeaverIcons
.
getImage
(
library
.
getIcon
()));
item
.
setText
(
0
,
library
.
getDisplayName
());
item
.
setText
(
1
,
CommonUtils
.
notEmpty
(
library
.
getVersion
()));
item
.
setText
(
2
,
CommonUtils
.
notEmpty
(
library
.
getDescription
()));
totalItems
++;
if
(
addDependencies
(
item
,
node
))
{
item
.
setExpanded
(
true
);
...
...
@@ -141,6 +143,7 @@ class DriverDownloadAutoPage extends DriverDownloadPage {
item
.
setImage
(
DBeaverIcons
.
getImage
(
dep
.
library
.
getIcon
()));
item
.
setText
(
0
,
dep
.
library
.
getDisplayName
());
item
.
setText
(
1
,
CommonUtils
.
notEmpty
(
dep
.
library
.
getVersion
()));
item
.
setText
(
2
,
CommonUtils
.
notEmpty
(
dep
.
library
.
getDescription
()));
if
(
dep
.
duplicate
)
{
item
.
setForeground
(
getShell
().
getDisplay
().
getSystemColor
(
SWT
.
COLOR_WIDGET_DARK_SHADOW
));
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java
浏览文件 @
0efb9a11
...
...
@@ -333,7 +333,7 @@ public class DriverEditDialog extends HelpEnabledDialog
File
localFile
=
lib
.
getLocalFile
();
if
(
localFile
!=
null
&&
localFile
.
exists
())
{
cell
.
setForeground
(
null
);
}
else
if
(!
lib
.
isResolved
(
))
{
}
else
if
(!
driver
.
isLibraryResolved
(
lib
))
{
cell
.
setForeground
(
Display
.
getDefault
().
getSystemColor
(
SWT
.
COLOR_BLUE
));
}
else
{
cell
.
setForeground
(
Display
.
getDefault
().
getSystemColor
(
SWT
.
COLOR_RED
));
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriverLibrary.java
浏览文件 @
0efb9a11
...
...
@@ -54,7 +54,7 @@ public interface DBPDriverLibrary
String
getId
();
/**
* Library version. If library doesn
;
t support versions returns null.
* Library version. If library doesn
'
t support versions returns null.
*/
@Nullable
String
getVersion
();
...
...
@@ -83,8 +83,6 @@ public interface DBPDriverLibrary
boolean
isDownloadable
();
boolean
isResolved
();
@Nullable
String
getExternalURL
(
DBRProgressMonitor
monitor
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录