Use the new banner images in the wizard

HannesWell · Mar 20, 2023 · 05ad2fe · 05ad2fe
1 parent 9e2710e
commit 05ad2fe
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 5 deletions.
diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 2.0.5.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor

diff --git a/org.eclipse.m2e.core.ui/icons/banner_new_module.png b/org.eclipse.m2e.core.ui/icons/banner_new_module.png
diff --git a/org.eclipse.m2e.core.ui/icons/banner_new_module@2x.png b/org.eclipse.m2e.core.ui/icons/banner_new_module@2x.png
diff --git a/org.eclipse.m2e.core.ui/icons/banner_new_project.png b/org.eclipse.m2e.core.ui/icons/banner_new_project.png
diff --git a/org.eclipse.m2e.core.ui/icons/banner_new_project@2x.png b/org.eclipse.m2e.core.ui/icons/banner_new_project@2x.png
diff --git a/org.eclipse.m2e.core.ui/icons/banner_update_project.png b/org.eclipse.m2e.core.ui/icons/banner_update_project.png
diff --git a/org.eclipse.m2e.core.ui/icons/banner_update_project@2x.png b/org.eclipse.m2e.core.ui/icons/banner_update_project@2x.png
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenImages.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenImages.java
@@ -96,7 +96,11 @@ public class MavenImages {
   // wizard images
   public static final ImageDescriptor WIZ_IMPORT_WIZ = createDescriptor("import_project.png"); //$NON-NLS-1$
 
-  public static final ImageDescriptor WIZ_NEW_PROJECT = createDescriptor("new_m2_project_wizard.png"); //$NON-NLS-1$
+  public static final ImageDescriptor WIZ_NEW_MAVEN_PROJECT = createDescriptor("banner_new_project.png"); //$NON-NLS-1$
+
+  public static final ImageDescriptor WIZ_NEW_MODULE_PROJECT = createDescriptor("banner_new_module.png"); //$NON-NLS-1$
+
+  public static final ImageDescriptor WIZ_UPDATE_PROJECT = createDescriptor("banner_update_project.png"); //$NON-NLS-1$
 
   public static final String MVN_PROJECT = "project-mlabel.gif"; //$NON-NLS-1$
 

diff --git a/...e.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/UpdateMavenProjectsDialog.java b/...e.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/UpdateMavenProjectsDialog.java
@@ -19,6 +19,7 @@
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -27,6 +28,7 @@
 import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.ui.internal.MavenImages;
 import org.eclipse.m2e.core.ui.internal.Messages;
 import org.eclipse.m2e.core.ui.internal.components.NestedProjectsComposite;
 
@@ -136,7 +138,9 @@ protected Control createDialogArea(Composite parent) {
 
     setTitle(getDialogTitle());
     setMessage(getDialogMessage());
-
+    Image image = MavenImages.WIZ_UPDATE_PROJECT.createImage();
+    setTitleImage(image);
+    area.addDisposeListener(e -> image.dispose());
     return area;
   }
 

diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java
@@ -90,7 +90,7 @@ public class MavenModuleWizard extends AbstractMavenProjectWizard implements INe
   /** Default constructor. Sets the title and image of the wizard. */
   public MavenModuleWizard() {
     setWindowTitle(Messages.wizardModuleTitle);
-    setDefaultPageImageDescriptor(MavenImages.WIZ_NEW_PROJECT);
+    setDefaultPageImageDescriptor(MavenImages.WIZ_NEW_MODULE_PROJECT);
     setNeedsProgressMonitor(true);
   }
 

diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java
@@ -100,7 +100,7 @@ public class MavenProjectWizard extends AbstractMavenProjectWizard implements IN
    */
   public MavenProjectWizard() {
     setWindowTitle(Messages.wizardProjectTitle);
-    setDefaultPageImageDescriptor(MavenImages.WIZ_NEW_PROJECT);
+    setDefaultPageImageDescriptor(MavenImages.WIZ_NEW_MAVEN_PROJECT);
     setNeedsProgressMonitor(true);
   }