From 302c601bac4934b5f5c6584ce75e5d73b41f8813 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Thu, 18 Feb 2016 11:00:59 -0500 Subject: [PATCH] Enable double click selection in New Launch Config Wizard. Also set the title on the edit page so we can tell what type we're editing. Change-Id: Ia526eae2cdb906e8ab115a3a74585db8b3c5de2c --- .../eclipse/launchbar/ui/internal/Messages.java | 1 + .../internal/dialogs/NewLaunchConfigEditPage.java | 10 ++++++---- .../internal/dialogs/NewLaunchConfigModePage.java | 10 ++++++++-- .../internal/dialogs/NewLaunchConfigTypePage.java | 14 +++++++++++--- .../launchbar/ui/internal/messages.properties | 1 + 5 files changed, 27 insertions(+), 9 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 be31a049e01..55684221c1f 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 @@ -50,6 +50,7 @@ public class Messages extends NLS { public static String NewLaunchConfigEditPage_4; public static String NewLaunchConfigEditPage_5; public static String NewLaunchConfigEditPage_6; + public static String NewLaunchConfigEditPage_7; public static String NewLaunchConfigModePage_0; public static String NewLaunchConfigModePage_1; public static String NewLaunchConfigModePage_2; diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java index 5dd8ff1f801..1c888382b89 100644 --- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java +++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java @@ -81,6 +81,7 @@ public class NewLaunchConfigEditPage extends WizardPage { workingCopy = type.newInstance(null, name); launchConfigurationDialog.doSetDefaults(workingCopy); tabViewer.setInput(workingCopy); + setTitle(String.format(Messages.NewLaunchConfigEditPage_7, type.getName())); } } catch (CoreException e) { Activator.log(e); @@ -152,13 +153,14 @@ public class NewLaunchConfigEditPage extends WizardPage { public void updateButtons() { // Launch button getTabViewer().refresh(); - // getButton(ID_LAUNCH_BUTTON).setEnabled(getTabViewer().canLaunch() & getTabViewer().canLaunchWithModes() & !getTabViewer().hasDuplicateDelegates()); + // getButton(ID_LAUNCH_BUTTON).setEnabled(getTabViewer().canLaunch() + // & getTabViewer().canLaunchWithModes() & + // !getTabViewer().hasDuplicateDelegates()); } @Override - public void run(boolean fork, boolean cancelable, - IRunnableWithProgress runnable) - throws InvocationTargetException, InterruptedException { + public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) + throws InvocationTargetException, InterruptedException { // ignore } diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigModePage.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigModePage.java index 6ae6734e692..30536c6ff2b 100644 --- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigModePage.java +++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigModePage.java @@ -91,8 +91,14 @@ public class NewLaunchConfigModePage extends WizardPage { table.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - selectedGroup = (ILaunchGroup)table.getSelection()[0].getData(); - ((NewLaunchConfigWizard)getWizard()).typePage.populateItems(); + selectedGroup = (ILaunchGroup) table.getSelection()[0].getData(); + ((NewLaunchConfigWizard) getWizard()).typePage.populateItems(); + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + getContainer().showPage(getNextPage()); } }); diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigTypePage.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigTypePage.java index 2a610ed2f13..ad24719705f 100644 --- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigTypePage.java +++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigTypePage.java @@ -19,6 +19,8 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.launchbar.ui.internal.Messages; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -43,21 +45,27 @@ public class NewLaunchConfigTypePage extends WizardPage { GridData data = new GridData(SWT.FILL, SWT.FILL, true, false); data.heightHint = 500; table.setLayoutData(data); - + table.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetDefaultSelected(SelectionEvent e) { + getContainer().showPage(getNextPage()); + } + }); populateItems(); setControl(comp); } void populateItems() { - ILaunchGroup group = ((NewLaunchConfigWizard)getWizard()).modePage.selectedGroup; + ILaunchGroup group = ((NewLaunchConfigWizard) getWizard()).modePage.selectedGroup; if (group == null) return; table.removeAll(); boolean haveItems = false; - for (ILaunchConfigurationType type : DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationTypes()) { + for (ILaunchConfigurationType type : DebugPlugin.getDefault().getLaunchManager() + .getLaunchConfigurationTypes()) { if (!type.isPublic() || type.getCategory() != null || !type.supportsMode(group.getMode())) continue; 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 f63a71d1b4d..eb1436f270c 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 @@ -33,6 +33,7 @@ NewLaunchConfigEditPage_3=Name NewLaunchConfigEditPage_4=Name can not be empty NewLaunchConfigEditPage_5=A configuration with this name already exists NewLaunchConfigEditPage_6=New Configuration +NewLaunchConfigEditPage_7=%s Launch Configuration Properties NewLaunchConfigModePage_0=Select Initial Launch Mode NewLaunchConfigModePage_1=Initial Launch Mode NewLaunchConfigModePage_2=Select initial launch mode.