提交 56eb494c 编写于 作者: S Serge Rider

Compile warnings fixes


Former-commit-id: daa700b5
上级 a2acc39b
...@@ -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);
} }
......
...@@ -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);
} }
......
...@@ -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 mainPage = new MySQLScriptExecuteWizardPageSettings(this); private MySQLScriptExecuteWizardPageSettings settingsPage = 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) {
mainPage.saveState(); settingsPage.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(mainPage); addPage(settingsPage);
super.addPages(); super.addPages();
} }
@Override
public IWizardPage getNextPage(IWizardPage page) {
if (page == settingsPage) {
return null;
}
return super.getNextPage(page);
}
} }
...@@ -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.parseDouble(getPlainValue());
} }
} }
...@@ -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);
} }
} }
......
...@@ -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
......
...@@ -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");
} }
......
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) {
......
...@@ -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.
先完成此消息的编辑!
想要评论请 注册