Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
56eb494c
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,发现更多精彩内容 >>
提交
56eb494c
编写于
12月 26, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Compile warnings fixes
Former-commit-id:
daa700b5
上级
a2acc39b
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
29 addition
and
31 deletion
+29
-31
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/registry/DataTransferNodeDescriptor.java
...r/tools/transfer/registry/DataTransferNodeDescriptor.java
+2
-2
plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModelDescriptor.java
...er/ext/generic/model/meta/GenericMetaModelDescriptor.java
+1
-1
plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizard.java
...iss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizard.java
+12
-3
plugins/org.jkiss.dbeaver.lang/src/org/jkiss/dbeaver/lang/base/SCMENumber.java
...aver.lang/src/org/jkiss/dbeaver/lang/base/SCMENumber.java
+1
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractDescriptor.java
.../src/org/jkiss/dbeaver/model/impl/AbstractDescriptor.java
+3
-2
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/preferences/BundlePreferenceStore.java
...dbeaver/model/impl/preferences/BundlePreferenceStore.java
+4
-4
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/registry/formatter/DataFormatterDescriptor.java
...s/dbeaver/registry/formatter/DataFormatterDescriptor.java
+1
-1
plugins/org.jkiss.dbeaver.net.ssh.jsch/src/org/jkiss/dbeaver/model/net/ssh/DBeaverIdentityRepository.java
...kiss/dbeaver/model/net/ssh/DBeaverIdentityRepository.java
+4
-4
plugins/org.jkiss.dbeaver.team.git.ui/src/org/jkiss/dbeaver/team/git/ui/Activator.java
...m.git.ui/src/org/jkiss/dbeaver/team/git/ui/Activator.java
+1
-13
未找到文件。
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/registry/DataTransferNodeDescriptor.java
浏览文件 @
56eb494c
...
@@ -115,7 +115,7 @@ public class DataTransferNodeDescriptor extends AbstractDescriptor
...
@@ -115,7 +115,7 @@ public class DataTransferNodeDescriptor extends AbstractDescriptor
{
{
implType
.
checkObjectClass
(
IDataTransferNode
.
class
);
implType
.
checkObjectClass
(
IDataTransferNode
.
class
);
try
{
try
{
return
implType
.
getObjectClass
(
IDataTransferNode
.
class
).
newInstance
();
return
implType
.
getObjectClass
(
IDataTransferNode
.
class
).
getDeclaredConstructor
().
newInstance
();
}
catch
(
Throwable
e
)
{
}
catch
(
Throwable
e
)
{
throw
new
DBException
(
"Can't create data transformer node"
,
e
);
throw
new
DBException
(
"Can't create data transformer node"
,
e
);
}
}
...
@@ -125,7 +125,7 @@ public class DataTransferNodeDescriptor extends AbstractDescriptor
...
@@ -125,7 +125,7 @@ public class DataTransferNodeDescriptor extends AbstractDescriptor
{
{
settingsType
.
checkObjectClass
(
IDataTransferSettings
.
class
);
settingsType
.
checkObjectClass
(
IDataTransferSettings
.
class
);
try
{
try
{
return
settingsType
.
getObjectClass
(
IDataTransferSettings
.
class
).
newInstance
();
return
settingsType
.
getObjectClass
(
IDataTransferSettings
.
class
).
getDeclaredConstructor
().
newInstance
();
}
catch
(
Throwable
e
)
{
}
catch
(
Throwable
e
)
{
throw
new
DBException
(
"Can't create node settings"
,
e
);
throw
new
DBException
(
"Can't create node settings"
,
e
);
}
}
...
...
plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModelDescriptor.java
浏览文件 @
56eb494c
...
@@ -89,7 +89,7 @@ public class GenericMetaModelDescriptor extends AbstractDescriptor {
...
@@ -89,7 +89,7 @@ public class GenericMetaModelDescriptor extends AbstractDescriptor {
throw
new
DBException
(
"Can't create generic meta model instance '"
+
implType
.
getImplName
()
+
"'"
);
throw
new
DBException
(
"Can't create generic meta model instance '"
+
implType
.
getImplName
()
+
"'"
);
}
}
try
{
try
{
instance
=
implClass
.
newInstance
();
instance
=
implClass
.
getDeclaredConstructor
().
newInstance
();
}
catch
(
Throwable
e
)
{
}
catch
(
Throwable
e
)
{
throw
new
DBException
(
"Can't instantiate meta model"
,
e
);
throw
new
DBException
(
"Can't instantiate meta model"
,
e
);
}
}
...
...
plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLScriptExecuteWizard.java
浏览文件 @
56eb494c
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
package
org.jkiss.dbeaver.ext.mysql.tools
;
package
org.jkiss.dbeaver.ext.mysql.tools
;
import
org.eclipse.jface.wizard.IWizardPage
;
import
org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog
;
import
org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog
;
import
org.jkiss.dbeaver.ext.mysql.tasks.MySQLScriptExecuteSettings
;
import
org.jkiss.dbeaver.ext.mysql.tasks.MySQLScriptExecuteSettings
;
import
org.jkiss.dbeaver.ext.mysql.tasks.MySQLTasks
;
import
org.jkiss.dbeaver.ext.mysql.tasks.MySQLTasks
;
...
@@ -32,7 +33,7 @@ import java.util.Map;
...
@@ -32,7 +33,7 @@ import java.util.Map;
class
MySQLScriptExecuteWizard
extends
AbstractScriptExecuteWizard
<
MySQLScriptExecuteSettings
,
MySQLCatalog
,
MySQLCatalog
>
{
class
MySQLScriptExecuteWizard
extends
AbstractScriptExecuteWizard
<
MySQLScriptExecuteSettings
,
MySQLCatalog
,
MySQLCatalog
>
{
private
MySQLScriptExecuteWizardPageSettings
main
Page
=
new
MySQLScriptExecuteWizardPageSettings
(
this
);
private
MySQLScriptExecuteWizardPageSettings
settings
Page
=
new
MySQLScriptExecuteWizardPageSettings
(
this
);
MySQLScriptExecuteWizard
(
MySQLCatalog
catalog
,
boolean
isImport
)
{
MySQLScriptExecuteWizard
(
MySQLCatalog
catalog
,
boolean
isImport
)
{
super
(
Collections
.
singleton
(
catalog
),
isImport
?
MySQLUIMessages
.
tools_script_execute_wizard_db_import
:
MySQLUIMessages
.
tools_script_execute_wizard_execute_script
);
super
(
Collections
.
singleton
(
catalog
),
isImport
?
MySQLUIMessages
.
tools_script_execute_wizard_db_import
:
MySQLUIMessages
.
tools_script_execute_wizard_execute_script
);
...
@@ -51,7 +52,7 @@ class MySQLScriptExecuteWizard extends AbstractScriptExecuteWizard<MySQLScriptEx
...
@@ -51,7 +52,7 @@ class MySQLScriptExecuteWizard extends AbstractScriptExecuteWizard<MySQLScriptEx
@Override
@Override
public
void
saveTaskState
(
DBRRunnableContext
runnableContext
,
Map
<
String
,
Object
>
state
)
{
public
void
saveTaskState
(
DBRRunnableContext
runnableContext
,
Map
<
String
,
Object
>
state
)
{
main
Page
.
saveState
();
settings
Page
.
saveState
();
getSettings
().
saveSettings
(
runnableContext
,
new
TaskPreferenceStore
(
state
));
getSettings
().
saveSettings
(
runnableContext
,
new
TaskPreferenceStore
(
state
));
}
}
...
@@ -76,8 +77,16 @@ class MySQLScriptExecuteWizard extends AbstractScriptExecuteWizard<MySQLScriptEx
...
@@ -76,8 +77,16 @@ class MySQLScriptExecuteWizard extends AbstractScriptExecuteWizard<MySQLScriptEx
@Override
@Override
public
void
addPages
()
{
public
void
addPages
()
{
addTaskConfigPages
();
addTaskConfigPages
();
addPage
(
main
Page
);
addPage
(
settings
Page
);
super
.
addPages
();
super
.
addPages
();
}
}
@Override
public
IWizardPage
getNextPage
(
IWizardPage
page
)
{
if
(
page
==
settingsPage
)
{
return
null
;
}
return
super
.
getNextPage
(
page
);
}
}
}
plugins/org.jkiss.dbeaver.lang/src/org/jkiss/dbeaver/lang/base/SCMENumber.java
浏览文件 @
56eb494c
...
@@ -34,7 +34,7 @@ public class SCMENumber extends SCMLeafNode {
...
@@ -34,7 +34,7 @@ public class SCMENumber extends SCMLeafNode {
}
}
public
Number
getNumberValue
()
{
public
Number
getNumberValue
()
{
return
new
Double
(
getPlainValue
());
return
Double
.
parse
Double
(
getPlainValue
());
}
}
}
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractDescriptor.java
浏览文件 @
56eb494c
...
@@ -28,6 +28,7 @@ import org.jkiss.dbeaver.model.DBPImage;
...
@@ -28,6 +28,7 @@ import org.jkiss.dbeaver.model.DBPImage;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
import
org.osgi.framework.Bundle
;
import
org.osgi.framework.Bundle
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -191,8 +192,8 @@ public abstract class AbstractDescriptor {
...
@@ -191,8 +192,8 @@ public abstract class AbstractDescriptor {
throw
new
DBException
(
"Can't load class '"
+
getImplName
()
+
"'"
);
throw
new
DBException
(
"Can't load class '"
+
getImplName
()
+
"'"
);
}
}
try
{
try
{
return
objectClass
.
newInstance
();
return
objectClass
.
getDeclaredConstructor
().
newInstance
();
}
catch
(
InstantiationException
|
IllegalAccessException
e
)
{
}
catch
(
InstantiationException
|
IllegalAccessException
|
NoSuchMethodException
|
InvocationTargetException
e
)
{
throw
new
DBException
(
"Can't instantiate class '"
+
getImplName
()
+
"'"
,
e
);
throw
new
DBException
(
"Can't instantiate class '"
+
getImplName
()
+
"'"
,
e
);
}
}
}
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/preferences/BundlePreferenceStore.java
浏览文件 @
56eb494c
...
@@ -172,7 +172,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
...
@@ -172,7 +172,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
props
.
putDouble
(
name
,
value
);
props
.
putDouble
(
name
,
value
);
}
}
dirty
=
true
;
dirty
=
true
;
firePropertyChangeEvent
(
name
,
new
Double
(
oldValue
),
new
Double
(
value
)
);
firePropertyChangeEvent
(
name
,
oldValue
,
value
);
}
}
@Override
@Override
...
@@ -187,7 +187,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
...
@@ -187,7 +187,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
props
.
putFloat
(
name
,
value
);
props
.
putFloat
(
name
,
value
);
}
}
dirty
=
true
;
dirty
=
true
;
firePropertyChangeEvent
(
name
,
new
Float
(
oldValue
),
new
Float
(
value
)
);
firePropertyChangeEvent
(
name
,
oldValue
,
value
);
}
}
@Override
@Override
...
@@ -202,7 +202,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
...
@@ -202,7 +202,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
props
.
putInt
(
name
,
value
);
props
.
putInt
(
name
,
value
);
}
}
dirty
=
true
;
dirty
=
true
;
firePropertyChangeEvent
(
name
,
new
Integer
(
oldValue
),
new
Integer
(
value
)
);
firePropertyChangeEvent
(
name
,
oldValue
,
value
);
}
}
@Override
@Override
...
@@ -217,7 +217,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
...
@@ -217,7 +217,7 @@ public class BundlePreferenceStore extends AbstractPreferenceStore {
props
.
putLong
(
name
,
value
);
props
.
putLong
(
name
,
value
);
}
}
dirty
=
true
;
dirty
=
true
;
firePropertyChangeEvent
(
name
,
new
Long
(
oldValue
),
new
Long
(
value
)
);
firePropertyChangeEvent
(
name
,
oldValue
,
value
);
}
}
@Override
@Override
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/registry/formatter/DataFormatterDescriptor.java
浏览文件 @
56eb494c
...
@@ -59,7 +59,7 @@ public class DataFormatterDescriptor extends AbstractDescriptor
...
@@ -59,7 +59,7 @@ public class DataFormatterDescriptor extends AbstractDescriptor
}
}
Class
<?>
objectClass
=
getObjectClass
(
config
.
getAttribute
(
"sampleClass"
));
Class
<?>
objectClass
=
getObjectClass
(
config
.
getAttribute
(
"sampleClass"
));
try
{
try
{
sample
=
(
DBDDataFormatterSample
)
objectClass
.
newInstance
();
sample
=
(
DBDDataFormatterSample
)
objectClass
.
getDeclaredConstructor
().
newInstance
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"Can't instantiate data formatter '"
+
getId
()
+
"' sample"
);
log
.
error
(
"Can't instantiate data formatter '"
+
getId
()
+
"' sample"
);
}
}
...
...
plugins/org.jkiss.dbeaver.net.ssh.jsch/src/org/jkiss/dbeaver/model/net/ssh/DBeaverIdentityRepository.java
浏览文件 @
56eb494c
package
org.jkiss.dbeaver.model.net.ssh
;
package
org.jkiss.dbeaver.model.net.ssh
;
import
java.util.List
;
import
java.util.Vector
;
import
com.jcraft.jsch.Buffer
;
import
com.jcraft.jsch.Buffer
;
import
com.jcraft.jsch.IdentityRepository
;
import
com.jcraft.jsch.IdentityRepository
;
import
com.jcraft.jsch.JSchException
;
import
com.jcraft.jsch.JSchException
;
import
java.util.List
;
import
java.util.Vector
;
public
class
DBeaverIdentityRepository
implements
IdentityRepository
{
public
class
DBeaverIdentityRepository
implements
IdentityRepository
{
private
SSHImplementationAbstract
impl
;
private
SSHImplementationAbstract
impl
;
...
@@ -18,7 +18,7 @@ public class DBeaverIdentityRepository implements IdentityRepository {
...
@@ -18,7 +18,7 @@ public class DBeaverIdentityRepository implements IdentityRepository {
}
}
@Override
@Override
public
Vector
getIdentities
()
{
public
Vector
<?>
getIdentities
()
{
Vector
<
com
.
jcraft
.
jsch
.
Identity
>
result
=
new
Vector
<
com
.
jcraft
.
jsch
.
Identity
>();
Vector
<
com
.
jcraft
.
jsch
.
Identity
>
result
=
new
Vector
<
com
.
jcraft
.
jsch
.
Identity
>();
for
(
SSHAgentIdentity
identity
:
identities
)
{
for
(
SSHAgentIdentity
identity
:
identities
)
{
...
...
plugins/org.jkiss.dbeaver.team.git.ui/src/org/jkiss/dbeaver/team/git/ui/Activator.java
浏览文件 @
56eb494c
...
@@ -18,26 +18,14 @@
...
@@ -18,26 +18,14 @@
package
org.jkiss.dbeaver.team.git.ui
;
package
org.jkiss.dbeaver.team.git.ui
;
import
org.eclipse.core.runtime.CoreException
;
import
org.eclipse.core.runtime.Plugin
;
import
org.eclipse.core.runtime.Plugin
;
import
org.jkiss.dbeaver.Log
;
import
org.osgi.framework.BundleContext
;
import
org.osgi.framework.BundleContext
;
public
class
Activator
extends
Plugin
{
public
class
Activator
extends
Plugin
{
//private static final Log log = Log.getLog(Activator.class);
@Override
public
void
startup
()
throws
CoreException
{
//super.startup();
//log.info("Activator git startup");
}
@Override
@Override
public
void
start
(
BundleContext
context
)
throws
Exception
{
public
void
start
(
BundleContext
context
)
throws
Exception
{
//super.start(context);
super
.
start
(
context
);
//log.info("Activator git start");
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录