mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 428990 - Breakpoint problem marker has a too generic error message

Browse source 
Propagated GDB error message up to the top level

Change-Id: I98b33a4d35af7b0bc3582dfa1572cd6a5bc07b58
Signed-off-by: Teodor Madan <teodor.madan@freescale.com>
Reviewed-on: https://git.eclipse.org/r/22511
Reviewed-by: Marc Khouzam <marc.khouzam@ericsson.com>
IP-Clean: Marc Khouzam <marc.khouzam@ericsson.com>
Tested-by: Marc Khouzam <marc.khouzam@ericsson.com>
This commit is contained in:
Teodor Madan 2014-02-25 14:50:29 +02:00
parent d786838a0a
commit 4aa3f06bb4
6 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java
View file

@ -170,7 +170,7 @@ public class GDBBreakpoints_7_0 extends MIBreakpoints
@Override @Override
protected void handleError() { protected void handleError() {
rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, BREAKPOINT_INSERTION_FAILURE, null)); rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, BREAKPOINT_INSERTION_FAILURE, getStatus().getException()));
rm.done(); rm.done();
} }
}); });

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java
View file

@ -250,7 +250,7 @@ public class GDBBreakpoints_7_2 extends GDBBreakpoints_7_0
@Override @Override
protected void handleError() { protected void handleError() {
drm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, BREAKPOINT_INSERTION_FAILURE, null)); drm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, BREAKPOINT_INSERTION_FAILURE, getStatus().getException()));
drm.done(); drm.done();
} }
}); });

6
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java
View file

@ -688,7 +688,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints, I
@Override @Override
protected void handleError() { protected void handleError() {
rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, BREAKPOINT_INSERTION_FAILURE, null)); rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, BREAKPOINT_INSERTION_FAILURE, getStatus().getException()));
rm.done(); rm.done();
} }
}); });
@ -783,7 +783,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints, I
@Override @Override
protected void handleError() { protected void handleError() {
drm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, WATCHPOINT_INSERTION_FAILURE, null)); drm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, WATCHPOINT_INSERTION_FAILURE, getStatus().getException()));
drm.done(); drm.done();
} }
}; };
@ -858,7 +858,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints, I
@Override @Override
protected void handleError() { protected void handleError() {
rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, CATCHPOINT_INSERTION_FAILURE, null)); rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, CATCHPOINT_INSERTION_FAILURE, getStatus().getException()));
rm.done(); rm.done();
} }
}); });

12
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java
View file

@ -658,7 +658,17 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
@Override @Override
protected void handleError() { protected void handleError() {
String description = MessageFormat.format(Messages.Breakpoint_attribute_problem, new Object[] { Messages.Breakpoint_installation_failed }); String detailedMessage;
if (getStatus().getException() != null &&
getStatus().getException().getMessage() != null) {
detailedMessage = getStatus().getException().getMessage();
} else {
detailedMessage = getStatus().getMessage();
}
String description = (detailedMessage == null) ?
Messages.Breakpoint_attribute_problem :
MessageFormat.format(Messages.Breakpoint_attribute_detailed_problem, new Object[] { detailedMessage});
addBreakpointProblemMarker(breakpoint, description, IMarker.SEVERITY_WARNING); addBreakpointProblemMarker(breakpoint, description, IMarker.SEVERITY_WARNING);
installRM.done(); installRM.done();
} }

1
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.java
View file

@ -18,6 +18,7 @@ import org.eclipse.osgi.util.NLS;
* @since 3.0 * @since 3.0
*/ */
class Messages extends NLS { class Messages extends NLS {
public static String Breakpoint_attribute_detailed_problem;
public static String Breakpoint_attribute_problem; public static String Breakpoint_attribute_problem;
public static String Breakpoint_installation_failed; public static String Breakpoint_installation_failed;
public static String MIExpressions_NotAvailableBecauseChildOfDynamicVarobj; public static String MIExpressions_NotAvailableBecauseChildOfDynamicVarobj;

3
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/Messages.properties
View file

@ -10,7 +10,8 @@
# Jens Elmenthaler (Verigy) - Added Full GDB pretty-printing support (bug 302121) # Jens Elmenthaler (Verigy) - Added Full GDB pretty-printing support (bug 302121)
############################################################################### ###############################################################################
Breakpoint_attribute_problem=Breakpoint attribute problem: {0} Breakpoint_attribute_detailed_problem=Breakpoint installation failed: {0}
Breakpoint_attribute_problem=Breakpoint installation failed
Breakpoint_installation_failed=installation failed Breakpoint_installation_failed=installation failed
MIExpressions_NotAvailableBecauseChildOfDynamicVarobj=N/A (child of pretty-printed object) MIExpressions_NotAvailableBecauseChildOfDynamicVarobj=N/A (child of pretty-printed object)