diff options
author | Mike Rennie | 2012-02-29 21:11:52 +0000 |
---|---|---|
committer | Mike Rennie | 2012-02-29 21:11:52 +0000 |
commit | 3d89e94ffcffc2d71c03a1001b7baab6de614635 (patch) | |
tree | 0b4a18d3624823d5930593bd78b7025b4d694aaf | |
parent | 60c03cad75d982c086bd66d4800ac4ad1559f54a (diff) | |
download | eclipse.platform.debug-3d89e94ffcffc2d71c03a1001b7baab6de614635.tar.gz eclipse.platform.debug-3d89e94ffcffc2d71c03a1001b7baab6de614635.tar.xz eclipse.platform.debug-3d89e94ffcffc2d71c03a1001b7baab6de614635.zip |
Bug 337791 - [menu] Command name Debug/Run Last Launched not accurate
6 files changed, 32 insertions, 28 deletions
diff --git a/org.eclipse.debug.ui/plugin.properties b/org.eclipse.debug.ui/plugin.properties index 59d36c550..8ea412e0d 100644 --- a/org.eclipse.debug.ui/plugin.properties +++ b/org.eclipse.debug.ui/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2011 IBM Corporation and others. +# Copyright (c) 2000, 2012 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 @@ -232,17 +232,17 @@ ActionDefinition.disconnect.description=Disconnect ActionDefinition.openProfile.name=Profile... ActionDefinition.openProfile.description=Open profile launch configuration dialog -ActionDefinition.profileLast.name=Profile Last Launched -ActionDefinition.profileLast.description=Profile the last launch in profile mode +ActionDefinition.profileLast.name=Profile +ActionDefinition.profileLast.description=Launch in profile mode ActionDefinition.openRun.name=Run... ActionDefinition.openRun.description=Open run launch configuration dialog -ActionDefinition.debugLast.name=Debug Last Launched -ActionDefinition.debugLast.description=Debug the last launch in debug mode +ActionDefinition.debugLast.name=Debug +ActionDefinition.debugLast.description=Launch in debug mode -ActionDefinition.runLast.name=Run Last Launched -ActionDefinition.runLast.description=Relaunch the last launch in run mode +ActionDefinition.runLast.name=Run +ActionDefinition.runLast.description=Launch in run mode ActionDefinition.openDebug.name=Debug... ActionDefinition.openDebug.description=Open debug launch configuration dialog diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml index 3bf72ef9e..6b71457e4 100644 --- a/org.eclipse.debug.ui/plugin.xml +++ b/org.eclipse.debug.ui/plugin.xml @@ -466,7 +466,7 @@ disabledIcon="$nl$/icons/full/dlcl16/debuglast_co.gif" icon="$nl$/icons/full/elcl16/debuglast_co.gif" helpContextId="debug_last_action_context" - label="%DebugLastAction.label" + label="%ContextLaunchingDebugMenu.name" menubarPath="org.eclipse.ui.run/relaunchGroup"> </action> <action @@ -477,7 +477,7 @@ disabledIcon="$nl$/icons/full/dlcl16/runlast_co.gif" icon="$nl$/icons/full/elcl16/runlast_co.gif" helpContextId="run_last_action_context" - label="%RunLastAction.label" + label="%ContextLaunchingRunMenu.name" menubarPath="org.eclipse.ui.run/relaunchGroup"> </action> <action diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java index 0dbd235bc..8ddf8bfd6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2012 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 @@ -17,7 +17,7 @@ import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager; import org.eclipse.debug.ui.IDebugUIConstants; /** - * Relaunches the last debug-mode launch + * Re-launches the last debug-mode launch * * This menu item appears in the main 'Run' menu * @@ -33,9 +33,9 @@ public class DebugLastAction extends RelaunchLastAction { public String getMode() { return ILaunchManager.DEBUG_MODE; } - - /** - * @see org.eclipse.debug.internal.ui.actions.LaunchDropDownAction#getLaunchGroupId() + + /* (non-Javadoc) + * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getLaunchGroupId() */ public String getLaunchGroupId() { return IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java index 66f14d815..8aead7f88 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2012 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 @@ -17,7 +17,7 @@ import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager; import org.eclipse.debug.ui.IDebugUIConstants; /** - * Relaunches the last profile-mode launch + * Re-launches the last profile-mode launch * * This menu item appears in the main 'Run' menu * @@ -35,8 +35,8 @@ public class ProfileLastAction extends RelaunchLastAction { return ILaunchManager.PROFILE_MODE; } - /** - * @see org.eclipse.debug.internal.ui.actions.LaunchDropDownAction#getLaunchGroupId() + /* (non-Javadoc) + * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getLaunchGroupId() */ public String getLaunchGroupId() { return IDebugUIConstants.ID_PROFILE_LAUNCH_GROUP; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java index e257f4975..efb03ce76 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2012 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 @@ -37,7 +37,7 @@ import org.eclipse.ui.commands.ICommandService; import com.ibm.icu.text.MessageFormat; /** - * Relaunches the last launch. + * Re-launches the last launch. * * @see ContextRunner * @see org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationManager @@ -60,8 +60,8 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega DebugUIPlugin.getDefault().getPluginPreferences().removePropertyChangeListener(this); } - /** - * @see IWorkbenchWindowActionDelegate + /* (non-Javadoc) + * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ public void init(IWorkbenchWindow window){ fWorkbenchWindow = window; @@ -123,6 +123,7 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega * Set the enabled state of the underlying action based on whether there are any * registered launch configuration types that understand how to launch in the * mode of this action. + * @param action the {@link IAction} to initialize */ private void initialize(IAction action) { fAction = action; @@ -161,6 +162,7 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega /** * Return the last launch that occurred in the workspace. + * @return the filtered last launch */ protected ILaunchConfiguration getLastLaunch() { return DebugUIPlugin.getDefault().getLaunchConfigurationManager().getFilteredLastLaunch(getLaunchGroupId()); @@ -174,8 +176,8 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega return fWorkbenchWindow.getShell(); } - /** - * @see org.eclipse.core.runtime.Preferences$IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent) + /* (non-Javadoc) + * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent) */ public void propertyChange(PropertyChangeEvent event) { if(event.getProperty().equals(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH)) { @@ -185,11 +187,13 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega /** * Returns the mode (run or debug) of this action. + * @return the mode */ public abstract String getMode(); /** * Returns the launch group id of this action. + * @return the launch group id */ public abstract String getLaunchGroupId(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java index 17fa319a1..81224a240 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2012 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 @@ -17,7 +17,7 @@ import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager; import org.eclipse.debug.ui.IDebugUIConstants; /** - * Relaunches the last run-mode launch + * Re-launches the last run-mode launch * * This menu item appears in the main 'Run' menu * @@ -34,8 +34,8 @@ public class RunLastAction extends RelaunchLastAction { return ILaunchManager.RUN_MODE; } - /** - * @see org.eclipse.debug.internal.ui.actions.LaunchDropDownAction#getLaunchGroupId() + /* (non-Javadoc) + * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getLaunchGroupId() */ public String getLaunchGroupId() { return IDebugUIConstants.ID_RUN_LAUNCH_GROUP; |