summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2012-04-11 02:05:19 (EDT)
committer Mike Rennie2012-04-11 02:05:19 (EDT)
commit916b44d62f73459a05e0d819300c5897f519aacc (patch)
tree98a8d88b19be004b206ca1b8be360658cfb24f39
parentaceb2f12bf2c1dc85000f600f1865049d1605b87 (diff)
downloadeclipse.platform.debug-916b44d62f73459a05e0d819300c5897f519aacc.zip
eclipse.platform.debug-916b44d62f73459a05e0d819300c5897f519aacc.tar.gz
eclipse.platform.debug-916b44d62f73459a05e0d819300c5897f519aacc.tar.bz2
Bug 374153 - [patch][breakpoints] Show accelerator for toggle breakpoint
modifiers in ruler popup menu.
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java6
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties4
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/RulerEnableDisableBreakpointAction.java8
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java2
4 files changed, 13 insertions, 7 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 d4ed16c..7db55d0 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 7df10e4..2c331de 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
@@ -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 ff37aa4..fb19c1a 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 d15da73..0a0aadd 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;