Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
6feb9125
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,发现更多精彩内容 >>
提交
6feb9125
编写于
8月 22, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#6595 Driver libraries resolution fix
Former-commit-id:
ba2a5538
上级
e8335067
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
11 deletion
+11
-11
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java
...org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java
+4
-4
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
...c/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
+5
-3
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptorSerializerLegacy.java
...ver/registry/driver/DriverDescriptorSerializerLegacy.java
+1
-3
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverLibraryAbstract.java
.../jkiss/dbeaver/registry/driver/DriverLibraryAbstract.java
+1
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java
浏览文件 @
6feb9125
...
...
@@ -562,7 +562,7 @@ public class DriverEditDialog extends HelpEnabledDialog {
driver
,
DBPDriverLibrary
.
FileType
.
jar
,
DriverLibraryMavenArtifact
.
PATH_PREFIX
+
fd
.
getArtifact
().
getPath
(),
null
));
null
)
,
true
);
changeLibContent
();
}
}
...
...
@@ -578,7 +578,7 @@ public class DriverEditDialog extends HelpEnabledDialog {
driver
,
DBPDriverLibrary
.
FileType
.
jar
,
selected
,
null
));
null
)
,
true
);
changeLibContent
();
}
}
...
...
@@ -601,7 +601,7 @@ public class DriverEditDialog extends HelpEnabledDialog {
driver
,
fileName
.
endsWith
(
".jar"
)
||
fileName
.
endsWith
(
".zip"
)
?
DBPDriverLibrary
.
FileType
.
jar
:
DBPDriverLibrary
.
FileType
.
lib
,
new
File
(
folderFile
,
fileName
).
getAbsolutePath
(),
null
));
null
)
,
true
);
}
changeLibContent
();
}
...
...
@@ -789,7 +789,7 @@ public class DriverEditDialog extends HelpEnabledDialog {
Collection
<
DBPDriverLibrary
>
newLibList
=
CommonUtils
.
copyList
(
original
?
driver
.
getOrigFiles
()
:
origLibList
);
for
(
DBPDriverLibrary
lib
:
newLibList
)
{
lib
.
setDisabled
(
false
);
driver
.
addDriverLibrary
(
lib
);
driver
.
addDriverLibrary
(
lib
,
true
);
}
for
(
DBPDriverLibrary
lib
:
CommonUtils
.
copyList
(
driver
.
getDriverLibraries
()))
{
if
(!
newLibList
.
contains
(
lib
))
{
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptor.java
浏览文件 @
6feb9125
...
...
@@ -775,13 +775,15 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver {
}
}
DriverLibraryAbstract
lib
=
DriverLibraryAbstract
.
createFromPath
(
this
,
fileType
,
path
,
null
);
addDriverLibrary
(
lib
);
addDriverLibrary
(
lib
,
true
);
return
lib
;
}
public
boolean
addDriverLibrary
(
DBPDriverLibrary
descriptor
)
{
public
boolean
addDriverLibrary
(
DBPDriverLibrary
descriptor
,
boolean
resetCache
)
{
if
(!
libraries
.
contains
(
descriptor
))
{
resetDriverInstance
();
if
(
resetCache
)
{
resetDriverInstance
();
}
this
.
libraries
.
add
(
descriptor
);
return
true
;
}
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverDescriptorSerializerLegacy.java
浏览文件 @
6feb9125
...
...
@@ -24,7 +24,6 @@ import org.jkiss.dbeaver.registry.DataSourceProviderDescriptor;
import
org.jkiss.dbeaver.registry.DataSourceProviderRegistry
;
import
org.jkiss.dbeaver.registry.RegistryConstants
;
import
org.jkiss.dbeaver.registry.maven.MavenArtifactReference
;
import
org.jkiss.dbeaver.utils.SystemVariablesResolver
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.xml.SAXListener
;
import
org.jkiss.utils.xml.SAXReader
;
...
...
@@ -33,7 +32,6 @@ import org.xml.sax.Attributes;
import
java.io.File
;
import
java.io.IOException
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -259,7 +257,7 @@ public class DriverDescriptorSerializerLegacy extends DriverDescriptorSerializer
lib
.
setDisabled
(
true
);
}
else
if
(
lib
==
null
)
{
lib
=
DriverLibraryAbstract
.
createFromPath
(
curDriver
,
type
,
path
,
version
);
curDriver
.
addDriverLibrary
(
lib
);
curDriver
.
addDriverLibrary
(
lib
,
false
);
}
else
if
(!
CommonUtils
.
isEmpty
(
version
))
{
lib
.
setPreferredVersion
(
version
);
}
...
...
plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/driver/DriverLibraryAbstract.java
浏览文件 @
6feb9125
...
...
@@ -209,7 +209,7 @@ public abstract class DriverLibraryAbstract implements DBPDriverLibrary
if
(
localFile
==
null
)
{
throw
new
IOException
(
"No target file for '"
+
getPath
()
+
"'"
);
}
if
(!
forceUpdate
&&
localFile
.
exists
())
{
if
(!
forceUpdate
&&
localFile
.
exists
()
&&
localFile
.
length
()
>
0
)
{
return
;
}
final
File
localDir
=
localFile
.
getParentFile
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录