Bug 514863: Use png files in org.eclipse.equinox.p2.ui

Change-Id: Ia891112782c251e903149d5e3db8d873f3b1b6d9
Signed-off-by: Matthias Becker <ma.becker@sap.com>

7 files changed, 70 insertions, 70 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/icons/install_wiz.gif b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/install_wiz.gif
deleted file mode 100644
index 7eee7c3a7..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/icons/install_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz.png b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz.png
new file mode 100644
index 000000000..35f23e99a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz@2x.png b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz@2x.png
new file mode 100644
index 000000000..c1ef3ebbe
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.importexport/plugin.xml
index 7b9ace0e2..d3b4800bf 100755
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/plugin.xml
@@ -10,7 +10,7 @@
       <wizard
             category="org.eclipse.equinox.p2.category"
             class="org.eclipse.equinox.internal.p2.importexport.internal.wizard.ExportWizard"
-            icon="icons/install_wiz.gif"
+            icon="icons/wizban/install_wiz.png"
             id="org.eclipse.equinox.p2.replication.export"
             name="%export.name">
             <description>
@@ -27,17 +27,17 @@
       <wizard
             category="org.eclipse.equinox.p2.category"
             class="org.eclipse.equinox.internal.p2.importexport.internal.wizard.ImportWizard"
-            icon="icons/install_wiz.gif"
+            icon="icons/wizban/install_wiz.png"
             id="org.eclipse.equinox.p2.replication.import"
             name="%import.name">
             <description>
             	%import.description
-            </description>            
+            </description>
       </wizard>
       <wizard
             category="org.eclipse.equinox.p2.category"
             class="org.eclipse.equinox.internal.p2.importexport.internal.wizard.ImportFromInstallationWizard"
-            icon="icons/install_wiz.gif"
+            icon="icons/wizban/install_wiz.png"
             id="org.eclipse.equinox.p2.replication.importfrominstallation"
             name="%importfrominstallation.name">
          <description>
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java
index 86986aa78..23799a6e3 100755
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2011 WindRiver Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     WindRiver Corporation - initial API and implementation
  *******************************************************************************/
@@ -42,7 +42,7 @@ public class ExportWizard extends AbstractWizard implements IExportWizard {
 
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		setWindowTitle(Messages.ExportWizard_WizardTitle);
-		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/install_wiz.gif"))); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/wizban/install_wiz.png"))); //$NON-NLS-1$
 		setNeedsProgressMonitor(true);
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportFromInstallationWizard.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportFromInstallationWizard.java
index 6b89c6488..b2e296b15 100644
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportFromInstallationWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportFromInstallationWizard.java
@@ -1,62 +1,62 @@
-/*******************************************************************************

- * Copyright (c) 2011 WindRiver Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     WindRiver Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.equinox.internal.p2.importexport.internal.wizard;

-

-import java.util.Collection;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.equinox.internal.p2.importexport.internal.*;

-import org.eclipse.equinox.internal.p2.ui.dialogs.ISelectableIUsPage;

-import org.eclipse.equinox.internal.p2.ui.dialogs.InstallWizard;

-import org.eclipse.equinox.internal.p2.ui.model.IUElementListRoot;

-import org.eclipse.equinox.p2.engine.ProvisioningContext;

-import org.eclipse.equinox.p2.metadata.IInstallableUnit;

-import org.eclipse.equinox.p2.operations.InstallOperation;

-import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob;

-import org.eclipse.equinox.p2.ui.ProvisioningUI;

-import org.eclipse.jface.dialogs.IDialogSettings;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.IImportWizard;

-import org.eclipse.ui.IWorkbench;

-

-public class ImportFromInstallationWizard extends InstallWizard implements IImportWizard {

-

-	public ImportFromInstallationWizard() {

-		this(ProvisioningUI.getDefaultUI(), null, null, null);

-	}

-

-	public ImportFromInstallationWizard(ProvisioningUI ui, InstallOperation operation, Collection<IInstallableUnit> initialSelections, LoadMetadataRepositoryJob preloadJob) {

-		super(ui, operation, initialSelections, preloadJob);

-		IDialogSettings workbenchSettings = ImportExportActivator.getDefault().getDialogSettings();

-		String sectionName = "ImportFromInstallationWizard"; //$NON-NLS-1$

-		IDialogSettings section = workbenchSettings.getSection(sectionName);

-		if (section == null) {

-			section = workbenchSettings.addNewSection(sectionName);

-		}

-		setDialogSettings(section);

-	}

-

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		setWindowTitle(Messages.ImportWizard_WINDOWTITLE);

-		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/install_wiz.gif"))); //$NON-NLS-1$

-		setNeedsProgressMonitor(true);

-	}

-

-	@Override

-	protected ISelectableIUsPage createMainPage(IUElementListRoot input, Object[] selections) {

-		return new ImportFromInstallationPage(ui, this);

-	}

-

-	@Override

-	protected ProvisioningContext getProvisioningContext() {

-		return ((ImportFromInstallationPage) mainPage).getProvisioningContext();

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2011 WindRiver Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     WindRiver Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.internal.p2.importexport.internal.wizard;
+
+import java.util.Collection;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.equinox.internal.p2.importexport.internal.*;
+import org.eclipse.equinox.internal.p2.ui.dialogs.ISelectableIUsPage;
+import org.eclipse.equinox.internal.p2.ui.dialogs.InstallWizard;
+import org.eclipse.equinox.internal.p2.ui.model.IUElementListRoot;
+import org.eclipse.equinox.p2.engine.ProvisioningContext;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.operations.InstallOperation;
+import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob;
+import org.eclipse.equinox.p2.ui.ProvisioningUI;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+
+public class ImportFromInstallationWizard extends InstallWizard implements IImportWizard {
+
+	public ImportFromInstallationWizard() {
+		this(ProvisioningUI.getDefaultUI(), null, null, null);
+	}
+
+	public ImportFromInstallationWizard(ProvisioningUI ui, InstallOperation operation, Collection<IInstallableUnit> initialSelections, LoadMetadataRepositoryJob preloadJob) {
+		super(ui, operation, initialSelections, preloadJob);
+		IDialogSettings workbenchSettings = ImportExportActivator.getDefault().getDialogSettings();
+		String sectionName = "ImportFromInstallationWizard"; //$NON-NLS-1$
+		IDialogSettings section = workbenchSettings.getSection(sectionName);
+		if (section == null) {
+			section = workbenchSettings.addNewSection(sectionName);
+		}
+		setDialogSettings(section);
+	}
+
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		setWindowTitle(Messages.ImportWizard_WINDOWTITLE);
+		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/wizban/install_wiz.png"))); //$NON-NLS-1$
+		setNeedsProgressMonitor(true);
+	}
+
+	@Override
+	protected ISelectableIUsPage createMainPage(IUElementListRoot input, Object[] selections) {
+		return new ImportFromInstallationPage(ui, this);
+	}
+
+	@Override
+	protected ProvisioningContext getProvisioningContext() {
+		return ((ImportFromInstallationPage) mainPage).getProvisioningContext();
+	}
+}
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java
index f2ed24744..7eb1555e0 100644
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java
@@ -57,7 +57,7 @@ public class ImportWizard extends InstallWizard implements IImportWizard {
 
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		setWindowTitle(Messages.ImportWizard_WINDOWTITLE);
-		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/install_wiz.gif"))); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/wizban/install_wiz.png"))); //$NON-NLS-1$
 		setNeedsProgressMonitor(true);
 	}