#8517 ui part of plugin ext.spanner in ext.spanner.ui moved

features/org.jkiss.dbeaver.db.feature/feature.xml

@@ -44,6 +44,7 @@
     <plugin id="org.jkiss.dbeaver.ext.opendistro" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.phoenix" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.snowflake.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.spanner" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.sqlite" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.teradata" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.vertica" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

features/org.jkiss.dbeaver.db.ui.feature/feature.xml

@@ -30,7 +30,7 @@
 
     <plugin id="org.jkiss.dbeaver.ext.athena.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.bigquery.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.spanner" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.spanner.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.snowflake.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.sqlite.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 

plugins/org.jkiss.dbeaver.ext.spanner.ui/META-INF/MANIFEST.MF

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.jkiss.dbeaver.ext.spanner.ui;singleton:=true
+Bundle-Version: 1.0.1.qualifier
+Bundle-Release-Date: 20200420
+Bundle-Activator: org.jkiss.dbeaver.ext.spanner.ui.SpannerActivator
+Require-Bundle: org.eclipse.ui,
+ org.jkiss.dbeaver.ui.editors.connection,
+ org.jkiss.dbeaver.model,
+ org.jkiss.dbeaver.ui,
+ org.jkiss.dbeaver.ext.spanner
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.ext.athena.ui

plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle.properties

+Bundle-Vendor = DBeaver Corp
+Bundle-Name = DBeaver Google Spanner UI
+
+spanner.dialog.connection.header=Google Spanner Connection Settings
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_de.properties

+spanner.dialog.connection.header=Google Spanner Verbindungseinstellungen
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_pt_BR.properties

+Bundle-Name = DBeaver Google UI
+Bundle-Vendor = DBeaver Corp
+
+spanner.dialog.connection.header = Google Spanner Configura\u00E7\u00F5es de conex\u00E3o

plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_ru.properties

+spanner.dialog.connection.header=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F Google Spanner

plugins/org.jkiss.dbeaver.ext.spanner.ui/build.properties

+source.. = src/
+output.. = target/classes/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               OSGI-INF/,\
+               icons/,\

plugins/org.jkiss.dbeaver.ext.spanner.ui/plugin.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+
+    <extension point="org.jkiss.dbeaver.dataSourceView">
+        <view
+                id="org.jkiss.dbeaver.ext.spanner.dataSourceWizardView"
+                targetID="org.jkiss.dbeaver.ext.ui.newConnectionWizard"
+                dataSource="google_spanner"
+                label="%spanner.dialog.connection.header"
+                class="org.jkiss.dbeaver.ext.spanner.ui.views.SpannerConnectionPage"
+                icon="platform:/plugin/org.jkiss.dbeaver.ext.spanner/icons/spanner_icon.png">
+        </view>
+        <view
+                class="org.jkiss.dbeaver.ext.spanner.ui.views.SpannerConnectionPage"
+                icon="platform:/plugin/org.jkiss.dbeaver.ext.spanner/icons/spanner_icon.png"
+                id="org.jkiss.dbeaver.ext.spanner.dataSourceEditorView"
+                dataSource="google_spanner"
+                label="%spanner.dialog.connection.header"
+                targetID="org.jkiss.dbeaver.ext.ui.editConnectionDialog">
+        </view>
+    </extension>
+
+</plugin>

plugins/org.jkiss.dbeaver.ext.spanner.ui/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jkiss.dbeaver</groupId>
+    <artifactId>plugins</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+     <relativePath>../</relativePath>
+  </parent>
+  <artifactId>org.jkiss.dbeaver.ext.spanner.ui</artifactId>
+  <version>1.0.1-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>

plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/SpannerActivator.java → plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/SpannerActivator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.spanner;
+package org.jkiss.dbeaver.ext.spanner.ui;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -26,7 +26,7 @@ import org.osgi.framework.BundleContext;
 public class SpannerActivator extends AbstractUIPlugin {
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.spanner";
+    public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.spanner.ui";
 
     // The shared instance
     private static SpannerActivator plugin;

plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/SpannerMessages.java → plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/SpannerMessages.java

-package org.jkiss.dbeaver.ext.spanner.views;
+package org.jkiss.dbeaver.ext.spanner.ui.internal;
 
 import org.eclipse.osgi.util.NLS;
 
 public class SpannerMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.spanner.views.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.spanner.ui.internal.messages"; //$NON-NLS-1$
 
 	public static String label_connection;
 	public static String label_private_key_path;
 	public static String label_project;
+	public static String label_instance;
+	public static String label_database;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, SpannerMessages.class);

plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/messages.properties → plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages.properties

 label_connection=Connection
 label_private_key_path=Private key path (p12 or JSON)
 label_project=Project
+label_instance=Instance 
+label_database=Database
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages_de.properties

+label_connection=Verbindung
+label_private_key_path=Privater Schl\u00fcsselpfad (p12 oder JSON)
+label_project=Projekt
+label_instance=Instanz 
+label_database=Datenbank
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/messages_ru.properties → plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages_ru.properties

 label_connection=\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435
 label_private_key_path=\u041F\u0443\u0442\u044C \u043A \u0437\u0430\u043A\u0440\u044B\u0442\u043E\u043C\u0443 \u043A\u043B\u044E\u0447\u0443 (p12 \u0438\u043B\u0438 JSON)
 label_project=\u041F\u0440\u043E\u0435\u043A\u0442
