#8562 Activator renamed in org.jkiss.dbeaver.ext.db2.ui, db2_logo.png added

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

@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jkiss.dbeaver.ext.db2.ui;singleton:=true
 Bundle-Version: 1.0.1.qualifier
 Bundle-Release-Date: 20200504
-Bundle-Activator: org.jkiss.dbeaver.ext.db2.ui.Activator
+Bundle-Activator: org.jkiss.dbeaver.ext.db2.ui.DB2Activator
 Require-Bundle: org.eclipse.ui,
  org.jkiss.dbeaver.ui.editors.connection,
  org.jkiss.dbeaver.ui,

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

@@ -27,7 +27,7 @@
                 targetID="org.jkiss.dbeaver.ext.ui.newConnectionWizard"
                 label="%dialog.connection.header"
                 class="org.jkiss.dbeaver.ext.db2.ui.views.DB2ConnectionPage"
-                icon="icons/db2_icon.png">
+                icon="platform:/plugin/org.jkiss.dbeaver.ext.db2/icons/db2_icon.png">
         </view>
         <view
                 id="org.jkiss.dbeaver.ext.db2.dataSourceEditorView"

plugins/org.jkiss.dbeaver.ext.db2.ui/src/org/jkiss/dbeaver/ext/db2/ui/Activator.java → plugins/org.jkiss.dbeaver.ext.db2.ui/src/org/jkiss/dbeaver/ext/db2/ui/DB2Activator.java

@@ -23,18 +23,18 @@ import org.osgi.framework.BundleContext;
 /**
  * The activator class controls the plug-in life cycle
  */
-public class Activator extends AbstractUIPlugin {
+public class DB2Activator extends AbstractUIPlugin {
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.db2";
+    public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.db2.ui";
 
     // The shared instance
-    private static Activator plugin;
+    private static DB2Activator plugin;
 
     /**
      * The constructor
      */
-    public Activator()
+    public DB2Activator()
     {
     }
 
@@ -67,7 +67,7 @@ public class Activator extends AbstractUIPlugin {
      *
      * @return the shared instance
      */
-    public static Activator getDefault()
+    public static DB2Activator getDefault()
     {
         return plugin;
     }

plugins/org.jkiss.dbeaver.ext.db2.ui/src/org/jkiss/dbeaver/ext/db2/ui/views/DB2ConnectionPage.java

@@ -26,7 +26,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.jkiss.dbeaver.ext.db2.ui.Activator;
+import org.jkiss.dbeaver.ext.db2.ui.DB2Activator;
 import org.jkiss.dbeaver.ext.db2.ui.internal.DB2Messages;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
@@ -47,7 +47,7 @@ public class DB2ConnectionPage extends ConnectionPageAbstract implements ICompos
     private Text dbText;
     private Text usernameText;
 
-    private static ImageDescriptor logoImage = Activator.getImageDescriptor("icons/db2_logo.png"); //$NON-NLS-1$
+    private static ImageDescriptor logoImage = DB2Activator.getImageDescriptor("icons/db2_logo.png"); //$NON-NLS-1$
 
     @Override
     public void dispose()