Bug 16027 - Debug action error messages are backwards

12 files changed, 38 insertions, 28 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
index 47510dfe3..5525f4edd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
@@ -187,14 +187,18 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct
 	}

 	/**

 	 * Returns the String to use as an error dialog message for

-	 * a failed action.  Default is to return null.

+	 * a failed action. This message appears as the "Message:" in

+	 * the error dialog for this action.

+	 * Default is to return null.

 	 */

 	protected String getErrorDialogMessage(){

 		return null;

 	}

 	/**

 	 * Returns the String to use as a status message for

-	 * a failed action. Default is to return the empty String.

+	 * a failed action. This message appears as the "Reason:"

+	 * in the error dialog for this action.

+	 * Default is to return the empty String.

 	 */

 	protected String getStatusMessage(){

 		return ""; //$NON-NLS-1$

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 c48ef0092..2e10b9543 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
@@ -17,7 +17,6 @@ ChangeVariableValue.toolTipText=Changes the Value of a Simple Type Variable
 ClearOutputAction.title=Clea&r

 ClearOutputAction.toolTipText=Clear the Console

 

-CopyToClipboardActionDelegate.Copy_failed=Copy failed.

 CopyToClipboardActionDelegate.Problem_Copying_to_Clipboard_1=Problem Copying to Clipboard

 CopyToClipboardActionDelegate.There_was_a_problem_when_accessing_the_system_clipboard._Retry__2=There was a problem when accessing the system clipboard. Retry?

 

@@ -36,6 +35,7 @@ OpenBreakpointMarkerAction.Go_to_File_for_Breakpoint_2=Go to File for Breakpoint
 

 RelaunchActionDelegate.An_exception_occurred_while_launching_2=An exception occurred while launching

 RelaunchActionDelegate.Launch_Failed_1=Launch Failed

+RelaunchActionDelegate.Launch_1=Launch

 

 RemoveAllBreakpointsAction.Breakpoint(s)_removal_failed_3=Breakpoint(s) removal failed

 RemoveAllBreakpointsAction.Exceptions_occurred_removing_breakpoints._5=Exceptions occurred removing breakpoints.

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CopyToClipboardActionDelegate.java
index e71624ccc..9939bc05e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CopyToClipboardActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CopyToClipboardActionDelegate.java
@@ -184,13 +184,6 @@ public class CopyToClipboardActionDelegate extends AbstractDebugActionDelegate {
 	protected boolean shouldAppendChildren(Object e) {

 		return e instanceof IDebugTarget || e instanceof IThread;

 	}

-	

-	/**

-	 * @see AbstractDebugActionDelegate#getStatusMessage()

-	 */

-	protected String getStatusMessage() {

-		return ActionMessages.getString("CopyToClipboardActionDelegate.Copy_failed"); //$NON-NLS-1$

-	}

 			

 	protected ContentViewer getViewer() {

 		return fViewer;

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DisconnectActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DisconnectActionDelegate.java
index c01b05a4d..c91b8b567 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DisconnectActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DisconnectActionDelegate.java
@@ -32,14 +32,14 @@ public class DisconnectActionDelegate extends AbstractListenerActionDelegate {
 	 * @see AbstractDebugActionDelegate#getStatusMessage()

 	 */

 	protected String getStatusMessage() {

-		return ActionMessages.getString("DisconnectActionDelegate.Disconnect_failed_1"); //$NON-NLS-1$

+		return ActionMessages.getString("DisconnectActionDelegate.Exceptions_occurred_attempting_to_disconnect._2"); //$NON-NLS-1$

 	}

 

 	/**

 	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()

 	 */

 	protected String getErrorDialogMessage() {

-		return ActionMessages.getString("DisconnectActionDelegate.Exceptions_occurred_attempting_to_disconnect._2"); //$NON-NLS-1$

+		return ActionMessages.getString("DisconnectActionDelegate.Disconnect_failed_1"); //$NON-NLS-1$

 	}

 	/**

 	 * @see AbstractDebugActionDelegate#getErrorDialogTitle()

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java
index 3a5e58a84..4474f7743 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java
@@ -77,9 +77,23 @@ public class RelaunchActionDelegate extends AbstractDebugActionDelegate {
 	}

 			

 	/**

+	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()

+	 */

+	protected String getErrorDialogMessage() {

+		return ActionMessages.getString("RelaunchActionDelegate.Launch_Failed_1"); //$NON-NLS-1$

+	}

+	

+	/**

+	 * @see AbstractDebugActionDelegate#getErrorDialogTitle()

+	 */

+	protected String getErrorDialogTitle() {

+		return ActionMessages.getString("RelaunchActionDelegate.Launch_1"); //$NON-NLS-1$

+	}

+	

+	/**

 	 * @see AbstractDebugActionDelegate#getStatusMessage()

 	 */

 	protected String getStatusMessage() {

-		return ActionMessages.getString("RelaunchActionDelegate.Launch_Failed_1"); //$NON-NLS-1$

+		return ActionMessages.getString("RelaunchActionDelegate.An_exception_occurred_while_launching_2"); //$NON-NLS-1$

 	}

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ResumeActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ResumeActionDelegate.java
index 90f3a254c..f5c3bad52 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ResumeActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ResumeActionDelegate.java
@@ -43,14 +43,14 @@ public class ResumeActionDelegate extends AbstractListenerActionDelegate {
 	 * @see AbstractDebugActionDelegate#getStatusMessage()

 	 */

 	protected String getStatusMessage() {

-		return ActionMessages.getString("ResumeActionDelegate.Resume_failed._1"); //$NON-NLS-1$

+		return ActionMessages.getString("ResumeActionDelegate.Exceptions_occurred_attempting_to_resume._2"); //$NON-NLS-1$

 	}

 

 	/**

 	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()

 	 */

 	protected String getErrorDialogMessage() {

-		return ActionMessages.getString("ResumeActionDelegate.Exceptions_occurred_attempting_to_resume._2"); //$NON-NLS-1$

+		return ActionMessages.getString("ResumeActionDelegate.Resume_failed._1"); //$NON-NLS-1$

 	}

 

 	/**

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepIntoActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepIntoActionDelegate.java
index e1457d0ee..bfd9fde9e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepIntoActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepIntoActionDelegate.java
@@ -28,14 +28,14 @@ public class StepIntoActionDelegate extends StepActionDelegate {
 	 * @see AbstractDebugActionDelegate#getStatusMessage()

 	 */

 	protected String getStatusMessage() {

-		return ActionMessages.getString("StepIntoActionDelegate.Step_into_failed_1"); //$NON-NLS-1$

+		return ActionMessages.getString("StepIntoActionDelegate.Exceptions_occurred_attempting_to_step_into_the_frame_2"); //$NON-NLS-1$

 	}

 

 	/**

 	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()

 	 */

 	protected String getErrorDialogMessage() {

-		return ActionMessages.getString("StepIntoActionDelegate.Exceptions_occurred_attempting_to_step_into_the_frame_2"); //$NON-NLS-1$

+		return ActionMessages.getString("StepIntoActionDelegate.Step_into_failed_1"); //$NON-NLS-1$

 	}

 

 	/**

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepOverActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepOverActionDelegate.java
index e30f175f2..e6f4ae479 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepOverActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepOverActionDelegate.java
@@ -28,14 +28,14 @@ public class StepOverActionDelegate extends StepActionDelegate {
 	 * @see AbstractDebugActionDelegate#getStatusMessage()

 	 */

 	protected String getStatusMessage() {

-		return ActionMessages.getString("StepOverActionDelegate.Step_over_failed_1"); //$NON-NLS-1$

+		return ActionMessages.getString("StepOverActionDelegate.Exceptions_occurred_attempting_to_step_over_the_frame_2"); //$NON-NLS-1$

 	}

 

 	/**

 	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()

 	 */

 	protected String getErrorDialogMessage() {

-		return ActionMessages.getString("StepOverActionDelegate.Exceptions_occurred_attempting_to_step_over_the_frame_2"); //$NON-NLS-1$

+		return ActionMessages.getString("StepOverActionDelegate.Step_over_failed_1"); //$NON-NLS-1$

 	}

 

 	/**

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepReturnActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepReturnActionDelegate.java
index d27f1f6fe..cc9ce7b88 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepReturnActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepReturnActionDelegate.java
@@ -28,14 +28,14 @@ public class StepReturnActionDelegate extends StepActionDelegate {
 	 * @see AbstractDebugActionDelegate#getStatusMessage()

 	 */

 	protected String getStatusMessage() {

-		return ActionMessages.getString("StepReturnActionDelegate.Run_to_return_failed._1"); //$NON-NLS-1$

+		return ActionMessages.getString("StepReturnActionDelegate.Exceptions_occurred_attempting_to_run_to_return_of_the_frame._2"); //$NON-NLS-1$

 	}

 

 	/**

 	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()

 	 */

 	protected String getErrorDialogMessage() {

-		return ActionMessages.getString("StepReturnActionDelegate.Exceptions_occurred_attempting_to_run_to_return_of_the_frame._2"); //$NON-NLS-1$

+		return ActionMessages.getString("StepReturnActionDelegate.Run_to_return_failed._1"); //$NON-NLS-1$

 	}

 

 	/**

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SuspendActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SuspendActionDelegate.java
index 92b81cec4..290df09ee 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SuspendActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SuspendActionDelegate.java
@@ -43,14 +43,14 @@ public class SuspendActionDelegate extends AbstractListenerActionDelegate {
 	 * @see AbstractDebugActionDelegate#getStatusMessage()

 	 */

 	protected String getStatusMessage() {

-		return ActionMessages.getString("SuspendActionDelegate.Suspend_failed_1"); //$NON-NLS-1$

+		return ActionMessages.getString("SuspendActionDelegate.Exceptions_occurred_attempting_to_suspend._2"); //$NON-NLS-1$

 	}

 

 	/**

 	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()

 	 */

 	protected String getErrorDialogMessage() {

-		return ActionMessages.getString("SuspendActionDelegate.Exceptions_occurred_attempting_to_suspend._2"); //$NON-NLS-1$

+		return ActionMessages.getString("SuspendActionDelegate.Suspend_failed_1"); //$NON-NLS-1$

 	}

 

 	/**

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateActionDelegate.java
index b2579f0f7..6bda28a23 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateActionDelegate.java
@@ -31,15 +31,14 @@ public class TerminateActionDelegate extends AbstractListenerActionDelegate {
 	 * @see AbstractDebugActionDelegate#getStatusMessage()

 	 */

 	protected String getStatusMessage() {

-		return ActionMessages.getString("TerminateActionDelegate.Terminate_failed._1"); //$NON-NLS-1$

+		return ActionMessages.getString("TerminateActionDelegate.Exceptions_occurred_attempting_to_terminate._2"); //$NON-NLS-1$

 	}

 

 	/**

 	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()

 	 */

 	protected String getErrorDialogMessage() {

-		return ActionMessages.getString("TerminateActionDelegate.Exceptions_occurred_attempting_to_terminate._2"); //$NON-NLS-1$

-

+		return ActionMessages.getString("TerminateActionDelegate.Terminate_failed._1"); //$NON-NLS-1$

 	}

 

 	/**

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateAndRemoveActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateAndRemoveActionDelegate.java
index 5b5c28ac5..6ab65b134 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateAndRemoveActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateAndRemoveActionDelegate.java
@@ -57,14 +57,14 @@ public class TerminateAndRemoveActionDelegate extends AbstractDebugActionDelegat
 	 * @see AbstractDebugActionDelegate#getStatusMessage()

 	 */

 	protected String getStatusMessage() {

-		return ActionMessages.getString("TerminateAndRemoveActionDelegate.Terminate_and_remove_failed_1"); //$NON-NLS-1$

+		return ActionMessages.getString("TerminateAndRemoveActionDelegate.Exceptions_occurred_attempting_to_terminate_and_remove_2"); //$NON-NLS-1$

 	}

 

 	/**

 	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()

 	 */

 	protected String getErrorDialogMessage() {

-		return ActionMessages.getString("TerminateAndRemoveActionDelegate.Exceptions_occurred_attempting_to_terminate_and_remove_2"); //$NON-NLS-1$

+		return ActionMessages.getString("TerminateAndRemoveActionDelegate.Terminate_and_remove_failed_1"); //$NON-NLS-1$

 	}

 

 	/**