+label_instance=\u042d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440
+label_database=\u0411\u0430\u0437\u0430\u0020\u0434\u0430\u043d\u043d\u044b\u0445
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/SpannerConnectionPage.java → plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/views/SpannerConnectionPage.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.ext.spanner.views;
+package org.jkiss.dbeaver.ext.spanner.ui.views;
 
 import org.eclipse.jface.dialogs.IDialogPage;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -25,7 +25,8 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.ext.spanner.SpannerActivator;
+import org.jkiss.dbeaver.ext.spanner.ui.SpannerActivator;
+import org.jkiss.dbeaver.ext.spanner.ui.internal.SpannerMessages;
 import org.jkiss.dbeaver.ext.spanner.model.SpannerConstants;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
@@ -78,11 +79,11 @@ public class SpannerConnectionPage extends ConnectionPageAbstract implements ICo
             projectText = UIUtils.createLabelText(addrGroup, SpannerMessages.label_project, ""); //$NON-NLS-2$
             projectText.addModifyListener(textListener);
 
-            instanceText = UIUtils.createLabelText(addrGroup, "Instance", ""); //$NON-NLS-2$
+            instanceText = UIUtils.createLabelText(addrGroup, SpannerMessages.label_instance, ""); //$NON-NLS-2$
             instanceText.setToolTipText("Spanner Instance ID"); //$NON-NLS-1$
             instanceText.addModifyListener(textListener);
 
-            databaseText = UIUtils.createLabelText(addrGroup, "Database", ""); //$NON-NLS-2$
+            databaseText = UIUtils.createLabelText(addrGroup, SpannerMessages.label_database, ""); //$NON-NLS-2$
             databaseText.setToolTipText("Spanner Database ID"); //$NON-NLS-1$
             databaseText.addModifyListener(textListener);
 

plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF

@@ -4,14 +4,10 @@ Bundle-Name: DBeaver Spanner extension
 Bundle-SymbolicName: org.jkiss.dbeaver.ext.spanner;singleton:=true
 Bundle-Version: 1.0.18.qualifier
 Bundle-Release-Date: 20200420
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.jkiss.dbeaver.core,
- org.jkiss.dbeaver.model,
- org.jkiss.dbeaver.ext.generic
-Bundle-Activator: org.jkiss.dbeaver.ext.spanner.SpannerActivator
+Require-Bundle: org.jkiss.dbeaver.ext.generic
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: DBeaver Corp
 Bundle-Localization: OSGI-INF/l10n/bundle
 Automatic-Module-Name: org.jkiss.dbeaver.ext.spanner
+Export-Package: org.jkiss.dbeaver.ext.spanner.model

plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle.properties

 Bundle-Vendor = DBeaver Corp
 Bundle-Name = DBeaver Google Spanner Extension
-datasource.spanner.description = Spanner datasource
-
-spanner.dialog.connection.header=Google Spanner Connection Settings
+datasource.spanner.description = Spanner datasource
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_pt_BR.properties

@@ -3,6 +3,4 @@ Bundle-Name = DBeaver Google Spanner Extens\u00E3o
 
 Bundle-Vendor = DBeaver Corp
 
-datasource.spanner.description = Spanner fonte de dados
-
-spanner.dialog.connection.header = Google Spanner Configura\u00E7\u00F5es de conex\u00E3o
+datasource.spanner.description = Spanner fonte de dados
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_ru.properties

-spanner.dialog.connection.header=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F Google Spanner
+datasource.spanner.description = Spanner \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0020\u0434\u0430\u043d\u043d\u044b\u0445
\ No newline at end of file

plugins/org.jkiss.dbeaver.ext.spanner/plugin.xml

@@ -44,23 +44,6 @@
         </dialect>
     </extension>
 
-    <extension point="org.jkiss.dbeaver.dataSourceView">
-        <view
-                id="org.jkiss.dbeaver.ext.spanner.dataSourceWizardView"
-                targetID="org.jkiss.dbeaver.ext.ui.newConnectionWizard"
-                dataSource="google_spanner"
-                label="%spanner.dialog.connection.header"
-                class="org.jkiss.dbeaver.ext.spanner.views.SpannerConnectionPage"
-                icon="icons/spanner_icon.png">
-        </view>
-        <view
-                class="org.jkiss.dbeaver.ext.spanner.views.SpannerConnectionPage"
-                icon="icons/spanner_icon.png"
-                id="org.jkiss.dbeaver.ext.spanner.dataSourceEditorView"
-                dataSource="google_spanner"
-                label="%spanner.dialog.connection.header"
-                targetID="org.jkiss.dbeaver.ext.ui.editConnectionDialog">
-        </view>
-    </extension>
+
 
 </plugin>

plugins/pom.xml

@@ -47,6 +47,7 @@
         <module>org.jkiss.dbeaver.ext.postgresql</module>
 
         <module>org.jkiss.dbeaver.ext.snowflake.core</module>
+        <module>org.jkiss.dbeaver.ext.spanner</module>
         <module>org.jkiss.dbeaver.ext.sqlite</module>
         <module>org.jkiss.dbeaver.ext.vertica</module>
         <module>org.jkiss.dbeaver.ext.teradata</module>
@@ -88,7 +89,7 @@
                 <module>org.jkiss.dbeaver.ext.postgresql.debug.core</module>
                 <module>org.jkiss.dbeaver.ext.postgresql.debug.ui</module>
                 <module>org.jkiss.dbeaver.ext.sqlite.ui</module>
-                <module>org.jkiss.dbeaver.ext.spanner</module>
+                <module>org.jkiss.dbeaver.ext.spanner.ui</module>
                 <module>org.jkiss.dbeaver.ext.snowflake.ui</module>
                 <module>org.jkiss.dbeaver.ext.vertica.ui</module>
                 <module>org.jkiss.dbeaver.ext.wmi</module>