Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
0a6a9131
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,发现更多精彩内容 >>
提交
0a6a9131
编写于
6月 05, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Properties model refactoring
Former-commit-id:
3ced7682
上级
54a036f6
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
49 addition
and
54 deletion
+49
-54
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSourceProvider.java
...re/src/org/jkiss/dbeaver/model/DBPDataSourceProvider.java
+1
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDriver.java
...s.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDriver.java
+1
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceProvider.java
...jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceProvider.java
+7
-8
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceProviderDescriptor.java
.../jkiss/dbeaver/registry/DataSourceProviderDescriptor.java
+10
-6
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
...core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
+5
-10
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/transfer/DataTransferProcessorDescriptor.java
...er/registry/transfer/DataTransferProcessorDescriptor.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ConnectionPropertiesControl.java
...kiss/dbeaver/ui/controls/ConnectionPropertiesControl.java
+10
-9
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/PropertySourceCustom.java
...org/jkiss/dbeaver/ui/properties/PropertySourceCustom.java
+11
-12
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/WMIDataSourceProvider.java
.../src/org/jkiss/dbeaver/ext/wmi/WMIDataSourceProvider.java
+1
-2
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDataSourceProvider.java
浏览文件 @
0a6a9131
...
...
@@ -18,7 +18,6 @@
package
org.jkiss.dbeaver.model
;
import
org.eclipse.jface.operation.IRunnableContext
;
import
org.eclipse.ui.views.properties.IPropertyDescriptor
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
...
...
@@ -53,7 +52,7 @@ public interface DBPDataSourceProvider
* @return property group which contains all supported properties
* @throws DBException on any error
*/
I
PropertyDescriptor
[]
getConnectionProperties
(
DBP
PropertyDescriptor
[]
getConnectionProperties
(
IRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnectionInfo
connectionInfo
)
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPDriver.java
浏览文件 @
0a6a9131
...
...
@@ -20,7 +20,6 @@ package org.jkiss.dbeaver.model;
import
org.eclipse.jface.operation.IRunnableContext
;
import
org.eclipse.swt.graphics.Image
;
import
org.eclipse.ui.views.properties.IPropertyDescriptor
;
import
org.jkiss.dbeaver.DBException
;
import
java.util.Collection
;
...
...
@@ -66,7 +65,7 @@ public interface DBPDriver extends DBPObject
boolean
isCustomDriverLoader
();
Collection
<
I
PropertyDescriptor
>
getConnectionPropertyDescriptors
();
Collection
<
DBP
PropertyDescriptor
>
getConnectionPropertyDescriptors
();
Map
<
Object
,
Object
>
getDefaultConnectionProperties
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceProvider.java
浏览文件 @
0a6a9131
...
...
@@ -17,12 +17,11 @@
*/
package
org.jkiss.dbeaver.model.impl.jdbc
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.core.Log
;
import
org.eclipse.jface.operation.IRunnableContext
;
import
org.
eclipse.ui.views.properties.IPropertyDescriptor
;
import
org.
jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.core.Log
;
import
org.jkiss.dbeaver.model.*
;
import
org.jkiss.dbeaver.ui.properties.PropertyDescriptorEx
;
...
...
@@ -50,12 +49,12 @@ public abstract class JDBCDataSourceProvider implements DBPDataSourceProvider {
}
@Override
public
I
PropertyDescriptor
[]
getConnectionProperties
(
public
DBP
PropertyDescriptor
[]
getConnectionProperties
(
IRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnectionInfo
connectionInfo
)
throws
DBException
{
Collection
<
I
PropertyDescriptor
>
props
=
null
;
Collection
<
DBP
PropertyDescriptor
>
props
=
null
;
Object
driverInstance
=
driver
.
getDriverInstance
(
runnableContext
);
if
(
driverInstance
instanceof
Driver
)
{
props
=
readDriverProperties
(
connectionInfo
,
(
Driver
)
driverInstance
);
...
...
@@ -63,10 +62,10 @@ public abstract class JDBCDataSourceProvider implements DBPDataSourceProvider {
if
(
props
==
null
)
{
return
null
;
}
return
props
.
toArray
(
new
I
PropertyDescriptor
[
props
.
size
()]);
return
props
.
toArray
(
new
DBP
PropertyDescriptor
[
props
.
size
()]);
}
private
Collection
<
I
PropertyDescriptor
>
readDriverProperties
(
private
Collection
<
DBP
PropertyDescriptor
>
readDriverProperties
(
DBPConnectionInfo
connectionInfo
,
Driver
driver
)
throws
DBException
{
...
...
@@ -83,7 +82,7 @@ public abstract class JDBCDataSourceProvider implements DBPDataSourceProvider {
return
null
;
}
List
<
IPropertyDescriptor
>
properties
=
new
ArrayList
<
I
PropertyDescriptor
>();
List
<
DBPPropertyDescriptor
>
properties
=
new
ArrayList
<
DBP
PropertyDescriptor
>();
for
(
DriverPropertyInfo
desc
:
propDescs
)
{
if
(
DBConstants
.
DATA_SOURCE_PROPERTY_USER
.
equals
(
desc
.
name
)
||
DBConstants
.
DATA_SOURCE_PROPERTY_PASSWORD
.
equals
(
desc
.
name
))
{
// Skip user/password properties
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceProviderDescriptor.java
浏览文件 @
0a6a9131
...
...
@@ -23,11 +23,11 @@ import org.eclipse.core.runtime.IConfigurationElement;
import
org.eclipse.jface.text.templates.TemplateContextType
;
import
org.eclipse.jface.viewers.IStructuredSelection
;
import
org.eclipse.swt.graphics.Image
;
import
org.eclipse.ui.views.properties.IPropertyDescriptor
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.model.DBPDataSourceProvider
;
import
org.jkiss.dbeaver.model.DBPPropertyDescriptor
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.registry.tree.*
;
import
org.jkiss.dbeaver.ui.DBIcon
;
...
...
@@ -58,7 +58,7 @@ public class DataSourceProviderDescriptor extends AbstractDescriptor
private
DBXTreeNode
treeDescriptor
;
private
final
Map
<
String
,
DBXTreeNode
>
treeNodeMap
=
new
HashMap
<
String
,
DBXTreeNode
>();
private
boolean
driversManagable
;
private
final
List
<
IPropertyDescriptor
>
driverProperties
=
new
ArrayList
<
I
PropertyDescriptor
>();
private
final
List
<
DBPPropertyDescriptor
>
driverProperties
=
new
ArrayList
<
DBP
PropertyDescriptor
>();
private
final
List
<
DriverDescriptor
>
drivers
=
new
ArrayList
<
DriverDescriptor
>();
private
final
List
<
DataSourceViewDescriptor
>
views
=
new
ArrayList
<
DataSourceViewDescriptor
>();
private
final
Map
<
String
,
ToolGroupDescriptor
>
toolGroups
=
new
LinkedHashMap
<
String
,
ToolGroupDescriptor
>();
...
...
@@ -99,7 +99,11 @@ public class DataSourceProviderDescriptor extends AbstractDescriptor
this
.
driversManagable
=
driversElement
.
getAttribute
(
RegistryConstants
.
ATTR_MANAGABLE
)
==
null
||
CommonUtils
.
getBoolean
(
driversElement
.
getAttribute
(
RegistryConstants
.
ATTR_MANAGABLE
));
for
(
IConfigurationElement
driverElement
:
driversElement
.
getChildren
(
RegistryConstants
.
TAG_DRIVER
))
{
try
{
this
.
drivers
.
add
(
loadDriver
(
driverElement
));
}
catch
(
Exception
e
)
{
log
.
error
(
"Error loading driver"
,
e
);
}
}
}
}
...
...
@@ -200,14 +204,14 @@ public class DataSourceProviderDescriptor extends AbstractDescriptor
return
driversManagable
;
}
public
List
<
I
PropertyDescriptor
>
getDriverProperties
()
public
List
<
DBP
PropertyDescriptor
>
getDriverProperties
()
{
return
driverProperties
;
}
public
I
PropertyDescriptor
getDriverProperty
(
String
name
)
public
DBP
PropertyDescriptor
getDriverProperty
(
String
name
)
{
for
(
I
PropertyDescriptor
prop
:
driverProperties
)
{
for
(
DBP
PropertyDescriptor
prop
:
driverProperties
)
{
if
(
prop
.
getId
().
equals
(
name
))
{
return
prop
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
浏览文件 @
0a6a9131
...
...
@@ -17,7 +17,6 @@
*/
package
org.jkiss.dbeaver.registry
;
import
org.jkiss.dbeaver.core.Log
;
import
org.eclipse.core.runtime.IConfigurationElement
;
import
org.eclipse.core.runtime.IProgressMonitor
;
import
org.eclipse.core.runtime.IStatus
;
...
...
@@ -33,12 +32,12 @@ import org.eclipse.swt.SWT;
import
org.eclipse.swt.graphics.Image
;
import
org.eclipse.swt.widgets.Composite
;
import
org.eclipse.swt.widgets.Shell
;
import
org.eclipse.ui.views.properties.IPropertyDescriptor
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.core.DBeaverActivator
;
import
org.jkiss.dbeaver.core.DBeaverCore
;
import
org.jkiss.dbeaver.core.DBeaverUI
;
import
org.jkiss.dbeaver.core.Log
;
import
org.jkiss.dbeaver.model.*
;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.runtime.RuntimeUtils
;
...
...
@@ -47,7 +46,6 @@ import org.jkiss.dbeaver.ui.OverlayImageDescriptor;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.dialogs.AcceptLicenseDialog
;
import
org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog
;
import
org.jkiss.dbeaver.ui.properties.IPropertyDescriptorEx
;
import
org.jkiss.dbeaver.ui.properties.PropertyDescriptorEx
;
import
org.jkiss.dbeaver.utils.ContentUtils
;
import
org.jkiss.utils.CommonUtils
;
...
...
@@ -109,7 +107,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
private
final
List
<
DriverFileDescriptor
>
files
=
new
ArrayList
<
DriverFileDescriptor
>();
private
final
List
<
DriverFileDescriptor
>
origFiles
=
new
ArrayList
<
DriverFileDescriptor
>();
private
final
List
<
DriverPathDescriptor
>
pathList
=
new
ArrayList
<
DriverPathDescriptor
>();
private
final
List
<
IPropertyDescriptor
>
connectionPropertyDescriptors
=
new
ArrayList
<
I
PropertyDescriptor
>();
private
final
List
<
DBPPropertyDescriptor
>
connectionPropertyDescriptors
=
new
ArrayList
<
DBP
PropertyDescriptor
>();
private
final
List
<
OSDescriptor
>
supportedSystems
=
new
ArrayList
<
OSDescriptor
>();
private
final
List
<
ReplaceInfo
>
driverReplacements
=
new
ArrayList
<
ReplaceInfo
>();
...
...
@@ -703,7 +701,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
}
@Override
public
List
<
I
PropertyDescriptor
>
getConnectionPropertyDescriptors
()
public
List
<
DBP
PropertyDescriptor
>
getConnectionPropertyDescriptors
()
{
return
connectionPropertyDescriptors
;
}
...
...
@@ -750,11 +748,8 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
public
void
setDriverParameter
(
String
name
,
String
value
,
boolean
setDefault
)
{
Object
valueObject
=
value
;
IPropertyDescriptor
prop
=
getProviderDescriptor
().
getDriverProperty
(
name
);
if
(
prop
instanceof
IPropertyDescriptorEx
)
{
valueObject
=
RuntimeUtils
.
convertString
(
value
,
((
IPropertyDescriptorEx
)
prop
).
getDataType
());
}
DBPPropertyDescriptor
prop
=
getProviderDescriptor
().
getDriverProperty
(
name
);
Object
valueObject
=
prop
==
null
?
value
:
RuntimeUtils
.
convertString
(
value
,
prop
.
getDataType
());
customParameters
.
put
(
name
,
valueObject
);
if
(
setDefault
)
{
defaultParameters
.
put
(
name
,
valueObject
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/transfer/DataTransferProcessorDescriptor.java
浏览文件 @
0a6a9131
...
...
@@ -20,8 +20,8 @@ package org.jkiss.dbeaver.registry.transfer;
import
org.eclipse.core.runtime.IConfigurationElement
;
import
org.eclipse.swt.graphics.Image
;
import
org.eclipse.ui.views.properties.IPropertyDescriptor
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.DBPPropertyDescriptor
;
import
org.jkiss.dbeaver.registry.AbstractDescriptor
;
import
org.jkiss.dbeaver.registry.RegistryConstants
;
import
org.jkiss.dbeaver.tools.transfer.IDataTransferProcessor
;
...
...
@@ -43,7 +43,7 @@ public class DataTransferProcessorDescriptor extends AbstractDescriptor
private
final
String
name
;
private
final
String
description
;
private
final
Image
icon
;
private
final
List
<
IPropertyDescriptor
>
properties
=
new
ArrayList
<
I
PropertyDescriptor
>();
private
final
List
<
DBPPropertyDescriptor
>
properties
=
new
ArrayList
<
DBP
PropertyDescriptor
>();
public
DataTransferProcessorDescriptor
(
DataTransferNodeDescriptor
node
,
IConfigurationElement
config
)
{
...
...
@@ -84,7 +84,7 @@ public class DataTransferProcessorDescriptor extends AbstractDescriptor
return
icon
;
}
public
List
<
I
PropertyDescriptor
>
getProperties
()
{
public
List
<
DBP
PropertyDescriptor
>
getProperties
()
{
return
properties
;
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ConnectionPropertiesControl.java
浏览文件 @
0a6a9131
...
...
@@ -29,6 +29,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
import
org.jkiss.dbeaver.model.DBConstants
;
import
org.jkiss.dbeaver.model.DBPConnectionInfo
;
import
org.jkiss.dbeaver.model.DBPDriver
;
import
org.jkiss.dbeaver.model.DBPPropertyDescriptor
;
import
org.jkiss.dbeaver.ui.dialogs.EnterNameDialog
;
import
org.jkiss.dbeaver.ui.properties.PropertyDescriptorEx
;
import
org.jkiss.dbeaver.ui.properties.PropertySourceCustom
;
...
...
@@ -46,8 +47,8 @@ public class ConnectionPropertiesControl extends PropertyTreeViewer {
public
static
final
String
USER_PROPERTIES_CATEGORY
=
CoreMessages
.
controls_connection_properties_category_user_properties
;
private
List
<
I
PropertyDescriptor
>
driverProvidedProperties
;
private
List
<
I
PropertyDescriptor
>
customProperties
;
private
List
<
DBP
PropertyDescriptor
>
driverProvidedProperties
;
private
List
<
DBP
PropertyDescriptor
>
customProperties
;
public
ConnectionPropertiesControl
(
Composite
parent
,
int
style
)
{
...
...
@@ -120,8 +121,8 @@ public class ConnectionPropertiesControl extends PropertyTreeViewer {
}
}
private
List
<
I
PropertyDescriptor
>
getAllProperties
(
DBPDriver
driver
,
boolean
includeCustom
)
{
List
<
IPropertyDescriptor
>
propertyDescriptors
=
new
ArrayList
<
I
PropertyDescriptor
>();
private
List
<
DBP
PropertyDescriptor
>
getAllProperties
(
DBPDriver
driver
,
boolean
includeCustom
)
{
List
<
DBPPropertyDescriptor
>
propertyDescriptors
=
new
ArrayList
<
DBP
PropertyDescriptor
>();
propertyDescriptors
.
addAll
(
driver
.
getConnectionPropertyDescriptors
());
if
(
driverProvidedProperties
!=
null
)
{
propertyDescriptors
.
addAll
(
driverProvidedProperties
);
...
...
@@ -135,9 +136,9 @@ public class ConnectionPropertiesControl extends PropertyTreeViewer {
private
void
loadDriverProperties
(
IRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnectionInfo
connectionInfo
)
{
try
{
final
I
PropertyDescriptor
[]
connectionsProps
=
final
DBP
PropertyDescriptor
[]
connectionsProps
=
driver
.
getDataSourceProvider
().
getConnectionProperties
(
runnableContext
,
driver
,
connectionInfo
);
driverProvidedProperties
=
new
ArrayList
<
I
PropertyDescriptor
>();
driverProvidedProperties
=
new
ArrayList
<
DBP
PropertyDescriptor
>();
if
(
connectionsProps
!=
null
)
{
Collections
.
addAll
(
driverProvidedProperties
,
connectionsProps
);
}
...
...
@@ -150,12 +151,12 @@ public class ConnectionPropertiesControl extends PropertyTreeViewer {
{
// Collect all driver (and all other) properties
Set
<
String
>
propNames
=
new
TreeSet
<
String
>();
List
<
I
PropertyDescriptor
>
allProperties
=
getAllProperties
(
driver
,
false
);
for
(
I
PropertyDescriptor
prop
:
allProperties
)
{
List
<
DBP
PropertyDescriptor
>
allProperties
=
getAllProperties
(
driver
,
false
);
for
(
DBP
PropertyDescriptor
prop
:
allProperties
)
{
propNames
.
add
(
CommonUtils
.
toString
(
prop
.
getId
()));
}
customProperties
=
new
ArrayList
<
I
PropertyDescriptor
>();
customProperties
=
new
ArrayList
<
DBP
PropertyDescriptor
>();
// Find prop values which are not from driver
for
(
Object
propId
:
properties
.
keySet
())
{
final
String
propName
=
propId
.
toString
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/PropertySourceCustom.java
浏览文件 @
0a6a9131
...
...
@@ -18,6 +18,7 @@
package
org.jkiss.dbeaver.ui.properties
;
import
org.eclipse.ui.views.properties.IPropertyDescriptor
;
import
org.jkiss.dbeaver.model.DBPPropertyDescriptor
;
import
org.jkiss.dbeaver.runtime.RuntimeUtils
;
import
org.jkiss.utils.CommonUtils
;
...
...
@@ -28,7 +29,7 @@ import java.util.*;
*/
public
class
PropertySourceCustom
implements
IPropertySourceEx
{
private
List
<
IPropertyDescriptor
>
props
=
new
ArrayList
<
I
PropertyDescriptor
>();
private
List
<
DBPPropertyDescriptor
>
props
=
new
ArrayList
<
DBP
PropertyDescriptor
>();
private
Map
<
Object
,
Object
>
originalValues
=
new
TreeMap
<
Object
,
Object
>();
private
Map
<
Object
,
Object
>
propValues
=
new
TreeMap
<
Object
,
Object
>();
...
...
@@ -38,7 +39,7 @@ public class PropertySourceCustom implements IPropertySourceEx {
{
}
public
PropertySourceCustom
(
Collection
<?
extends
I
PropertyDescriptor
>
properties
,
Map
<
Object
,
Object
>
values
)
public
PropertySourceCustom
(
Collection
<?
extends
DBP
PropertyDescriptor
>
properties
,
Map
<
Object
,
Object
>
values
)
{
addProperties
(
properties
);
setValues
(
values
);
...
...
@@ -50,10 +51,10 @@ public class PropertySourceCustom implements IPropertySourceEx {
// Set only allowed properties + transform property types
for
(
Map
.
Entry
<
Object
,
Object
>
value
:
values
.
entrySet
())
{
Object
propValue
=
value
.
getValue
();
for
(
I
PropertyDescriptor
prop
:
props
)
{
for
(
DBP
PropertyDescriptor
prop
:
props
)
{
if
(
prop
.
getId
().
equals
(
value
.
getKey
()))
{
if
(
propValue
instanceof
String
&&
prop
instanceof
IPropertyDescriptorEx
)
{
propValue
=
RuntimeUtils
.
convertString
((
String
)
value
.
getValue
(),
((
IPropertyDescriptorEx
)
prop
)
.
getDataType
());
if
(
propValue
instanceof
String
)
{
propValue
=
RuntimeUtils
.
convertString
((
String
)
value
.
getValue
(),
prop
.
getDataType
());
}
originalValues
.
put
(
value
.
getKey
(),
propValue
);
break
;
...
...
@@ -81,18 +82,16 @@ public class PropertySourceCustom implements IPropertySourceEx {
return
allValues
;
}
public
void
addProperties
(
Collection
<?
extends
I
PropertyDescriptor
>
properties
)
public
void
addProperties
(
Collection
<?
extends
DBP
PropertyDescriptor
>
properties
)
{
props
.
addAll
(
properties
);
for
(
IPropertyDescriptor
prop
:
properties
)
{
if
(
prop
instanceof
IPropertyDescriptorEx
)
{
final
Object
defaultValue
=
((
IPropertyDescriptorEx
)
prop
).
getDefaultValue
();
for
(
DBPPropertyDescriptor
prop
:
properties
)
{
final
Object
defaultValue
=
prop
.
getDefaultValue
();
if
(
defaultValue
!=
null
)
{
defaultValues
.
put
(
prop
.
getId
(),
defaultValue
);
}
}
}
}
@Override
public
Object
getEditableValue
()
...
...
plugins/org.jkiss.dbeaver.wmi/src/org/jkiss/dbeaver/ext/wmi/WMIDataSourceProvider.java
浏览文件 @
0a6a9131
...
...
@@ -18,7 +18,6 @@
package
org.jkiss.dbeaver.ext.wmi
;
import
org.eclipse.jface.operation.IRunnableContext
;
import
org.eclipse.ui.views.properties.IPropertyDescriptor
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ext.wmi.model.WMIDataSource
;
...
...
@@ -45,7 +44,7 @@ public class WMIDataSourceProvider implements DBPDataSourceProvider {
}
@Override
public
I
PropertyDescriptor
[]
getConnectionProperties
(
public
DBP
PropertyDescriptor
[]
getConnectionProperties
(
IRunnableContext
runnableContext
,
DBPDriver
driver
,
DBPConnectionInfo
connectionInfo
)
throws
DBException
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录