diff options
author | Marc Khouzam | 2012-01-17 14:42:18 +0000 |
---|---|---|
committer | Marc Khouzam | 2012-01-17 14:42:18 +0000 |
commit | 2bafef2e42a8fc04637fef5bd468e0cd893894a0 (patch) | |
tree | 8e1a3e813bd22dd84d7ee3af613b65fe32d3e218 /debug/org.eclipse.cdt.debug.mi.core | |
parent | d184e414d04125c66d85cf0c55e6b921d4d7c420 (diff) | |
download | org.eclipse.cdt-2bafef2e42a8fc04637fef5bd468e0cd893894a0.tar.gz org.eclipse.cdt-2bafef2e42a8fc04637fef5bd468e0cd893894a0.tar.xz org.eclipse.cdt-2bafef2e42a8fc04637fef5bd468e0cd893894a0.zip |
Code cleanup, mostly about missing @Override
Diffstat (limited to 'debug/org.eclipse.cdt.debug.mi.core')
185 files changed, 523 insertions, 0 deletions
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointHit.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointHit.java index 05dcb39fc17..e4b0eb87709 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointHit.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointHit.java @@ -29,6 +29,7 @@ public class BreakpointHit extends SessionObject implements ICDIBreakpointHit { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointHit#getBreakpoint() */ + @Override public ICDIBreakpoint getBreakpoint() { int number = breakEvent.getNumber(); // Ask the breakpointManager for the breakpoint diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java index 65fb579f0a5..b5fb510d924 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java @@ -388,6 +388,7 @@ public class BreakpointManager extends Manager { } } + @Override public void update(Target target) throws CDIException { update(target, null); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Condition.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Condition.java index 2701a1f7093..bf51f650629 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Condition.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Condition.java @@ -29,6 +29,7 @@ public class Condition implements ICDICondition { /** * @see org.eclipse.cdt.debug.core.cdi.ICDICondition#getIgnoreCount() */ + @Override public int getIgnoreCount() { return ignoreCount; } @@ -36,6 +37,7 @@ public class Condition implements ICDICondition { /** * @see org.eclipse.cdt.debug.core.cdi.ICDICondition#getExpression() */ + @Override public String getExpression() { return expression; } @@ -43,6 +45,7 @@ public class Condition implements ICDICondition { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.ICDICondition#getThreadId() */ + @Override public String[] getThreadIds() { return tids; } @@ -50,6 +53,7 @@ public class Condition implements ICDICondition { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(ICDICondition obj) { if (obj instanceof Condition) { Condition cond = (Condition)obj; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ErrorInfo.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ErrorInfo.java index b89ffeff50b..1ab0181f40d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ErrorInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ErrorInfo.java @@ -28,6 +28,7 @@ public class ErrorInfo extends SessionObject implements ICDIErrorInfo { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIErrorInfo#getMessage() */ + @Override public String getMessage() { return event.getMessage(); } @@ -35,6 +36,7 @@ public class ErrorInfo extends SessionObject implements ICDIErrorInfo { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIErrorInfo#getDetailMessage() */ + @Override public String getDetailMessage() { return event.getLogMessage(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventBreakpointHit.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventBreakpointHit.java index 92c23a3d8e5..dba0c36932b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventBreakpointHit.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventBreakpointHit.java @@ -37,6 +37,7 @@ public class EventBreakpointHit extends SessionObject implements ICDIEventBreakp fEventType = eventType; } + @Override public String getEventBreakpointType() { return fEventType; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java index 377fb74ea6a..19ed937509a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java @@ -86,6 +86,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs * Process the event from MI, do any state work on the CDI, * and fire the corresponding CDI event. */ + @Override public void update(Observable o, Object arg) { MIEvent miEvent = (MIEvent)arg; @@ -225,6 +226,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs /** * @see org.eclipse.cdt.debug.core.cdi.ICDIEventManager#addEventListener(ICDIEventListener) */ + @Override public void addEventListener(ICDIEventListener listener) { list.add(listener); } @@ -232,6 +234,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs /** * @see org.eclipse.cdt.debug.core.cdi.ICDIEventManager#removeEventListener(ICDIEventListener) */ + @Override public void removeEventListener(ICDIEventListener listener) { list.remove(listener); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java index 61012ea0f30..aa07d51bf31 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java @@ -27,6 +27,7 @@ public class ExitInfo extends SessionObject implements ICDIExitInfo { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIExitInfo#getCode() */ + @Override public int getCode() { return event.getExitCode(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java index 7d59720018e..785169733ec 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java @@ -109,6 +109,7 @@ public class ExpressionManager extends Manager { destroyExpressions(target, expressions); } + @Override public void update(Target target) throws CDIException { // deleteAllVariables(target); List eventList = new ArrayList(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java index 8523faba291..bbd6f4d1c92 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java @@ -39,6 +39,7 @@ public class FunctionFinished extends EndSteppingRange implements ICDIFunctionFi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.ICDIFunctionFinished#getReturnType() */ + @Override public ICDIType getReturnType() throws CDIException { Session session = (Session)getSession(); Target target = session.getTarget(fMIEvent.getMISession()); @@ -53,6 +54,7 @@ public class FunctionFinished extends EndSteppingRange implements ICDIFunctionFi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.ICDIFunctionFinished#getReturnValue() */ + @Override public ICDIValue getReturnValue() throws CDIException { Session session = (Session)getSession(); Target target = session.getTarget(fMIEvent.getMISession()); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java index 1f883cd8723..687e3bf1bcf 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java @@ -61,6 +61,7 @@ public class MemoryManager extends Manager { * Note: Frozen blocks are not updated. * */ + @Override public void update(Target target) { MISession miSession = target.getMISession(); List blockList = getMemoryBlockList(target); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ProcessManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ProcessManager.java index 0ec433d4edf..ab1ab6706c1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ProcessManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ProcessManager.java @@ -84,6 +84,7 @@ public class ProcessManager extends Manager { return null; } + @Override public void update(Target target) throws CDIException { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java index 6ca5ce068ff..b93dd9f2d01 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java @@ -94,6 +94,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getAttribute(String) */ + @Override public String getAttribute(String key) { return props.getProperty(key); } @@ -109,6 +110,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getEventManager() */ + @Override public ICDIEventManager getEventManager() { return eventManager; } @@ -144,6 +146,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getTargets() */ + @Override public ICDITarget[] getTargets() { ProcessManager pMgr = getProcessManager(); return pMgr.getCDITargets(); @@ -152,6 +155,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#setAttribute(String, String) */ + @Override public void setAttribute(String key, String value) { props.setProperty(key, value); } @@ -159,6 +163,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getConfiguration() */ + @Override public ICDISessionConfiguration getConfiguration() { return configuration; } @@ -170,6 +175,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISessionObject#getSession() */ + @Override public ICDISession getSession() { return this; } @@ -177,6 +183,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#terminate(ICDITarget) */ + @Override public void terminate() throws CDIException { ProcessManager pMgr = getProcessManager(); Target[] targets = pMgr.getTargets(); @@ -211,6 +218,8 @@ public class Session implements ICDISession, ICDISessionObject { * @deprecated * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getSessionProcess() */ + @Deprecated + @Override public Process getSessionProcess() throws CDIException { ICDITarget[] targets = getTargets(); if (targets != null && targets.length > 0) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionConfiguration.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionConfiguration.java index c02108c7e50..9bcc0346a34 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionConfiguration.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionConfiguration.java @@ -32,6 +32,7 @@ public class SessionConfiguration extends SessionObject implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.ICDISessionConfiguration#terminateSessionOnExit() */ + @Override public boolean terminateSessionOnExit() { return true; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java index a2522a1f816..c837e666755 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java @@ -26,6 +26,7 @@ public class SessionObject implements ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISessionObject#getSession() */ + @Override public ICDISession getSession() { return fSession; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java index f9236545b39..f2c4c1f05bf 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java @@ -130,6 +130,7 @@ public class SharedLibraryManager extends Manager { return miLibs; } + @Override public void update(Target target) throws CDIException { MISession miSession = target.getMISession(); Session session = (Session)target.getSession(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalExitInfo.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalExitInfo.java index f777a296877..1246273beb2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalExitInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalExitInfo.java @@ -27,6 +27,7 @@ public class SignalExitInfo extends SessionObject implements ICDISignalExitInfo /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignalExitInfo#getName() */ + @Override public String getName() { return event.getName(); } @@ -34,6 +35,7 @@ public class SignalExitInfo extends SessionObject implements ICDISignalExitInfo /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignalExitInfo#getDescription() */ + @Override public String getDescription() { return event.getMeaning(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java index 78860113fdd..3f07d963d40 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java @@ -190,6 +190,7 @@ public class SignalManager extends Manager { return EMPTY_SIGNALS; } + @Override public void update(Target target) throws CDIException { MISession miSession = target.getMISession(); MISigHandle[] miSigs = getMISignals(miSession); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java index 5d83c8d4753..be95c783322 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java @@ -29,6 +29,7 @@ public class SignalReceived extends SessionObject implements ICDISignalReceived /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignalReceived#getSignal() */ + @Override public ICDISignal getSignal() { return signal; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java index d61fbd04dab..903b21a84b3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java @@ -182,6 +182,7 @@ public class SourceManager extends Manager { } } + @Override public void update(Target target) throws CDIException { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ThreadManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ThreadManager.java index 216f33861de..dde8830e440 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ThreadManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ThreadManager.java @@ -106,6 +106,7 @@ public class ThreadManager extends Manager { //implements ICDIThreadManager { return new ThreadSet(cthreads, currentThreadId); } + @Override public void update(Target target) throws CDIException { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java index fac1f35a122..1bfbe504682 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java @@ -611,6 +611,7 @@ public class VariableManager extends Manager { * This ok, since the IDE only a frame at a time. * */ + @Override public void update(Target target) throws CDIException { int highLevel = 0; int lowLevel = 0; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointScope.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointScope.java index 404fdace9f1..b4e73c7bb0f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointScope.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointScope.java @@ -29,6 +29,7 @@ public class WatchpointScope extends SessionObject implements ICDIWatchpointScop /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpointScope#getWatchpoint() */ + @Override public ICDIWatchpoint getWatchpoint() { int number = watchEvent.getNumber(); // Ask the breakpointManager for the breakpoint diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointTrigger.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointTrigger.java index f24bdb9becc..79184b1f55c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointTrigger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointTrigger.java @@ -29,6 +29,7 @@ public class WatchpointTrigger extends SessionObject implements ICDIWatchpointTr /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger#getNewValue() */ + @Override public String getNewValue() { return watchEvent.getNewValue(); } @@ -36,6 +37,7 @@ public class WatchpointTrigger extends SessionObject implements ICDIWatchpointTr /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger#getOldValue() */ + @Override public String getOldValue() { return watchEvent.getOldValue(); } @@ -43,6 +45,7 @@ public class WatchpointTrigger extends SessionObject implements ICDIWatchpointTr /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger#getWatchpoint() */ + @Override public ICDIWatchpoint getWatchpoint() { int number = watchEvent.getNumber(); // Ask the breakpointManager for the breakpoint diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ChangedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ChangedEvent.java index 9ed722268fa..1bef1443607 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ChangedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ChangedEvent.java @@ -128,6 +128,7 @@ public class ChangedEvent implements ICDIChangedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java index a10421b258d..7374fc105be 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java @@ -127,6 +127,7 @@ public class CreatedEvent implements ICDICreatedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java index d85f79b24a4..64c885bf843 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java @@ -104,6 +104,7 @@ public class DestroyedEvent implements ICDIDestroyedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java index 7047320d5c0..cef69fc92b5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java @@ -31,6 +31,7 @@ public class DisconnectedEvent implements ICDIDisconnectedEvent { /** * @see org.eclipse.cdt.debug.core..ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ExitedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ExitedEvent.java index 50d79db793b..6e032ed6da1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ExitedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ExitedEvent.java @@ -47,6 +47,7 @@ public class ExitedEvent implements ICDIExitedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIExitedEvent#getExitInfo() */ + @Override public ICDISessionObject getReason() { if (event instanceof MIInferiorExitEvent) { return new ExitInfo(session, (MIInferiorExitEvent)event); @@ -59,6 +60,7 @@ public class ExitedEvent implements ICDIExitedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { Target target = session.getTarget(event.getMISession()); return target; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/MemoryChangedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/MemoryChangedEvent.java index 508e30f735e..9b3d7b04706 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/MemoryChangedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/MemoryChangedEvent.java @@ -37,6 +37,7 @@ public class MemoryChangedEvent implements ICDIMemoryChangedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getAddresses() */ + @Override public BigInteger[] getAddresses() { /* But only returns the address that are in the block. */ BigInteger[] mi_addresses = miMem.getAddresses(); @@ -52,6 +53,7 @@ public class MemoryChangedEvent implements ICDIMemoryChangedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java index 1f95cffcfc9..b46fcfb4e52 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java @@ -31,6 +31,7 @@ public class ResumedEvent implements ICDIResumedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { // We can send the target as the Source. CDI // Will assume that all threads are supended for this. @@ -43,6 +44,7 @@ public class ResumedEvent implements ICDIResumedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent#getType() */ + @Override public int getType() { MIRunningEvent running = event; int type = running.getType(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java index 57be8a1ded9..2be82f30d21 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java @@ -52,6 +52,7 @@ public class SuspendedEvent implements ICDISuspendedEvent { event = e; } + @Override public ICDISessionObject getReason() { if (event instanceof MIBreakpointHitEvent) { // A Catchpoint hit is reported by gdb as a breakpoint hit. We can @@ -88,6 +89,7 @@ public class SuspendedEvent implements ICDISuspendedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { Target target = session.getTarget(event.getMISession()); // We can send the target as the Source. CDI diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java index 56b693d2b90..14685ae0c8c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java @@ -30,6 +30,7 @@ public class Argument extends Variable implements ICDIArgument { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createVariable(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.core.cdi.model.ICDIThread, org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame, java.lang.String, java.lang.String, int, int, org.eclipse.cdt.debug.mi.core.output.MIVar) */ + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { return new Argument(target, thread, frame, name, fullName, pos, depth, miVar); } @@ -37,6 +38,7 @@ public class Argument extends Variable implements ICDIArgument { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor(Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth) { return new ArgumentDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java index 857b61426a6..26a7443a111 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java @@ -46,6 +46,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint2#getType() */ + @Override public int getType() { return type; } @@ -65,6 +66,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#getCondition() */ + @Override public ICDICondition getCondition() throws CDIException { if (condition == null) { if (miBreakpoints != null && miBreakpoints.length > 0) { @@ -89,6 +91,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isEnabled() */ + @Override public boolean isEnabled() throws CDIException { return enabled; } @@ -99,6 +102,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { * CDT 5.0 won't call this deprecated method (since we implement * ICDIBreakpoint2), but we use it ourselves. */ + @Override public boolean isHardware() { // ignore the TEMPORARY bit qualifier return ((type & ~ICBreakpointType.TEMPORARY) == ICBreakpointType.HARDWARE); @@ -110,6 +114,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { * CDT 5.0 won't call this deprecated method (since we implement * ICDIBreakpoint2), but we use it ourselves. */ + @Override public boolean isTemporary() { return (type & ICBreakpointType.TEMPORARY) != 0; } @@ -117,6 +122,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#setCondition(ICDICondition) */ + @Override public void setCondition(ICDICondition newCondition) throws CDIException { Session session = (Session)getTarget().getSession(); BreakpointManager mgr = session.getBreakpointManager(); @@ -131,6 +137,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#setEnabled(boolean) */ + @Override public void setEnabled(boolean on) throws CDIException { Session session = (Session)getTarget().getSession(); BreakpointManager mgr = session.getBreakpointManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CObject.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CObject.java index a81c240a0e7..262bc2433d2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CObject.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CObject.java @@ -26,6 +26,7 @@ public class CObject implements ICDIObject { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getTarget() */ + @Override public ICDITarget getTarget() { return fTarget; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CoreFileConfiguration.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CoreFileConfiguration.java index 11b2d0f765e..832ae18d083 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CoreFileConfiguration.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CoreFileConfiguration.java @@ -21,52 +21,64 @@ public class CoreFileConfiguration extends CObject implements ICDITargetConfigur super(t); } + @Override public boolean supportsTerminate() { return true; } + @Override public boolean supportsDisconnect() { return false; } + @Override public boolean supportsRestart() { return false; } + @Override public boolean supportsStepping() { return false; } + @Override public boolean supportsInstructionStepping() { return false; } + @Override public boolean supportsBreakpoints() { return false; } + @Override public boolean supportsRegisters() { return true; } + @Override public boolean supportsRegisterModification() { return false; } + @Override public boolean supportsMemoryRetrieval() { return true; } + @Override public boolean supportsMemoryModification() { return false; } + @Override public boolean supportsExpressionEvaluation() { return true; } /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsResume() */ + @Override public boolean supportsResume() { return false; } @@ -74,6 +86,7 @@ public class CoreFileConfiguration extends CObject implements ICDITargetConfigur /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsSuspend() */ + @Override public boolean supportsSuspend() { return false; } @@ -81,6 +94,7 @@ public class CoreFileConfiguration extends CObject implements ICDITargetConfigur /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsSharedLibrary() */ + @Override public boolean supportsSharedLibrary() { return true; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java index 916fa6081e0..7504cbc4b2a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java @@ -34,10 +34,12 @@ public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint { this.arg = arg==null?"":arg; //$NON-NLS-1$ } + @Override public String getEventType() { return eventType; } + @Override public String getExtraArgument() { return arg; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java index e192b8d3d00..abf4e5ee99d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java @@ -40,6 +40,7 @@ public class Exceptionpoint extends Breakpoint implements ICDIExceptionpoint { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExceptionpoint#isStopOnThrow() */ + @Override public boolean isStopOnThrow() { return fStopOnThrow; } @@ -47,6 +48,7 @@ public class Exceptionpoint extends Breakpoint implements ICDIExceptionpoint { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExceptionpoint#isStopOnCatch() */ + @Override public boolean isStopOnCatch() { return fStopOnCatch; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java index 828404ff641..7fb45b4e2fe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java @@ -42,6 +42,7 @@ public class Expression extends CObject implements ICDIExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#getExpressionText() */ + @Override public String getExpressionText() { return fExpression; } @@ -49,6 +50,7 @@ public class Expression extends CObject implements ICDIExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#equals(org.eclipse.cdt.debug.core.cdi.model.ICDIExpression) */ + @Override public boolean equals(ICDIExpression obj) { if (obj instanceof Expression) { Expression other = (Expression)obj; @@ -95,6 +97,7 @@ public class Expression extends CObject implements ICDIExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#getValue(org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame) */ + @Override public ICDIValue getValue(ICDIStackFrame context) throws CDIException { Session session = (Session)getTarget().getSession(); ExpressionManager mgr = session.getExpressionManager(); @@ -123,6 +126,7 @@ public class Expression extends CObject implements ICDIExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#dispose() */ + @Override public void dispose() throws CDIException { Session session = (Session)getTarget().getSession(); ExpressionManager mgr = session.getExpressionManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/GlobalVariable.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/GlobalVariable.java index 81a35ea0fee..d15c9662e95 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/GlobalVariable.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/GlobalVariable.java @@ -46,6 +46,7 @@ public class GlobalVariable extends Variable implements ICDIGlobalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createVariable(org.eclipse.cdt.debug.mi.core.cdi.model.Target, java.lang.String, java.lang.String, org.eclipse.cdt.debug.core.cdi.model.ICDIThread, org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame, int, int, org.eclipse.cdt.debug.mi.core.output.MIVar) */ + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { return new GlobalVariable(target, thread, frame, name, fullName, pos, depth, miVar); } @@ -53,6 +54,7 @@ public class GlobalVariable extends Variable implements ICDIGlobalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor(Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth) { return new GlobalVariableDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Instruction.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Instruction.java index bf0b71c009b..961ac4f14a7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Instruction.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Instruction.java @@ -29,6 +29,7 @@ public class Instruction extends CObject implements ICDIInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getAdress() */ + @Override public BigInteger getAdress() { return MIFormat.getBigInteger(asm.getAddress()); } @@ -36,6 +37,7 @@ public class Instruction extends CObject implements ICDIInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getFuntionName() */ + @Override public String getFuntionName() { return asm.getFunction(); } @@ -43,6 +45,7 @@ public class Instruction extends CObject implements ICDIInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getInstruction() */ + @Override public String getInstruction() { return asm.getInstruction(); } @@ -50,6 +53,7 @@ public class Instruction extends CObject implements ICDIInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getOffset() */ + @Override public long getOffset() { return asm.getOffset(); } @@ -57,6 +61,7 @@ public class Instruction extends CObject implements ICDIInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getArgs() */ + @Override public String getArgs() { return asm.getArgs(); } @@ -64,6 +69,7 @@ public class Instruction extends CObject implements ICDIInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getOpcode() */ + @Override public String getOpcode() { return asm.getOpcode(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocalVariable.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocalVariable.java index 08235629e77..f88cefabfdf 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocalVariable.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocalVariable.java @@ -36,6 +36,7 @@ public class LocalVariable extends Variable implements ICDILocalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createVariable(org.eclipse.cdt.debug.mi.core.cdi.model.Target, java.lang.String, java.lang.String, org.eclipse.cdt.debug.core.cdi.model.ICDIThread, org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame, int, int, org.eclipse.cdt.debug.mi.core.output.MIVar) */ + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { return new LocalVariable(target, thread, frame, name, fullName, pos, depth, miVar); @@ -44,6 +45,7 @@ public class LocalVariable extends Variable implements ICDILocalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor(Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth) { return new LocalVariableDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MappedSourceLocation.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MappedSourceLocation.java index 9c0041b3cca..f867177d423 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MappedSourceLocation.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MappedSourceLocation.java @@ -28,30 +28,37 @@ public class MappedSourceLocation implements ICDIAddressToSource.IMappedSourceLo this.executable = executable; } + @Override public IAddress getAddress() { return address; } + @Override public IPath getExecutable() { return Path.fromOSString(executable); } + @Override public String getFunctionName() { return lineInfo.getStartLocation(); } + @Override public int getLineNumber() { return lineInfo.getLineNumber(); } + @Override public IPath getSourceFile() { return Path.fromOSString(lineInfo.getFileName()); } + @Override public String getUnmangledFunctionName() { return lineInfo.getStartLocation(); } + @Override public int compareTo(Object arg0) { return address.compareTo(arg0); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java index 34f2c36f722..551f38239de 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java @@ -65,6 +65,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @return the size of each memory word in bytes. */ + @Override public int getWordSize() { return fWordSize; } @@ -186,6 +187,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { return offsets; } + @Override public byte[] getBytes() throws CDIException { return cBytes; } @@ -193,6 +195,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#refresh() */ + @Override public void refresh() throws CDIException { Target target = (Target)getTarget(); MemoryManager mgr = ((Session)target.getSession()).getMemoryManager(); @@ -214,6 +217,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#getLength() */ + @Override public long getLength() { try { // use this instead. If the wordSize @@ -229,6 +233,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#getStartAddress() */ + @Override public BigInteger getStartAddress() { return cStartAddress; } @@ -236,6 +241,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#isFrozen() */ + @Override public boolean isFrozen() { return frozen; } @@ -243,6 +249,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#setFrozen(boolean) */ + @Override public void setFrozen(boolean frozen) { this.frozen = frozen; } @@ -250,6 +257,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#setValue(long, byte[]) */ + @Override public void setValue(long offset, byte[] bytes) throws CDIException { if (offset >= getLength() || offset + bytes.length > getLength()) { throw new CDIException(CdiResources.getString("cdi.model.MemoryBlock.Bad_Offset")); //$NON-NLS-1$ @@ -298,6 +306,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#getFlags(int) */ + @Override public synchronized byte getFlags(int offset) { if (offset < 0 || offset >= getLength()) { throw new IndexOutOfBoundsException(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MixedInstruction.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MixedInstruction.java index e12d6b5a1e9..007a5cd841b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MixedInstruction.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MixedInstruction.java @@ -29,6 +29,7 @@ public class MixedInstruction extends CObject implements ICDIMixedInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction#getFileName() */ + @Override public String getFileName() { return srcAsm.getFile(); } @@ -36,6 +37,7 @@ public class MixedInstruction extends CObject implements ICDIMixedInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction#getInstructions() */ + @Override public ICDIInstruction[] getInstructions() { MIAsm[] asms = srcAsm.getMIAsms(); ICDIInstruction[] instructions = new ICDIInstruction[asms.length]; @@ -48,6 +50,7 @@ public class MixedInstruction extends CObject implements ICDIMixedInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction#getLineNumber() */ + @Override public int getLineNumber() { return srcAsm.getLine(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java index e58c545ce56..ce73f3ffe2f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java @@ -46,12 +46,14 @@ public class Register extends Variable implements ICDIRegister { } + @Override protected void addToTypeCache(String nameType, ICDIType type) throws CDIException { Session session = (Session)getTarget().getSession(); RegisterManager mgr = session.getRegisterManager(); mgr.addToTypeCache(nameType, type); } + @Override protected ICDIType getFromTypeCache(String nameType) throws CDIException { Session session = (Session)getTarget().getSession(); RegisterManager mgr = session.getRegisterManager(); @@ -61,6 +63,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.VariableDescriptor#getFullName() */ + @Override public String getFullName() { if (fFullName == null) { String n = getName(); @@ -73,6 +76,7 @@ public class Register extends Variable implements ICDIRegister { return fFullName; } + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { return new Register(target, thread, frame, name, fullName, pos, depth, miVar); } @@ -80,6 +84,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#dispose() */ + @Override public void dispose() throws CDIException { ICDITarget target = getTarget(); RegisterManager regMgr = ((Session)target.getSession()).getRegisterManager(); @@ -89,6 +94,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegister#getValue(org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame) */ + @Override public ICDIValue getValue(ICDIStackFrame context) throws CDIException { Session session = (Session)getTarget().getSession(); RegisterManager mgr = session.getRegisterManager(); @@ -99,6 +105,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegister#equals(org.eclipse.cdt.debug.core.cdi.model.ICDIRegister) */ + @Override public boolean equals(ICDIRegister register) { if (register instanceof Register) { Register reg = (Register) register; @@ -110,6 +117,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor(Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth) { return new RegisterDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterDescriptor.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterDescriptor.java index 7a8f5feb928..35ecd42984a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterDescriptor.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterDescriptor.java @@ -25,6 +25,7 @@ public class RegisterDescriptor extends VariableDescriptor implements ICDIRegist /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.VariableDescriptor#getFullName() */ + @Override public String getFullName() { if (fFullName == null) { String n = getName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterGroup.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterGroup.java index 509928741ee..cfb0a848e10 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterGroup.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterGroup.java @@ -35,6 +35,7 @@ public class RegisterGroup extends CObject implements ICDIRegisterGroup { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterGroup#getRegisterDescriptors() */ + @Override public ICDIRegisterDescriptor[] getRegisterDescriptors() throws CDIException { Target target = (Target)getTarget(); Session session = (Session)target.getSession(); @@ -45,6 +46,7 @@ public class RegisterGroup extends CObject implements ICDIRegisterGroup { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterGroup#getName() */ + @Override public String getName() { return fName; } @@ -52,6 +54,7 @@ public class RegisterGroup extends CObject implements ICDIRegisterGroup { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterGroup#hasRegisters() */ + @Override public boolean hasRegisters() throws CDIException { return true; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RuntimeOptions.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RuntimeOptions.java index faf2718a357..b5cc94b733b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RuntimeOptions.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RuntimeOptions.java @@ -35,6 +35,7 @@ public class RuntimeOptions extends CObject implements ICDIRuntimeOptions { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions#setArguments(String) */ + @Override public void setArguments(String[] args) throws CDIException { Target target = (Target)getTarget(); if (args == null || args.length == 0) { @@ -57,6 +58,7 @@ public class RuntimeOptions extends CObject implements ICDIRuntimeOptions { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions#setEnvironment(Properties) */ + @Override public void setEnvironment(Properties props) throws CDIException { Target target = (Target)getTarget(); if (props == null) { @@ -90,6 +92,7 @@ public class RuntimeOptions extends CObject implements ICDIRuntimeOptions { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions#setWorkingDirectory(String) */ + @Override public void setWorkingDirectory(String wd) throws CDIException { Target target = (Target)getTarget(); if (wd == null || wd.length() == 0) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java index 1b6157b9b21..1f68edebd6e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java @@ -43,6 +43,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#getFileName() */ + @Override public String getFileName() { return miShared.getName(); } @@ -50,6 +51,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#getStartAddress() */ + @Override public BigInteger getStartAddress() { return MIFormat.getBigInteger(miShared.getFrom()); } @@ -57,6 +59,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#getEndAddress() */ + @Override public BigInteger getEndAddress() { return MIFormat.getBigInteger(miShared.getTo()); } @@ -64,6 +67,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#areSymbolsLoaded() */ + @Override public boolean areSymbolsLoaded() { return miShared.isRead(); } @@ -71,6 +75,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#loadSymbols() */ + @Override public void loadSymbols() throws CDIException { Target target = (Target)getTarget(); SharedLibraryManager mgr = ((Session)target.getSession()).getSharedLibraryManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java index d324374776a..ccba13945ce 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java @@ -38,6 +38,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#getMeaning() */ + @Override public String getDescription() { return sig.getDescription(); } @@ -45,6 +46,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#getName() */ + @Override public String getName() { return sig.getName(); } @@ -52,6 +54,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#handle() */ + @Override public void handle(boolean ignore, boolean stop) throws CDIException { SignalManager mgr = ((Session)getTarget().getSession()).getSignalManager(); mgr.handle(this, ignore, stop); @@ -60,6 +63,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#isIgnore() */ + @Override public boolean isIgnore() { return !sig.isPass(); } @@ -67,6 +71,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#isStopSet() */ + @Override public boolean isStopSet() { return sig.isStop(); } @@ -74,6 +79,7 @@ public class Signal extends CObject implements ICDISignal { /** * Continue program giving it signal specified by the argument. */ + @Override public void signal() throws CDIException { getTarget().resume(this); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java index 4e259ee12fd..a9dbe7f0b22 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java @@ -97,6 +97,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getThread() */ + @Override public ICDIThread getThread() { return cthread; } @@ -104,6 +105,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getArgumentDescriptors() */ + @Override public ICDIArgumentDescriptor[] getArgumentDescriptors() throws CDIException { if (argDescs == null) { Session session = (Session)getTarget().getSession(); @@ -116,6 +118,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLocalVariableDescriptors() */ + @Override public ICDILocalVariableDescriptor[] getLocalVariableDescriptors() throws CDIException { if (localDescs == null) { Session session = (Session)getTarget().getSession(); @@ -128,6 +131,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#createArgument(org.eclipse.cdt.debug.core.cdi.model.ICDIArgumentDescriptor) */ + @Override public ICDIArgument createArgument(ICDIArgumentDescriptor varDesc) throws CDIException { if (varDesc instanceof ArgumentDescriptor) { Session session = (Session)getTarget().getSession(); @@ -140,6 +144,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#createLocalVariable(org.eclipse.cdt.debug.core.cdi.model.ICDILocalVariableDescriptor) */ + @Override public ICDILocalVariable createLocalVariable(ICDILocalVariableDescriptor varDesc) throws CDIException { if (varDesc instanceof ArgumentDescriptor) { return createArgument((ICDIArgumentDescriptor)varDesc); @@ -154,6 +159,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLocation() */ + @Override public ICDILocator getLocator() { BigInteger addr = BigInteger.ZERO; if (frame != null) { @@ -175,6 +181,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLevel() */ + @Override public int getLevel() { return level; } @@ -182,6 +189,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#equals(ICDIStackFrame) */ + @Override public boolean equals(ICDIStackFrame stackframe) { if (stackframe instanceof StackFrame) { StackFrame stack = (StackFrame)stackframe; @@ -204,6 +212,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStepReturn#stepReturn() */ + @Override public void stepReturn() throws CDIException { finish(); } @@ -211,6 +220,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStepReturn#stepReturn(org.eclipse.cdt.debug.core.cdi.model.ICDIValue) */ + @Override public void stepReturn(ICDIValue value) throws CDIException { execReturn(value.toString()); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java index 57c681511e8..135a5af7def 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java @@ -160,6 +160,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getTarget() */ + @Override public ICDITarget getTarget() { return this; } @@ -374,6 +375,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM return cthreads; } + @Override public ICDIThread getCurrentThread() throws CDIException { ICDIThread[] threads = getThreads(); for (int i = 0; i < threads.length; i++) { @@ -388,6 +390,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getThreads() */ + @Override public synchronized ICDIThread[] getThreads() throws CDIException { if (currentThreads.length == 0) { currentThreads = getCThreads(); @@ -430,6 +433,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#restart() */ + @Override public void restart() throws CDIException { // Reset the inferior pid MIInferior inferior = getMISession().getMIInferior(); @@ -452,6 +456,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepInto() */ + @Override public void stepInto() throws CDIException { stepInto(1); } @@ -459,6 +464,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepInto(int) */ + @Override public void stepInto(int count) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); MIExecStep step = factory.createMIExecStep(count); @@ -476,6 +482,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepIntoInstruction() */ + @Override public void stepIntoInstruction() throws CDIException { stepIntoInstruction(1); } @@ -483,6 +490,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepIntoInstruction(int) */ + @Override public void stepIntoInstruction(int count) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); MIExecStepInstruction stepi = factory.createMIExecStepInstruction(count); @@ -501,6 +509,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepOver() */ + @Override public void stepOver() throws CDIException { stepOver(1); } @@ -508,6 +517,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepOver(int) */ + @Override public void stepOver(int count) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); MIExecNext next = factory.createMIExecNext(count); @@ -525,6 +535,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepOverInstruction() */ + @Override public void stepOverInstruction() throws CDIException { stepOverInstruction(1); } @@ -532,6 +543,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepOverInstruction(int) */ + @Override public void stepOverInstruction(int count) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); MIExecNextInstruction nexti = factory.createMIExecNextInstruction(count); @@ -556,6 +568,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#runUntil(ICDILocation) */ + @Override public void runUntil(ICDILocation location) throws CDIException { stepUntil(location); } @@ -563,6 +576,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepUntil(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void stepUntil(ICDILocation location) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); String loc = null; @@ -610,6 +624,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#suspend() */ + @Override public void suspend() throws CDIException { try { miSession.getMIInferior().interrupt(); @@ -631,6 +646,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#disconnect() */ + @Override public void disconnect() throws CDIException { // if Target is running try to suspend first. if (isRunning()) { @@ -661,6 +677,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#resume() */ + @Override public void resume() throws CDIException { resume(false); } @@ -668,6 +685,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void resume(ICDILocation location) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); String loc = null; @@ -719,6 +737,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @since 6.0 */ + @Override public void moveInstructionPointer(ICDILocation location) throws CDIException { // Most of this code was taken from our Resume() // method. The only differences are that we create a temporary @@ -771,6 +790,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(org.eclipse.cdt.debug.core.cdi.model.ICDISignal) */ + @Override public void resume(ICDISignal signal) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); CLISignal sig = factory.createCLISignal(signal.getName()); @@ -788,6 +808,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(boolean) */ + @Override public void resume(boolean passSignal) throws CDIException { if (miSession.getMIInferior().isRunning()) { throw new CDIException(CdiResources.getString("cdi.model.Target.Inferior_already_running")); //$NON-NLS-1$ @@ -831,6 +852,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#jump(ICDILocation) */ + @Override public void jump(ICDILocation location) throws CDIException { resume(location); } @@ -838,6 +860,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#signal() */ + @Override public void signal() throws CDIException { resume(true); } @@ -845,10 +868,12 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#signal(ICDISignal) */ + @Override public void signal(ICDISignal signal) throws CDIException { resume(signal); } + @Override public String evaluateExpressionToString(ICDIStackFrame frame, String expressionText) throws CDIException { Target target = (Target)frame.getTarget(); Thread currentThread = (Thread)target.getCurrentThread(); @@ -877,6 +902,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#terminate() */ + @Override public void terminate() throws CDIException { try { miSession.getMIInferior().terminate(); @@ -888,6 +914,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isTerminated() */ + @Override public boolean isTerminated() { return miSession.getMIInferior().isTerminated(); } @@ -895,6 +922,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isDisconnected() */ + @Override public boolean isDisconnected() { return !miSession.getMIInferior().isConnected(); } @@ -902,6 +930,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isSuspended() */ + @Override public boolean isSuspended() { return miSession.getMIInferior().isSuspended(); } @@ -913,6 +942,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getProcess() */ + @Override public Process getProcess() { if (miSession.isCoreSession()) { return new CoreProcess(); @@ -926,6 +956,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setLineBreakpoint(int, org.eclipse.cdt.debug.core.cdi.ICDILineLocation, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDILineBreakpoint setLineBreakpoint(int type, ICDILineLocation location, ICDICondition condition, boolean deferred) throws CDIException { return this.setLineBreakpoint(type, location, condition, deferred, true); @@ -934,6 +965,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setFunctionBreakpoint(int, org.eclipse.cdt.debug.core.cdi.ICDIFunctionLocation, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDIFunctionBreakpoint setFunctionBreakpoint(int type, ICDIFunctionLocation location, ICDICondition condition, boolean deferred) throws CDIException { return this.setFunctionBreakpoint(type, location, condition, deferred, true); @@ -942,6 +974,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setAddressBreakpoint(int, org.eclipse.cdt.debug.core.cdi.ICDIAddressLocation, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDIAddressBreakpoint setAddressBreakpoint(int type, ICDIAddressLocation location, ICDICondition condition, boolean deferred) throws CDIException { return this.setAddressBreakpoint(type, location, condition, deferred, true); @@ -950,6 +983,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setWatchpoint(int, int, java.lang.String, org.eclipse.cdt.debug.core.cdi.ICDICondition) */ + @Override public ICDIWatchpoint setWatchpoint(int type, int watchType, String expression, ICDICondition condition) throws CDIException { return this.setWatchpoint(type, watchType, expression, condition, true); @@ -958,6 +992,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement2#setWatchpoint(int, int, java.lang.String, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDIWatchpoint setWatchpoint(int type, int watchType, String expression, ICDICondition condition, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); @@ -969,6 +1004,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement2#setWatchpoint(int, int, java.lang.String, java.math.BigInteger, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDIWatchpoint setWatchpoint(int type, int watchType, String expression, String memorySpace, BigInteger range, ICDICondition condition, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); @@ -980,6 +1016,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setExceptionBreakpoint(java.lang.String, boolean, boolean) */ + @Override public ICDIExceptionpoint setExceptionBreakpoint(String clazz, boolean stopOnThrow, boolean stopOnCatch) throws CDIException { throw new CDIException(CdiResources.getString("cdi.Common.Not_implemented")); //$NON-NLS-1$ @@ -988,6 +1025,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#getBreakpoints() */ + @Override public ICDIBreakpoint[] getBreakpoints() throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.getBreakpoints(this); @@ -996,6 +1034,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#deleteBreakpoints(org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint[]) */ + @Override public void deleteBreakpoints(ICDIBreakpoint[] breakpoints) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); bMgr.deleteBreakpoints(this, breakpoints); @@ -1004,6 +1043,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#deleteAllBreakpoints() */ + @Override public void deleteAllBreakpoints() throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); bMgr.deleteAllBreakpoints(this); @@ -1012,6 +1052,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createCondition(int, java.lang.String, String) */ + @Override public ICDICondition createCondition(int ignoreCount, String expression) { return createCondition(ignoreCount, expression, null); } @@ -1019,6 +1060,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createCondition(int, java.lang.String, String) */ + @Override public ICDICondition createCondition(int ignoreCount, String expression, String[] tids) { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.createCondition(ignoreCount, expression, tids); @@ -1027,6 +1069,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createLineLocation(java.lang.String, int) */ + @Override public ICDILineLocation createLineLocation(String file, int line) { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.createLineLocation(file, line); @@ -1035,6 +1078,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createFunctionLocation(java.lang.String, java.lang.String) */ + @Override public ICDIFunctionLocation createFunctionLocation(String file, String function) { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.createFunctionLocation(file, function); @@ -1043,6 +1087,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createLocation(long) */ + @Override public ICDIAddressLocation createAddressLocation(BigInteger address) { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.createAddressLocation(address); @@ -1051,6 +1096,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getRuntimeOptions() */ + @Override public ICDIRuntimeOptions getRuntimeOptions() { return new RuntimeOptions(this); } @@ -1058,6 +1104,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpressionManagement#createExpression(java.lang.String) */ + @Override public ICDIExpression createExpression(String code) throws CDIException { ExpressionManager expMgr = ((Session)getSession()).getExpressionManager(); return expMgr.createExpression(this, code); @@ -1066,6 +1113,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpressionManagement#getExpressions() */ + @Override public ICDIExpression[] getExpressions() throws CDIException { ExpressionManager expMgr = ((Session)getSession()).getExpressionManager(); return expMgr.getExpressions(this); @@ -1074,6 +1122,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpressionManagement#destroyExpression(org.eclipse.cdt.debug.core.cdi.model.ICDIExpression[]) */ + @Override public void destroyExpressions(ICDIExpression[] expressions) throws CDIException { ExpressionManager expMgr = ((Session)getSession()).getExpressionManager(); expMgr.destroyExpressions(this, expressions); @@ -1082,6 +1131,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpressionManagement#destroyAllExpression() */ + @Override public void destroyAllExpressions() throws CDIException { ExpressionManager expMgr = ((Session)getSession()).getExpressionManager(); expMgr.destroyAllExpressions(this); @@ -1093,6 +1143,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM * @return the array of signals * @throws CDIException on failure. Reasons include: */ + @Override public ICDISignal[] getSignals() throws CDIException { SignalManager sigMgr = ((Session)getSession()).getSignalManager(); return sigMgr.getSignals(this); @@ -1101,6 +1152,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#setSourcePaths(java.lang.String[]) */ + @Override public void setSourcePaths(String[] srcPaths) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); srcMgr.setSourcePaths(this, srcPaths); @@ -1109,6 +1161,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getSourcePaths() */ + @Override public String[] getSourcePaths() throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getSourcePaths(this); @@ -1117,6 +1170,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getInstructions(java.math.BigInteger, java.math.BigInteger) */ + @Override public ICDIInstruction[] getInstructions(BigInteger startAddress, BigInteger endAddress) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getInstructions(this, startAddress, endAddress); @@ -1125,6 +1179,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getInstructions(java.lang.String, int) */ + @Override public ICDIInstruction[] getInstructions(String filename, int linenum) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getInstructions(this, filename, linenum); @@ -1133,6 +1188,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getInstructions(java.lang.String, int, int) */ + @Override public ICDIInstruction[] getInstructions(String filename, int linenum, int lines) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getInstructions(this, filename, linenum, lines); @@ -1141,6 +1197,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getMixedInstructions(java.math.BigInteger, java.math.BigInteger) */ + @Override public ICDIMixedInstruction[] getMixedInstructions(BigInteger startAddress, BigInteger endAddress) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getMixedInstructions(this, startAddress, endAddress); @@ -1149,6 +1206,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getMixedInstructions(java.lang.String, int) */ + @Override public ICDIMixedInstruction[] getMixedInstructions(String filename, int linenum) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getMixedInstructions(this, filename, linenum); @@ -1157,6 +1215,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getMixedInstructions(java.lang.String, int, int) */ + @Override public ICDIMixedInstruction[] getMixedInstructions(String filename, int linenum, int lines) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getMixedInstructions(this, filename, linenum, lines); @@ -1165,6 +1224,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#createMemoryBlock(java.lang.String, int) */ + @Override public ICDIMemoryBlock createMemoryBlock(String address, int units, int wordSize) throws CDIException { MemoryManager memMgr = ((Session)getSession()).getMemoryManager(); return memMgr.createMemoryBlock(this, address, units, wordSize); @@ -1173,6 +1233,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#removeBlocks(org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock[]) */ + @Override public void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException { MemoryManager memMgr = ((Session)getSession()).getMemoryManager(); memMgr.removeBlocks(this, memoryBlocks); @@ -1181,6 +1242,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#removeAllBlocks() */ + @Override public void removeAllBlocks() throws CDIException { MemoryManager memMgr = ((Session)getSession()).getMemoryManager(); memMgr.removeAllBlocks(this); @@ -1189,6 +1251,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#getMemoryBlocks() */ + @Override public ICDIMemoryBlock[] getMemoryBlocks() throws CDIException { MemoryManager memMgr = ((Session)getSession()).getMemoryManager(); return memMgr.getMemoryBlocks(this); @@ -1197,6 +1260,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibraryManagement#getSharedLibraries() */ + @Override public ICDISharedLibrary[] getSharedLibraries() throws CDIException { SharedLibraryManager sharedMgr = ((Session)getSession()).getSharedLibraryManager(); return sharedMgr.getSharedLibraries(this); @@ -1205,6 +1269,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getGlobalVariableDescriptors(java.lang.String, java.lang.String, java.lang.String) */ + @Override public ICDIGlobalVariableDescriptor getGlobalVariableDescriptors(String filename, String function, String name) throws CDIException { VariableManager varMgr = ((Session)getSession()).getVariableManager(); return varMgr.getGlobalVariableDescriptor(this, filename, function, name); @@ -1213,6 +1278,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getRegisterGroups() */ + @Override public ICDIRegisterGroup[] getRegisterGroups() throws CDIException { RegisterManager regMgr = ((Session)getSession()).getRegisterManager(); return regMgr.getRegisterGroups(this); @@ -1221,6 +1287,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getConfiguration() */ + @Override public ICDITargetConfiguration getConfiguration() { if (fConfiguration == null) { if (miSession.isProgramSession()) { @@ -1239,6 +1306,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createGlobalVariable(org.eclipse.cdt.debug.core.cdi.model.ICDIGlobalVariableDescriptor) */ + @Override public ICDIGlobalVariable createGlobalVariable(ICDIGlobalVariableDescriptor varDesc) throws CDIException { if (varDesc instanceof GlobalVariableDescriptor) { VariableManager varMgr = ((Session)getSession()).getVariableManager(); @@ -1250,6 +1318,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createRegister(org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterDescriptor) */ + @Override public ICDIRegister createRegister(ICDIRegisterDescriptor varDesc) throws CDIException { if (varDesc instanceof RegisterDescriptor) { Session session = (Session)getTarget().getSession(); @@ -1275,25 +1344,30 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM return miSession.isVerboseModeEnabled(); } + @Override public ICDIAddressBreakpoint setAddressBreakpoint(int type, ICDIAddressLocation location, ICDICondition condition, boolean deferred, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.setAddressBreakpoint(this, type, location, condition, deferred, enabled); } + @Override public ICDIExceptionpoint setExceptionBreakpoint(String clazz, boolean stopOnThrow, boolean stopOnCatch, boolean enabled) throws CDIException { throw new CDIException(CdiResources.getString("cdi.Common.Not_implemented")); //$NON-NLS-1$ } + @Override public ICDIFunctionBreakpoint setFunctionBreakpoint(int type, ICDIFunctionLocation location, ICDICondition condition, boolean deferred, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.setFunctionBreakpoint(this, type, location, condition, deferred, enabled); } + @Override public ICDILineBreakpoint setLineBreakpoint(int type, ICDILineLocation location, ICDICondition condition, boolean deferred, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.setLineBreakpoint(this, type, location, condition, deferred, enabled); } + @Override public IMappedSourceLocation getSourceForAddress(IAddress address) throws CDIException { // Ask gdb for info for this address, use the module list // to determine the executable. @@ -1317,6 +1391,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM } } + @Override public ICDIEventBreakpoint setEventBreakpoint(String type, String arg, int cdiType, ICDICondition condition, boolean deferred, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/TargetConfiguration.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/TargetConfiguration.java index 5af2f3b7103..90c65016fa0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/TargetConfiguration.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/TargetConfiguration.java @@ -25,6 +25,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsBreakpoints() */ + @Override public boolean supportsBreakpoints() { return true; } @@ -32,6 +33,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsDisconnect() */ + @Override public boolean supportsDisconnect() { MISession miSession = ((Target)getTarget()).getMISession(); return miSession.isAttachSession() ? true : false; @@ -40,6 +42,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsExpressionEvaluation() */ + @Override public boolean supportsExpressionEvaluation() { return true; } @@ -47,6 +50,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsInstructionStepping() */ + @Override public boolean supportsInstructionStepping() { return true; } @@ -54,6 +58,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsMemoryModification() */ + @Override public boolean supportsMemoryModification() { return true; } @@ -61,6 +66,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsMemoryRetrieval() */ + @Override public boolean supportsMemoryRetrieval() { return true; } @@ -68,6 +74,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsRegisterModification() */ + @Override public boolean supportsRegisterModification() { return true; } @@ -75,6 +82,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsRegisters() */ + @Override public boolean supportsRegisters() { return true; } @@ -82,6 +90,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsSharedLibrary() */ + @Override public boolean supportsSharedLibrary() { return true; } @@ -89,6 +98,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsRestart() */ + @Override public boolean supportsRestart() { MISession miSession = ((Target)getTarget()).getMISession(); return miSession.isAttachSession() ? false : true; @@ -97,6 +107,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsStepping() */ + @Override public boolean supportsStepping() { return true; } @@ -104,6 +115,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsTerminate() */ + @Override public boolean supportsTerminate() { return true; @@ -111,6 +123,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsResume() */ + @Override public boolean supportsResume() { return true; } @@ -118,6 +131,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsSuspend() */ + @Override public boolean supportsSuspend() { String os = null; try { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java index 69880720eaa..1c34fdbdac9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java @@ -103,6 +103,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#getStackFrames() */ + @Override public ICDIStackFrame[] getStackFrames() throws CDIException { // get the frames depth @@ -154,6 +155,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#getStackFrames() */ + @Override public int getStackFrameCount() throws CDIException { if (stackdepth == 0) { Target target = (Target)getTarget(); @@ -208,6 +210,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#getStackFrames() */ + @Override public ICDIStackFrame[] getStackFrames(int low, int high) throws CDIException { if (currentFrames == null || currentFrames.size() < high) { currentFrames = new ArrayList(); @@ -326,6 +329,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepInto() */ + @Override public void stepInto() throws CDIException { stepInto(1); } @@ -333,6 +337,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepInto(int) */ + @Override public void stepInto(int count) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -344,6 +349,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepIntoInstruction() */ + @Override public void stepIntoInstruction() throws CDIException { stepIntoInstruction(1); } @@ -351,6 +357,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepIntoInstruction(int) */ + @Override public void stepIntoInstruction(int count) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -362,6 +369,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepOver() */ + @Override public void stepOver() throws CDIException { stepOver(1); } @@ -369,6 +377,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepOver(int) */ + @Override public void stepOver(int count) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -380,6 +389,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepOverInstruction() */ + @Override public void stepOverInstruction() throws CDIException { stepOverInstruction(1); } @@ -387,6 +397,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepOverInstruction(int) */ + @Override public void stepOverInstruction(int count) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -398,6 +409,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepReturn() */ + @Override public void stepReturn() throws CDIException { getCurrentStackFrame().stepReturn(); } @@ -405,6 +417,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#runUntil(ICDILocation) */ + @Override public void runUntil(ICDILocation location) throws CDIException { stepUntil(location); } @@ -412,6 +425,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepUntil(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void stepUntil(ICDILocation location) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -423,6 +437,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#isSuspended() */ + @Override public boolean isSuspended() { return getTarget().isSuspended(); } @@ -430,6 +445,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#suspend() */ + @Override public void suspend() throws CDIException { getTarget().suspend(); } @@ -437,6 +453,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#resume() */ + @Override public void resume() throws CDIException { resume(false); } @@ -445,6 +462,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(boolean) */ + @Override public void resume(boolean passSignal) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -455,6 +473,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void resume(ICDILocation location) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -466,6 +485,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(org.eclipse.cdt.debug.core.cdi.model.ICDISignal) */ + @Override public void resume(ICDISignal signal) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -477,6 +497,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#jump(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void jump(ICDILocation location) throws CDIException { resume(location); } @@ -484,6 +505,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#signal() */ + @Override public void signal() throws CDIException { resume(false); } @@ -491,6 +513,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#signal(org.eclipse.cdt.debug.core.cdi.model.ICDISignal) */ + @Override public void signal(ICDISignal signal) throws CDIException { resume(signal); } @@ -499,6 +522,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#equals(ICDIThread) */ + @Override public boolean equals(ICDIThread thread) { if (thread instanceof Thread) { Thread cthread = (Thread) thread; @@ -535,6 +559,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#getThreadStorageDescriptors() */ + @Override public ICDIThreadStorageDescriptor[] getThreadStorageDescriptors() throws CDIException { Session session = (Session)getTarget().getSession(); VariableManager varMgr = session.getVariableManager(); @@ -544,6 +569,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#createThreadStorage(org.eclipse.cdt.debug.core.cdi.model.ICDIThreadStorageDescriptor) */ + @Override public ICDIThreadStorage createThreadStorage(ICDIThreadStorageDescriptor varDesc) throws CDIException { if (varDesc instanceof ThreadStorageDescriptor) { Session session = (Session)getTarget().getSession(); @@ -559,6 +585,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @since 6.0 */ + @Override public void moveInstructionPointer(ICDILocation location) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/ThreadStorage.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/ThreadStorage.java index 01ee69593ca..155e9f5deb7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/ThreadStorage.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/ThreadStorage.java @@ -46,6 +46,7 @@ public class ThreadStorage extends Variable implements ICDIThreadStorage { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createVariable(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int, org.eclipse.cdt.debug.mi.core.output.MIVar) */ + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { @@ -55,6 +56,7 @@ public class ThreadStorage extends Variable implements ICDIThreadStorage { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor( Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth ) { return new ThreadStorageDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java index a59775a7549..e1c4f339973 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java @@ -48,6 +48,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getTypeName() */ + @Override public String getTypeName() throws CDIException { return getVariable().getTypeName(); } @@ -55,6 +56,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getValueString() */ + @Override public String getValueString() throws CDIException { // make sure the variable is updated. if (! getVariable().isUpdated()) { @@ -95,6 +97,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getVariables() */ + @Override public int getChildrenNumber() throws CDIException { return getVariable().getMIVar().getNumChild(); } @@ -102,6 +105,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getVariables() */ + @Override public boolean hasChildren() throws CDIException { /* int number = 0; @@ -127,6 +131,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getVariables() */ + @Override public ICDIVariable[] getVariables() throws CDIException { return getVariable().getChildren(); } @@ -134,6 +139,7 @@ public class Value extends CObject implements ICDIValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getType() */ + @Override public ICDIType getType() throws CDIException { return getVariable().getType(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java index 03d7472d94f..bba0600af06 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java @@ -341,6 +341,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getValue() */ + @Override public ICDIValue getValue() throws CDIException { if (value == null) { ICDIType t = getType(); @@ -384,6 +385,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#setValue(ICDIValue) */ + @Override public void setValue(ICDIValue value) throws CDIException { setValue(value.getValueString()); } @@ -391,6 +393,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#setValue(String) */ + @Override public void setValue(String expression) throws CDIException { Target target = (Target)getTarget(); MISession miSession = target.getMISession(); @@ -446,6 +449,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl * handle it. * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#isEditable() */ + @Override public boolean isEditable() throws CDIException { if (editable == null) { MISession mi = ((Target) getTarget()).getMISession(); @@ -487,6 +491,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#equals() */ + @Override public boolean equals(ICDIVariable var) { if (var instanceof Variable) { Variable variable = (Variable) var; @@ -511,6 +516,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#dispose() */ + @Override public void dispose() throws CDIException { ICDITarget target = getTarget(); VariableManager varMgr = ((Session)target.getSession()).getVariableManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java index 9c3e524a828..94c90308def 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java @@ -172,6 +172,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /** * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableDescriptor#getName() */ + @Override public String getName() { return fName; } @@ -179,6 +180,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getType() */ + @Override public ICDIType getType() throws CDIException { if (fType == null) { String nametype = getTypeName(); @@ -234,6 +236,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#sizeof() */ + @Override public int sizeof() throws CDIException { if (sizeof == null) { Target target = (Target) getTarget(); @@ -296,6 +299,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#getTypeName() */ + @Override public String getTypeName() throws CDIException { if (fTypename == null) { Target target = (Target)getTarget(); @@ -322,6 +326,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#getQualifiedName() */ + @Override public String getQualifiedName() throws CDIException { if (qualifiedName == null) { qualifiedName = encodeVariable(); @@ -347,6 +352,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#equals(ICDIVariableDescriptor) */ + @Override public boolean equals(ICDIVariableDescriptor varDesc) { if (varDesc instanceof VariableDescriptor) { VariableDescriptor desc = (VariableDescriptor) varDesc; @@ -395,6 +401,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#getVariableDescriptorAsArray(org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor, int, int) */ + @Override public ICDIVariableDescriptor getVariableDescriptorAsArray(int start, int length) throws CDIException { Session session = (Session)getTarget().getSession(); VariableManager mgr = session.getVariableManager(); @@ -404,6 +411,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#getVariableDescriptorAsType(org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor, java.lang.String) */ + @Override public ICDIVariableDescriptor getVariableDescriptorAsType(String type) throws CDIException { Session session = (Session)getTarget().getSession(); VariableManager mgr = session.getVariableManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java index 3f7a5801a9c..6f2e064feb0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java @@ -77,6 +77,7 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint#getWatchExpression() */ + @Override public String getWatchExpression() throws CDIException { if (expression == null) { MIBreakpoint[] miPoints = getMIBreakpoints(); @@ -90,6 +91,7 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint#isReadType() */ + @Override public boolean isReadType() { return ((watchType & ICDIWatchpoint.READ) == ICDIWatchpoint.READ); // MIBreakpoint miPoint = getMIBreakpoint(); @@ -101,6 +103,7 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint#isWriteType() */ + @Override public boolean isWriteType() { return ((watchType & ICDIWatchpoint.WRITE) == ICDIWatchpoint.WRITE); // MIBreakpoint miPoint = getMIBreakpoint(); @@ -109,10 +112,12 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { // return ((watchType & ICDIWatchpoint.WRITE) == ICDIWatchpoint.WRITE); } + @Override public String getMemorySpace() throws CDIException { return memorySpace; } + @Override public BigInteger getRange() throws CDIException { return range; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java index d9573a1ba91..4fa680c15eb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java @@ -32,6 +32,7 @@ public class ArrayType extends DerivedType implements ICDIArrayType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIArrayType#getDimension() */ + @Override public int getDimension() { if (derivedType == null) { getComponentType(); @@ -42,6 +43,7 @@ public class ArrayType extends DerivedType implements ICDIArrayType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIArrayType#getComponentType() */ + @Override public ICDIType getComponentType() { if (derivedType == null) { String orig = getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayValue.java index 1e75abb6220..7675d87c3f5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayValue.java @@ -96,6 +96,7 @@ public class ArrayValue extends DerivedValue implements ICDIArrayValue, ICDIPoin * * an Array of range[index, index + length - 1] */ + @Override public ICDIVariable[] getVariables(int index, int length) throws CDIException { //int children = getChildrenNumber(); //if (index >= children || index + length >= children) { @@ -125,6 +126,7 @@ public class ArrayValue extends DerivedValue implements ICDIArrayValue, ICDIPoin /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIPointerValue#pointerValue() */ + @Override public BigInteger pointerValue() throws CDIException { String address = getAddressString(); if (address.length() > 0 ){ diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java index f4c93be5778..9c80858ef0c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java @@ -29,6 +29,7 @@ public class BoolValue extends IntegralValue implements ICDIBoolValue { super(v); } + @Override public BigInteger bigIntegerValue() throws CDIException { String valueString = getValueString(); if (valueString.equalsIgnoreCase("false"))//$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java index b91eb16c743..34dfceb572f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java @@ -32,6 +32,7 @@ public abstract class FloatingPointType extends Type implements ICDIFloatingPoin /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType#isComplex() */ + @Override public boolean isComplex() { return complex; } @@ -39,6 +40,7 @@ public abstract class FloatingPointType extends Type implements ICDIFloatingPoin /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType#isImaginary() */ + @Override public boolean isImaginary() { return imaginary; } @@ -46,6 +48,7 @@ public abstract class FloatingPointType extends Type implements ICDIFloatingPoin /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType#isLong() */ + @Override public boolean isLong() { return islong; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java index 0a864a6bb4f..89e7df4f88c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java @@ -30,6 +30,7 @@ public abstract class FloatingPointValue extends Value implements ICDIFloatingPo /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointValue#doubleValue() */ + @Override public double doubleValue() throws CDIException { double result = 0; String valueString = getValueString(); @@ -51,6 +52,7 @@ public abstract class FloatingPointValue extends Value implements ICDIFloatingPo /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointValue#floatValue() */ + @Override public float floatValue() throws CDIException { float result = 0; String valueString = getValueString(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java index 6dfd946eb13..0bc98d24ab8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java @@ -28,6 +28,7 @@ public class FunctionType extends DerivedType implements ICDIFunctionType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIDerivedType#getComponentType() */ + @Override public ICDIType getComponentType() { if (derivedType != null) { String orig = getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java index 71a0f972111..0df093c5912 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java @@ -28,6 +28,7 @@ public abstract class IntegralType extends Type implements ICDIIntegralType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralType#isUnsigned() */ + @Override public boolean isUnsigned() { return unSigned; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java index b3d662438e5..ac7e4ac8e2c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java @@ -35,6 +35,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#biIntegerValue() */ + @Override public BigInteger bigIntegerValue() throws CDIException { return bigIntegerValue(getValueString()); } @@ -64,6 +65,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#longValue() */ + @Override public long longValue() throws CDIException { return bigIntegerValue().longValue(); } @@ -71,6 +73,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#longValue() */ + @Override public int intValue() throws CDIException { return bigIntegerValue().intValue(); } @@ -78,6 +81,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#shortValue() */ + @Override public short shortValue() throws CDIException { return bigIntegerValue().shortValue(); } @@ -85,6 +89,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#byteValue() */ + @Override public int byteValue() throws CDIException { return bigIntegerValue().byteValue(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java index 7eea7e47ad8..4f3ff8964ff 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java @@ -26,6 +26,7 @@ public class PointerType extends DerivedType implements ICDIPointerType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIDerivedType#getComponentType() */ + @Override public ICDIType getComponentType() { if (derivedType == null) { String orig = getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerValue.java index 7604784bcc5..95d2f1b1719 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerValue.java @@ -31,6 +31,7 @@ public class PointerValue extends DerivedValue implements ICDIPointerValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIPointerValue#pointerValue() */ + @Override public BigInteger pointerValue() throws CDIException { return IntegralValue.bigIntegerValue(getValueString()); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java index c5e3931766a..ab32a107cb3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java @@ -29,6 +29,7 @@ public class ReferenceType extends DerivedType implements ICDIReferenceType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIDerivedType#getComponentType() */ + @Override public ICDIType getComponentType() { if (derivedType == null) { String orig = getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java index 42c4e2085d0..ac602fe073c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java @@ -52,6 +52,7 @@ public class ReferenceValue extends DerivedValue implements ICDIReferenceValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIReferenceValue#referenceValue() */ + @Override public ICDIValue referenceValue() throws CDIException { Value value = null; ICDIReferenceType rt = (ICDIReferenceType)getType(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java index 1b6523ab66c..941595c67d3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java @@ -29,6 +29,7 @@ public class StructType extends AggregateType implements ICDIStructType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType#isClass() */ + @Override public boolean isClass() { return getDetailTypeName().startsWith("class"); //$NON-NLS-1$ } @@ -36,6 +37,7 @@ public class StructType extends AggregateType implements ICDIStructType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType#isStruct() */ + @Override public boolean isStruct() { return getDetailTypeName().startsWith("struct"); //$NON-NLS-1$ } @@ -43,6 +45,7 @@ public class StructType extends AggregateType implements ICDIStructType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType#isUnion() */ + @Override public boolean isUnion() { return getDetailTypeName().startsWith("union"); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java index 4c9823eb242..c786b5be176 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java @@ -30,6 +30,7 @@ public abstract class Type extends CObject implements ICDIType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIType#getTypeName() */ + @Override public String getTypeName() { return typename; } @@ -41,6 +42,7 @@ public abstract class Type extends CObject implements ICDIType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIType#getDetailTypeName() */ + @Override public String getDetailTypeName() { if (detailName == null) { return getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CoreProcess.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CoreProcess.java index 55572103642..0c94049ccb2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CoreProcess.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CoreProcess.java @@ -22,6 +22,7 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#exitValue() */ + @Override public int exitValue() { return 0; } @@ -29,6 +30,7 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#waitFor() */ + @Override public int waitFor() throws InterruptedException { return 0; } @@ -36,14 +38,17 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#destroy() */ + @Override public void destroy() { } /* (non-Javadoc) * @see java.lang.Process#getErrorStream() */ + @Override public InputStream getErrorStream() { return new InputStream() { + @Override public int read() throws IOException { return -1; } @@ -53,8 +58,10 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#getInputStream() */ + @Override public InputStream getInputStream() { return new InputStream() { + @Override public int read() throws IOException { return -1; } @@ -64,8 +71,10 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#getOutputStream() */ + @Override public OutputStream getOutputStream() { return new OutputStream() { + @Override public void write(int b) throws IOException { } }; diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/ErrorThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/ErrorThread.java index 3150718bad7..c3f53dc8754 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/ErrorThread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/ErrorThread.java @@ -33,6 +33,7 @@ public class ErrorThread extends Thread { /* * Sit on the error stream output, and append to the GDB console */ + @Override public void run() { BufferedReader reader = new BufferedReader(new InputStreamReader(session.getChannelErrorStream())); try { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/EventThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/EventThread.java index ac432c45455..4161e6fd95d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/EventThread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/EventThread.java @@ -27,6 +27,7 @@ public class EventThread extends Thread { session = s; } + @Override public void run() { // Signal by the session of time to die. while (session.getChannelOutputStream() != null) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java index 7dc492a1e8d..4441c22ad71 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java @@ -167,6 +167,7 @@ public class GDBTypeParser { type = t; } + @Override public String toString() { return unParse(this); } @@ -214,6 +215,7 @@ public class GDBTypeParser { return child != null; } + @Override public String verbose() { StringBuffer sb = new StringBuffer(); switch (getType()) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java index e5aded32406..03574d2fd53 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java @@ -72,9 +72,11 @@ public class MIInferior extends Process { /** * @see java.lang.Process#getOutputStream() */ + @Override public OutputStream getOutputStream() { if (out == null) { out = new OutputStream() { + @Override public void write(int b) throws IOException { if (!isRunning()) { throw new IOException(MIPlugin.getResourceString("src.MIInferior.target_is_suspended")); //$NON-NLS-1$ @@ -93,6 +95,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#getInputStream() */ + @Override public InputStream getInputStream() { if (in == null) { try { @@ -107,6 +110,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#getErrorStream() */ + @Override public InputStream getErrorStream() { // FIXME: We do not have any err stream from gdb/mi // so this gdb err channel instead. @@ -129,6 +133,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#waitFor() */ + @Override public int waitFor() throws InterruptedException { waitForSync(); return exitValue(); @@ -137,6 +142,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#exitValue() */ + @Override public int exitValue() { if (isTerminated()) { if (!session.isTerminated()) { @@ -161,6 +167,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#destroy() */ + @Override public void destroy() { try { terminate(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java index d4ffd106fbe..ecf1bea25f9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java @@ -111,6 +111,7 @@ public class MISession extends Observable { * @throws MIException * @deprecated */ + @Deprecated public MISession(MIProcess process, IMITTY tty, int type, int commandTimeout, int launchTimeout, String miVersion, IProgressMonitor monitor) throws MIException { this(process, tty, type, new CommandFactory(miVersion), commandTimeout, launchTimeout, monitor); } @@ -126,6 +127,7 @@ public class MISession extends Observable { * @param type the type of debugin session. * @deprecated */ + @Deprecated public MISession(MIProcess process, IMITTY tty, int commandTimeout, int type, int launchTimeout) throws MIException { this(process, tty, type, commandTimeout, launchTimeout, MIVersion.MI1, new NullProgressMonitor()); if (useExecConsole()) { @@ -144,6 +146,7 @@ public class MISession extends Observable { * @param timeout time in milliseconds to wait for command response. * @deprecated */ + @Deprecated public MISession(MIProcess process, IMITTY tty, int type, CommandFactory commandFactory, int commandTimeout, int launchTimeout, IProgressMonitor monitor) throws MIException { gdbProcess = process; inChannel = process.getInputStream(); @@ -274,6 +277,7 @@ public class MISession extends Observable { /** * @deprecated use <code>setup()</code> without parameters */ + @Deprecated protected void setup(int launchTimeout, IProgressMonitor monitor) throws MIException { // The Process may have terminated earlier because // of bad arguments etc .. check this here and bail out. @@ -364,6 +368,7 @@ public class MISession extends Observable { /** * @deprecated use <code>initialize()</code> without parameters */ + @Deprecated protected void initialize(int launchTimeout, IProgressMonitor monitor) throws MIException { // Disable a certain number of irritations from gdb. // Like confirmation and screen size. @@ -786,6 +791,7 @@ public class MISession extends Observable { /** * Notify the observers of new MI OOB events. */ + @Override public void notifyObservers(Object arg) { setChanged(); super.notifyObservers(arg); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java index 2687606e997..3eb0cc86c4b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java @@ -83,6 +83,7 @@ public class RxThread extends Thread { * Get the response, parse the output, dispatch for OOB * search for the corresponding token in rxQueue for the ResultRecord. */ + @Override public void run() { BufferedReader reader = new BufferedReader(new InputStreamReader(session.getChannelInputStream())); try { @@ -108,6 +109,7 @@ public class RxThread extends Thread { // session.terminate() will set the channelInputStream to null. if (session.getChannelInputStream() != null) { Runnable cleanup = new Runnable() { + @Override public void run() { // Change the state of the inferior. session.getMIInferior().setTerminated(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/SessionProcess.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/SessionProcess.java index 31407dc5f98..349eb5e3375 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/SessionProcess.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/SessionProcess.java @@ -33,6 +33,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#destroy() */ + @Override public void destroy() { session.terminate(); } @@ -40,6 +41,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#exitValue() */ + @Override public int exitValue() { return session.getGDBProcess().exitValue(); } @@ -47,6 +49,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#getErrorStream() */ + @Override public InputStream getErrorStream() { return session.getMILogStream(); } @@ -54,6 +57,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#getInputStream() */ + @Override public InputStream getInputStream() { return session.getMIConsoleStream(); } @@ -61,10 +65,12 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#getOutputStream() */ + @Override public OutputStream getOutputStream() { if (out == null) { out = new OutputStream() { StringBuffer buf = new StringBuffer(); + @Override public void write(int b) throws IOException { buf.append((char)b); if (b == '\n') { @@ -113,6 +119,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#waitFor() */ + @Override public int waitFor() throws InterruptedException { return session.getGDBProcess().waitFor(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/TxThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/TxThread.java index 08e79ac1262..11a64d500e2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/TxThread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/TxThread.java @@ -34,6 +34,7 @@ public class TxThread extends Thread { cli = new CLIProcessor(session); } + @Override public void run () { try { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICatch.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICatch.java index 0e297358831..7735a37eaa1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICatch.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICatch.java @@ -32,6 +32,7 @@ public class CLICatch extends CLICommand { /** * This command return breakpoint inserted */ + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICommand.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICommand.java index c893408b73d..063e71ea811 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICommand.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICommand.java @@ -38,6 +38,7 @@ public class CLICommand extends Command * * @return the text representation of this command */ + @Override public String toString(){ String str = getToken() + " " + operation; //$NON-NLS-1$ if (str.endsWith("\n")) //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoLine.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoLine.java index 3aa9548a1dc..5409c62f82f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoLine.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoLine.java @@ -26,6 +26,7 @@ public class CLIInfoLine extends CLICommand { return (CLIInfoLineInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProc.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProc.java index f9cf396cbcb..9dc560a1cc1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProc.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProc.java @@ -31,6 +31,7 @@ public class CLIInfoProc extends CLICommand return (CLIInfoProcInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProgram.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProgram.java index f7daf62729b..a6307e6923c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProgram.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProgram.java @@ -31,6 +31,7 @@ public class CLIInfoProgram extends CLICommand return (CLIInfoProgramInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSharedLibrary.java index 238299be835..a6e8f234c41 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSharedLibrary.java @@ -31,6 +31,7 @@ public class CLIInfoSharedLibrary extends CLICommand return (CLIInfoSharedLibraryInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSignals.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSignals.java index e0cf445bbf4..31741e64e19 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSignals.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSignals.java @@ -35,6 +35,7 @@ public class CLIInfoSignals extends CLICommand return (CLIInfoSignalsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoThreads.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoThreads.java index 97f54527b52..89c50c4ea8c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoThreads.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoThreads.java @@ -31,6 +31,7 @@ public class CLIInfoThreads extends CLICommand return (CLIInfoThreadsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIJump.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIJump.java index f86ff186145..0cd2e218120 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIJump.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIJump.java @@ -34,6 +34,7 @@ public class CLIJump extends CLICommand { * it does not return so we have to fake * a return value. We return "^running" */ + @Override public MIOutput getMIOutput() { if (out == null) { out = new MIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIPType.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIPType.java index 70aca7a1d77..ac32fd75f39 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIPType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIPType.java @@ -31,6 +31,7 @@ public class CLIPType extends CLICommand return (CLIPTypeInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLISignal.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLISignal.java index 516ff7558f8..22a2afe87eb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLISignal.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLISignal.java @@ -35,6 +35,7 @@ public class CLISignal extends CLICommand { * it does not return so we have to fake * a return value. We return "^running" */ + @Override public MIOutput getMIOutput() { if (out == null) { out = new MIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIWhatis.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIWhatis.java index 79aefcdfc21..6f8977b7212 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIWhatis.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIWhatis.java @@ -31,6 +31,7 @@ public class CLIWhatis extends CLICommand return (CLIWhatisInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java index 898e681d19c..41f6ed48442 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java @@ -30,6 +30,7 @@ public class MIBreakCondition extends MICommand { * Do not do any munging on the string i.e. quoting spaces * etc .. doing this will break the command -break-condition. */ + @Override protected String parametersToString() { String[] parameters = getParameters(); StringBuffer buffer = new StringBuffer(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakInsert.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakInsert.java index c337fc791ef..8835d17416e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakInsert.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakInsert.java @@ -123,6 +123,7 @@ public class MIBreakInsert extends MICommand return (MIBreakInsertInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java index 54aa279b5e6..f840472ef6b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java @@ -59,6 +59,7 @@ public class MIBreakList extends MICommand return (MIBreakListInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakWatch.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakWatch.java index b35de309305..052e8cf2cbe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakWatch.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakWatch.java @@ -49,6 +49,7 @@ public class MIBreakWatch extends MICommand return (MIBreakWatchInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MICommand.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MICommand.java index 395090c49af..33eeddcecfc 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MICommand.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MICommand.java @@ -182,6 +182,7 @@ public class MICommand extends Command { return buffer.toString().trim(); } + @Override public String toString() { StringBuffer command = new StringBuffer(getToken() + getOperation()); String opt = optionsToString(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataDisassemble.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataDisassemble.java index 6ec648ee2eb..db47d221d43 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataDisassemble.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataDisassemble.java @@ -116,6 +116,7 @@ public class MIDataDisassemble extends MICommand return (MIDataDisassembleInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); @@ -132,6 +133,7 @@ public class MIDataDisassemble extends MICommand * GDB the -data-disassemble uses "--" as a separator wit only the MODE * So override the MICommand */ + @Override protected String parametersToString() { String[] parameters = getParameters(); if (parameters != null && parameters.length > 0) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataEvaluateExpression.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataEvaluateExpression.java index 69a58b38e30..9474c3237e0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataEvaluateExpression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataEvaluateExpression.java @@ -35,6 +35,7 @@ public class MIDataEvaluateExpression extends MICommand return (MIDataEvaluateExpressionInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListChangedRegisters.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListChangedRegisters.java index 08408f43ba2..ab7daeb16d7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListChangedRegisters.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListChangedRegisters.java @@ -33,6 +33,7 @@ public class MIDataListChangedRegisters extends MICommand return (MIDataListChangedRegistersInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterNames.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterNames.java index 44c9d53afe0..ff16d2db64f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterNames.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterNames.java @@ -49,6 +49,7 @@ public class MIDataListRegisterNames extends MICommand return (MIDataListRegisterNamesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterValues.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterValues.java index 2a255572c69..7b973d554b8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterValues.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterValues.java @@ -80,6 +80,7 @@ public class MIDataListRegisterValues extends MICommand return (MIDataListRegisterValuesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataReadMemory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataReadMemory.java index 26edb1590ec..d23f886360f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataReadMemory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataReadMemory.java @@ -139,6 +139,7 @@ public class MIDataReadMemory extends MICommand { return (MIDataReadMemoryInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPWD.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPWD.java index 2d18cf1a721..e98508ba9f1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPWD.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPWD.java @@ -29,6 +29,7 @@ public class MIEnvironmentPWD extends MICommand super(miVersion, "-environment-pwd"); //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetEnvironment.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetEnvironment.java index 87bae6b83a7..7c467e144a6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetEnvironment.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetEnvironment.java @@ -38,6 +38,7 @@ public class MIGDBSetEnvironment extends MIGDBSet { * * So pass the strings raw without interpretation. */ + @Override protected String parametersToString() { String[] parameters = getParameters(); StringBuffer buffer = new StringBuffer(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShow.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShow.java index 8bbf07d91ec..35c1b5812cd 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShow.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShow.java @@ -32,6 +32,7 @@ public class MIGDBShow extends MICommand { return (MIGDBShowInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowAddressSize.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowAddressSize.java index 0d61c5491ca..7a9c496d647 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowAddressSize.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowAddressSize.java @@ -24,6 +24,7 @@ public class MIGDBShowAddressSize extends MIGDBShow { super(miVersion, new String[] { "remoteaddresssize" }); //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIGDBShowAddressSizeInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowDirectories.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowDirectories.java index 20da64e6873..8855f9242b2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowDirectories.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowDirectories.java @@ -31,6 +31,7 @@ public class MIGDBShowDirectories extends MIGDBShow { public MIGDBShowDirectoriesInfo getMIGDBShowDirectoriesInfo() throws MIException { return (MIGDBShowDirectoriesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowEndian.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowEndian.java index d207d834dce..fb8a7dfb4d1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowEndian.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowEndian.java @@ -26,6 +26,7 @@ public class MIGDBShowEndian extends MIGDBShow { return (MIGDBShowEndianInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowExitCode.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowExitCode.java index d2e68e99693..b3bb1dc79fa 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowExitCode.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowExitCode.java @@ -34,6 +34,7 @@ public class MIGDBShowExitCode extends MIDataEvaluateExpression { return (MIGDBShowExitCodeInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowSolibSearchPath.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowSolibSearchPath.java index f44efbb5739..a9f6c1fca97 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowSolibSearchPath.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowSolibSearchPath.java @@ -31,6 +31,7 @@ public class MIGDBShowSolibSearchPath extends MIGDBShow { public MIGDBShowSolibSearchPathInfo getMIGDBShowSolibSearchPathInfo() throws MIException { return (MIGDBShowSolibSearchPathInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIInfoSharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIInfoSharedLibrary.java index 16c349d277b..d4c42a0b3a8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIInfoSharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIInfoSharedLibrary.java @@ -21,6 +21,7 @@ public class MIInfoSharedLibrary extends MICommand { super(miVersion, "info sharedlibrary"); //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackInfoDepth.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackInfoDepth.java index 8bb1bc5c61e..8e8ebb7eeea 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackInfoDepth.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackInfoDepth.java @@ -38,6 +38,7 @@ public class MIStackInfoDepth extends MICommand return (MIStackInfoDepthInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListArguments.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListArguments.java index e44848574ec..6f2cf534bd8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListArguments.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListArguments.java @@ -58,6 +58,7 @@ public class MIStackListArguments extends MICommand return (MIStackListArgumentsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java index 701f9aeb67c..6d3450cb15a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java @@ -64,6 +64,7 @@ public class MIStackListFrames extends MICommand return (MIStackListFramesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListLocals.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListLocals.java index f4136a0e5f6..f2da9efd560 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListLocals.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListLocals.java @@ -40,6 +40,7 @@ public class MIStackListLocals extends MICommand return (MIStackListLocalsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadListIds.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadListIds.java index 0835fce8fc8..14884808621 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadListIds.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadListIds.java @@ -34,6 +34,7 @@ public class MIThreadListIds extends MICommand return (MIThreadListIdsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java index fdfdf63939e..dc3c4077fbe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java @@ -34,6 +34,7 @@ public class MIThreadSelect extends MICommand return (MIThreadSelectInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java index 4660b81ee98..5bb922a4d83 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java @@ -63,6 +63,7 @@ public class MIVarCreate extends MICommand return (MIVarCreateInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarDelete.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarDelete.java index 4db2ad8be1a..ee800431483 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarDelete.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarDelete.java @@ -35,6 +35,7 @@ public class MIVarDelete extends MICommand return (MIVarDeleteInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java index 9ee716f4aed..bd5294a5a73 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java @@ -37,6 +37,7 @@ public class MIVarEvaluateExpression extends MICommand { return (MIVarEvaluateExpressionInfo) getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoExpression.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoExpression.java index cc3d1638593..9967fa548f5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoExpression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoExpression.java @@ -37,6 +37,7 @@ public class MIVarInfoExpression extends MICommand return (MIVarInfoExpressionInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoNumChildren.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoNumChildren.java index 4148217d673..3b8af6c0c5d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoNumChildren.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoNumChildren.java @@ -35,6 +35,7 @@ public class MIVarInfoNumChildren extends MICommand return (MIVarInfoNumChildrenInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoType.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoType.java index 2c0d88b9791..9d7f1b7bd43 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoType.java @@ -36,6 +36,7 @@ public class MIVarInfoType extends MICommand return (MIVarInfoTypeInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java index d347adee021..cc8bbab0821 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java @@ -36,6 +36,7 @@ public class MIVarListChildren extends MICommand return (MIVarListChildrenInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java index 09e7e22a39e..8af24b6639a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java @@ -37,6 +37,7 @@ public class MIVarShowAttributes extends MICommand return (MIVarShowAttributesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java index b4614f0bba1..9ac786f5132 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java @@ -39,6 +39,7 @@ public class MIVarUpdate extends MICommand { return (MIVarUpdateInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/RawCommand.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/RawCommand.java index 63af4eb7cee..87f982d3857 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/RawCommand.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/RawCommand.java @@ -26,6 +26,7 @@ public class RawCommand extends Command { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { if (fRaw == null) { fRaw = "\n"; //$NON-NLS-1$; @@ -38,6 +39,7 @@ public class RawCommand extends Command { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.Command#getMIOutput() */ + @Override public MIOutput getMIOutput() { return new MIOutput(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibrary.java index f1de8a84a84..ba630440cfb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibrary.java @@ -23,6 +23,7 @@ public class LinuxCLIInfoSharedLibrary extends CLIInfoSharedLibrary { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.CLIInfoSharedLibrary#getMIInfo() */ + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibraryInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibraryInfo.java index 4f5f2f58649..03057eb74db 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibraryInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibraryInfo.java @@ -30,6 +30,7 @@ public class LinuxCLIInfoSharedLibraryInfo extends CLIInfoSharedLibraryInfo { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.output.CLIInfoSharedLibraryInfo#parseShared(java.lang.String, java.util.List) */ + @Override protected void parseShared( String str, List aList ) { if ( str.length() > 0 && !str.startsWith( "From" ) ) { //$NON-NLS-1$ // Pass the header diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/StandardLinuxCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/StandardLinuxCommandFactory.java index cc42b57e251..a6870a1fbaf 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/StandardLinuxCommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/StandardLinuxCommandFactory.java @@ -36,6 +36,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.CommandFactory#createCLIInfoSharedLibrary() */ + @Override public CLIInfoSharedLibrary createCLIInfoSharedLibrary() { return new LinuxCLIInfoSharedLibrary(); } @@ -43,6 +44,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.CommandFactory#createMIGDBSetNewConsole() */ + @Override public MIGDBSetNewConsole createMIGDBSetNewConsole() { // Suppress "set new-console" - returns error on Linux return new MIGDBSetNewConsole( getMIVersion() ) { @@ -50,6 +52,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getOperation() */ + @Override public String getOperation() { return ""; //$NON-NLS-1$ } @@ -57,6 +60,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getOptions() */ + @Override public String[] getOptions() { return new String[0]; } @@ -64,6 +68,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getParameters() */ + @Override public String[] getParameters() { return new String[0]; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoPID.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoPID.java index d64eccc1a3c..8d0fd44209f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoPID.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoPID.java @@ -32,6 +32,7 @@ class MacOSCLIInfoPID extends CLIInfoProc { setOperation("info pid"); //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); @@ -75,6 +76,7 @@ class MacOSCLIInfoPID extends CLIInfoProc { } } + @Override public int getPID() { return pid; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoThreads.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoThreads.java index 14fff6498c6..b1ae6bf2271 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoThreads.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoThreads.java @@ -27,10 +27,12 @@ class MacOSCLIInfoThreads extends CLIInfoThreads { // MI doesn't work with a space between the token and the // operation, so we override CLICommmand's toString + @Override public String toString() { return getToken() + getOperation() + "\n"; //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); @@ -43,6 +45,7 @@ class MacOSCLIInfoThreads extends CLIInfoThreads { return info; } + @Override public CLIInfoThreadsInfo getMIInfoThreadsInfo() throws MIException { return (CLIInfoThreadsInfo) getMIInfo(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIPtype.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIPtype.java index 74dfbb84011..2abaa44ff4a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIPtype.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIPtype.java @@ -23,6 +23,7 @@ class MacOSCLIPtype extends CLIPType { // MI doesn't work with a space between the token and the // operation, so we override CLICommmand's toString + @Override public String toString() { return getToken() + getOperation() + "\n"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIEnvironmentCD.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIEnvironmentCD.java index 36c1ff61a3e..117e9d825b2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIEnvironmentCD.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIEnvironmentCD.java @@ -20,6 +20,7 @@ public class MacOSMIEnvironmentCD extends MIEnvironmentCD { this.setOperation("-environment-cd");//$NON-NLS-1$ } + @Override protected String parametersToString() { String[] parameters = getParameters(); if (parameters != null && parameters.length == 1) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdate.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdate.java index 6644a130b24..311ec88b6d5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdate.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdate.java @@ -32,6 +32,7 @@ class MacOSMIVarUpdate extends MIVarUpdate { super(miVersion, name); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdateInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdateInfo.java index 6c073094374..27b4655e4d1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdateInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdateInfo.java @@ -38,6 +38,7 @@ class MacOSMIVarUpdateInfo extends MIVarUpdateInfo { parse(); } + @Override public MIVarChange[] getMIVarChanges() { return changeList; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java index 27f93bb1423..86e00d0dc6a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java @@ -31,6 +31,7 @@ class MacOsCLIInfoThreadsInfo extends CLIInfoThreadsInfo { super(out); } + @Override protected void parse() { if (isDone()) { MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/StandardMacOSCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/StandardMacOSCommandFactory.java index bc96bf3f25b..b6b5894f06f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/StandardMacOSCommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/StandardMacOSCommandFactory.java @@ -31,6 +31,7 @@ public class StandardMacOSCommandFactory extends StandardCommandFactory { super(); } + @Override public String getWorkingDirectory(File cwd) { return "--cd=" + '"' + cwd.getAbsolutePath() + '"'; //$NON-NLS-1$ } @@ -42,34 +43,42 @@ public class StandardMacOSCommandFactory extends StandardCommandFactory { super( miVersion ); } + @Override public MIEnvironmentCD createMIEnvironmentCD(String pathdir) { return new MacOSMIEnvironmentCD(getMIVersion(), pathdir); } + @Override public CLIPType createCLIPType(String name) { return new MacOSCLIPtype(name); } + @Override public MIInfoSharedLibrary createMIInfoSharedLibrary() { return new MIInfoSharedLibrary(getMIVersion()); } + @Override public MIVarUpdate createMIVarUpdate() { return new MacOSMIVarUpdate(getMIVersion()); } + @Override public MIVarUpdate createMIVarUpdate(String name) { return new MacOSMIVarUpdate(getMIVersion(), name); } + @Override public CLIInfoProc createCLIInfoProc() { return new MacOSCLIInfoPID(); } + @Override public MIExecInterrupt createMIExecInterrupt() { return new MIExecInterrupt(getMIVersion()); } + @Override public CLIInfoThreads createCLIInfoThreads() { return new MacOSCLIInfoThreads(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinCommandFactory.java index 57e0707ed50..91bf5d13553 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinCommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinCommandFactory.java @@ -36,10 +36,12 @@ public class CygwinCommandFactory extends StandardWinCommandFactory { super( miVersion ); } + @Override public MIEnvironmentDirectory createMIEnvironmentDirectory(boolean reset, String[] pathdirs) { return new CygwinMIEnvironmentDirectory( getMIVersion(), reset, pathdirs ); } + @Override public MIProcess createMIProcess(String[] args, int launchTimeout, IProgressMonitor monitor) throws IOException { return new CygwinMIProcessAdapter(args, launchTimeout, monitor); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java index 60fb9d5025b..76a66f0640a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java @@ -37,68 +37,83 @@ public class StandardWinCommandFactory extends StandardCommandFactory { super( miVersion ); } + @Override public MIEnvironmentCD createMIEnvironmentCD( String pathdir ) { return new WinMIEnvironmentCD( getMIVersion(), pathdir ); } + @Override public CLIInfoSharedLibrary createCLIInfoSharedLibrary() { return new WinCLIInfoSharedLibrary(); } + @Override public MIGDBSetAutoSolib createMIGDBSetAutoSolib( boolean set ) { // Suppress "set auto-solib" - returns error on Windows return new MIGDBSetAutoSolib( getMIVersion(), true ) { + @Override public String getOperation() { return ""; //$NON-NLS-1$ } + @Override public String[] getOptions() { return new String[0]; } + @Override public String[] getParameters() { return new String[0]; } }; } + @Override public MIGDBShowSolibSearchPath createMIGDBShowSolibSearchPath() { // Suppress "show solib-search-path" - returns error on Windows return new MIGDBShowSolibSearchPath( getMIVersion() ) { + @Override public String getOperation() { return ""; //$NON-NLS-1$ } + @Override public String[] getOptions() { return new String[0]; } + @Override public String[] getParameters() { return new String[0]; } }; } + @Override public MIGDBSetSolibSearchPath createMIGDBSetSolibSearchPath( String[] params ) { // Suppress "set solib-search-path" - returns error on Windows return new MIGDBSetSolibSearchPath( getMIVersion(), params ) { + @Override public String getOperation() { return ""; //$NON-NLS-1$ } + @Override public String[] getOptions() { return new String[0]; } + @Override public String[] getParameters() { return new String[0]; } }; } + @Override public MIGDBSetNewConsole createMIGDBSetNewConsole() { // By default in Windows, turn off new console so that the // Ctrl-C's get propogated automatically to the inferior. diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibrary.java index 0025c734d1a..6ddf5a8119b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibrary.java @@ -23,6 +23,7 @@ public class WinCLIInfoSharedLibrary extends CLIInfoSharedLibrary { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.CLIInfoSharedLibrary#getMIInfo() */ + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibraryInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibraryInfo.java index 53ee5ef1802..b7b0c88d622 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibraryInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibraryInfo.java @@ -27,6 +27,7 @@ public class WinCLIInfoSharedLibraryInfo extends CLIInfoSharedLibraryInfo { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.output.CLIInfoSharedLibraryInfo#parseShared(java.lang.String, java.util.List) */ + @Override protected void parseShared( String str, List aList ) { // skip the header (DLL Name) if ( !str.startsWith( "DLL" ) ) { //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinMIEnvironmentCD.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinMIEnvironmentCD.java index b1bc4b04c7e..54e69eb9bc4 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinMIEnvironmentCD.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinMIEnvironmentCD.java @@ -24,6 +24,7 @@ public class WinMIEnvironmentCD extends MIEnvironmentCD { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.MICommand#parametersToString() */ + @Override protected String parametersToString() { String[] params = getParameters(); if ( params != null && params.length == 1 ) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIBreakpointHitEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIBreakpointHitEvent.java index 29c5339bb83..9f5cec3d5fb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIBreakpointHitEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIBreakpointHitEvent.java @@ -61,6 +61,7 @@ public class MIBreakpointHitEvent extends MIStoppedEvent { return frame; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("number=").append(bkptno).append('\n'); //$NON-NLS-1$ @@ -69,6 +70,7 @@ public class MIBreakpointHitEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIResult[] results = null; MIExecAsyncOutput exec = getMIExecAsyncOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java index 47f83bac5c7..208bccb1260 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java @@ -24,6 +24,7 @@ public class MIDetachedEvent extends MIDestroyedEvent { super(source, token); } + @Override public String toString() { return "Detached"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIErrorEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIErrorEvent.java index 2555e00cebf..15dadc0bbc6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIErrorEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIErrorEvent.java @@ -47,6 +47,7 @@ public class MIErrorEvent extends MIStoppedEvent { return log; } + @Override void parse () { MIResultRecord rr = getMIResultRecord(); if (rr != null) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java index 035cd3d9443..efbd854960f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java @@ -50,6 +50,7 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent { return returnType; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("gdb-result-var=" + gdbResult + "\n"); //$NON-NLS-1$//$NON-NLS-2$ @@ -63,6 +64,7 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIExecAsyncOutput exec = getMIExecAsyncOutput(); MIResultRecord rr = getMIResultRecord(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java index 906699ea0af..2d6dd79591d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java @@ -51,6 +51,7 @@ public class MIInferiorSignalExitEvent extends MIDestroyedEvent { return sigMeaning; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("signal-name=" + sigName + "\n"); //$NON-NLS-1$//$NON-NLS-2$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java index 79540d9a84c..d8d020df668 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java @@ -34,6 +34,7 @@ public class MILocationReachedEvent extends MIStoppedEvent { parse(); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("thread-id=").append(getThreadId()).append('\n'); //$NON-NLS-1$ @@ -44,6 +45,7 @@ public class MILocationReachedEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIResult[] results = null; MIExecAsyncOutput exec = getMIExecAsyncOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java index 545af972c1c..01240955dbc 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java @@ -40,6 +40,7 @@ public class MIRunningEvent extends MIEvent { return type; } + @Override public String toString() { return "Running"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java index 08d0c001343..6a1426e0411 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java @@ -46,6 +46,7 @@ public class MISignalEvent extends MIStoppedEvent { return sigMeaning; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("signal-name=" + sigName + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -58,6 +59,7 @@ public class MISignalEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIExecAsyncOutput exec = getMIExecAsyncOutput(); MIResultRecord rr = getMIResultRecord(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java index d2f0cf0a838..b586e027e72 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java @@ -35,6 +35,7 @@ public class MISteppingRangeEvent extends MIStoppedEvent { parse(); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("thread-id=").append(getThreadId()).append('\n'); //$NON-NLS-1$ @@ -45,6 +46,7 @@ public class MISteppingRangeEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIResult[] results = null; MIExecAsyncOutput exec = getMIExecAsyncOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java index dfaf6c300eb..9da7102d8f0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java @@ -41,6 +41,7 @@ public class MIWatchpointScopeEvent extends MIStoppedEvent { return number; } + @Override void parse() { MIExecAsyncOutput exec = getMIExecAsyncOutput(); MIResultRecord rr = getMIResultRecord(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java index 965e932dd8d..92c02219c21 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java @@ -57,6 +57,7 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent { } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("number=").append(number).append('\n'); //$NON-NLS-1$ @@ -71,6 +72,7 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse() { MIResult[] results = null; MIExecAsyncOutput exec = getMIExecAsyncOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIArg.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIArg.java index 60372a79ccc..734f26f4410 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIArg.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIArg.java @@ -124,6 +124,7 @@ public class MIArg { return arg; } + @Override public String toString() { return name + "=" + value; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsm.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsm.java index 945207797ba..45bb8ce8154 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsm.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsm.java @@ -40,6 +40,7 @@ public class MIAsm { return opcode + " " + args; //$NON-NLS-1$ } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append('{'); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java index 84782aab735..edb8f10c0b9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java @@ -49,6 +49,7 @@ public abstract class MIAsyncRecord extends MIOOBRecord { results = res; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); if (token != 0) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIConst.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIConst.java index bc32352adad..d23715e6829 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIConst.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIConst.java @@ -68,6 +68,7 @@ public class MIConst extends MIValue { return buffer.toString(); } + @Override public String toString() { return getCString(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataDisassembleInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataDisassembleInfo.java index 7fa24c8e119..0e151c12834 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataDisassembleInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataDisassembleInfo.java @@ -41,6 +41,7 @@ public class MIDataDisassembleInfo extends MIInfo { return src_asm; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("asm_insns=["); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java index 16af22cd4d2..7e0d4786519 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java @@ -57,6 +57,7 @@ public class MIFrame { return level; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("level=\"" + level + "\""); //$NON-NLS-1$//$NON-NLS-2$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfo.java index 036fc473ea9..8794ce70fb3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfo.java @@ -45,6 +45,7 @@ public class MIInfo { return isResultClass(MIResultRecord.EXIT); } + @Override public String toString() { if (miOutput != null) { return miOutput.toString(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIList.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIList.java index 566e17131c7..032a1091724 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIList.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIList.java @@ -37,6 +37,7 @@ public class MIList extends MIValue { values = vals; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append('['); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIOutput.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIOutput.java index c30ae6c6887..730e0570e96 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIOutput.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIOutput.java @@ -36,6 +36,7 @@ public class MIOutput { oobs = bands; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); for (int i = 0; i < oobs.length; i++) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIParser.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIParser.java index 507427c3944..ff5783d0eed 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIParser.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIParser.java @@ -547,6 +547,7 @@ public class MIParser { return buf.substring(start + pos, end + pos); } + @Override public String toString() { return buf.substring(pos, buf.length()); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIRegisterValue.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIRegisterValue.java index c29f548f6c4..72e25b208fe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIRegisterValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIRegisterValue.java @@ -35,6 +35,7 @@ public class MIRegisterValue { return value; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("number=\"").append(number).append('"'); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResult.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResult.java index 3e3fd974713..80a92be0e14 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResult.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResult.java @@ -33,6 +33,7 @@ public class MIResult { value = val; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append(variable); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResultRecord.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResultRecord.java index 9619f886908..46cf3a3774b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResultRecord.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResultRecord.java @@ -52,6 +52,7 @@ public class MIResultRecord { results = res; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append(token).append('^').append(resultClass); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MISrcAsm.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MISrcAsm.java index 37bb5e2b68b..51aff7e4ebe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MISrcAsm.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MISrcAsm.java @@ -37,6 +37,7 @@ public class MISrcAsm { return asm; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("src_and_asm_line={"); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIStreamRecord.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIStreamRecord.java index 2c8983fb454..38b198156d6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIStreamRecord.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIStreamRecord.java @@ -29,6 +29,7 @@ public abstract class MIStreamRecord extends MIOOBRecord { return MIConst.getString(getCString()); } + @Override public String toString() { if (this instanceof MIConsoleStreamOutput) { return "~\"" + cstring + "\"\n"; //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MITuple.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MITuple.java index e3b324decad..749ee553f2b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MITuple.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MITuple.java @@ -36,6 +36,7 @@ public class MITuple extends MIValue { values = vals; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append('{'); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java index c25f64844fd..060e6a7ccb9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java @@ -48,6 +48,7 @@ abstract public class AbstractGDBCDIDebugger implements ICDIDebugger2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICDIDebugger#createDebuggerSession(org.eclipse.debug.core.ILaunch, org.eclipse.cdt.core.IBinaryParser.IBinaryObject, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public ICDISession createDebuggerSession( ILaunch launch, IBinaryObject exe, IProgressMonitor monitor ) throws CoreException { return createSession( launch, exe.getPath().toFile(), monitor ); } @@ -55,6 +56,7 @@ abstract public class AbstractGDBCDIDebugger implements ICDIDebugger2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICDIDebugger2#createSession(org.eclipse.debug.core.ILaunch, java.io.File, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public ICDISession createSession( ILaunch launch, File executable, IProgressMonitor monitor ) throws CoreException { boolean failed = false; if ( monitor == null ) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIProcessAdapter.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIProcessAdapter.java index 4f521844e4b..0b017c6ce21 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIProcessAdapter.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIProcessAdapter.java @@ -32,6 +32,7 @@ public class CygwinMIProcessAdapter extends MIProcessAdapter { super(args, launchTimeout, monitor); } + @Override public void interrupt(MIInferior inferior) { if (fGDBProcess instanceof Spawner) { if (inferior.isRunning()) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java index cdebd9caeef..8c99933bbd5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java @@ -54,6 +54,7 @@ public class GDBCDIDebugger implements ICDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICDIDebugger#createDebuggerSession(org.eclipse.debug.core.ILaunch, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { fLaunch = launch; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java index b2575f5f71b..c58b5f482e3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java @@ -42,6 +42,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; */ public class GDBCDIDebugger2 extends AbstractGDBCDIDebugger { + @Override protected String[] getExtraArguments( ILaunchConfiguration config ) throws CoreException { String debugMode = config.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN ); if ( ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN.equals( debugMode ) ) @@ -66,6 +67,7 @@ public class GDBCDIDebugger2 extends AbstractGDBCDIDebugger { return new String[]{ getWorkingDirectory( config ), getCommandFile( config ), "-c", coreFile.toFile().getAbsolutePath() }; //$NON-NLS-1$ } + @Override protected CommandFactory getCommandFactory( ILaunchConfiguration config ) throws CoreException { String factoryID = MIPlugin.getCommandFactory( config ); CommandFactory factory = MIPlugin.getDefault().getCommandFactoryManager().getCommandFactory( factoryID ); @@ -102,6 +104,7 @@ public class GDBCDIDebugger2 extends AbstractGDBCDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.AbstractGDBCDIDebugger#doStartSession(org.eclipse.debug.core.ILaunch, org.eclipse.cdt.debug.mi.core.cdi.Session, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void doStartSession( ILaunch launch, Session session, IProgressMonitor monitor ) throws CoreException { ILaunchConfiguration config = launch.getLaunchConfiguration(); initializeLibraries( config, session ); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java index 24ff881dfb6..13039da7afe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java @@ -69,6 +69,7 @@ public class GDBDebugger implements ICDebugger { } } + @Override public ICDISession createLaunchSession(ILaunchConfiguration config, IFile exe) throws CDIException { Session session = null; boolean failed = false; @@ -102,6 +103,7 @@ public class GDBDebugger implements ICDebugger { } } + @Override public ICDISession createAttachSession(ILaunchConfiguration config, IFile exe, int pid) throws CDIException { Session session = null; boolean failed = false; @@ -135,6 +137,7 @@ public class GDBDebugger implements ICDebugger { } } + @Override public ICDISession createCoreSession(ILaunchConfiguration config, IFile exe, IPath corefile) throws CDIException { Session session = null; boolean failed = false; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java index 979ec8523cd..63ed50f0cf7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java @@ -33,6 +33,7 @@ public class GDBServerCDIDebugger extends GDBCDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createLaunchSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public Session createLaunchSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { Session session = null; @@ -102,6 +103,7 @@ public class GDBServerCDIDebugger extends GDBCDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createAttachSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public Session createAttachSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { String msg = MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_attaching_unsupported"); //$NON-NLS-1$ @@ -111,6 +113,7 @@ public class GDBServerCDIDebugger extends GDBCDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createCoreSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public Session createCoreSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { String msg = MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_corefiles_unsupported"); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger2.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger2.java index ed1d41f0360..e61fd0031f8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger2.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger2.java @@ -32,6 +32,7 @@ public class GDBServerCDIDebugger2 extends GDBCDIDebugger2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger2#doStartSession(org.eclipse.debug.core.ILaunch, org.eclipse.cdt.debug.mi.core.cdi.Session, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void doStartSession( ILaunch launch, Session session, IProgressMonitor monitor ) throws CoreException { ILaunchConfiguration config = launch.getLaunchConfiguration(); initializeLibraries( config, session ); @@ -129,6 +130,7 @@ public class GDBServerCDIDebugger2 extends GDBCDIDebugger2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.AbstractGDBCDIDebugger#usePty(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override protected boolean usePty( ILaunchConfiguration config ) throws CoreException { return false; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java index b68ac359a5e..4654741bd85 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java @@ -59,6 +59,7 @@ public class GDBServerDebugger implements ICDebugger { } } + @Override public ICDISession createLaunchSession(ILaunchConfiguration config, IFile exe) throws CDIException { Session session = null; boolean failed = false; @@ -125,10 +126,12 @@ public class GDBServerDebugger implements ICDebugger { } } + @Override public ICDISession createAttachSession(ILaunchConfiguration config, IFile exe, int pid) throws CDIException { throw new CDIException(MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_attaching_unsupported")); //$NON-NLS-1$ } + @Override public ICDISession createCoreSession(ILaunchConfiguration config, IFile exe, IPath corefile) throws CDIException { throw new CDIException(MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_corefiles_unsupported")); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java index 42297d1a7bf..a9cbffc7dc7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java @@ -116,6 +116,7 @@ public class MIPlugin extends Plugin { * * @deprecated */ + @Deprecated public MISession createMISession(MIProcess process, IMITTY pty, int timeout, int type, int launchTimeout, String miVersion, IProgressMonitor monitor) throws MIException { return new MISession(process, pty, type, timeout, launchTimeout, miVersion, monitor); } @@ -130,6 +131,7 @@ public class MIPlugin extends Plugin { * * @deprecated */ + @Deprecated public MISession createMISession(MIProcess process, IMITTY pty, int type, String miVersion, IProgressMonitor monitor) throws MIException { MIPlugin miPlugin = getDefault(); Preferences prefs = miPlugin.getPluginPreferences(); @@ -151,6 +153,7 @@ public class MIPlugin extends Plugin { * * @deprecated use <code>createSession</code> */ + @Deprecated public Session createCSession(String gdb, String miVersion, File program, File cwd, String gdbinit, IProgressMonitor monitor) throws IOException, MIException { IMITTY pty = null; boolean failed = false; @@ -198,6 +201,7 @@ public class MIPlugin extends Plugin { * * @deprecated use <code>createSession</code> */ + @Deprecated public Session createCSession(String gdb, String miVersion, File program, File cwd, String gdbinit, IMITTY pty, IProgressMonitor monitor) throws IOException, MIException { if (gdb == null || gdb.length() == 0) { gdb = GDB; @@ -273,6 +277,7 @@ public class MIPlugin extends Plugin { * * @deprecated use <code>createSession</code> */ + @Deprecated public Session createCSession(String gdb, String miVersion, File program, File core, File cwd, String gdbinit, IProgressMonitor monitor) throws IOException, MIException { if (gdb == null || gdb.length() == 0) { gdb = GDB; @@ -324,6 +329,7 @@ public class MIPlugin extends Plugin { * * @deprecated use <code>createSession</code> */ + @Deprecated public Session createCSession(String gdb, String miVersion, File program, int pid, String[] targetParams, File cwd, String gdbinit, IProgressMonitor monitor) throws IOException, MIException { if (gdb == null || gdb.length() == 0) { gdb = GDB; @@ -542,6 +548,7 @@ public class MIPlugin extends Plugin { /* (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#startup() */ + @Override public void start(BundleContext context) throws Exception { super.start(context); ICDebugConfiguration dc = CDebugCorePlugin.getDefault().getDefaultDefaultDebugConfiguration(); @@ -553,6 +560,7 @@ public class MIPlugin extends Plugin { /* (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#shutdown() */ + @Override public void stop(BundleContext context) throws Exception { savePluginPreferences(); super.stop(context); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java index 0358cafc36f..f228011d53c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java @@ -24,6 +24,7 @@ public class MIPreferenceInitializer extends AbstractPreferenceInitializer { /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { MIPlugin.getDefault().getPluginPreferences().setDefault(IMIConstants.PREF_REQUEST_TIMEOUT, IMIConstants.DEF_REQUEST_TIMEOUT); MIPlugin.getDefault().getPluginPreferences().setDefault(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT, IMIConstants.DEF_REQUEST_LAUNCH_TIMEOUT); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIProcessAdapter.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIProcessAdapter.java index f504ba5b5eb..15e4b0c66c5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIProcessAdapter.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIProcessAdapter.java @@ -50,6 +50,7 @@ public class MIProcessAdapter implements MIProcess { protected Process getGDBProcess(String[] args, int launchTimeout, IProgressMonitor monitor) throws IOException { final Process pgdb = createGDBProcess(args); Thread syncStartup = new Thread("GDB Start") { //$NON-NLS-1$ + @Override public void run() { try { PushbackInputStream pb = new PushbackInputStream(pgdb.getInputStream()); @@ -115,10 +116,12 @@ public class MIProcessAdapter implements MIProcess { return ProcessFactory.getFactory().exec(args); } + @Override public boolean canInterrupt(MIInferior inferior) { return fGDBProcess instanceof Spawner; } + @Override public void interrupt(MIInferior inferior) { if (fGDBProcess instanceof Spawner) { if (inferior.isRunning()) { @@ -163,14 +166,17 @@ public class MIProcessAdapter implements MIProcess { } } + @Override public int exitValue() { return fGDBProcess.exitValue(); } + @Override public int waitFor() throws InterruptedException { return fGDBProcess.waitFor(); } + @Override public void destroy() { // We are responsible for closing the streams we have used or else // we will leak pipes. @@ -188,14 +194,17 @@ public class MIProcessAdapter implements MIProcess { fGDBProcess.destroy(); } + @Override public InputStream getErrorStream() { return fGDBProcess.getErrorStream(); } + @Override public InputStream getInputStream() { return gdbInputStream; } + @Override public OutputStream getOutputStream() { return fGDBProcess.getOutputStream(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MITTYAdapter.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MITTYAdapter.java index e632e659c32..79b6bb44f49 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MITTYAdapter.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MITTYAdapter.java @@ -31,6 +31,7 @@ public class MITTYAdapter implements IMITTY { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.IMITTY#getSlaveName() */ + @Override public String getSlaveName() { return fPty.getSlaveName(); } @@ -38,6 +39,7 @@ public class MITTYAdapter implements IMITTY { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.IMITTY#getOutputStream() */ + @Override public OutputStream getOutputStream() { return fPty.getOutputStream(); } @@ -45,6 +47,7 @@ public class MITTYAdapter implements IMITTY { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.IMITTY#getInputStream() */ + @Override public InputStream getInputStream() { return fPty.getInputStream(); } |