Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
ddf293b3
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,发现更多精彩内容 >>
提交
ddf293b3
编写于
10月 16, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Artifact version update. Version lookup fix.
Former-commit-id:
bc62e96d
上级
771702dd
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
13 addition
and
9 deletion
+13
-9
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverDependencies.java
...org/jkiss/dbeaver/registry/driver/DriverDependencies.java
+0
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
...c/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
+5
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryLocal.java
...org/jkiss/dbeaver/registry/driver/DriverLibraryLocal.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenArtifact.java
...s/dbeaver/registry/driver/DriverLibraryMavenArtifact.java
+3
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifact.java
...e/src/org/jkiss/dbeaver/registry/maven/MavenArtifact.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriverLibrary.java
.../org/jkiss/dbeaver/model/connection/DBPDriverLibrary.java
+3
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverDependencies.java
浏览文件 @
ddf293b3
...
...
@@ -92,7 +92,6 @@ public class DriverDependencies implements DBPDriverDependencies
}
private
void
resolveDependencies
(
DBRProgressMonitor
monitor
,
DependencyNode
ownerNode
,
Map
<
String
,
DependencyNode
>
libMap
)
throws
IOException
{
ownerNode
.
library
.
resolve
(
monitor
);
Collection
<?
extends
DBPDriverLibrary
>
dependencies
=
ownerNode
.
library
.
getDependencies
(
monitor
);
if
(
dependencies
!=
null
&&
!
dependencies
.
isEmpty
())
{
for
(
DBPDriverLibrary
dep
:
dependencies
)
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
浏览文件 @
ddf293b3
...
...
@@ -886,6 +886,11 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
public
void
updateFiles
()
{
resetDriverInstance
();
for
(
DBPDriverLibrary
library
:
libraries
)
{
if
(!
library
.
isDisabled
())
{
library
.
resetVersion
();
}
}
validateFilesPresence
();
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryLocal.java
浏览文件 @
ddf293b3
...
...
@@ -58,7 +58,7 @@ public class DriverLibraryLocal extends DriverLibraryAbstract
}
@Override
public
void
res
olve
(
DBRProgressMonitor
monitor
)
throws
IOException
{
public
void
res
etVersion
()
{
// do nothing
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/driver/DriverLibraryMavenArtifact.java
浏览文件 @
ddf293b3
...
...
@@ -74,10 +74,9 @@ public class DriverLibraryMavenArtifact extends DriverLibraryAbstract
}
@Override
public
void
resolve
(
DBRProgressMonitor
monitor
)
throws
IOException
{
if
(
getArtifactVersion
(
monitor
)
==
null
)
{
throw
new
IOException
(
"Can't resolve artifact "
+
this
+
" version"
);
}
public
void
resetVersion
()
{
this
.
localVersion
=
null
;
MavenRegistry
.
getInstance
().
resetArtifactInfo
(
reference
);
}
@Nullable
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifact.java
浏览文件 @
ddf293b3
...
...
@@ -237,7 +237,7 @@ public class MavenArtifact
switch
(
versionRef
)
{
case
MavenArtifactReference
.
VERSION_PATTERN_RELEASE
:
versionInfo
=
releaseVersion
;
if
(!
CommonUtils
.
isEmpty
(
version
Ref
)
&&
isBetaVersion
(
versionRef
))
{
if
(!
CommonUtils
.
isEmpty
(
version
Info
)
&&
isBetaVersion
(
versionInfo
))
{
versionInfo
=
null
;
}
break
;
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPDriverLibrary.java
浏览文件 @
ddf293b3
...
...
@@ -85,8 +85,6 @@ public interface DBPDriverLibrary
boolean
isResolved
();
void
resolve
(
DBRProgressMonitor
monitor
)
throws
IOException
;
@Nullable
String
getExternalURL
(
DBRProgressMonitor
monitor
);
...
...
@@ -100,4 +98,7 @@ public interface DBPDriverLibrary
void
downloadLibraryFile
(
@NotNull
DBRProgressMonitor
monitor
,
boolean
forceUpdate
,
String
taskName
)
throws
IOException
,
InterruptedException
;
void
resetVersion
();
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录