diff options
author | Mike Rennie | 2012-04-16 14:20:41 +0000 |
---|---|---|
committer | Mike Rennie | 2012-04-16 14:20:41 +0000 |
commit | 5eb839fc01e47602ba07ce0f040848427a593ec2 (patch) | |
tree | 7ec46e2750a2993508d8e92014a769c68759dce7 | |
parent | 85b1247c16c5f44a0e9b199068a7bf23a5041c31 (diff) | |
download | eclipse.platform.debug-5eb839fc01e47602ba07ce0f040848427a593ec2.tar.gz eclipse.platform.debug-5eb839fc01e47602ba07ce0f040848427a593ec2.tar.xz eclipse.platform.debug-5eb839fc01e47602ba07ce0f040848427a593ec2.zip |
Bug 376818 - Accidental revert of previous commitv20120416-1420N20120417-1633N20120417-1307I20120426-1030I20120426-1000I20120426-0800I20120425-1600I20120425-1200I20120425-0800I20120424-1700I20120424-1600I20120424-0800I20120419-1434I20120418-0248I20120417-1000I20120417-0800I20120417-0334I20120417-0255I20120417-0235I20120417-0211I20120417-0142I20120416-2327
4 files changed, 16 insertions, 10 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java index d4ed16c31..7db55d09a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java @@ -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 @@ -143,6 +143,8 @@ public class ActionMessages extends NLS { public static String ToggleBreakpointAction_0; public static String ToggleBreakpointAction_1; public static String ToggleBreakpointAction_2; + + public static String ToggleBreakpointAction_3; public static String ToggleStepFiltersAction_0; public static String ToggleStepFiltersAction_1; @@ -193,6 +195,8 @@ public class ActionMessages extends NLS { public static String RulerEnableDisableBreakpointAction_2; public static String RulerEnableDisableBreakpointAction_3; + public static String RulerEnableDisableBreakpointAction_4; + public static String DisconnectAction_0; public static String DisconnectAction_3; public static String DropToFrameAction_0; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties index 7df10e420..7a9e3192a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.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 @@ -80,7 +80,7 @@ RelaunchLastAction_Error_encountered_attempting_to_relaunch_4=Error encountered ## # @see Bug 105733 TVT 3.1 - TCT 531 - Poor grammar in "Run Eclipse Application" and "Profile Eclipse Application" -# - the following string is used to display the tooltip for run/debug/profile buttons and is +# - the following string is used to display the tooltip for run/debug/profile buttons and is # the concatenation of "{mode} {configuration name}", for example "Run HelloWorld". In some languages # this may need to be reversed to be translated properly. ## @@ -91,8 +91,8 @@ AbstractLaunchHistoryAction_3=Profile AbstractLaunchHistoryAction_4=Launch ## # The following string is used to display the tooltip for run/debug/profile buttons in the -# event there is no configuration name to concatenate (as mentioned for AbstractLaunchHistoryAction_0) -# For example "Run" or "External Tools". +# event there is no configuration name to concatenate (as mentioned for AbstractLaunchHistoryAction_0) +# For example "Run" or "External Tools". ## AbstractLaunchHistoryAction_5={0} AbstractLaunchHistoryAction_6=(no launch history) @@ -108,6 +108,7 @@ ToggleDetailPaneAction_8=Hide the Detail Pane so that only the Main Tree View is ToggleBreakpointAction_0=Toggle Brea&kpoint ToggleBreakpointAction_1=Error ToggleBreakpointAction_2=Unable to toggle breakpoint +ToggleBreakpointAction_3=Double Click ToggleStepFiltersAction_0=Use Step Filters ToggleStepFiltersAction_1=&Use Step Filters @@ -161,6 +162,7 @@ RulerEnableDisableBreakpointAction_0=Error RulerEnableDisableBreakpointAction_1=Failed to toggle breakpoint enablement RulerEnableDisableBreakpointAction_2=&Disable Breakpoint RulerEnableDisableBreakpointAction_3=&Enable Breakpoint +RulerEnableDisableBreakpointAction_4=Shift+Double Click TerminateAndRelaunchAction_0=org.eclipse.debug.ui.commands.TerminateAndRelaunch TerminateAndRelaunchAction_3=Terminate and Relaunch TerminateAndRelaunchAction_4=Terminate and Relaunch diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RulerEnableDisableBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RulerEnableDisableBreakpointAction.java index ff37aa448..fb19c1a25 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RulerEnableDisableBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RulerEnableDisableBreakpointAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005, 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 @@ -53,14 +53,14 @@ public class RulerEnableDisableBreakpointAction extends RulerBreakpointAction im if (fBreakpoint != null) { try { if (fBreakpoint.isEnabled()) { - setText(ActionMessages.RulerEnableDisableBreakpointAction_2); + setText(ActionMessages.RulerEnableDisableBreakpointAction_2 + '\t' + ActionMessages.RulerEnableDisableBreakpointAction_4); } else { - setText(ActionMessages.RulerEnableDisableBreakpointAction_3); + setText(ActionMessages.RulerEnableDisableBreakpointAction_3 + '\t' + ActionMessages.RulerEnableDisableBreakpointAction_4); } } catch (CoreException e) { } } else { - setText(ActionMessages.RulerEnableDisableBreakpointAction_2); + setText(ActionMessages.RulerEnableDisableBreakpointAction_2 + '\t' + ActionMessages.RulerEnableDisableBreakpointAction_4); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java index d15da736e..0a0aadd0e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java @@ -67,7 +67,7 @@ public class ToggleBreakpointAction extends Action implements IUpdate { * @param rulerInfo specifies location the user has double-clicked */ public ToggleBreakpointAction(IWorkbenchPart part, IDocument document, IVerticalRulerInfo rulerInfo) { - super(ActionMessages.ToggleBreakpointAction_0); + super(ActionMessages.ToggleBreakpointAction_0 + '\t' + ActionMessages.ToggleBreakpointAction_3); fPart = part; fDocument = document; fRulerInfo = rulerInfo; |