diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/.classpath b/plugins/org.jkiss.dbeaver.ext.import_config/.classpath similarity index 98% rename from plugins/org.jkiss.dbeaver.ext.import-config/.classpath rename to plugins/org.jkiss.dbeaver.ext.import_config/.classpath index b1dabee38291b97f08cc3a18bee4e65b1e550530..098194ca4b7d8f45177f94e735506ae3a26b5c94 100644 --- a/plugins/org.jkiss.dbeaver.ext.import-config/.classpath +++ b/plugins/org.jkiss.dbeaver.ext.import_config/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/.project b/plugins/org.jkiss.dbeaver.ext.import_config/.project similarity index 95% rename from plugins/org.jkiss.dbeaver.ext.import-config/.project rename to plugins/org.jkiss.dbeaver.ext.import_config/.project index 7ea33d0b40ffdfad7c13215d013a53ad3e796793..02bf473e37db9f25716e793824e5c07804d50157 100644 --- a/plugins/org.jkiss.dbeaver.ext.import-config/.project +++ b/plugins/org.jkiss.dbeaver.ext.import_config/.project @@ -1,28 +1,28 @@ - - - org.jkiss.dbeaver.ext.import_config - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - + + + org.jkiss.dbeaver.ext.import_config + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/.settings/org.eclipse.jdt.core.prefs b/plugins/org.jkiss.dbeaver.ext.import_config/.settings/org.eclipse.jdt.core.prefs similarity index 97% rename from plugins/org.jkiss.dbeaver.ext.import-config/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.jkiss.dbeaver.ext.import_config/.settings/org.eclipse.jdt.core.prefs index b6fa1f9c3c6c506765e941387ff7bb7acef81473..6c7076f14b794e467d477e86ca470c945706c3fa 100644 --- a/plugins/org.jkiss.dbeaver.ext.import-config/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.jkiss.dbeaver.ext.import_config/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ -#Thu Aug 19 23:54:20 MSD 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +#Thu Aug 19 23:54:20 MSD 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.import_config/META-INF/MANIFEST.MF similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/META-INF/MANIFEST.MF rename to plugins/org.jkiss.dbeaver.ext.import_config/META-INF/MANIFEST.MF diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ext.import_config/OSGI-INF/l10n/bundle.properties similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/OSGI-INF/l10n/bundle.properties rename to plugins/org.jkiss.dbeaver.ext.import_config/OSGI-INF/l10n/bundle.properties diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/build.properties b/plugins/org.jkiss.dbeaver.ext.import_config/build.properties similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/build.properties rename to plugins/org.jkiss.dbeaver.ext.import_config/build.properties diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/contexts.xml b/plugins/org.jkiss.dbeaver.ext.import_config/contexts.xml similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/contexts.xml rename to plugins/org.jkiss.dbeaver.ext.import_config/contexts.xml diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/icons/custom.png b/plugins/org.jkiss.dbeaver.ext.import_config/icons/custom.png similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/icons/custom.png rename to plugins/org.jkiss.dbeaver.ext.import_config/icons/custom.png diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/icons/dbvis.png b/plugins/org.jkiss.dbeaver.ext.import_config/icons/dbvis.png similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/icons/dbvis.png rename to plugins/org.jkiss.dbeaver.ext.import_config/icons/dbvis.png diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/icons/dbvis_big.png b/plugins/org.jkiss.dbeaver.ext.import_config/icons/dbvis_big.png similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/icons/dbvis_big.png rename to plugins/org.jkiss.dbeaver.ext.import_config/icons/dbvis_big.png diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/icons/navicat.png b/plugins/org.jkiss.dbeaver.ext.import_config/icons/navicat.png similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/icons/navicat.png rename to plugins/org.jkiss.dbeaver.ext.import_config/icons/navicat.png diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/icons/squirrel.png b/plugins/org.jkiss.dbeaver.ext.import_config/icons/squirrel.png similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/icons/squirrel.png rename to plugins/org.jkiss.dbeaver.ext.import_config/icons/squirrel.png diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/icons/squirrel_big.png b/plugins/org.jkiss.dbeaver.ext.import_config/icons/squirrel_big.png similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/icons/squirrel_big.png rename to plugins/org.jkiss.dbeaver.ext.import_config/icons/squirrel_big.png diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/plugin.xml b/plugins/org.jkiss.dbeaver.ext.import_config/plugin.xml similarity index 97% rename from plugins/org.jkiss.dbeaver.ext.import-config/plugin.xml rename to plugins/org.jkiss.dbeaver.ext.import_config/plugin.xml index 3e33ab31af1169c742a937b746eeb1344c5d4efa..5bb647f985321cd8ea0b973cc762a659321de1a3 100644 --- a/plugins/org.jkiss.dbeaver.ext.import-config/plugin.xml +++ b/plugins/org.jkiss.dbeaver.ext.import_config/plugin.xml @@ -1,58 +1,58 @@ - - - - - - - - - SQL Squirrel Client - - - DBVisualizer - - - Navicat - - - Custom connections format (CSV, XML) - - - - - + + + + + + + + + SQL Squirrel Client + + + DBVisualizer + + + Navicat + + + Custom connections format (CSV, XML) + + + + + diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/pom.xml b/plugins/org.jkiss.dbeaver.ext.import_config/pom.xml similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/pom.xml rename to plugins/org.jkiss.dbeaver.ext.import_config/pom.xml diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/Activator.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/Activator.java similarity index 96% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/Activator.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/Activator.java index 1f6b7c5298c74f87e9b43dc7dee940111ec39f6f..8b5cbfaa4c726bf625a6bbe95b68a578f29eac19 100644 --- a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/Activator.java +++ b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/Activator.java @@ -1,71 +1,71 @@ -/* - * DBeaver - Universal Database Manager - * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jkiss.dbeaver.ext.import_config; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.import_config"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - /** - * Returns an image descriptor for the image file at the given - * plug-in relative path - * - * @param path the path - * @return the image descriptor - */ - public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin(PLUGIN_ID, path); - } -} +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jkiss.dbeaver.ext.import_config; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.import_config"; + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Returns an image descriptor for the image file at the given + * plug-in relative path + * + * @param path the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } +} diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizard.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizard.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizard.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizard.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizardPage.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizardPage.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizardPage.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizardPage.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportConnectionInfo.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportConnectionInfo.java similarity index 95% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportConnectionInfo.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportConnectionInfo.java index 2f977bf768f99b0cfda42a6f3222b14d3613e7cd..2ddf1031ca358f5c051b9ccb8048ab958494df78 100644 --- a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportConnectionInfo.java +++ b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportConnectionInfo.java @@ -1,163 +1,163 @@ -/* - * DBeaver - Universal Database Manager - * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jkiss.dbeaver.ext.import_config.wizards; - -import org.jkiss.dbeaver.registry.driver.DriverDescriptor; - -import java.util.HashMap; -import java.util.Map; - -/** - * Import connection info - */ -public class ImportConnectionInfo { - - private DriverDescriptor driver; - private ImportDriverInfo driverInfo; - private String id; - private String alias; - private String url; - private String host; - private String port; - private String database; - private String user; - private String password; - private Map properties = new HashMap<>(); - private Map providerProperties = new HashMap<>(); - private boolean checked = false; - - public ImportConnectionInfo(ImportDriverInfo driverInfo, String id, String alias, String url, String host, String port, String database, String user, String password) - { - this.driverInfo = driverInfo; - this.id = id; - this.alias = alias; - this.url = url; - this.host = host; - this.port = port; - this.database = database; - this.user = user; - this.password = password; - } - - public DriverDescriptor getDriver() - { - return driver; - } - - public void setDriver(DriverDescriptor driver) - { - this.driver = driver; - } - - public ImportDriverInfo getDriverInfo() - { - return driverInfo; - } - - public String getId() - { - return id; - } - - public String getAlias() - { - return alias; - } - - public String getUrl() - { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getHost() - { - return host; - } - - public String getPort() - { - return port; - } - - public void setPort(String port) - { - this.port = port; - } - - public String getDatabase() - { - return database; - } - - public void setDatabase(String database) - { - this.database = database; - } - - public String getUser() - { - return user; - } - - public void setUser(String user) { - this.user = user; - } - - public String getPassword() - { - return password; - } - - public Map getProperties() - { - return properties; - } - - public void setProperty(String name, String value) - { - properties.put(name, value); - } - - public Map getProviderProperties() { - return providerProperties; - } - - public void setProviderProperty(String name, String value) - { - properties.put(name, value); - } - - public void setHost(String host) - { - this.host = host; - } - - public boolean isChecked() - { - return checked; - } - - public void setChecked(boolean checked) - { - this.checked = checked; - } -} +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jkiss.dbeaver.ext.import_config.wizards; + +import org.jkiss.dbeaver.registry.driver.DriverDescriptor; + +import java.util.HashMap; +import java.util.Map; + +/** + * Import connection info + */ +public class ImportConnectionInfo { + + private DriverDescriptor driver; + private ImportDriverInfo driverInfo; + private String id; + private String alias; + private String url; + private String host; + private String port; + private String database; + private String user; + private String password; + private Map properties = new HashMap<>(); + private Map providerProperties = new HashMap<>(); + private boolean checked = false; + + public ImportConnectionInfo(ImportDriverInfo driverInfo, String id, String alias, String url, String host, String port, String database, String user, String password) + { + this.driverInfo = driverInfo; + this.id = id; + this.alias = alias; + this.url = url; + this.host = host; + this.port = port; + this.database = database; + this.user = user; + this.password = password; + } + + public DriverDescriptor getDriver() + { + return driver; + } + + public void setDriver(DriverDescriptor driver) + { + this.driver = driver; + } + + public ImportDriverInfo getDriverInfo() + { + return driverInfo; + } + + public String getId() + { + return id; + } + + public String getAlias() + { + return alias; + } + + public String getUrl() + { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getHost() + { + return host; + } + + public String getPort() + { + return port; + } + + public void setPort(String port) + { + this.port = port; + } + + public String getDatabase() + { + return database; + } + + public void setDatabase(String database) + { + this.database = database; + } + + public String getUser() + { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public String getPassword() + { + return password; + } + + public Map getProperties() + { + return properties; + } + + public void setProperty(String name, String value) + { + properties.put(name, value); + } + + public Map getProviderProperties() { + return providerProperties; + } + + public void setProviderProperty(String name, String value) + { + properties.put(name, value); + } + + public void setHost(String host) + { + this.host = host; + } + + public boolean isChecked() + { + return checked; + } + + public void setChecked(boolean checked) + { + this.checked = checked; + } +} diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportData.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportData.java similarity index 96% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportData.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportData.java index 3f7d7f560e9bdb41b62254d4fa98e4e843351f9b..4b58b0e6b1dc580330185607992fef3151592333 100644 --- a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportData.java +++ b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportData.java @@ -1,71 +1,71 @@ -/* - * DBeaver - Universal Database Manager - * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jkiss.dbeaver.ext.import_config.wizards; - -import java.util.ArrayList; -import java.util.List; - -/** - * Import data - */ -public class ImportData { - - private List drivers = new ArrayList<>(); - private List connections = new ArrayList<>(); - - public List getDrivers() - { - return drivers; - } - - public ImportDriverInfo getDriver(String name) - { - for (ImportDriverInfo driver : drivers) { - if (name.equals(driver.getName())) { - return driver; - } - } - return null; - } - - public ImportDriverInfo getDriverByID(String id) - { - for (ImportDriverInfo driver : drivers) { - if (id.equals(driver.getId())) { - return driver; - } - } - return null; - } - - public void addDriver(ImportDriverInfo driverInfo) - { - drivers.add(driverInfo); - } - - public List getConnections() - { - return connections; - } - - public void addConnection(ImportConnectionInfo connectionInfo) - { - connections.add(connectionInfo); - } - -} +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jkiss.dbeaver.ext.import_config.wizards; + +import java.util.ArrayList; +import java.util.List; + +/** + * Import data + */ +public class ImportData { + + private List drivers = new ArrayList<>(); + private List connections = new ArrayList<>(); + + public List getDrivers() + { + return drivers; + } + + public ImportDriverInfo getDriver(String name) + { + for (ImportDriverInfo driver : drivers) { + if (name.equals(driver.getName())) { + return driver; + } + } + return null; + } + + public ImportDriverInfo getDriverByID(String id) + { + for (ImportDriverInfo driver : drivers) { + if (id.equals(driver.getId())) { + return driver; + } + } + return null; + } + + public void addDriver(ImportDriverInfo driverInfo) + { + drivers.add(driverInfo); + } + + public List getConnections() + { + return connections; + } + + public void addConnection(ImportConnectionInfo connectionInfo) + { + connections.add(connectionInfo); + } + +} diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportDriverInfo.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportDriverInfo.java similarity index 95% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportDriverInfo.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportDriverInfo.java index f39dd44c46cea90b9bd98db7f13282103fcf2b1d..5492d58c06651b5f3f75ac65b8ad509f285d979d 100644 --- a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportDriverInfo.java +++ b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/ImportDriverInfo.java @@ -1,118 +1,118 @@ -/* - * DBeaver - Universal Database Manager - * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jkiss.dbeaver.ext.import_config.wizards; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Import data - */ -public class ImportDriverInfo { - - private String id; - private String name; - private String sampleURL; - private String driverClass; - private List libraries = new ArrayList<>(); - private Map properties = new HashMap<>(); - private String defaultPort; - private String description; - - public ImportDriverInfo(String id, String name, String sampleURL, String driverClass) - { - this.id = id; - this.name = name; - this.sampleURL = sampleURL; - this.driverClass = driverClass; - } - - public String getId() - { - return id; - } - - public String getName() - { - return name; - } - - public String getSampleURL() - { - return sampleURL; - } - - public void setSampleURL(String sampleURL) - { - this.sampleURL = sampleURL; - } - - public String getDriverClass() - { - return driverClass; - } - - public String getDefaultPort() - { - return defaultPort; - } - - public void setDefaultPort(String defaultPort) - { - this.defaultPort = defaultPort; - } - - public List getLibraries() - { - return libraries; - } - - public void addLibrary(String path) - { - libraries.add(path); - } - - public Map getProperties() - { - return properties; - } - - public void setProperty(String name, String value) - { - properties.put(name, value); - } - - public String getDescription() - { - return description; - } - - public void setDescription(String description) - { - this.description = description; - } - - @Override - public String toString() - { - return name + " - " + driverClass + " - " + sampleURL; - } - -} +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jkiss.dbeaver.ext.import_config.wizards; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Import data + */ +public class ImportDriverInfo { + + private String id; + private String name; + private String sampleURL; + private String driverClass; + private List libraries = new ArrayList<>(); + private Map properties = new HashMap<>(); + private String defaultPort; + private String description; + + public ImportDriverInfo(String id, String name, String sampleURL, String driverClass) + { + this.id = id; + this.name = name; + this.sampleURL = sampleURL; + this.driverClass = driverClass; + } + + public String getId() + { + return id; + } + + public String getName() + { + return name; + } + + public String getSampleURL() + { + return sampleURL; + } + + public void setSampleURL(String sampleURL) + { + this.sampleURL = sampleURL; + } + + public String getDriverClass() + { + return driverClass; + } + + public String getDefaultPort() + { + return defaultPort; + } + + public void setDefaultPort(String defaultPort) + { + this.defaultPort = defaultPort; + } + + public List getLibraries() + { + return libraries; + } + + public void addLibrary(String path) + { + libraries.add(path); + } + + public Map getProperties() + { + return properties; + } + + public void setProperty(String name, String value) + { + properties.put(name, value); + } + + public String getDescription() + { + return description; + } + + public void setDescription(String description) + { + this.description = description; + } + + @Override + public String toString() + { + return name + " - " + driverClass + " - " + sampleURL; + } + +} diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardCustom.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardCustom.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardCustom.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardCustom.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomConnections.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomConnections.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomConnections.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomConnections.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomDriver.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomDriver.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomDriver.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomDriver.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomSettings.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomSettings.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomSettings.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/custom/ConfigImportWizardPageCustomSettings.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/dbvis/ConfigImportWizardDbvis.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/dbvis/ConfigImportWizardDbvis.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/dbvis/ConfigImportWizardDbvis.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/dbvis/ConfigImportWizardDbvis.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/dbvis/ConfigImportWizardPageDbvis.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/dbvis/ConfigImportWizardPageDbvis.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/dbvis/ConfigImportWizardPageDbvis.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/dbvis/ConfigImportWizardPageDbvis.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardNavicat.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardNavicat.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardNavicat.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardNavicat.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatConnections.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatConnections.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatConnections.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatConnections.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatDriver.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatDriver.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatDriver.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatDriver.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatSettings.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatSettings.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatSettings.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/ConfigImportWizardPageNavicatSettings.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/squirrel/ConfigImportWizardPageSquirrel.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/squirrel/ConfigImportWizardPageSquirrel.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/squirrel/ConfigImportWizardPageSquirrel.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/squirrel/ConfigImportWizardPageSquirrel.java diff --git a/plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/squirrel/ConfigImportWizardSquirrel.java b/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/squirrel/ConfigImportWizardSquirrel.java similarity index 100% rename from plugins/org.jkiss.dbeaver.ext.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/squirrel/ConfigImportWizardSquirrel.java rename to plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/squirrel/ConfigImportWizardSquirrel.java diff --git a/pom.xml b/pom.xml index 39f7709c5d6fcace5bba81b65977f48841847218..8c7e158b0a53505fa73f5b2c4fb5d84b6392e403 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ plugins/org.jkiss.dbeaver.ext.ui.locks plugins/org.jkiss.dbeaver.ext.firebird plugins/org.jkiss.dbeaver.ext.generic - plugins/org.jkiss.dbeaver.ext.import-config + plugins/org.jkiss.dbeaver.ext.import_config plugins/org.jkiss.dbeaver.ext.h2 plugins/org.jkiss.dbeaver.ext.hana plugins/org.jkiss.dbeaver.ext.hsqldb