1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-27 10:55:33 +02:00

Changed the messages of CDI exceptions.

This commit is contained in:
Mikhail Khodjaiants 2003-04-07 22:45:11 +00:00
parent 23e42715f6
commit 9360ad3bbe
3 changed files with 26 additions and 21 deletions

View file

@ -1,3 +1,8 @@
2003-04-07 Mikhail Khodjaiants
Changed the messages of CDI exceptions.
* MISession.java
* Target.java
2003-04-04 Alain Magloire 2003-04-04 Alain Magloire
Code from Monta Vista to add a Session via GDBServer. Code from Monta Vista to add a Session via GDBServer.

View file

@ -288,7 +288,7 @@ public class MISession extends Observable {
// REMINDER: if we support -exec-interrupt // REMINDER: if we support -exec-interrupt
// Let it throught: // Let it throught:
// if (cmd instanceof MIExecInterrupt) { } // if (cmd instanceof MIExecInterrupt) { }
throw new MIException("Target running"); throw new MIException("Target is not suspended");
} }
txQueue.addCommand(cmd); txQueue.addCommand(cmd);
@ -301,7 +301,7 @@ public class MISession extends Observable {
try { try {
cmd.wait(timeout); cmd.wait(timeout);
if (cmd.getMIOutput() == null) { if (cmd.getMIOutput() == null) {
throw new MIException("Timedout"); throw new MIException("Target is not responding (timed out)");
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
} }

View file

@ -87,7 +87,7 @@ public class Target implements ICDITarget {
if (cthread instanceof Thread) { if (cthread instanceof Thread) {
setCurrentThread(cthread, true); setCurrentThread(cthread, true);
} else { } else {
throw new CDIException("unknown thread"); throw new CDIException("Unknown thread");
} }
} }
@ -95,7 +95,7 @@ public class Target implements ICDITarget {
if (cthread instanceof Thread) { if (cthread instanceof Thread) {
setCurrentThread((Thread)cthread, doUpdate); setCurrentThread((Thread)cthread, doUpdate);
} else { } else {
throw new CDIException("unknown thread"); throw new CDIException("Unknown thread");
} }
} }
@ -119,7 +119,7 @@ public class Target implements ICDITarget {
mi.postCommand(select); mi.postCommand(select);
MIThreadSelectInfo info = select.getMIThreadSelectInfo(); MIThreadSelectInfo info = select.getMIThreadSelectInfo();
if (info == null) { if (info == null) {
throw new CDIException("No Answer"); throw new CDIException("Target is not responding");
} }
currentThreadId = info.getNewThreadId(); currentThreadId = info.getNewThreadId();
} catch (MIException e) { } catch (MIException e) {
@ -307,7 +307,7 @@ public class Target implements ICDITarget {
mi.postCommand(run); mi.postCommand(run);
MIInfo info = run.getMIInfo(); MIInfo info = run.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -321,7 +321,7 @@ public class Target implements ICDITarget {
public void resume() throws CDIException { public void resume() throws CDIException {
MISession mi = session.getMISession(); MISession mi = session.getMISession();
if (mi.getMIInferior().isRunning()) { if (mi.getMIInferior().isRunning()) {
throw new CDIException("Inferior already running"); throw new CDIException("Inferior is already running");
} else if (mi.getMIInferior().isSuspended()) { } else if (mi.getMIInferior().isSuspended()) {
CommandFactory factory = mi.getCommandFactory(); CommandFactory factory = mi.getCommandFactory();
MIExecContinue cont = factory.createMIExecContinue(); MIExecContinue cont = factory.createMIExecContinue();
@ -329,7 +329,7 @@ public class Target implements ICDITarget {
mi.postCommand(cont); mi.postCommand(cont);
MIInfo info = cont.getMIInfo(); MIInfo info = cont.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -353,7 +353,7 @@ public class Target implements ICDITarget {
mi.postCommand(step); mi.postCommand(step);
MIInfo info = step.getMIInfo(); MIInfo info = step.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -372,7 +372,7 @@ public class Target implements ICDITarget {
mi.postCommand(stepi); mi.postCommand(stepi);
MIInfo info = stepi.getMIInfo(); MIInfo info = stepi.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -391,7 +391,7 @@ public class Target implements ICDITarget {
mi.postCommand(next); mi.postCommand(next);
MIInfo info = next.getMIInfo(); MIInfo info = next.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -410,7 +410,7 @@ public class Target implements ICDITarget {
mi.postCommand(nexti); mi.postCommand(nexti);
MIInfo info = nexti.getMIInfo(); MIInfo info = nexti.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -446,7 +446,7 @@ public class Target implements ICDITarget {
mi.postCommand(finish); mi.postCommand(finish);
MIInfo info = finish.getMIInfo(); MIInfo info = finish.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -464,7 +464,7 @@ public class Target implements ICDITarget {
mi.postCommand(ret); mi.postCommand(ret);
MIInfo info = ret.getMIInfo(); MIInfo info = ret.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -488,7 +488,7 @@ public class Target implements ICDITarget {
} }
} }
if (isRunning()) { if (isRunning()) {
throw new CDIException("Failed to suspend"); throw new CDIException("Unable to suspend target");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -506,7 +506,7 @@ public class Target implements ICDITarget {
mi.postCommand(detach); mi.postCommand(detach);
MIInfo info = detach.getMIInfo(); MIInfo info = detach.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -537,7 +537,7 @@ public class Target implements ICDITarget {
mi.postCommand(until); mi.postCommand(until);
MIInfo info = until.getMIInfo(); MIInfo info = until.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -565,7 +565,7 @@ public class Target implements ICDITarget {
mi.postCommand(jump); mi.postCommand(jump);
MIInfo info = jump.getMIInfo(); MIInfo info = jump.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -587,7 +587,7 @@ public class Target implements ICDITarget {
MIDataEvaluateExpressionInfo info = MIDataEvaluateExpressionInfo info =
evaluate.getMIDataEvaluateExpressionInfo(); evaluate.getMIDataEvaluateExpressionInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
return info.getExpression(); return info.getExpression();
} catch (MIException e) { } catch (MIException e) {
@ -646,7 +646,7 @@ public class Target implements ICDITarget {
mi.postCommand(signal); mi.postCommand(signal);
MIInfo info = signal.getMIInfo(); MIInfo info = signal.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);
@ -665,7 +665,7 @@ public class Target implements ICDITarget {
mi.postCommand(sig); mi.postCommand(sig);
MIInfo info = sig.getMIInfo(); MIInfo info = sig.getMIInfo();
if (info == null) { if (info == null) {
throw new CDIException("No answer"); throw new CDIException("Target is not responding");
} }
} catch (MIException e) { } catch (MIException e) {
throw new MI2CDIException(e); throw new MI2CDIException(e);