Set title and description for new target wizard selection page.

Change-Id: I15ade69533ef0227864c0723678d9df672db39c4

3 files changed, 174 insertions, 165 deletions

diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/Messages.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/Messages.java
index 105892d1fff..969bd40d01d 100644
--- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/Messages.java
+++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/Messages.java
@@ -39,6 +39,10 @@ public class Messages extends NLS {
 
 	public static String NewLaunchTargetWizard_Title;
 
+	public static String NewLaunchTargetWizardSelectionPage_Description;
+
+	public static String NewLaunchTargetWizardSelectionPage_Title;
+
 	public static String DescriptorMustNotBeNull;
 	public static String DescriptorMustNotBeNullDesc;
 	public static String NoActiveTarget;
diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/messages.properties b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/messages.properties
index 4e66d904734..7d1827330b8 100644
--- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/messages.properties
+++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/messages.properties
@@ -28,6 +28,8 @@ NewLaunchConfigTypePage2_Mode=Launch Mode
 NewLaunchConfigTypePage2_Type=Launch Configuration Type
 NewLaunchConfigWizard_0=Create Launch Configuration
 NewLaunchTargetWizard_Title=New Launch Target
+NewLaunchTargetWizardSelectionPage_Description=Select the type of target to create.
+NewLaunchTargetWizardSelectionPage_Title=New Launch Target
 
 DescriptorMustNotBeNull=Descriptor must not be null
 DescriptorMustNotBeNullDesc=The launch descriptor must not be null.
diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/target/NewLaunchTargetWizardSelectionPage.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/target/NewLaunchTargetWizardSelectionPage.java
index ae11b1a9738..436c4323881 100644
--- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/target/NewLaunchTargetWizardSelectionPage.java
+++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/target/NewLaunchTargetWizardSelectionPage.java
@@ -1,165 +1,168 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.launchbar.ui.internal.target;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.launchbar.ui.internal.Activator;
-import org.eclipse.launchbar.ui.target.LaunchTargetWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbenchWizard;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-class NewLaunchTargetWizardSelectionPage extends WizardPage {
-
-	private Table table;
-
-	public NewLaunchTargetWizardSelectionPage() {
-		super(NewLaunchTargetWizardSelectionPage.class.getName());
-	}
-
-	@Override
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		comp.setLayout(new GridLayout());
-
-		table = new Table(comp, SWT.BORDER | SWT.SINGLE);
-		table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		List<IConfigurationElement> elements = new ArrayList<>();
-		IExtensionPoint point = Platform.getExtensionRegistry()
-				.getExtensionPoint(Activator.PLUGIN_ID + ".launchTargetTypeUI"); //$NON-NLS-1$
-		for (IExtension extension : point.getExtensions()) {
-			for (IConfigurationElement element : extension.getConfigurationElements()) {
-				String elementName = element.getName();
-				if ("wizard2".equals(elementName) || "wizard".equals(elementName)) { //$NON-NLS-1$ //$NON-NLS-2$
-					elements.add(element);
-				}
-			}
-		}
-
-		elements.sort(new Comparator<IConfigurationElement>() {
-			@Override
-			public int compare(IConfigurationElement o1, IConfigurationElement o2) {
-				String name1 = o1.getAttribute("name"); //$NON-NLS-1$
-				String name2 = o2.getAttribute("name"); //$NON-NLS-1$
-				return name1.compareTo(name2);
-			}
-		});
-
-		for (IConfigurationElement element : elements) {
-			String name = element.getAttribute("name"); //$NON-NLS-1$
-			TableItem item = new TableItem(table, SWT.NONE);
-			item.setText(name);
-
-			String iconFile = element.getAttribute("icon"); //$NON-NLS-1$
-			if (iconFile != null) {
-				ImageDescriptor desc = Activator.imageDescriptorFromPlugin(element.getNamespaceIdentifier(), iconFile);
-				if (desc != null) {
-					item.setImage(desc.createImage());
-				}
-			}
-
-			item.setData(element);
-		}
-
-		table.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				getContainer().updateButtons();
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-				if (canFlipToNextPage()) {
-					getContainer().showPage(getNextPage());
-				}
-			}
-		});
-
-		setControl(comp);
-	}
-
-	@Override
-	public void dispose() {
-		for (TableItem item : table.getItems()) {
-			Object obj = item.getData();
-			if (obj instanceof Wizard) {
-				((Wizard) obj).dispose();
-			}
-		}
-		super.dispose();
-	}
-
-	public ImageDescriptor getDescriptionImage(IConfigurationElement element) {
-		String descImage = element.getAttribute("icon"); //$NON-NLS-1$
-		if (descImage == null) {
-			return null;
-		}
-		return AbstractUIPlugin.imageDescriptorFromPlugin(element.getNamespaceIdentifier(), descImage);
-	}
-
-	@Override
-	public boolean canFlipToNextPage() {
-		return table.getSelectionIndex() >= 0;
-	}
-
-	@Override
-	public IWizardPage getNextPage() {
-		int i = table.getSelectionIndex();
-		if (i >= 0) {
-			TableItem item = table.getItem(i);
-			Object obj = item.getData();
-			Wizard nextWizard;
-			if (obj instanceof IConfigurationElement) {
-				IConfigurationElement element = (IConfigurationElement) obj;
-				try {
-					nextWizard = (Wizard) element.createExecutableExtension("class"); //$NON-NLS-1$
-					nextWizard.addPages();
-					if (nextWizard instanceof IWorkbenchWizard) {
-						((IWorkbenchWizard) nextWizard).init(PlatformUI.getWorkbench(), new StructuredSelection());
-					}
-					item.setData(nextWizard);
-				} catch (CoreException e) {
-					Activator.log(e);
-					return null;
-				}
-			} else {
-				nextWizard = (LaunchTargetWizard) obj;
-			}
-
-			return nextWizard.getStartingPage();
-		}
-		return super.getNextPage();
-	}
-
-}
+/*******************************************************************************

+ * Copyright (c) 2000, 2015 IBM 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:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.launchbar.ui.internal.target;

+

+import java.util.ArrayList;

+import java.util.Comparator;

+import java.util.List;

+

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IConfigurationElement;

+import org.eclipse.core.runtime.IExtension;

+import org.eclipse.core.runtime.IExtensionPoint;

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

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

+import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.jface.wizard.IWizardPage;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.jface.wizard.WizardPage;

+import org.eclipse.launchbar.ui.internal.Activator;

+import org.eclipse.launchbar.ui.internal.Messages;

+import org.eclipse.launchbar.ui.target.LaunchTargetWizard;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Table;

+import org.eclipse.swt.widgets.TableItem;

+import org.eclipse.ui.IWorkbenchWizard;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+

+class NewLaunchTargetWizardSelectionPage extends WizardPage {

+

+	private Table table;

+

+	public NewLaunchTargetWizardSelectionPage() {

+		super(NewLaunchTargetWizardSelectionPage.class.getName());

+		setTitle(Messages.NewLaunchTargetWizardSelectionPage_Title);

+		setDescription(Messages.NewLaunchTargetWizardSelectionPage_Description);

+	}

+

+	@Override

+	public void createControl(Composite parent) {

+		Composite comp = new Composite(parent, SWT.NONE);

+		comp.setLayout(new GridLayout());

+

+		table = new Table(comp, SWT.BORDER | SWT.SINGLE);

+		table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

+

+		List<IConfigurationElement> elements = new ArrayList<>();

+		IExtensionPoint point = Platform.getExtensionRegistry()

+				.getExtensionPoint(Activator.PLUGIN_ID + ".launchTargetTypeUI"); //$NON-NLS-1$

+		for (IExtension extension : point.getExtensions()) {

+			for (IConfigurationElement element : extension.getConfigurationElements()) {

+				String elementName = element.getName();

+				if ("wizard2".equals(elementName) || "wizard".equals(elementName)) { //$NON-NLS-1$ //$NON-NLS-2$

+					elements.add(element);

+				}

+			}

+		}

+

+		elements.sort(new Comparator<IConfigurationElement>() {

+			@Override

+			public int compare(IConfigurationElement o1, IConfigurationElement o2) {

+				String name1 = o1.getAttribute("name"); //$NON-NLS-1$

+				String name2 = o2.getAttribute("name"); //$NON-NLS-1$

+				return name1.compareTo(name2);

+			}

+		});

+

+		for (IConfigurationElement element : elements) {

+			String name = element.getAttribute("name"); //$NON-NLS-1$

+			TableItem item = new TableItem(table, SWT.NONE);

+			item.setText(name);

+

+			String iconFile = element.getAttribute("icon"); //$NON-NLS-1$

+			if (iconFile != null) {

+				ImageDescriptor desc = Activator.imageDescriptorFromPlugin(element.getNamespaceIdentifier(), iconFile);

+				if (desc != null) {

+					item.setImage(desc.createImage());

+				}

+			}

+

+			item.setData(element);

+		}

+

+		table.addSelectionListener(new SelectionListener() {

+			@Override

+			public void widgetSelected(SelectionEvent e) {

+				getContainer().updateButtons();

+			}

+

+			@Override

+			public void widgetDefaultSelected(SelectionEvent e) {

+				widgetSelected(e);

+				if (canFlipToNextPage()) {

+					getContainer().showPage(getNextPage());

+				}

+			}

+		});

+

+		setControl(comp);

+	}

+

+	@Override

+	public void dispose() {

+		for (TableItem item : table.getItems()) {

+			Object obj = item.getData();

+			if (obj instanceof Wizard) {

+				((Wizard) obj).dispose();

+			}

+		}

+		super.dispose();

+	}

+

+	public ImageDescriptor getDescriptionImage(IConfigurationElement element) {

+		String descImage = element.getAttribute("icon"); //$NON-NLS-1$

+		if (descImage == null) {

+			return null;

+		}

+		return AbstractUIPlugin.imageDescriptorFromPlugin(element.getNamespaceIdentifier(), descImage);

+	}

+

+	@Override

+	public boolean canFlipToNextPage() {

+		return table.getSelectionIndex() >= 0;

+	}

+

+	@Override

+	public IWizardPage getNextPage() {

+		int i = table.getSelectionIndex();

+		if (i >= 0) {

+			TableItem item = table.getItem(i);

+			Object obj = item.getData();

+			Wizard nextWizard;

+			if (obj instanceof IConfigurationElement) {

+				IConfigurationElement element = (IConfigurationElement) obj;

+				try {

+					nextWizard = (Wizard) element.createExecutableExtension("class"); //$NON-NLS-1$

+					nextWizard.addPages();

+					if (nextWizard instanceof IWorkbenchWizard) {

+						((IWorkbenchWizard) nextWizard).init(PlatformUI.getWorkbench(), new StructuredSelection());

+					}

+					item.setData(nextWizard);

+				} catch (CoreException e) {

+					Activator.log(e);

+					return null;

+				}

+			} else {

+				nextWizard = (LaunchTargetWizard) obj;

+			}

+

+			return nextWizard.getStartingPage();

+		}

+		return super.getNextPage();

+	}

+

+}