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.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.core')
111 files changed, 798 insertions, 24 deletions
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/CDIException.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/CDIException.java index bbfbddbe95b..9ca1728391f 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/CDIException.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/CDIException.java @@ -49,6 +49,7 @@ public class CDIException extends Exception { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { return super.toString() + '['+ getDetailMessage() + ']'; } diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java index 2f7bc42134b..ba542945ee2 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java @@ -32,22 +32,27 @@ import org.eclipse.cdt.debug.core.model.ICBreakpointType; */ public interface ICDIBreakpoint extends ICDIObject { /** @deprecated use ICBreakpointTyped.REGULAR */ + @Deprecated final static public int REGULAR = ICBreakpointType.REGULAR; /** @deprecated use ICBreakpointTyped.TEMPORARY */ + @Deprecated final static public int TEMPORARY = ICBreakpointType.TEMPORARY; /** @deprecated use ICBreakpointTyped.HARDWARE */ + @Deprecated final static public int HARDWARE = ICBreakpointType.HARDWARE; /** * @return whether this breakpoint is temporary * @deprecated by {@link ICDIBreakpoint2#getType()} */ + @Deprecated boolean isTemporary(); /** * @return whether this breakpoint is hardware-assisted * @deprecated by {@link ICDIBreakpoint2#getType()} */ + @Deprecated boolean isHardware(); /** diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemorySpaceManagement.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemorySpaceManagement.java index e7b0102194b..e209f8fca0c 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemorySpaceManagement.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemorySpaceManagement.java @@ -34,6 +34,7 @@ public interface ICDIMemorySpaceManagement extends ICDIObject { * @return the encoded string representation of the address or null * @deprecated CDI clients should implement ICDIMemorySpaceEncoder */ + @Deprecated String addressToString(BigInteger address, String memorySpaceID); /** @@ -54,6 +55,7 @@ public interface ICDIMemorySpaceManagement extends ICDIObject { * if string is not in the expected format * @deprecated CDI clients should implement ICDIMemorySpaceEncoder */ + @Deprecated BigInteger stringToAddress(String str, StringBuffer memorySpaceID_out) throws CDIException; /** diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java index baf316edd20..e9d976ad4e1 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java @@ -155,6 +155,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, * @deprecated * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void resume() throws CDIException; /** @@ -164,6 +165,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, * @see #stepOver(int) * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void stepOver() throws CDIException; /** @@ -173,6 +175,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, * @see #stepInto(int) * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void stepInto() throws CDIException; /** @@ -182,6 +185,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, * @see stepOverInstruction(int) * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void stepOverInstruction() throws CDIException; /** @@ -191,6 +195,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, * @see #stepIntoInstruction(int) * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void stepIntoInstruction() throws CDIException; /** @@ -200,6 +205,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, * @see #stepUntil(ICDILocation) * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void runUntil(ICDILocation location) throws CDIException; /** @@ -209,6 +215,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, * @see #resume(ICDLocation) * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void jump(ICDILocation location) throws CDIException; /** @@ -217,6 +224,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, * @deprecated * @throws CDIException */ + @Deprecated void signal() throws CDIException; /** @@ -227,6 +235,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, * @param signal * @throws CDIException */ + @Deprecated void signal(ICDISignal signal) throws CDIException; /** diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java index 936fbeb5706..dfb2061afef 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java @@ -80,6 +80,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @deprecated * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void resume() throws CDIException; /** @@ -88,6 +89,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @deprecated * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void stepOver() throws CDIException; /** @@ -96,6 +98,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @deprecated * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void stepInto() throws CDIException; /** @@ -104,6 +107,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @deprecated * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void stepOverInstruction() throws CDIException; /** @@ -112,6 +116,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @deprecated * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void stepIntoInstruction() throws CDIException; /** @@ -122,6 +127,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @see ICDIStackFrame.stepReturn() * @throws CDIException */ + @Deprecated void stepReturn() throws CDIException; /** @@ -131,6 +137,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @see #stepUntil(ICDILocation) * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void runUntil(ICDILocation location) throws CDIException; /** @@ -140,6 +147,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @see #resume(ICDILocation) * @throws CDIException if this method fails. Reasons include: */ + @Deprecated void jump(ICDILocation location) throws CDIException; /** @@ -149,6 +157,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @see #resume(boolean) * @throws CDIException */ + @Deprecated void signal() throws CDIException; /** @@ -159,6 +168,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp * @param signal * @throws CDIException */ + @Deprecated void signal(ICDISignal signal) throws CDIException; /** diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java index 6961023eae1..1d445fade22 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java @@ -101,6 +101,7 @@ public class CDIDebugModel { final IDebugTarget[] target = new IDebugTarget[1]; IWorkspaceRunnable r = new IWorkspaceRunnable() { + @Override public void run( IProgressMonitor m ) throws CoreException { target[0] = new CDebugTarget( launch, project, cdiTarget, name, debuggeeProcess, file, allowTerminate, allowDisconnect ); ((CDebugTarget)target[0]).start( stopSymbol, resumeTarget ); @@ -139,6 +140,7 @@ public class CDIDebugModel { final IDebugTarget[] target = new IDebugTarget[1]; IWorkspaceRunnable r = new IWorkspaceRunnable() { + @Override public void run( IProgressMonitor m ) throws CoreException { String stopSymbol = null; if ( stopInMain ) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger.java index eab67849c5c..17feefc9165 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger.java @@ -19,11 +19,13 @@ import org.eclipse.debug.core.ILaunch; /** * @deprecated use <code>ICDIDebugger2</code>. */ +@Deprecated public interface ICDIDebugger { /** * @deprecated use <code>createSession</code> of <code>ICDIDebugger2</code> */ + @Deprecated public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java index 6ba9ea2a385..7daa69733b6 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java @@ -157,6 +157,7 @@ public interface ICDTLaunchConfigurationConstants { * is launched. * @deprecated - see ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES */ + @Deprecated public static final String ATTR_PROGRAM_ENVIROMENT_INHERIT = CDT_LAUNCH_ID + ".ENVIRONMENT_INHERIT"; //$NON-NLS-1$ /** @@ -165,6 +166,7 @@ public interface ICDTLaunchConfigurationConstants { * * @deprecated - see ILaunchManager.ATTR_ENVIRONMENT_VARIABLES */ + @Deprecated public static final String ATTR_PROGRAM_ENVIROMENT_MAP = CDT_LAUNCH_ID + ".ENVIRONMENT_MAP"; //$NON-NLS-1$ /** @@ -254,6 +256,7 @@ public interface ICDTLaunchConfigurationConstants { * use. For now only "mi", "mi1", "m2", "mi3" are supported. * @deprecated */ + @Deprecated public static final String ATTR_DEBUGGER_PROTOCOL = CDT_LAUNCH_ID + ".protocol"; //$NON-NLS-1$ /** diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConfiguration.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConfiguration.java index 806e74e9403..b7f24329eb4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConfiguration.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConfiguration.java @@ -20,6 +20,7 @@ public interface ICDebugConfiguration { * @throws CoreException * @deprecated */ + @Deprecated ICDebugger getDebugger() throws CoreException; ICDIDebugger createDebugger() throws CoreException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugger.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugger.java index ff9a79f1fb1..30b5ed50c60 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugger.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugger.java @@ -20,6 +20,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; * * @deprecated - see ICDIDebugger */ +@Deprecated public interface ICDebugger { public ICDISession createLaunchSession(ILaunchConfiguration config, IFile exe) throws CDIException ; public ICDISession createAttachSession(ILaunchConfiguration config, IFile exe, int pid) throws CDIException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/AbstractBreakpointAction.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/AbstractBreakpointAction.java index a75f327f8c7..b0ea9b5bd9d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/AbstractBreakpointAction.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/AbstractBreakpointAction.java @@ -16,10 +16,12 @@ public abstract class AbstractBreakpointAction extends PlatformObject implements private String actionName; + @Override public String getName() { return actionName; } + @Override public void setName(String name) { actionName = name; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionAdapterFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionAdapterFactory.java index 61ff2caf764..1d27bf90c83 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionAdapterFactory.java @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IAdapterFactory; public class BreakpointActionAdapterFactory implements IAdapterFactory { + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if (adapterType.equals(ILogActionEnabler.class)) { if (adaptableObject instanceof CThread) { @@ -29,6 +30,7 @@ public class BreakpointActionAdapterFactory implements IAdapterFactory { return null; } + @Override public Class[] getAdapterList() { return new Class[] { ILogActionEnabler.class, IResumeActionEnabler.class, }; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java index 50532cfe732..a21157dcaff 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java @@ -106,6 +106,7 @@ public class BreakpointActionManager { final String[] actions = actionNames.split(","); //$NON-NLS-1$ if (actions.length > 0){ Job job = new Job("Execute breakpoint actions") { + @Override public IStatus run(final IProgressMonitor monitor) { return doExecuteActions(breakpoint, context, actions, monitor); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/LogActionEnabler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/LogActionEnabler.java index 05aa75e2c51..9cdab443877 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/LogActionEnabler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/LogActionEnabler.java @@ -23,6 +23,7 @@ public class LogActionEnabler implements ILogActionEnabler { this.thread = thread; } + @Override public String evaluateExpression(String expression) throws Exception { List frames = thread.computeStackFrames(); CStackFrame frame = (CStackFrame) frames.get(0); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ResumeActionEnabler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ResumeActionEnabler.java index d5e2860c0bd..2e823cbd767 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ResumeActionEnabler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ResumeActionEnabler.java @@ -20,6 +20,7 @@ public class ResumeActionEnabler implements IResumeActionEnabler { thread = adaptableObject; } + @Override public void resume() throws Exception { thread.resume(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CCommandAdapterFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CCommandAdapterFactory.java index 5c0f666f6bd..c57c652c646 100755 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CCommandAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CCommandAdapterFactory.java @@ -29,6 +29,7 @@ public class CCommandAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if (IRestartHandler.class.equals(adapterType)) { if (adaptableObject instanceof IRestart) { @@ -41,6 +42,7 @@ public class CCommandAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override public Class[] getAdapterList() { return new Class[] { IRestartHandler.class diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CForEachCommand.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CForEachCommand.java index c2f3abfe277..7d7d58b6631 100755 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CForEachCommand.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CForEachCommand.java @@ -29,6 +29,7 @@ public abstract class CForEachCommand extends AbstractDebugCommand { /* (non-Javadoc) * @see org.eclipse.debug.internal.core.commands.DebugCommand#doExecute(java.lang.Object[], org.eclipse.core.runtime.IProgressMonitor, org.eclipse.debug.core.IRequest) */ + @Override protected void doExecute(Object[] targets, IProgressMonitor monitor, IRequest request) throws CoreException { for (int i = 0; i < targets.length; i++) { execute(targets[i]); @@ -41,6 +42,7 @@ public abstract class CForEachCommand extends AbstractDebugCommand { /* (non-Javadoc) * @see org.eclipse.debug.internal.core.commands.DebugCommand#isExecutable(java.lang.Object[], org.eclipse.core.runtime.IProgressMonitor, org.eclipse.debug.core.commands.IEnabledStateRequest) */ + @Override protected boolean isExecutable(Object[] targets, IProgressMonitor monitor, IEnabledStateRequest request) throws CoreException { for (int i = 0; i < targets.length; i++) { if (!isExecutable(targets[i])) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/RestartCommand.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/RestartCommand.java index feef3bafd2d..1f29109c836 100755 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/RestartCommand.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/RestartCommand.java @@ -23,14 +23,17 @@ import org.eclipse.debug.core.commands.IRestartHandler; */ public class RestartCommand extends CForEachCommand implements IRestartHandler { + @Override protected Object getTarget(Object element) { return getAdapter(element, IRestart.class); } + @Override protected void execute(Object target) throws CoreException { ((IRestart)target).restart(); } + @Override protected boolean isExecutable(Object target) { return ((IRestart)target).canRestart(); } @@ -38,6 +41,7 @@ public class RestartCommand extends CForEachCommand implements IRestartHandler { /* (non-Javadoc) * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest) */ + @Override protected Object getEnabledStateJobFamily(IDebugCommandRequest request) { return IRestart.class; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java index d28e79ee272..8deb41cf228 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java @@ -295,10 +295,15 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr // flush those caches when applicable locators change. CDebugCorePlugin.getDefault().getCommonSourceLookupDirector().addParticipants(new ISourceLookupParticipant[] { new ISourceLookupParticipant(){ + @Override public void init(ISourceLookupDirector director) {} + @Override public Object[] findSourceElements(Object object) { return new Object[0]; } + @Override public String getSourceName(Object object) throws CoreException { return ""; } //$NON-NLS-1$ + @Override public void dispose() {} + @Override public void sourceContainersChanged(ISourceLookupDirector director) { // Unfortunately, it would be extremely difficult/costly to // determine which binaries are effected by the source locator @@ -311,6 +316,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr // into play when an Executable looks for a source file locally. So, // listen for changes in those locators, too. DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(new ILaunchConfigurationListener() { + @Override public void launchConfigurationChanged(ILaunchConfiguration configuration) { // Expect lots of noise for working copies. We only care about // changes to actual configs @@ -336,7 +342,9 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr // with so we can flush only that Executable flushExecutablesSourceMappings(); } + @Override public void launchConfigurationRemoved(ILaunchConfiguration configuration) { configAddedOrRemoved(configuration); } + @Override public void launchConfigurationAdded(ILaunchConfiguration configuration) { configAddedOrRemoved(configuration); } private void configAddedOrRemoved(ILaunchConfiguration configuration) { // Expect lots of noise for working copies. We only care about @@ -478,6 +486,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr synchronized (executableImporters) { Collections.sort(executableImporters, new Comparator<IExecutableImporter>() { + @Override public int compare(IExecutableImporter arg0, IExecutableImporter arg1) { int p0 = arg0.getPriority(fileNames); int p1 = arg1.getPriority(fileNames); @@ -533,6 +542,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr synchronized (sourceFileProviders) { Collections.sort(sourceFileProviders, new Comparator<ISourceFilesProvider>() { + @Override public int compare(ISourceFilesProvider arg0, ISourceFilesProvider arg1) { int p0 = arg0.getPriority(executable); int p1 = arg1.getPriority(executable); @@ -621,12 +631,14 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * @deprecated we no longer listen directly for platform resource changes * but rather C model changes */ + @Override @Deprecated public void resourceChanged(IResourceChangeEvent event) {} /** * @since 7.0 */ + @Override public void handleEvent(CProjectDescriptionEvent event) { if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, event); @@ -862,6 +874,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * * @since 7.1 */ + @Override public void elementChanged(ElementChangedEvent event) { if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null); if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "event = \n" + event); // must be done separately because of traceEntry() limitation //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java index 52903c09f88..2f6fcc74b2d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java @@ -47,10 +47,12 @@ public class StandardExecutableProvider implements IProjectExecutablesProvider { supportedNatureIds.add(CCProjectNature.CC_NATURE_ID); } + @Override public List<String> getProjectNatures() { return supportedNatureIds; } + @Override public List<Executable> getExecutables(IProject project, IProgressMonitor monitor) { List<Executable> executables = new ArrayList<Executable>(); @@ -122,6 +124,7 @@ public class StandardExecutableProvider implements IProjectExecutablesProvider { return executables; } + @Override public IStatus removeExecutable(Executable executable, IProgressMonitor monitor) { IResource exeResource = executable.getResource(); if (exeResource != null) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CDebugElementState.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CDebugElementState.java index 8abeaafd85b..7cfd9240eb9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CDebugElementState.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CDebugElementState.java @@ -21,6 +21,7 @@ public class CDebugElementState { this.fName = name; } + @Override public String toString() { return this.fName; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CVariableFormat.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CVariableFormat.java index 6bdb9198140..d4c26a6f4cd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CVariableFormat.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CVariableFormat.java @@ -23,6 +23,7 @@ public class CVariableFormat { this.fNum= num; } + @Override public String toString() { return this.fName; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTarget.java index 612711cf98e..0d7439950f1 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTarget.java @@ -32,6 +32,7 @@ public interface ICDebugTarget extends IDebugTarget, * * @return whether this target is little endian */ + @Override public boolean isLittleEndian(); /** diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/AbsolutePathSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/AbsolutePathSourceContainer.java index 3102863ced6..b24d3095cdd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/AbsolutePathSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/AbsolutePathSourceContainer.java @@ -35,6 +35,7 @@ public class AbsolutePathSourceContainer extends AbstractSourceContainer { return file.isAbsolute() && file.exists() && file.isFile(); } + @Override public Object[] findSourceElements(String name) throws CoreException { if (name != null) { File file = new File(name); @@ -45,6 +46,7 @@ public class AbsolutePathSourceContainer extends AbstractSourceContainer { return new Object[0]; } + @Override public String getName() { return SourceLookupMessages.AbsolutePathSourceContainer_0; } @@ -52,6 +54,7 @@ public class AbsolutePathSourceContainer extends AbstractSourceContainer { /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() */ + @Override public ISourceContainerType getType() { return getSourceContainerType(TYPE_ID); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/CProjectSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/CProjectSourceContainer.java index ea6e02f5cef..38f9de6d2c3 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/CProjectSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/CProjectSourceContainer.java @@ -111,6 +111,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer { /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) */ + @Override public Object[] findSourceElements(String name) throws CoreException { if (fProject == null) return EMPTY; @@ -174,6 +175,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer { /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName() */ + @Override public String getName() { return fProject != null ? fProject.getName() : InternalSourceLookupMessages.CProjectSourceContainer_0; } @@ -181,6 +183,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj != null && obj instanceof CProjectSourceContainer) { CProjectSourceContainer loc = (CProjectSourceContainer) obj; @@ -192,10 +195,12 @@ public class CProjectSourceContainer extends CompositeSourceContainer { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return TYPE_ID.hashCode() * 31 + (fProject == null ? 0 : fProject.hashCode()); } + @Override public boolean isComposite() { return true; } @@ -203,6 +208,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer { /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers() */ + @Override protected ISourceContainer[] createSourceContainers() throws CoreException { if (fProject != null && fProject.isOpen()) { if (isSearchReferencedProjects()) { @@ -263,6 +269,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer { return fSearchReferencedProjects; } + @Override public ISourceContainerType getType() { return getSourceContainerType(TYPE_ID); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java index 518d1bbd6f9..e0fc94fb615 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java @@ -52,6 +52,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() */ + @Override public String getName() { return fName; } @@ -59,6 +60,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() */ + @Override public ISourceContainerType getType() { return getSourceContainerType(TYPE_ID); } @@ -66,6 +68,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#isComposite() */ + @Override public boolean isComposite() { return !fContainers.isEmpty(); } @@ -73,6 +76,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) */ + @Override public Object[] findSourceElements(String name) throws CoreException { return findSourceElements(name, getSourceContainers()); } @@ -128,6 +132,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer#getSourceContainers() */ + @Override public ISourceContainer[] getSourceContainers() throws CoreException { return fContainers.toArray(new MapEntrySourceContainer[fContainers.size()]); } @@ -159,6 +164,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#dispose() */ + @Override public void dispose() { super.dispose(); Iterator<MapEntrySourceContainer> it = fContainers.iterator(); @@ -184,6 +190,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I /* (non-Javadoc) * @see IMappingSourceContainer#getCompilationPath(String) */ + @Override public IPath getCompilationPath(String sourceName) { IPath path = new Path(sourceName); IPath result = null; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java index db35ef8bd3a..b8d9889ac1d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java @@ -81,6 +81,7 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ * * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) */ + @Override public Object[] findSourceElements(String sourceName) throws CoreException { if (sourceName == null) { return new Object[0]; @@ -115,6 +116,7 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() */ + @Override public String getName() { return SourceLookupMessages.ProgramRelativePathSourceContainer_0; } @@ -122,6 +124,7 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() */ + @Override public ISourceContainerType getType() { return getSourceContainerType(TYPE_ID); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java index 9646c7b77ab..31a2c068ea3 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java @@ -289,6 +289,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[]) */ + @Override public void breakpointsAdded( IBreakpoint[] breakpoints ) { if ( !isTargetAvailable() ) return; @@ -298,6 +299,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsRemoved( IBreakpoint[] breakpoints, IMarkerDelta[] deltas ) { if ( !isTargetAvailable() ) return; @@ -327,6 +329,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana final ICDIBreakpoint[] cdiBreakpoints = (ICDIBreakpoint[])list.toArray( new ICDIBreakpoint[list.size()] ); final ICDITarget cdiTarget = getCDITarget(); DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { try { cdiTarget.deleteBreakpoints( cdiBreakpoints ); @@ -340,6 +343,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) */ + @Override public void breakpointsChanged( IBreakpoint[] breakpoints, IMarkerDelta[] deltas ) { ArrayList removeList = new ArrayList( breakpoints.length ); ArrayList installList = new ArrayList( breakpoints.length ); @@ -373,10 +377,12 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana } } + @Override public void breakpointManagerEnablementChanged( boolean enabled ) { doSkipBreakpoints( !enabled ); } + @Override public void handleDebugEvents( ICDIEvent[] events ) { for( int i = 0; i < events.length; i++ ) { ICDIEvent event = events[i]; @@ -410,6 +416,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana } } + @Override public Object getAdapter( Class adapter ) { if ( CBreakpointManager.class.equals( adapter ) ) return this; @@ -816,6 +823,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana } DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { try { cdiTarget.deleteBreakpoints( cdiBreakpoints ); @@ -845,6 +853,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana final ICBreakpoint[] bkpts = register( breakpoints ); if ( bkpts.length > 0 ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { setBreakpointsOnTarget0( bkpts ); } @@ -1230,6 +1239,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana private void changeBreakpointPropertiesOnTarget( final ICDIBreakpoint breakpoint, final Boolean enabled, final ICDICondition condition ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { if ( enabled != null ) { try { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointNotifier.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointNotifier.java index 5f6b90cd17f..b6ada09c8be 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointNotifier.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointNotifier.java @@ -33,6 +33,7 @@ public class CBreakpointNotifier implements ICBreakpointListener { * @see org.eclipse.cdt.debug.core.ICBreakpointListener#installingBreakpoint(org.eclipse.debug.core.model.IDebugTarget, * org.eclipse.debug.core.model.IBreakpoint) */ + @Override public boolean installingBreakpoint( IDebugTarget target, IBreakpoint breakpoint ) { boolean result = true; Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners(); @@ -49,6 +50,7 @@ public class CBreakpointNotifier implements ICBreakpointListener { * @see org.eclipse.cdt.debug.core.ICBreakpointListener#breakpointInstalled(org.eclipse.debug.core.model.IDebugTarget, * org.eclipse.debug.core.model.IBreakpoint) */ + @Override public void breakpointInstalled( IDebugTarget target, IBreakpoint breakpoint ) { Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners(); for( int i = 0; i < listeners.length; ++i ) @@ -61,6 +63,7 @@ public class CBreakpointNotifier implements ICBreakpointListener { * @see org.eclipse.cdt.debug.core.ICBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IDebugTarget, * org.eclipse.debug.core.model.IBreakpoint) */ + @Override public void breakpointChanged( IDebugTarget target, IBreakpoint breakpoint, Map attributes ) { Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners(); for( int i = 0; i < listeners.length; ++i ) @@ -73,6 +76,7 @@ public class CBreakpointNotifier implements ICBreakpointListener { * @see org.eclipse.cdt.debug.core.ICBreakpointListener#breakpointsRemoved(org.eclipse.debug.core.model.IDebugTarget, * org.eclipse.debug.core.model.IBreakpoint[]) */ + @Override public void breakpointsRemoved( IDebugTarget target, IBreakpoint[] breakpoints ) { Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners(); for( int i = 0; i < listeners.length; ++i ) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java index d589031e42d..84210cd7e73 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java @@ -55,6 +55,7 @@ public class CDebugAdapter implements ICDIDebugger { * org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, * org.eclipse.core.runtime.IProgressMonitor) */ + @Override public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { ILaunchConfiguration config = launch.getLaunchConfiguration(); if (exe == null) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugCorePreferenceInitializer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugCorePreferenceInitializer.java index 66757298b1a..a5d67555f1c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugCorePreferenceInitializer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugCorePreferenceInitializer.java @@ -31,6 +31,7 @@ public class CDebugCorePreferenceInitializer extends AbstractPreferenceInitializ /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { CDebugCorePlugin.getDefault().getPluginPreferences().setDefault( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS, ICDebugConstants.DEF_NUMBER_OF_INSTRUCTIONS ); CDebugCorePlugin.getDefault().getPluginPreferences().setDefault( ICDebugConstants.PREF_DEFAULT_VARIABLE_FORMAT, ICDIFormat.NATURAL ); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDisassemblyContextProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDisassemblyContextProvider.java index 52e844847b9..82286a083f0 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDisassemblyContextProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDisassemblyContextProvider.java @@ -25,7 +25,8 @@ public class CDisassemblyContextProvider implements IDisassemblyContextProvider /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextProvider#getDisassemblyContext(java.lang.Object) */ - public Object getDisassemblyContext( Object element ) { + @Override + public Object getDisassemblyContext( Object element ) { if ( element instanceof ICDebugElement ) { IDebugTarget target = ((ICDebugElement)element).getDebugTarget(); return ((CDebugTarget)target).getDisassemblyRetrieval(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CGlobalVariableManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CGlobalVariableManager.java index a2e56b1f6b2..90b66d19ef8 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CGlobalVariableManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CGlobalVariableManager.java @@ -98,6 +98,7 @@ public class CGlobalVariableManager implements ICGlobalVariableManager { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#addGlobals(IGlobalVariableDescriptor[]) */ + @Override public void addGlobals( IGlobalVariableDescriptor[] descriptors ) throws DebugException { fGlobals = new ArrayList<ICGlobalVariable>( 10 ); MultiStatus ms = new MultiStatus( CDebugCorePlugin.getUniqueIdentifier(), 0, "", null ); //$NON-NLS-1$ @@ -124,6 +125,7 @@ public class CGlobalVariableManager implements ICGlobalVariableManager { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#removeGlobals(ICGlobalVariable[]) */ + @Override public void removeGlobals( ICGlobalVariable[] globals ) { synchronized( fGlobals ) { fGlobals.removeAll( Arrays.asList( globals ) ); @@ -138,6 +140,7 @@ public class CGlobalVariableManager implements ICGlobalVariableManager { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#removeAllGlobals() */ + @Override public void removeAllGlobals() { if (fGlobals == null ) { return; @@ -278,6 +281,7 @@ public class CGlobalVariableManager implements ICGlobalVariableManager { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#getDescriptors() */ + @Override public IGlobalVariableDescriptor[] getDescriptors() { if ( fGlobals == null ) return getInitialDescriptors(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryBlockRetrievalExtension.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryBlockRetrievalExtension.java index f21a429d8a0..ed2eeb10f73 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryBlockRetrievalExtension.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryBlockRetrievalExtension.java @@ -221,6 +221,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtensionRetrieval#getExtendedMemoryBlock(java.lang.String, org.eclipse.debug.core.model.IDebugElement) */ + @Override public IMemoryBlockExtension getExtendedMemoryBlock( String expression, Object selected ) throws DebugException { return getMemoryBlock(expression, selected, null); } @@ -228,6 +229,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#getExtendedMemoryBlock(java.lang.String, java.lang.Object, java.lang.String) */ + @Override public IMemorySpaceAwareMemoryBlock getMemoryBlock( String expression, Object selected, String memorySpaceID ) throws DebugException { String address = null; CExpression exp = null; @@ -305,6 +307,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval() */ + @Override public boolean supportsStorageRetrieval() { return true; } @@ -312,6 +315,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long) */ + @Override public IMemoryBlock getMemoryBlock( long startAddress, long length ) throws DebugException { String expression = Long.toHexString(startAddress); BigInteger address = new BigInteger(expression, 16); @@ -372,6 +376,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM /** * @see org.eclipse.cdt.debug.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#getMemorySpaces(java.lang.Object, org.eclipse.cdt.debug.internal.core.model.provisional.IRequestListener) */ + @Override public void getMemorySpaces(final Object context, GetMemorySpacesRequest request) { // We're not very asynchronous in CDI. DSF is another story. Also, note // that we ignore the context. That's because we know that there's only @@ -411,6 +416,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#encodeAddress(java.math.BigInteger, java.lang.String) */ + @Override public String encodeAddress(final String expression, final String memorySpaceID) { // See if the CDI client provides customized encoding/decoding if (fDebugTarget != null) { @@ -441,7 +447,9 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM final String expression = str.substring(index+1); return new DecodeResult() { + @Override public String getMemorySpaceId() { return memorySpaceID; } + @Override public String getExpression() { return expression; } }; } @@ -449,6 +457,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#decodeAddress(java.lang.String, java.lang.StringBuffer) */ + @Override public DecodeResult decodeAddress(final String str) throws CoreException { // See if the CDI client provides customized encoding/decoding @@ -458,7 +467,9 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM try { final ICDIMemorySpaceEncoder.DecodeResult result = ((ICDIMemorySpaceEncoder)cdiTarget).decodeAddress(str); return new DecodeResult() { + @Override public String getMemorySpaceId() { return result.getMemorySpaceId(); } + @Override public String getExpression() { return result.getExpression(); } }; } @@ -477,6 +488,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#creatingBlockRequiresMemorySpaceID() */ + @Override public boolean creatingBlockRequiresMemorySpaceID() { // A behavioral control we're not extending to CDI clients, but is being // extended to DSF ones. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java index 5f7cfb383b5..5b095513991 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java @@ -93,6 +93,7 @@ public class CRegisterManager { public void dispose() { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { synchronized( fRegisterGroups ) { Iterator it = fRegisterGroups.iterator(); @@ -167,6 +168,7 @@ public class CRegisterManager { public void addRegisterGroup( final String name, final IRegisterDescriptor[] descriptors ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { fRegisterGroups.add( new CRegisterGroup( getDebugTarget(), name, descriptors ) ); setUseDefaultRegisterGroups( false ); @@ -178,6 +180,7 @@ public class CRegisterManager { public void removeAllRegisterGroups() { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { synchronized( fRegisterGroups ) { Iterator it = fRegisterGroups.iterator(); @@ -195,6 +198,7 @@ public class CRegisterManager { public void removeRegisterGroups( final IRegisterGroup[] groups ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { for ( int i = 0; i < groups.length; ++i ) { ((CRegisterGroup)groups[i]).dispose(); @@ -209,6 +213,7 @@ public class CRegisterManager { public void restoreDefaults() { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { synchronized( fRegisterGroups ) { Iterator it = fRegisterGroups.iterator(); @@ -349,6 +354,7 @@ public class CRegisterManager { public void modifyRegisterGroup( final IPersistableRegisterGroup group, final IRegisterDescriptor[] descriptors ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { group.setRegisterDescriptors( descriptors ); ((CRegisterGroup)group).fireChangeEvent( DebugEvent.CONTENT ); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRequest.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRequest.java index 6da3d54454c..74a3dd94b8c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRequest.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRequest.java @@ -26,6 +26,7 @@ public class CRequest implements IRequest { /* * @see org.eclipse.debug.core.IRequest#cancel() */ + @Override public void cancel() { fCanceled= true; } @@ -33,12 +34,14 @@ public class CRequest implements IRequest { /* * @see org.eclipse.debug.core.IRequest#done() */ + @Override public void done() { } /* * @see org.eclipse.debug.core.IRequest#getStatus() */ + @Override public IStatus getStatus() { return fStatus; } @@ -46,6 +49,7 @@ public class CRequest implements IRequest { /* * @see org.eclipse.debug.core.IRequest#isCanceled() */ + @Override public boolean isCanceled() { return fCanceled; } @@ -53,6 +57,7 @@ public class CRequest implements IRequest { /* * @see org.eclipse.debug.core.IRequest#setStatus(org.eclipse.core.runtime.IStatus) */ + @Override public void setStatus(IStatus status) { fStatus= status; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSettingsManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSettingsManager.java index 26113debef0..69454161b32 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSettingsManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSettingsManager.java @@ -105,6 +105,7 @@ public class CSettingsManager { */ private Map fContentMap = new LinkedHashMap(MAX_ELEMENT_COUNT, 0.75f, true) { private static final long serialVersionUID = 1; + @Override protected boolean removeEldestEntry(Map.Entry eldest) { return size() > MAX_ELEMENT_COUNT; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java index 73d3a563f5c..9a9d5cd1205 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java @@ -85,6 +85,7 @@ public class CSignalManager implements IAdaptable { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter( Class adapter ) { if ( adapter.equals( CSignalManager.class ) ) { return this; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java index c16310f354d..ab1c6116edb 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java @@ -45,6 +45,7 @@ public class DebugConfiguration implements ICDebugConfiguration { return fElement; } + @Override public ICDebugger getDebugger() throws CoreException { Object debugger = getConfigurationElement().createExecutableExtension("class"); //$NON-NLS-1$ if (debugger instanceof ICDebugger) { @@ -53,6 +54,7 @@ public class DebugConfiguration implements ICDebugConfiguration { throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), -1, InternalDebugCoreMessages.getString("DebugConfiguration.0"), null)); //$NON-NLS-1$ } + @Override public ICDIDebugger createDebugger() throws CoreException { Object debugger = getConfigurationElement().createExecutableExtension("class"); //$NON-NLS-1$ if (debugger instanceof ICDIDebugger) { @@ -61,15 +63,18 @@ public class DebugConfiguration implements ICDebugConfiguration { return new CDebugAdapter((ICDebugger)debugger); } + @Override public String getName() { String name = getConfigurationElement().getAttribute("name"); //$NON-NLS-1$ return name != null ? name : ""; //$NON-NLS-1$ } + @Override public String getID() { return getConfigurationElement().getAttribute("id"); //$NON-NLS-1$ } + @Override public String getPlatform() { String platform = getConfigurationElement().getAttribute("platform"); //$NON-NLS-1$ if (platform == null) { @@ -78,18 +83,22 @@ public class DebugConfiguration implements ICDebugConfiguration { return platform; } + @Override public String[] getCPUList() { return (String[]) getCPUs().toArray(new String[0]); } + @Override public String[] getModeList() { return (String[]) getModes().toArray(new String[0]); } + @Override public boolean supportsMode(String mode) { return getModes().contains(mode); } + @Override public boolean supportsCPU(String cpu) { String nativeCPU = Platform.getOSArch(); boolean ret = false; @@ -149,6 +158,7 @@ public class DebugConfiguration implements ICDebugConfiguration { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICDebugConfiguration#getCoreFileExtensions() */ + @Override public String[] getCoreFileExtensions() { if (fCoreExt == null) { List exts = new ArrayList(); @@ -166,6 +176,7 @@ public class DebugConfiguration implements ICDebugConfiguration { return fCoreExt; } + @Override public String[] getSupportedBuildConfigPatterns() { IConfigurationElement[] patternElems = fElement.getChildren("buildIdPattern"); //$NON-NLS-1$ String[] patterns = new String[patternElems.length]; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/SessionManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/SessionManager.java index 62671eed259..f4a0d72bbbf 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/SessionManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/SessionManager.java @@ -49,6 +49,7 @@ public class SessionManager implements IDebugEventSetListener { * * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ + @Override public void handleDebugEvents( DebugEvent[] events ) { for( int i = 0; i < events.length; i++ ) { DebugEvent event = events[i]; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/Trace.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/Trace.java index f892ebbd905..8eef259decb 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/Trace.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/Trace.java @@ -66,13 +66,21 @@ public class Trace { * clients; no need to check for null. */ private static final DebugTrace NULL_TRACE = new DebugTrace() { + @Override public void trace(String option, String message) {} + @Override public void trace(String option, String message, Throwable error) {} + @Override public void traceDumpStack(String option) {} + @Override public void traceEntry(String option) {} + @Override public void traceEntry(String option, Object methodArgument) {} + @Override public void traceEntry(String option, Object[] methodArguments) {} + @Override public void traceExit(String option) {} + @Override public void traceExit(String option, Object result) {} }; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractLineBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractLineBreakpoint.java index 7d0bd0878b4..ee0004fd4db 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractLineBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractLineBreakpoint.java @@ -48,6 +48,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi /*(non-Javadoc) * @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber() */ + @Override public int getLineNumber() throws CoreException { return ensureMarker().getAttribute( IMarker.LINE_NUMBER, -1 ); } @@ -55,6 +56,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi /*(non-Javadoc) * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart() */ + @Override public int getCharStart() throws CoreException { return ensureMarker().getAttribute( IMarker.CHAR_START, -1 ); } @@ -62,6 +64,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi /*(non-Javadoc) * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd() */ + @Override public int getCharEnd() throws CoreException { return ensureMarker().getAttribute( IMarker.CHAR_END, -1 ); } @@ -69,6 +72,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getAddress() */ + @Override public String getAddress() throws CoreException { return ensureMarker().getAttribute( ICLineBreakpoint.ADDRESS, "" ); //$NON-NLS-1$ } @@ -76,6 +80,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFileName() */ + @Override public String getFileName() throws CoreException { String fileName = ensureMarker().getAttribute( ICBreakpoint.SOURCE_HANDLE, "" ); //$NON-NLS-1$ IPath path = new Path( fileName ); @@ -85,6 +90,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFunction() */ + @Override public String getFunction() throws CoreException { return ensureMarker().getAttribute( ICLineBreakpoint.FUNCTION, "" ); //$NON-NLS-1$ } @@ -92,6 +98,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setAddress(java.lang.String) */ + @Override public void setAddress( String address ) throws CoreException { setAttribute( ICLineBreakpoint.ADDRESS, address ); } @@ -99,6 +106,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setFunction(java.lang.String) */ + @Override public void setFunction( String function ) throws CoreException { setAttribute( ICLineBreakpoint.FUNCTION, function ); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractTracepoint.java index 69dee1c930e..02611c9e218 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractTracepoint.java @@ -49,6 +49,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep /*(non-Javadoc) * @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber() */ + @Override public int getLineNumber() throws CoreException { return ensureMarker().getAttribute( IMarker.LINE_NUMBER, -1 ); } @@ -56,6 +57,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep /*(non-Javadoc) * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart() */ + @Override public int getCharStart() throws CoreException { return ensureMarker().getAttribute( IMarker.CHAR_START, -1 ); } @@ -63,6 +65,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep /*(non-Javadoc) * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd() */ + @Override public int getCharEnd() throws CoreException { return ensureMarker().getAttribute( IMarker.CHAR_END, -1 ); } @@ -70,6 +73,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getAddress() */ + @Override public String getAddress() throws CoreException { return ensureMarker().getAttribute( ICLineBreakpoint.ADDRESS, "" ); //$NON-NLS-1$ } @@ -77,6 +81,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFileName() */ + @Override public String getFileName() throws CoreException { String fileName = ensureMarker().getAttribute( ICBreakpoint.SOURCE_HANDLE, "" ); //$NON-NLS-1$ IPath path = new Path( fileName ); @@ -86,6 +91,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFunction() */ + @Override public String getFunction() throws CoreException { return ensureMarker().getAttribute( ICLineBreakpoint.FUNCTION, "" ); //$NON-NLS-1$ } @@ -102,6 +108,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setAddress(java.lang.String) */ + @Override public void setAddress( String address ) throws CoreException { setAttribute( ICLineBreakpoint.ADDRESS, address ); } @@ -109,6 +116,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setFunction(java.lang.String) */ + @Override public void setFunction( String function ) throws CoreException { setAttribute( ICLineBreakpoint.FUNCTION, function ); } @@ -117,6 +125,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep * (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICTracepoint#getPassCount() */ + @Override public int getPassCount() throws CoreException { return ensureMarker().getAttribute( PASS_COUNT, 0 ); } @@ -125,6 +134,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep * (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICTracepoint#setPassCount(int) */ + @Override public void setPassCount( int passCount ) throws CoreException { setAttribute( PASS_COUNT, passCount ); setAttribute( IMarker.MESSAGE, getMarkerMessage() ); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java index 46ee3210326..bb10180f928 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java @@ -50,6 +50,7 @@ public class CAddressBreakpoint extends AbstractLineBreakpoint implements ICAddr * * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() */ + @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format( BreakpointMessages.getString( "CAddressBreakpoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java index cdbbaf58ac6..1b13c3eb632 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java @@ -54,6 +54,7 @@ public class CAddressTracepoint extends AbstractTracepoint implements ICAddressB * * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() */ + @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format( BreakpointMessages.getString( "CAddressTracepoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java index 26da7616058..7d8efe54df2 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java @@ -71,6 +71,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC this(); IWorkspaceRunnable wr = new IWorkspaceRunnable() { + @Override public void run( IProgressMonitor monitor ) throws CoreException { // create the marker setMarker( resource.createMarker( markerType ) ); @@ -87,6 +88,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC public void createMarker( final IResource resource, final String markerType, final Map attributes, final boolean add ) throws DebugException { IWorkspaceRunnable wr = new IWorkspaceRunnable() { + @Override public void run( IProgressMonitor monitor ) throws CoreException { // create the marker setMarker( resource.createMarker( markerType ) ); @@ -106,6 +108,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.debug.core.model.IBreakpoint#getModelIdentifier() */ + @Override public String getModelIdentifier() { return CDIDebugModel.getPluginIdentifier(); } @@ -115,6 +118,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.cdt.debug.core.ICBreakpoint#isInstalled() */ + @Override public boolean isInstalled() throws CoreException { return fInstallCount > 0; } @@ -124,6 +128,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.cdt.debug.core.ICBreakpoint#getCondition() */ + @Override public String getCondition() throws CoreException { return ensureMarker().getAttribute( CONDITION, "" ); //$NON-NLS-1$ } @@ -133,6 +138,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.cdt.debug.core.ICBreakpoint#setCondition(String) */ + @Override public void setCondition( String condition ) throws CoreException { setAttribute( CONDITION, condition ); setAttribute( IMarker.MESSAGE, getMarkerMessage() ); @@ -143,6 +149,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.cdt.debug.core.ICBreakpoint#getIgnoreCount() */ + @Override public int getIgnoreCount() throws CoreException { return ensureMarker().getAttribute( IGNORE_COUNT, 0 ); } @@ -152,6 +159,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.cdt.debug.core.ICBreakpoint#setIgnoreCount(int) */ + @Override public void setIgnoreCount( int ignoreCount ) throws CoreException { setAttribute( IGNORE_COUNT, ignoreCount ); setAttribute( IMarker.MESSAGE, getMarkerMessage() ); @@ -161,6 +169,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getType() */ + @Override public int getType() throws CoreException { return ensureMarker().getAttribute( TYPE, 0 ); } @@ -169,6 +178,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setType(int) */ + @Override public void setType(int type) throws CoreException { setAttribute( TYPE, type ); setAttribute( IMarker.MESSAGE, getMarkerMessage() ); @@ -180,6 +190,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.cdt.debug.core.ICBreakpoint#getThreadId() */ + @Override public String getThreadId() throws CoreException { return ensureMarker().getAttribute( THREAD_ID, null ); } @@ -189,6 +200,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.cdt.debug.core.ICBreakpoint#setThreadId(String) */ + @Override public void setThreadId( String threadId ) throws CoreException { setAttribute( THREAD_ID, threadId ); } @@ -196,6 +208,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getSourceHandle() */ + @Override public String getSourceHandle() throws CoreException { return ensureMarker().getAttribute( SOURCE_HANDLE, null ); } @@ -203,6 +216,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setSourceHandle(java.lang.String) */ + @Override public void setSourceHandle( String sourceHandle ) throws CoreException { setAttribute( SOURCE_HANDLE, sourceHandle ); } @@ -212,6 +226,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(DebugEvent[]) */ + @Override public void handleDebugEvents( DebugEvent[] events ) { } @@ -245,6 +260,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#incrementInstallCount() */ + @Override public synchronized int incrementInstallCount() throws CoreException { ++fInstallCount; @@ -266,6 +282,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#decrementInstallCount() */ + @Override public synchronized int decrementInstallCount() throws CoreException { fInstallCount--; @@ -279,6 +296,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#resetInstallCount() */ + @Override public synchronized void resetInstallCount() throws CoreException { if (fInstallCount != 0) { fInstallCount = 0; @@ -291,6 +309,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.debug.core.model.Breakpoint#ensureMarker() */ + @Override protected IMarker ensureMarker() throws DebugException { return super.ensureMarker(); } @@ -300,6 +319,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.debug.core.model.Breakpoint#setAttribute(String, Object) */ + @Override protected void setAttribute( String attributeName, Object value ) throws CoreException { super.setAttribute( attributeName, value ); } @@ -309,6 +329,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC * * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#isConditional() */ + @Override public boolean isConditional() throws CoreException { return ((getCondition() != null && getCondition().trim().length() > 0) || getIgnoreCount() > 0); } @@ -341,6 +362,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getModule() */ + @Override public String getModule() throws CoreException { return ensureMarker().getAttribute( MODULE, null ); } @@ -348,10 +370,12 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setModule(java.lang.String) */ + @Override public void setModule( String module ) throws CoreException { setAttribute( MODULE, module ); } + @Override public ICBreakpointExtension getExtension(String debugModelId, Class extensionType) throws CoreException { ICBreakpointExtension[] extensions = getExtensionsForModelId(debugModelId); for (int i = 0; i < extensions.length; i++) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpointFilterExtension.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpointFilterExtension.java index e0af9859f92..25654abf3cb 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpointFilterExtension.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpointFilterExtension.java @@ -28,7 +28,8 @@ import org.eclipse.debug.core.model.IDebugTarget; */ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension { - public void initialize(ICBreakpoint breakpoint) { + @Override + public void initialize(ICBreakpoint breakpoint) { } private Map fFilteredThreadsByTarget = new HashMap( 10 ); @@ -37,7 +38,8 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getTargetFilters() */ - public ICDebugTarget[] getTargetFilters() throws CoreException { + @Override + public ICDebugTarget[] getTargetFilters() throws CoreException { Set set = fFilteredThreadsByTarget.keySet(); return (ICDebugTarget[])set.toArray( new ICDebugTarget[set.size()] ); } @@ -45,7 +47,8 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getThreadFilters(org.eclipse.cdt.debug.core.model.ICDebugTarget) */ - public ICThread[] getThreadFilters( ICDebugTarget target ) throws CoreException { + @Override + public ICThread[] getThreadFilters( ICDebugTarget target ) throws CoreException { Set set = (Set)fFilteredThreadsByTarget.get( target ); return ( set != null ) ? (ICThread[])set.toArray( new ICThread[set.size()] ) : null; } @@ -53,7 +56,8 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#removeTargetFilter(org.eclipse.cdt.debug.core.model.ICDebugTarget) */ - public void removeTargetFilter( ICDebugTarget target ) throws CoreException { + @Override + public void removeTargetFilter( ICDebugTarget target ) throws CoreException { if ( fFilteredThreadsByTarget.containsKey( target ) ) { fFilteredThreadsByTarget.remove( target ); } @@ -62,7 +66,8 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#removeThreadFilters(org.eclipse.cdt.debug.core.model.ICThread[]) */ - public void removeThreadFilters( ICThread[] threads ) throws CoreException { + @Override + public void removeThreadFilters( ICThread[] threads ) throws CoreException { if ( threads != null && threads.length > 0 ) { IDebugTarget target = threads[0].getDebugTarget(); if ( fFilteredThreadsByTarget.containsKey( target ) ) { @@ -80,14 +85,16 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setTargetFilter(org.eclipse.cdt.debug.core.model.ICDebugTarget) */ - public void setTargetFilter( ICDebugTarget target ) throws CoreException { + @Override + public void setTargetFilter( ICDebugTarget target ) throws CoreException { fFilteredThreadsByTarget.put( target, null ); } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setThreadFilters(org.eclipse.cdt.debug.core.model.ICThread[]) */ - public void setThreadFilters( ICThread[] threads ) throws CoreException { + @Override + public void setThreadFilters( ICThread[] threads ) throws CoreException { if ( threads != null && threads.length > 0 ) { fFilteredThreadsByTarget.put( threads[0].getDebugTarget(), new HashSet( Arrays.asList( threads ) ) ); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CEventBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CEventBreakpoint.java index 9fbd219629a..70377807de7 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CEventBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CEventBreakpoint.java @@ -47,6 +47,7 @@ public class CEventBreakpoint extends CBreakpoint implements ICEventBreakpoint { final Map<String, Object> attributes, final boolean add) throws DebugException { IWorkspaceRunnable wr = new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { // create the marker setMarker(resource.createMarker(markerType)); @@ -70,6 +71,7 @@ public class CEventBreakpoint extends CBreakpoint implements ICEventBreakpoint { /** * @see ICEventBreakpoint#getEventType() */ + @Override public String getEventType() throws DebugException { return ensureMarker().getAttribute(EVENT_TYPE_ID, ""); //$NON-NLS-1$ } @@ -77,6 +79,7 @@ public class CEventBreakpoint extends CBreakpoint implements ICEventBreakpoint { /** * @see ICEventBreakpoint#getEventArgument() */ + @Override public String getEventArgument() throws CoreException { return ensureMarker().getAttribute(EVENT_ARG, ""); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java index f1b5f29408f..2d56d76629f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java @@ -48,6 +48,7 @@ public class CFunctionBreakpoint extends AbstractLineBreakpoint implements ICFun /*(non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() */ + @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format( BreakpointMessages.getString( "CFunctionBreakpoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java index 5b6d3a37aaf..81f939ef616 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java @@ -52,6 +52,7 @@ public class CFunctionTracepoint extends AbstractTracepoint implements ICFunctio /*(non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() */ + @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format( BreakpointMessages.getString( "CFunctionTracepoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java index 0671b4700e6..e35fb4d3866 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java @@ -48,6 +48,7 @@ public class CLineBreakpoint extends AbstractLineBreakpoint { /*(non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() */ + @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format( BreakpointMessages.getString( "CLineBreakpoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java index eab231f66d7..803d59389d6 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java @@ -51,6 +51,7 @@ public class CLineTracepoint extends AbstractTracepoint implements ICTracepoint /*(non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() */ + @Override protected String getMarkerMessage() throws CoreException { return MessageFormat.format( BreakpointMessages.getString( "CLineTracepoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java index 1c475878253..b995859cab8 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java @@ -47,6 +47,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICWatchpoint#isWriteType() */ + @Override public boolean isWriteType() throws CoreException { return ensureMarker().getAttribute( WRITE, true ); } @@ -54,6 +55,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICWatchpoint#isReadType() */ + @Override public boolean isReadType() throws CoreException { return ensureMarker().getAttribute( READ, false ); } @@ -61,6 +63,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICWatchpoint#getExpression() */ + @Override public String getExpression() throws CoreException { return ensureMarker().getAttribute( EXPRESSION, "" ); //$NON-NLS-1$ } @@ -75,6 +78,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() */ + @Override protected String getMarkerMessage() throws CoreException { String format = BreakpointMessages.getString( "CWatchpoint.3" ); //$NON-NLS-1$ if ( isWriteType() && !isReadType() ) @@ -89,6 +93,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { /* (non-Javadoc) * @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber() */ + @Override public int getLineNumber() throws CoreException { return ensureMarker().getAttribute( IMarker.LINE_NUMBER, -1 ); } @@ -96,6 +101,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { /* (non-Javadoc) * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart() */ + @Override public int getCharStart() throws CoreException { return ensureMarker().getAttribute( IMarker.CHAR_START, -1 ); } @@ -103,14 +109,17 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { /* (non-Javadoc) * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd() */ + @Override public int getCharEnd() throws CoreException { return ensureMarker().getAttribute( IMarker.CHAR_END, -1 ); } + @Override public String getMemorySpace() throws CoreException { return ensureMarker().getAttribute( MEMORYSPACE, "" ); //$NON-NLS-1$ } + @Override public BigInteger getRange() throws CoreException { String attr = ensureMarker().getAttribute( RANGE, "0" ); //$NON-NLS-1$ return new BigInteger( attr.length() > 0 ? attr : "0" ); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/disassembly/DisassemblyContextService.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/disassembly/DisassemblyContextService.java index 5681f6abf08..f8d6994e24f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/disassembly/DisassemblyContextService.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/disassembly/DisassemblyContextService.java @@ -31,21 +31,24 @@ public class DisassemblyContextService implements IDisassemblyContextService { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#addDisassemblyContextListener(org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextListener) */ - public void addDisassemblyContextListener( IDisassemblyContextListener listener ) { + @Override + public void addDisassemblyContextListener( IDisassemblyContextListener listener ) { fListeners.add( listener ); } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#removeDisassemblyContextListener(org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextListener) */ - public void removeDisassemblyContextListener( IDisassemblyContextListener listener ) { + @Override + public void removeDisassemblyContextListener( IDisassemblyContextListener listener ) { fListeners.remove( listener ); } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#register(java.lang.Object) */ - public void register( Object context ) { + @Override + public void register( Object context ) { fContexts.add( context ); for( Object listener : fListeners.getListeners() ) { ((IDisassemblyContextListener)listener).contextAdded( context ); @@ -55,7 +58,8 @@ public class DisassemblyContextService implements IDisassemblyContextService { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#unregister(java.lang.Object) */ - public void unregister( Object context ) { + @Override + public void unregister( Object context ) { fContexts.remove( context ); for( Object listener : fListeners.getListeners() ) { ((IDisassemblyContextListener)listener).contextRemoved( context ); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardExecutableImporter.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardExecutableImporter.java index 056689e36ea..cf3c6f0efba 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardExecutableImporter.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardExecutableImporter.java @@ -59,6 +59,7 @@ public class StandardExecutableImporter implements IExecutableImporter { * @see org.eclipse.cdt.debug.core.executables.IExecutableImporter#importExecutables(java.lang.String[], * org.eclipse.core.runtime.IProgressMonitor) */ + @Override public boolean importExecutables(String[] fileNames, IProgressMonitor monitor) { monitor.beginTask("Import Executables", fileNames.length); //$NON-NLS-1$ @@ -274,6 +275,7 @@ public class StandardExecutableImporter implements IExecutableImporter { return false; } + @Override public int getPriority(String[] fileNames) { return NORMAL_PRIORITY; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemapping.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemapping.java index 5d49787768e..7cba5571caf 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemapping.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemapping.java @@ -24,6 +24,7 @@ public class StandardSourceFileRemapping implements ISourceFileRemapping { srcFinder = (ISourceFinder) binary.getAdapter(ISourceFinder.class); } + @Override public String remapSourceFile(IPath executable, String filePath) { if (srcFinder != null) { String mappedPath = srcFinder.toLocalPath(filePath); @@ -37,6 +38,7 @@ public class StandardSourceFileRemapping implements ISourceFileRemapping { /* (non-Javadoc) * @see java.lang.Object#finalize() */ + @Override public void finalize(){ srcFinder.dispose(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemappingFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemappingFactory.java index a8f6fb9c251..7f9843d8f24 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemappingFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemappingFactory.java @@ -19,6 +19,7 @@ public class StandardSourceFileRemappingFactory implements ISourceFileRemappingF /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.executables.ISourceFileRemappingFactory#createRemapper(org.eclipse.cdt.core.model.IBinary) */ + @Override public ISourceFileRemapping createRemapper(IBinary binary) { return new StandardSourceFileRemapping(binary); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFilesProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFilesProvider.java index 4bf2b89165d..9fa7edf9ca9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFilesProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFilesProvider.java @@ -112,6 +112,7 @@ public class StandardSourceFilesProvider extends PlatformObject implements ISour return null; } + @Override public String[] getSourceFiles(Executable executable, IProgressMonitor monitor) { IBinaryFile bin = createBinaryFile(executable); @@ -125,6 +126,7 @@ public class StandardSourceFilesProvider extends PlatformObject implements ISour return new String[0]; } + @Override public int getPriority(Executable executable) { return ISourceFilesProvider.NORMAL_PRIORITY; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCValue.java index 362809f2184..1894ac3945b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCValue.java @@ -39,6 +39,7 @@ public abstract class AbstractCValue extends CDebugElement implements ICValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICValue#evaluateAsExpression(org.eclipse.cdt.debug.core.model.ICStackFrame) */ + @Override public String evaluateAsExpression( ICStackFrame frame ) { String valueString = ""; //$NON-NLS-1$ AbstractCVariable parent = getParentVariable(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCVariable.java index 82a87ede2eb..2dda4fd5453 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCVariable.java @@ -55,6 +55,7 @@ public abstract class AbstractCVariable extends CDebugElement implements ICVaria /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter( Class adapter ) { if ( IEnableDisableTarget.class.equals( adapter ) ) return this; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmInstruction.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmInstruction.java index 6db8f1c2da0..d6798ec7731 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmInstruction.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmInstruction.java @@ -35,6 +35,7 @@ public class AsmInstruction implements IAsmInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getAdress() */ + @Override public IAddress getAdress() { return fAddress; } @@ -42,6 +43,7 @@ public class AsmInstruction implements IAsmInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getFunctionName() */ + @Override public String getFunctionName() { return fCDIInstruction.getFuntionName(); } @@ -49,6 +51,7 @@ public class AsmInstruction implements IAsmInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getInstructionText() */ + @Override public String getInstructionText() { return fCDIInstruction.getInstruction(); } @@ -56,6 +59,7 @@ public class AsmInstruction implements IAsmInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOpcode() */ + @Override public String getOpcode() { return fCDIInstruction.getOpcode(); } @@ -63,6 +67,7 @@ public class AsmInstruction implements IAsmInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getArguments() */ + @Override public String getArguments() { return fCDIInstruction.getArgs(); } @@ -70,6 +75,7 @@ public class AsmInstruction implements IAsmInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOffset() */ + @Override public long getOffset() { return fCDIInstruction.getOffset(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmSourceLine.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmSourceLine.java index 5df38eb2498..5938f6a9066 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmSourceLine.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmSourceLine.java @@ -48,6 +48,7 @@ public class AsmSourceLine implements IAsmSourceLine { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getLineNumber() */ + @Override public int getLineNumber() { return fLineNumber; } @@ -55,10 +56,12 @@ public class AsmSourceLine implements IAsmSourceLine { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getInstructions() */ + @Override public IAsmInstruction[] getInstructions() { return fInstructions; } + @Override public String toString() { return fText; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CCoreFileDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CCoreFileDebugTarget.java index ea1752d16b2..b8be68c7368 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CCoreFileDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CCoreFileDebugTarget.java @@ -21,6 +21,7 @@ import org.eclipse.debug.core.model.IProcess; * A debug target for the postmortem debugging. * @deprecated */ +@Deprecated public class CCoreFileDebugTarget extends CDebugTarget { @@ -42,6 +43,7 @@ public class CCoreFileDebugTarget extends CDebugTarget { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#isPostMortem() */ + @Override public boolean isPostMortem() { return true; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java index e867d0da235..98d2248ebb2 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java @@ -82,6 +82,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle * * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier() */ + @Override public String getModelIdentifier() { return CDIDebugModel.getPluginIdentifier(); } @@ -91,6 +92,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle * * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget() */ + @Override public IDebugTarget getDebugTarget() { return fDebugTarget; } @@ -100,6 +102,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle * * @see org.eclipse.debug.core.model.IDebugElement#getLaunch() */ + @Override public ILaunch getLaunch() { return getDebugTarget().getLaunch(); } @@ -302,6 +305,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) */ + @Override public Object getAdapter( Class adapter ) { if ( adapter.equals( IDebugElement.class ) ) return this; @@ -342,6 +346,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugElementStatus#isOK() */ + @Override public boolean isOK() { return (fSeverity == ICDebugElementStatus.OK); } @@ -349,6 +354,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugElementStatus#getSeverity() */ + @Override public int getSeverity() { return fSeverity; } @@ -356,6 +362,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugElementStatus#getMessage() */ + @Override public String getMessage() { return fMessage; } @@ -363,6 +370,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugElement#getState() */ + @Override public CDebugElementState getState() { return fState; } @@ -379,6 +387,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugElement#getCurrentStateInfo() */ + @Override public Object getCurrentStateInfo() { return fCurrentStateInfo; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java index a759a9a5e0c..0d658ec745c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java @@ -418,6 +418,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugTarget#getProcess() */ + @Override public IProcess getProcess() { return fDebuggeeProcess; } @@ -438,6 +439,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv * * @see org.eclipse.debug.core.model.IDebugTarget#getThreads() */ + @Override public IThread[] getThreads() { List<CThread> threads = getThreadList(); return threads.toArray(new IThread[threads.size()]); @@ -448,6 +450,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv * * @see org.eclipse.debug.core.model.IDebugTarget#hasThreads() */ + @Override public boolean hasThreads() throws DebugException { return getThreadList().size() > 0; } @@ -457,6 +460,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv * * @see org.eclipse.debug.core.model.IDebugTarget#getName() */ + @Override public String getName() throws DebugException { return fName; } @@ -473,6 +477,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugTarget#supportsBreakpoint(org.eclipse.debug.core.model.IBreakpoint) */ + @Override public boolean supportsBreakpoint(IBreakpoint breakpoint) { if (!getConfiguration().supportsBreakpoints()) return false; @@ -482,6 +487,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchListener#launchRemoved(org.eclipse.debug.core.ILaunch) */ + @Override public void launchRemoved(ILaunch launch) { if (!isAvailable()) { return; @@ -496,18 +502,21 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch) */ + @Override public void launchAdded(ILaunch launch) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchListener#launchChanged(org.eclipse.debug.core.ILaunch) */ + @Override public void launchChanged(ILaunch launch) { } /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#canTerminate() */ + @Override public boolean canTerminate() { return supportsTerminate() && isAvailable(); } @@ -515,6 +524,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#isTerminated() */ + @Override public boolean isTerminated() { return (getState().equals(CDebugElementState.TERMINATED)); } @@ -522,6 +532,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#terminate() */ + @Override public void terminate() throws DebugException { if (!canTerminate()) { return; @@ -544,6 +555,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#canResume() */ + @Override public boolean canResume() { return getConfiguration().supportsResume() && isSuspended(); } @@ -551,6 +563,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() */ + @Override public boolean canSuspend() { if (!getConfiguration().supportsSuspend()) return false; @@ -570,6 +583,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() */ + @Override public boolean isSuspended() { return (getState().equals(CDebugElementState.SUSPENDED)); } @@ -577,6 +591,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ + @Override public void resume() throws DebugException { if (!canResume()) return; @@ -598,6 +613,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#suspend() */ + @Override public void suspend() throws DebugException { if (!canSuspend()) return; @@ -699,18 +715,21 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint) */ + @Override public void breakpointAdded(IBreakpoint breakpoint) { } /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta) */ + @Override public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) { } /* (non-Javadoc) * @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta) */ + @Override public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) { } @@ -735,6 +754,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDisconnect#canDisconnect() */ + @Override public boolean canDisconnect() { return supportsDisconnect() && isAvailable(); } @@ -742,6 +762,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDisconnect#disconnect() */ + @Override public void disconnect() throws DebugException { if (isDisconnecting()) { return; @@ -764,6 +785,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDisconnect#isDisconnected() */ + @Override public boolean isDisconnected() { return (getState().equals(CDebugElementState.DISCONNECTED)); } @@ -771,6 +793,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval() */ + @Override public boolean supportsStorageRetrieval() { return false; } @@ -778,6 +801,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long) */ + @Override public IMemoryBlock getMemoryBlock(long startAddress, long length) throws DebugException { return null; } @@ -870,6 +894,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents(ICDIEvent[] events) { for (int i = 0; i < events.length; i++) { ICDIEvent event = events[i]; @@ -938,6 +963,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRestart#canRestart() */ + @Override public boolean canRestart() { return getConfiguration().supportsRestart() && isSuspended(); } @@ -945,6 +971,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRestart#restart() */ + @Override public void restart() throws DebugException { if (!canRestart()) { return; @@ -1343,18 +1370,21 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionListener#expressionAdded(org.eclipse.debug.core.model.IExpression) */ + @Override public void expressionAdded(IExpression expression) { } /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionListener#expressionChanged(org.eclipse.debug.core.model.IExpression) */ + @Override public void expressionChanged(IExpression expression) { } /* (non-Javadoc) * @see org.eclipse.debug.core.IExpressionListener#expressionRemoved(org.eclipse.debug.core.model.IExpression) */ + @Override public void expressionRemoved(IExpression expression) { if (expression instanceof CExpression && expression.getDebugTarget().equals(this)) { ((CExpression)expression).dispose(); @@ -1398,6 +1428,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IExecFileInfo#isLittleEndian() */ + @Override public boolean isLittleEndian() { if (fIsLittleEndian == null) { fIsLittleEndian = Boolean.TRUE; @@ -1413,6 +1444,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IExecFileInfo#getExecFile() */ + @Override public IBinaryObject getExecFile() { return getBinaryFile(); } @@ -1436,6 +1468,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IExecFileInfo#getGlobals() */ + @Override public IGlobalVariableDescriptor[] getGlobals() throws DebugException { ICDITarget cdiTarget = getCDITarget(); // If the backend can give us the globals... @@ -1519,6 +1552,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal() */ + @Override public boolean canResumeWithoutSignal() { // Check if the configuration supports this!!! return (canResume() && getCurrentStateInfo() instanceof ICDISignalReceived); @@ -1527,6 +1561,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal() */ + @Override public void resumeWithoutSignal() throws DebugException { if (!canResume()) return; @@ -1618,7 +1653,8 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getDisassembly() */ - public IDisassembly getDisassembly() throws DebugException { + @Override + public IDisassembly getDisassembly() throws DebugException { return fDisassembly; } @@ -1629,6 +1665,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getSignals() */ + @Override public ICSignal[] getSignals() throws DebugException { CSignalManager sm = getSignalManager(); if (sm != null) { @@ -1640,6 +1677,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#hasSignals() */ + @Override public boolean hasSignals() throws DebugException { CSignalManager sm = getSignalManager(); if (sm != null) { @@ -1665,6 +1703,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IBreakpointTarget#getBreakpointAddress(org.eclipse.cdt.debug.core.model.ICLineBreakpoint) */ + @Override public IAddress getBreakpointAddress(ICLineBreakpoint breakpoint) throws DebugException { return (getBreakpointManager() != null) ? getBreakpointManager().getBreakpointAddress(breakpoint) : getAddressFactory().getZero(); } @@ -1672,6 +1711,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#enableInstructionStepping(boolean) */ + @Override public void enableInstructionStepping(boolean enabled) { fPreferences.setValue(PREF_INSTRUCTION_STEPPING_MODE, enabled); } @@ -1679,6 +1719,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#isInstructionSteppingEnabled() */ + @Override public boolean isInstructionSteppingEnabled() { return fPreferences.getBoolean(PREF_INSTRUCTION_STEPPING_MODE); } @@ -1686,6 +1727,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#supportsInstructionStepping() */ + @Override public boolean supportsInstructionStepping() { return getConfiguration().supportsInstructionStepping(); } @@ -1707,6 +1749,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ITargetProperties#addPropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener) */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { if (fPreferences != null) fPreferences.addPropertyChangeListener(listener); @@ -1715,6 +1758,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ITargetProperties#removePropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener) */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { if (fPreferences != null) fPreferences.removePropertyChangeListener(listener); @@ -1739,6 +1783,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#isPostMortem() */ + @Override public boolean isPostMortem() { return false; } @@ -1805,6 +1850,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv return CVariableFactory.createGlobalVariable(this, info, vo); } + @Override public void sourceContainersChanged(ISourceLookupDirector director) { setSourceLookupPath(director.getSourceContainers()); } @@ -1872,6 +1918,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getRegisterDescriptors() */ + @Override public IRegisterDescriptor[] getRegisterDescriptors() throws DebugException { return getRegisterManager().getAllRegisterDescriptors(); } @@ -1879,6 +1926,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#addUserDefinedRegisterGroup(java.lang.String, org.eclipse.cdt.debug.core.model.IRegisterDescriptor[]) */ + @Override public void addRegisterGroup(String name, IRegisterDescriptor[] descriptors) { getRegisterManager().addRegisterGroup(name, descriptors); } @@ -1886,6 +1934,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#removeRegisterGroups(org.eclipse.debug.core.model.IRegisterGroup[]) */ + @Override public void removeRegisterGroups(IRegisterGroup[] groups) { getRegisterManager().removeRegisterGroups(groups); } @@ -1893,6 +1942,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#modifyRegisterGroup(org.eclipse.cdt.debug.core.model.IPersistableRegisterGroup, org.eclipse.cdt.debug.core.model.IRegisterDescriptor[]) */ + @Override public void modifyRegisterGroup(IPersistableRegisterGroup group, IRegisterDescriptor[] descriptors) { getRegisterManager().modifyRegisterGroup(group, descriptors); } @@ -1900,6 +1950,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#restoreDefaultRegisterGroups() */ + @Override public void restoreDefaultRegisterGroups() { getRegisterManager().restoreDefaults(); } @@ -1968,6 +2019,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv } } + @Override public boolean hasModules() throws DebugException { CModuleManager mm = getModuleManager(); if (mm != null) @@ -1975,6 +2027,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv return false; } + @Override public ICModule[] getModules() throws DebugException { CModuleManager mm = getModuleManager(); if (mm != null) @@ -1982,6 +2035,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv return new ICModule[0]; } + @Override public void loadSymbolsForAllModules() throws DebugException { CModuleManager mm = getModuleManager(); if (mm != null) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java index 3efaf397e6c..cb049d02486 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java @@ -42,6 +42,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStackFrame#getThread() */ + @Override public IThread getThread() { return fThread; } @@ -51,6 +52,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStackFrame#getVariables() */ + @Override public IVariable[] getVariables() throws DebugException { return new IVariable[0]; } @@ -60,6 +62,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStackFrame#hasVariables() */ + @Override public boolean hasVariables() throws DebugException { return false; } @@ -69,6 +72,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber() */ + @Override public int getLineNumber() throws DebugException { return 0; } @@ -78,6 +82,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStackFrame#getCharStart() */ + @Override public int getCharStart() throws DebugException { return 0; } @@ -87,6 +92,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd() */ + @Override public int getCharEnd() throws DebugException { return 0; } @@ -96,6 +102,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStackFrame#getName() */ + @Override public String getName() throws DebugException { return "..."; //$NON-NLS-1$ } @@ -105,6 +112,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups() */ + @Override public IRegisterGroup[] getRegisterGroups() throws DebugException { return new IRegisterGroup[0]; } @@ -114,6 +122,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups() */ + @Override public boolean hasRegisterGroups() throws DebugException { return false; } @@ -123,6 +132,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStep#canStepInto() */ + @Override public boolean canStepInto() { return false; } @@ -132,6 +142,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStep#canStepOver() */ + @Override public boolean canStepOver() { return false; } @@ -141,6 +152,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStep#canStepReturn() */ + @Override public boolean canStepReturn() { return false; } @@ -150,6 +162,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStep#isStepping() */ + @Override public boolean isStepping() { return false; } @@ -159,6 +172,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStep#stepInto() */ + @Override public void stepInto() throws DebugException { } @@ -167,6 +181,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStep#stepOver() */ + @Override public void stepOver() throws DebugException { } @@ -175,6 +190,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.IStep#stepReturn() */ + @Override public void stepReturn() throws DebugException { } @@ -183,6 +199,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.ISuspendResume#canResume() */ + @Override public boolean canResume() { return false; } @@ -192,6 +209,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() */ + @Override public boolean canSuspend() { return false; } @@ -201,6 +219,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() */ + @Override public boolean isSuspended() { return false; } @@ -210,6 +229,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ + @Override public void resume() throws DebugException { } @@ -218,6 +238,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.ISuspendResume#suspend() */ + @Override public void suspend() throws DebugException { } @@ -226,6 +247,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.ITerminate#canTerminate() */ + @Override public boolean canTerminate() { return false; } @@ -235,6 +257,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.ITerminate#isTerminated() */ + @Override public boolean isTerminated() { return false; } @@ -244,6 +267,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.debug.core.model.ITerminate#terminate() */ + @Override public void terminate() throws DebugException { } @@ -261,6 +285,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) */ + @Override public Object getAdapter( Class adapter ) { if ( adapter.equals( IDummyStackFrame.class ) ) return this; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java index df5d76bf543..942e8676912 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java @@ -61,6 +61,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IExpression#getExpressionText() */ + @Override public String getExpressionText() { return fText; } @@ -68,6 +69,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents( ICDIEvent[] events ) { for( int i = 0; i < events.length; i++ ) { ICDIEvent event = events[i]; @@ -109,6 +111,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICVariable#isEnabled() */ + @Override public boolean isEnabled() { return true; } @@ -116,6 +119,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable() */ + @Override public boolean canEnableDisable() { return true; } @@ -123,6 +127,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.CVariable#isBookkeepingEnabled() */ + @Override protected boolean isBookkeepingEnabled() { return false; } @@ -130,6 +135,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IExpression#getValue() */ + @Override public IValue getValue() { CStackFrame frame = (CStackFrame)getStackFrame(); try { @@ -173,10 +179,12 @@ public class CExpression extends CLocalVariable implements IExpression { return fValue; } + @Override protected ICStackFrame getStackFrame() { return fStackFrame; } + @Override protected void resetValue() { if ( fValue instanceof AbstractCValue ) { ((AbstractCValue)fValue).reset(); @@ -202,6 +210,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#getExpressionString() */ + @Override public String getExpressionString() throws DebugException { return getExpressionText(); } @@ -209,6 +218,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#dispose() */ + @Override public void dispose() { if ( fCDIExpression != null ) { try { @@ -229,6 +239,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICVariable#getType() */ + @Override public ICType getType() throws DebugException { if ( isDisposed() ) return null; @@ -245,6 +256,7 @@ public class CExpression extends CLocalVariable implements IExpression { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName() */ + @Override public String getReferenceTypeName() throws DebugException { ICType type = getType(); return ( type != null ) ? type.getName() : ""; //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalValue.java index 27625a08829..023d2a73050 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalValue.java @@ -31,6 +31,7 @@ public class CGlobalValue extends CValue /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#hasVariables() */ + @Override public boolean hasVariables() throws DebugException { if ( fHasChildren == null ) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalVariable.java index d310b6895f1..6fece8f21a7 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalVariable.java @@ -80,6 +80,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { setCDIVariable( (varObject instanceof ICDIVariable) ? (ICDIVariable)varObject : null ); } + @Override public IInternalVariable createShadow( int start, int length ) throws DebugException { IInternalVariable iv = null; try { @@ -91,6 +92,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { return iv; } + @Override public IInternalVariable createShadow( String type ) throws DebugException { IInternalVariable iv = null; try { @@ -129,6 +131,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { fCDIVariableObject = variableObject; } + @Override public String getQualifiedName() throws DebugException { if ( fQualifiedName == null ) { try { @@ -141,6 +144,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { return fQualifiedName; } + @Override public CType getType() throws DebugException { if ( fType == null ) { ICDIVariableDescriptor varObject = getCDIVariableObject(); @@ -175,14 +179,17 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { fType = null; } + @Override public void dispose( boolean destroy ) { invalidate( destroy ); } + @Override public boolean isSameVariable( ICDIVariable cdiVar ) { return ( fCDIVariable != null ) ? fCDIVariable.equals( cdiVar ) : false; } + @Override public int sizeof() { if ( getCDIVariableObject() != null ) { try { @@ -194,10 +201,12 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { return 0; } + @Override public boolean isArgument() { return ( getCDIVariableObject() instanceof ICDIArgumentDescriptor ); } + @Override public void setValue( String expression ) throws DebugException { ICDIVariable cdiVariable = null; try { @@ -212,6 +221,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { } } + @Override public synchronized ICValue getValue() throws DebugException { if ( fValue.equals( CValueFactory.NULL_VALUE ) ) { ICDIVariable var = getCDIVariable(); @@ -244,6 +254,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { return fValue; } + @Override public void invalidateValue() { if ( fValue instanceof AbstractCValue ) { ((AbstractCValue)fValue).dispose(); @@ -251,10 +262,12 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { } } + @Override public boolean isChanged() { return fChanged; } + @Override public synchronized void setChanged( boolean changed ) { if ( changed ) { invalidateValue(); @@ -265,6 +278,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { fChanged = changed; } + @Override public synchronized void preserve() { setChanged( false ); if ( fValue instanceof AbstractCValue ) { @@ -280,12 +294,14 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { fVariable = variable; } + @Override public void resetValue() { if ( fValue instanceof AbstractCValue ) { ((AbstractCValue)fValue).reset(); } } + @Override public boolean isEditable() throws DebugException { ICDIVariable var = getCDIVariable(); if ( var != null ) { @@ -302,6 +318,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { * Compares the underlying variable objects. * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals( Object obj ) { if ( obj instanceof InternalVariable ) { return getCDIVariableObject().equals( ((InternalVariable)obj).getCDIVariableObject() ); @@ -309,10 +326,12 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { return false; } + @Override public boolean isSameDescriptor( ICDIVariableDescriptor desc ) { return getCDIVariableObject().equals( desc ); } + @Override public ICDIObject getCdiObject() { return fCDIVariable; } @@ -342,6 +361,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable() */ + @Override public boolean canEnableDisable() { return true; } @@ -349,6 +369,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents( ICDIEvent[] events ) { for( int i = 0; i < events.length; i++ ) { ICDIEvent event = events[i]; @@ -368,6 +389,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICGlobalVariable#getDescriptor() */ + @Override public IGlobalVariableDescriptor getDescriptor() { return fDescriptor; } @@ -375,11 +397,13 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#dispose() */ + @Override public void dispose() { internalDispose( true ); setDisposed( true ); } + @Override protected void createOriginal( ICDIVariableDescriptor vo ) { if ( vo != null ) { setName( vo.getName() ); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CIndexedValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CIndexedValue.java index 3614263086b..2c7483df20b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CIndexedValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CIndexedValue.java @@ -72,6 +72,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#setChanged(boolean) */ + @Override protected void setChanged( boolean changed ) { for (IVariable var : fVariables.values()) { ((AbstractCVariable)var).setChanged( changed ); @@ -81,6 +82,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#dispose() */ + @Override public void dispose() { for (IVariable var : fVariables.values()) { ((AbstractCVariable)var).dispose(); @@ -90,6 +92,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#reset() */ + @Override protected void reset() { for (IVariable var : fVariables.values()) { ((AbstractCVariable)var).resetValue(); @@ -99,6 +102,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#preserve() */ + @Override protected void preserve() { resetStatus(); for (IVariable var : fVariables.values()) { @@ -109,6 +113,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICValue#getType() */ + @Override public ICType getType() throws DebugException { if ( fType == null ) { synchronized( this ) { @@ -130,6 +135,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getReferenceTypeName() */ + @Override public String getReferenceTypeName() throws DebugException { ICType type = getType(); return ( type != null ) ? type.getName() : ""; //$NON-NLS-1$ @@ -142,6 +148,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { * * @see org.eclipse.debug.core.model.IValue#getValueString() */ + @Override public String getValueString() throws DebugException { if ( fCDIValue instanceof ICDIPointerValue ) { try { @@ -170,6 +177,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#isAllocated() */ + @Override public boolean isAllocated() throws DebugException { return true; } @@ -177,6 +185,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getVariables() */ + @Override public IVariable[] getVariables() throws DebugException { return getVariables0( getInitialOffset(), getSize() ); } @@ -184,6 +193,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#hasVariables() */ + @Override public boolean hasVariables() throws DebugException { return getSize() > 0; } @@ -191,6 +201,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IIndexedValue#getVariable(int) */ + @Override public IVariable getVariable( int offset ) throws DebugException { if ( offset >= getSize() ) { requestFailed( CoreModelMessages.getString( "CIndexedValue.0" ), null ); //$NON-NLS-1$ @@ -201,6 +212,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IIndexedValue#getVariables(int, int) */ + @Override public IVariable[] getVariables( int offset, int length ) throws DebugException { if ( offset >= getSize() ) { requestFailed( CoreModelMessages.getString( "CIndexedValue.1" ), null ); //$NON-NLS-1$ @@ -214,6 +226,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IIndexedValue#getSize() */ + @Override public int getSize() throws DebugException { return getSize0(); } @@ -221,6 +234,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IIndexedValue#getInitialOffset() */ + @Override public int getInitialOffset() { return fOffset; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CLocalVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CLocalVariable.java index cea54911776..7abf3c32b80 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CLocalVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CLocalVariable.java @@ -73,6 +73,7 @@ public class CLocalVariable extends CVariable { setCDIVariable( (varObject instanceof ICDIVariable) ? (ICDIVariable)varObject : null ); } + @Override public IInternalVariable createShadow( int start, int length ) throws DebugException { IInternalVariable iv = null; try { @@ -84,6 +85,7 @@ public class CLocalVariable extends CVariable { return iv; } + @Override public IInternalVariable createShadow( String type ) throws DebugException { IInternalVariable iv = null; try { @@ -122,6 +124,7 @@ public class CLocalVariable extends CVariable { fCDIVariableObject = variableObject; } + @Override public String getQualifiedName() throws DebugException { if ( fQualifiedName == null ) { try { @@ -134,6 +137,7 @@ public class CLocalVariable extends CVariable { return fQualifiedName; } + @Override public CType getType() throws DebugException { if ( fType == null ) { ICDIVariableDescriptor varObject = getCDIVariableObject(); @@ -168,14 +172,17 @@ public class CLocalVariable extends CVariable { fType = null; } + @Override public void dispose( boolean destroy ) { invalidate( destroy ); } + @Override public boolean isSameVariable( ICDIVariable cdiVar ) { return ( fCDIVariable != null ) ? fCDIVariable.equals( cdiVar ) : false; } + @Override public int sizeof() { if ( getCDIVariableObject() != null ) { try { @@ -187,10 +194,12 @@ public class CLocalVariable extends CVariable { return 0; } + @Override public boolean isArgument() { return ( getCDIVariableObject() instanceof ICDIArgumentDescriptor ); } + @Override public void setValue( String expression ) throws DebugException { ICDIVariable cdiVariable = null; try { @@ -205,6 +214,7 @@ public class CLocalVariable extends CVariable { } } + @Override public synchronized ICValue getValue() throws DebugException { if ( fValue.equals( CValueFactory.NULL_VALUE ) ) { ICDIVariable var = getCDIVariable(); @@ -237,6 +247,7 @@ public class CLocalVariable extends CVariable { return fValue; } + @Override public void invalidateValue() { if ( fValue instanceof AbstractCValue ) { ((AbstractCValue)fValue).dispose(); @@ -244,10 +255,12 @@ public class CLocalVariable extends CVariable { } } + @Override public boolean isChanged() { return fChanged; } + @Override public synchronized void setChanged( boolean changed ) { if ( changed ) { invalidateValue(); @@ -258,6 +271,7 @@ public class CLocalVariable extends CVariable { fChanged = changed; } + @Override public synchronized void preserve() { setChanged( false ); if ( fValue instanceof AbstractCValue ) { @@ -273,12 +287,14 @@ public class CLocalVariable extends CVariable { fVariable = variable; } + @Override public void resetValue() { if ( fValue instanceof AbstractCValue ) { ((AbstractCValue)fValue).reset(); } } + @Override public boolean isEditable() throws DebugException { ICDIVariable var = getCDIVariable(); if ( var != null ) { @@ -295,6 +311,7 @@ public class CLocalVariable extends CVariable { * Compares the underlying variable objects. * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals( Object obj ) { if ( obj instanceof InternalVariable ) { return getCDIVariableObject().equals( ((InternalVariable)obj).getCDIVariableObject() ); @@ -302,9 +319,11 @@ public class CLocalVariable extends CVariable { return false; } + @Override public boolean isSameDescriptor( ICDIVariableDescriptor desc ) { return getCDIVariableObject().equals( desc ); } + @Override public ICDIObject getCdiObject() { return fCDIVariable; } @@ -324,6 +343,7 @@ public class CLocalVariable extends CVariable { super( parent, cdiVariableObject ); } + @Override protected void createOriginal( ICDIVariableDescriptor vo ) { if ( vo != null ) { setName( vo.getName() ); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java index 4e84bdd3f4f..d03e41c8375 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java @@ -145,6 +145,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getExpression() */ + @Override public String getExpression() { return fExpression; } @@ -152,6 +153,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigBaseAddress() */ + @Override public BigInteger getBigBaseAddress() { return fBaseAddress; } @@ -159,6 +161,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressSize() */ + @Override public int getAddressSize() { return ((CDebugTarget)getDebugTarget()).getAddressFactory().createAddress( getBigBaseAddress() ).getSize(); } @@ -166,6 +169,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressableSize() */ + @Override public int getAddressableSize() throws DebugException { if (!fHaveWordSize) { synchronized (this) { @@ -194,6 +198,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportBaseAddressModification() */ + @Override public boolean supportBaseAddressModification() { return true; } @@ -201,6 +206,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#setBaseAddress(java.math.BigInteger) */ + @Override public void setBaseAddress( BigInteger address ) throws DebugException { BigInteger current = fBaseAddress; if (current == address || (current != null && current.equals(address))) { @@ -213,6 +219,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromOffset(java.math.BigInteger, long) */ + @Override public MemoryByte[] getBytesFromOffset( BigInteger unitOffset, long addressableUnits ) throws DebugException { return getBytesFromAddress(unitOffset.add(getBigBaseAddress()) , addressableUnits); } @@ -220,6 +227,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromAddress(java.math.BigInteger, long) */ + @Override public MemoryByte[] getBytesFromAddress( BigInteger address, long length ) throws DebugException { ICDIMemoryBlock cdiBlock = getCDIBlock(); if ( fBytes == null || cdiBlock == null || @@ -278,6 +286,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockRetrieval() */ + @Override public IMemoryBlockRetrieval getMemoryBlockRetrieval() { return (IMemoryBlockRetrieval)getDebugTarget().getAdapter( IMemoryBlockRetrieval.class ); } @@ -285,6 +294,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents( ICDIEvent[] events ) { for( int i = 0; i < events.length; i++ ) { ICDIEvent event = events[i]; @@ -307,6 +317,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlock#getStartAddress() */ + @Override public long getStartAddress() { return 0; } @@ -314,6 +325,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlock#getLength() */ + @Override public long getLength() { return 0; } @@ -321,6 +333,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlock#getBytes() */ + @Override public byte[] getBytes() throws DebugException { return null; } @@ -328,6 +341,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlock#supportsValueModification() */ + @Override public boolean supportsValueModification() { return true; } @@ -335,6 +349,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlock#setValue(long, byte[]) */ + @Override public void setValue( long offset, byte[] bytes ) throws DebugException { setValue( BigInteger.valueOf( offset ), bytes ); } @@ -342,6 +357,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#setValue(java.math.BigInteger, byte[]) */ + @Override public void setValue( BigInteger offset, byte[] bytes ) throws DebugException { ICDIMemoryBlock block = getCDIBlock(); if ( block != null ) { @@ -466,6 +482,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportsChangeManagement() */ + @Override public boolean supportsChangeManagement() { return true; } @@ -473,6 +490,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#connect(java.lang.Object) */ + @Override public void connect( Object object ) { // TODO Auto-generated method stub } @@ -480,6 +498,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#disconnect(java.lang.Object) */ + @Override public void disconnect( Object object ) { // TODO Auto-generated method stub } @@ -487,6 +506,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getConnections() */ + @Override public Object[] getConnections() { // TODO Auto-generated method stub return new Object[0]; @@ -495,6 +515,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#dispose() */ + @Override public void dispose() { fChanges.clear(); ICDIMemoryBlock cdiBlock = getCDIBlock(); @@ -516,6 +537,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override @SuppressWarnings("rawtypes") public Object getAdapter( Class adapter ) { if ( IMemoryBlockRetrieval.class.equals( adapter ) ) @@ -526,6 +548,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockStartAddress() */ + @Override public BigInteger getMemoryBlockStartAddress() throws DebugException { return null; // return null to mean not bounded ... according to the spec } @@ -533,6 +556,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockEndAddress() */ + @Override public BigInteger getMemoryBlockEndAddress() throws DebugException { return null;// return null to mean not bounded ... according to the spec } @@ -540,6 +564,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /* (non-Javadoc) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigLength() */ + @Override public BigInteger getBigLength() throws DebugException { ICDIMemoryBlock block = getCDIBlock(); if ( block != null ) { @@ -572,6 +597,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace /** * @see org.eclipse.cdt.debug.core.model.provisional.IMemorySpaceAwareMemoryBlock#getMemorySpaceID() */ + @Override public String getMemorySpaceID() { return fMemorySpaceID; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java index ecf94bc2f15..defc0826618 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java @@ -142,6 +142,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#getType() */ + @Override public int getType() { return fType; } @@ -149,6 +150,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#getName() */ + @Override public String getName() { return fImageName.lastSegment().toString(); } @@ -156,6 +158,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#getImageName() */ + @Override public IPath getImageName() { return fImageName; } @@ -163,6 +166,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#getSymbolsFileName() */ + @Override public IPath getSymbolsFileName() { return fSymbolsFileName; } @@ -170,6 +174,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#setSymbolsFileName(org.eclipse.core.runtime.IPath) */ + @Override public void setSymbolsFileName( IPath symbolsFile ) throws DebugException { loadSymbolsFromFile( symbolsFile ); fSymbolsFileName = symbolsFile; @@ -178,6 +183,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#getBaseAddress() */ + @Override public IAddress getBaseAddress() { return ( fCDIObject instanceof ICDISharedLibrary ) ? getAddressFactory().createAddress( ((ICDISharedLibrary)fCDIObject).getStartAddress() ) : getAddressFactory().getZero(); } @@ -185,6 +191,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#getSize() */ + @Override public long getSize() { long result = 0; if ( fCDIObject instanceof ICDISharedLibrary ) { @@ -199,6 +206,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#areSymbolsLoaded() */ + @Override public boolean areSymbolsLoaded() { if (fCDIObject instanceof ICDISharedLibrary) return ((ICDISharedLibrary)fCDIObject).areSymbolsLoaded(); @@ -212,6 +220,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#canLoadSymbols() */ + @Override public boolean canLoadSymbols() { return ( getDebugTarget().isSuspended() && !areSymbolsLoaded() ); } @@ -219,6 +228,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#loadSymbols() */ + @Override public void loadSymbols() throws DebugException { loadSymbolsFromFile( getSymbolsFileName() ); } @@ -226,6 +236,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#getPlatform() */ + @Override public String getPlatform() { return ( fBinary != null ) ? fBinary.getCPU() : CoreModelMessages.getString( "CModule.1" ); //$NON-NLS-1$ } @@ -233,6 +244,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#isLittleEndian() */ + @Override public boolean isLittleEndian() { return ( fBinary != null ) ? fBinary.isLittleEndian() : ((CDebugTarget)getDebugTarget()).isLittleEndian(); } @@ -240,6 +252,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#getAddressFactory() */ + @Override public IAddressFactory getAddressFactory() { return ((CDebugTarget)getDebugTarget()).getAddressFactory(); } @@ -247,6 +260,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICModule#getCPU() */ + @Override public String getCPU() { return ( fBinary != null ) ? fBinary.getCPU() : null; } @@ -254,6 +268,7 @@ public class CModule extends CDebugElement implements ICModule { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter( Class adapter ) { if ( ICElement.class.equals( adapter ) ) { return getCElement(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModuleManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModuleManager.java index ec683775a9f..d295e330276 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModuleManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModuleManager.java @@ -51,14 +51,17 @@ public class CModuleManager extends PlatformObject implements IModuleRetrieval { fModules = new ArrayList( 5 ); } + @Override public boolean hasModules() throws DebugException { return !fModules.isEmpty(); } + @Override public ICModule[] getModules() throws DebugException { return (ICModule[])fModules.toArray( new ICModule[fModules.size()] ); } + @Override public void loadSymbolsForAllModules() throws DebugException { MultiStatus ms = new MultiStatus( CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, CoreModelMessages.getString( "CModuleManager.0" ), null ); //$NON-NLS-1$ Iterator it = fModules.iterator(); @@ -157,6 +160,7 @@ public class CModuleManager extends PlatformObject implements IModuleRetrieval { /* (non-Javadoc) * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) */ + @Override public Object getAdapter( Class adapter ) { if ( adapter.equals( ICDebugTarget.class ) ) return getDebugTarget(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java index 9048dba88fb..f91868677ae 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java @@ -90,6 +90,7 @@ public class CRegister extends CVariable implements ICRegister { setCDIRegister( (varObject instanceof ICDIRegister) ? (ICDIRegister)varObject : null ); } + @Override public IInternalVariable createShadow( int start, int length ) throws DebugException { IInternalVariable iv = null; try { @@ -101,6 +102,7 @@ public class CRegister extends CVariable implements ICRegister { return iv; } + @Override public IInternalVariable createShadow( String type ) throws DebugException { IInternalVariable iv = null; try { @@ -139,6 +141,7 @@ public class CRegister extends CVariable implements ICRegister { fCDIVariableObject = variableObject; } + @Override public String getQualifiedName() throws DebugException { if ( fQualifiedName == null ) { try { @@ -151,6 +154,7 @@ public class CRegister extends CVariable implements ICRegister { return fQualifiedName; } + @Override public CType getType() throws DebugException { if ( fType == null ) { ICDIVariableDescriptor varObject = getCDIVariableObject(); @@ -185,14 +189,17 @@ public class CRegister extends CVariable implements ICRegister { fType = null; } + @Override public void dispose( boolean destroy ) { invalidate( destroy ); } + @Override public boolean isSameVariable( ICDIVariable cdiVar ) { return ( fCDIRegister != null ) ? fCDIRegister.equals( cdiVar ) : false; } + @Override public int sizeof() { if ( getCDIVariableObject() != null ) { try { @@ -204,10 +211,12 @@ public class CRegister extends CVariable implements ICRegister { return 0; } + @Override public boolean isArgument() { return ( getCDIVariableObject() instanceof ICDIArgumentDescriptor ); } + @Override public void setValue( String expression ) throws DebugException { ICDIRegister cdiRegister = null; try { @@ -222,6 +231,7 @@ public class CRegister extends CVariable implements ICRegister { } } + @Override public synchronized ICValue getValue() throws DebugException { CStackFrame frame = getCurrentStackFrame(); if ( frame == null || frame.isDisposed() ) @@ -254,6 +264,7 @@ public class CRegister extends CVariable implements ICRegister { return fValue; } + @Override public void invalidateValue() { if ( fValue instanceof AbstractCValue ) { ((AbstractCValue)fValue).dispose(); @@ -261,10 +272,12 @@ public class CRegister extends CVariable implements ICRegister { } } + @Override public boolean isChanged() { return fChanged; } + @Override public synchronized void setChanged( boolean changed ) { if ( changed ) { invalidateValue(); @@ -275,6 +288,7 @@ public class CRegister extends CVariable implements ICRegister { fChanged = changed; } + @Override public synchronized void preserve() { setChanged( false ); if ( fValue instanceof AbstractCValue ) { @@ -290,12 +304,14 @@ public class CRegister extends CVariable implements ICRegister { fVariable = variable; } + @Override public void resetValue() { if ( fValue instanceof AbstractCValue ) { ((AbstractCValue)fValue).reset(); } } + @Override public boolean isEditable() throws DebugException { ICDIRegister reg = getCDIRegister(); if ( reg != null && reg.getTarget().getConfiguration().supportsRegisterModification() ) { @@ -311,6 +327,7 @@ public class CRegister extends CVariable implements ICRegister { * Compares the underlying variable objects. * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals( Object obj ) { if ( obj instanceof InternalVariable ) { return getCDIVariableObject().equals( ((InternalVariable)obj).getCDIVariableObject() ); @@ -318,10 +335,12 @@ public class CRegister extends CVariable implements ICRegister { return false; } + @Override public boolean isSameDescriptor( ICDIVariableDescriptor desc ) { return getCDIVariableObject().equals( desc ); } + @Override public ICDIObject getCdiObject() { return fCDIRegister; } @@ -348,6 +367,7 @@ public class CRegister extends CVariable implements ICRegister { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IRegister#getRegisterGroup() */ + @Override public IRegisterGroup getRegisterGroup() throws DebugException { return (IRegisterGroup)getParent(); } @@ -355,6 +375,7 @@ public class CRegister extends CVariable implements ICRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.CVariable#isBookkeepingEnabled() */ + @Override protected boolean isBookkeepingEnabled() { boolean result = false; try { @@ -368,6 +389,7 @@ public class CRegister extends CVariable implements ICRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable() */ + @Override public boolean canEnableDisable() { return true; } @@ -375,6 +397,7 @@ public class CRegister extends CVariable implements ICRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents( ICDIEvent[] events ) { for( int i = 0; i < events.length; i++ ) { ICDIEvent event = events[i]; @@ -400,11 +423,13 @@ public class CRegister extends CVariable implements ICRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#dispose() */ + @Override public void dispose() { internalDispose( true ); setDisposed( true ); } + @Override protected ICStackFrame getStackFrame() { ICStackFrame frame = super.getStackFrame(); if (frame == null) @@ -416,6 +441,7 @@ public class CRegister extends CVariable implements ICRegister { return ((CDebugTarget)getDebugTarget()).getRegisterManager().getCurrentFrame(); } + @Override protected void createOriginal( ICDIVariableDescriptor vo ) { if ( vo != null ) { setName( vo.getName() ); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterDescriptor.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterDescriptor.java index 445b9c1a34f..df6735ea1ce 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterDescriptor.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterDescriptor.java @@ -43,6 +43,7 @@ public class CRegisterDescriptor implements IRegisterDescriptor { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRegisterDescriptor#getName() */ + @Override public String getName() { return fName; } @@ -50,6 +51,7 @@ public class CRegisterDescriptor implements IRegisterDescriptor { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRegisterDescriptor#getGroupName() */ + @Override public String getGroupName() { return fGroupName; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterGroup.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterGroup.java index a8a1cbc97ac..eef50a75e94 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterGroup.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterGroup.java @@ -69,6 +69,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste /* (non-Javadoc) * @see org.eclipse.debug.core.model.IRegisterGroup#getName() */ + @Override public String getName() throws DebugException { return fName; } @@ -76,6 +77,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste /* (non-Javadoc) * @see org.eclipse.debug.core.model.IRegisterGroup#getRegisters() */ + @Override public IRegister[] getRegisters() throws DebugException { if ( fDisposed ) return new IRegister[0]; @@ -95,6 +97,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste /* (non-Javadoc) * @see org.eclipse.debug.core.model.IRegisterGroup#hasRegisters() */ + @Override public boolean hasRegisters() throws DebugException { return ( fRegisterDescriptors.length > 0 ); } @@ -118,6 +121,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter( Class adapter ) { if ( IEnableDisableTarget.class.equals( adapter ) ) return this; @@ -127,6 +131,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IEnableDisableTarget#canEnableDisable() */ + @Override public boolean canEnableDisable() { return true; } @@ -134,6 +139,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IEnableDisableTarget#isEnabled() */ + @Override public boolean isEnabled() { return fIsEnabled; } @@ -141,6 +147,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IEnableDisableTarget#setEnabled(boolean) */ + @Override public void setEnabled( boolean enabled ) throws DebugException { if ( fRegisters != null ) { synchronized( fRegisters ) { @@ -157,6 +164,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste fireChangeEvent( DebugEvent.CONTENT ); } + @Override public String getMemento() throws CoreException { Document document = DebugPlugin.newDocument(); Element element = document.createElement( ELEMENT_REGISTER_GROUP ); @@ -172,6 +180,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste return DebugPlugin.serializeDocument( document ); } + @Override public void initializeFromMemento( String memento ) throws CoreException { Node node = DebugPlugin.parseDocument( memento ); if ( node.getNodeType() != Node.ELEMENT_NODE ) { @@ -227,6 +236,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IPersistableRegisterGroup#setRegisterDescriptors(org.eclipse.cdt.debug.core.model.IRegisterDescriptor[]) */ + @Override public void setRegisterDescriptors( IRegisterDescriptor[] registerDescriptors ) { invalidate(); fRegisterDescriptors = registerDescriptors; @@ -235,6 +245,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IPersistableRegisterGroup#getRegisterDescriptors() */ + @Override public IRegisterDescriptor[] getRegisterDescriptors() { return fRegisterDescriptors; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CSignal.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CSignal.java index 3285db587e4..4e891d5743f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CSignal.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CSignal.java @@ -40,6 +40,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICSignal#getDescription() */ + @Override public String getDescription() throws DebugException { return getCDISignal().getDescription(); @@ -48,6 +49,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICSignal#getName() */ + @Override public String getName() throws DebugException { return getCDISignal().getName(); @@ -56,6 +58,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICSignal#isPassEnabled() */ + @Override public boolean isPassEnabled() throws DebugException { return !getCDISignal().isIgnore(); @@ -64,6 +67,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICSignal#isStopEnabled() */ + @Override public boolean isStopEnabled() throws DebugException { return getCDISignal().isStopSet(); @@ -72,6 +76,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICSignal#setPassEnabled(boolean) */ + @Override public void setPassEnabled( boolean enable ) throws DebugException { handle( enable, isStopEnabled() ); @@ -80,6 +85,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICSignal#setStopEnabled(boolean) */ + @Override public void setStopEnabled( boolean enable ) throws DebugException { handle( isPassEnabled(), enable ); @@ -88,6 +94,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(ICDIEvent) */ + @Override public void handleDebugEvents( ICDIEvent[] events ) { } @@ -103,6 +110,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICSignal#signal() */ + @Override public void signal() throws DebugException { try @@ -132,6 +140,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene } } + @Override public boolean canModify() { // TODO add canModify method to ICDISignal return true; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java index 6c7022c11d1..bfde3914910 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java @@ -109,6 +109,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getThread() */ + @Override public IThread getThread() { return fThread; } @@ -116,6 +117,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getVariables() */ + @Override public IVariable[] getVariables() throws DebugException { if ( isDisposed() ) { return new IVariable[0]; @@ -186,6 +188,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#hasVariables() */ + @Override public boolean hasVariables() throws DebugException { return ( isDisposed() ) ? false : (getVariables0().size() > 0 || getGlobals().length > 0); } @@ -193,6 +196,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber() */ + @Override public int getLineNumber() throws DebugException { if ( isSuspended() ) { ISourceLocator locator = ((CDebugTarget)getDebugTarget()).getSourceLocator(); @@ -209,6 +213,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getCharStart() */ + @Override public int getCharStart() throws DebugException { return -1; } @@ -216,6 +221,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd() */ + @Override public int getCharEnd() throws DebugException { return -1; } @@ -223,6 +229,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getName() */ + @Override public String getName() throws DebugException { final ICDIStackFrame cdiFrame = getCDIStackFrame(); if (cdiFrame == null) { @@ -250,6 +257,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups() */ + @Override public IRegisterGroup[] getRegisterGroups() throws DebugException { return ( isDisposed() ) ? new IRegisterGroup[0] : ((CDebugTarget)getDebugTarget()).getRegisterGroups( this ); } @@ -257,6 +265,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups() */ + @Override public boolean hasRegisterGroups() throws DebugException { return ( isDisposed() ) ? false : ((CDebugTarget)getDebugTarget()).getRegisterGroups( this ).length > 0; } @@ -264,12 +273,14 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents( ICDIEvent[] events ) { } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#canStepInto() */ + @Override public boolean canStepInto() { try { return exists() /*&& isTopStackFrame()*/ && getThread().canStepInto(); @@ -283,6 +294,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#canStepOver() */ + @Override public boolean canStepOver() { try { return exists() && getThread().canStepOver(); @@ -296,6 +308,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#canStepReturn() */ + @Override public boolean canStepReturn() { try { if ( !exists() ) { @@ -316,6 +329,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#isStepping() */ + @Override public boolean isStepping() { return getThread().isStepping(); } @@ -323,6 +337,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#stepInto() */ + @Override public void stepInto() throws DebugException { if ( canStepInto() ) { getThread().stepInto(); @@ -332,6 +347,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#stepOver() */ + @Override public void stepOver() throws DebugException { if ( canStepOver() ) { getThread().stepOver(); @@ -341,6 +357,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#stepReturn() */ + @Override public void stepReturn() throws DebugException { if ( canStepReturn() ) { getThread().stepReturn(); @@ -350,6 +367,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#canResume() */ + @Override public boolean canResume() { return getThread().canResume(); } @@ -357,6 +375,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() */ + @Override public boolean canSuspend() { return getThread().canSuspend(); } @@ -364,6 +383,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() */ + @Override public boolean isSuspended() { return getThread().isSuspended(); } @@ -371,6 +391,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ + @Override public void resume() throws DebugException { getThread().resume(); } @@ -378,6 +399,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#suspend() */ + @Override public void suspend() throws DebugException { getThread().suspend(); } @@ -385,6 +407,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#canTerminate() */ + @Override public boolean canTerminate() { boolean exists = false; try { @@ -399,6 +422,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#isTerminated() */ + @Override public boolean isTerminated() { return getThread().isTerminated(); } @@ -406,6 +430,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#terminate() */ + @Override public void terminate() throws DebugException { if ( getThread().canTerminate() ) { getThread().terminate(); @@ -481,6 +506,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /** * @see IAdaptable#getAdapter(Class) */ + @Override public Object getAdapter( Class adapter ) { if ( adapter == IRunToLine.class ) { return this; @@ -604,6 +630,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getAddress() */ + @Override public IAddress getAddress() { IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory(); final ICDIStackFrame cdiFrame = getCDIStackFrame(); @@ -613,6 +640,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getFile() */ + @Override public String getFile() { final ICDIStackFrame cdiFrame = getCDIStackFrame(); return cdiFrame != null ? cdiFrame.getLocator().getFile() : ""; //$NON-NLS-1$ @@ -621,6 +649,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getFunction() */ + @Override public String getFunction() { final ICDIStackFrame cdiFrame = getCDIStackFrame(); return cdiFrame != null ? cdiFrame.getLocator().getFunction() : ""; //$NON-NLS-1$ @@ -629,6 +658,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getLevel() */ + @Override public int getLevel() { final ICDIStackFrame cdiFrame = getCDIStackFrame(); return cdiFrame != null ? cdiFrame.getLevel() : -1; @@ -637,6 +667,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getFrameLineNumber() */ + @Override public int getFrameLineNumber() { final ICDIStackFrame cdiFrame = getCDIStackFrame(); return cdiFrame != null ? cdiFrame.getLocator().getLineNumber() : -1; @@ -680,6 +711,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRestart#canRestart() */ + @Override public boolean canRestart() { return getDebugTarget() instanceof IRestart && ((IRestart)getDebugTarget()).canRestart(); } @@ -687,6 +719,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRestart#restart() */ + @Override public void restart() throws DebugException { if ( canRestart() ) { ((IRestart)getDebugTarget()).restart(); @@ -704,6 +737,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal() */ + @Override public boolean canResumeWithoutSignal() { return (getDebugTarget() instanceof IResumeWithoutSignal && ((IResumeWithoutSignal)getDebugTarget()).canResumeWithoutSignal()); } @@ -711,6 +745,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal() */ + @Override public void resumeWithoutSignal() throws DebugException { if ( canResumeWithoutSignal() ) { ((IResumeWithoutSignal)getDebugTarget()).resumeWithoutSignal(); @@ -720,6 +755,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#evaluateExpression(java.lang.String) */ + @Override public IValue evaluateExpression( String expressionText ) throws DebugException { if ( !isDisposed() ) { CExpression expression = getExpression( expressionText ); @@ -741,6 +777,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { try { return getName(); @@ -753,6 +790,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#evaluateExpressionToString(java.lang.String) */ + @Override public String evaluateExpressionToString( String expression ) throws DebugException { try { final ICDIStackFrame cdiFrame = getCDIStackFrame(); @@ -769,6 +807,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#canEvaluate() */ + @Override public boolean canEvaluate() { CDebugTarget target = ((CDebugTarget)getDebugTarget()); return target.supportsExpressionEvaluation() && isSuspended(); @@ -823,6 +862,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(org.eclipse.core.resources.IFile, int) */ + @Override public boolean canRunToLine( IFile file, int lineNumber ) { return ((CThread)getThread()).canRunToLine( file, lineNumber ); } @@ -830,6 +870,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToLine#runToLine(org.eclipse.core.resources.IFile, int, boolean) */ + @Override public void runToLine( IFile file, int lineNumber, boolean skipBreakpoints ) throws DebugException { if ( !canRunToLine( file, lineNumber ) ) return; @@ -839,6 +880,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(java.lang.String, int) */ + @Override public boolean canRunToLine( String fileName, int lineNumber ) { return ((CThread)getThread()).canRunToLine( fileName, lineNumber ); } @@ -846,6 +888,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToLine#runToLine(java.lang.String, int, boolean) */ + @Override public void runToLine( String fileName, int lineNumber, boolean skipBreakpoints ) throws DebugException { if ( !canRunToLine( fileName, lineNumber ) ) return; @@ -855,6 +898,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToAddress#canRunToAddress(org.eclipse.cdt.core.IAddress) */ + @Override public boolean canRunToAddress( IAddress address ) { return getThread().canResume(); } @@ -862,6 +906,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToAddress#runToAddress(org.eclipse.cdt.core.IAddress, boolean) */ + @Override public void runToAddress( IAddress address, boolean skipBreakpoints ) throws DebugException { if ( !canRunToAddress( address ) ) return; @@ -883,6 +928,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeAtLine#canResumeAtLine(org.eclipse.core.resources.IFile, int) */ + @Override public boolean canResumeAtLine( IFile file, int lineNumber ) { return getThread().canResume(); } @@ -890,6 +936,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeAtLine#resumeAtLine(org.eclipse.core.resources.IFile, int) */ + @Override public void resumeAtLine( IFile file, int lineNumber ) throws DebugException { if ( !canResumeAtLine( file, lineNumber ) ) return; @@ -899,6 +946,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeAtLine#canResumeAtLine(java.lang.String, int) */ + @Override public boolean canResumeAtLine( String fileName, int lineNumber ) { return getThread().canResume(); } @@ -906,6 +954,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeAtLine#resumeAtLine(java.lang.String, int) */ + @Override public void resumeAtLine( String fileName, int lineNumber ) throws DebugException { if ( !canResumeAtLine( fileName, lineNumber ) ) return; @@ -923,6 +972,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeAtAddress#canResumeAtAddress(org.eclipse.cdt.core.IAddress) */ + @Override public boolean canResumeAtAddress( IAddress address ) { return getThread().canResume(); } @@ -930,6 +980,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeAtAddress#resumeAtAddress(org.eclipse.cdt.core.IAddress) */ + @Override public void resumeAtAddress( IAddress address ) throws DebugException { if ( !canResumeAtAddress( address ) ) return; @@ -945,6 +996,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IMoveToAddress#canMoveToAddress(org.eclipse.cdt.core.IAddress) */ + @Override public boolean canMoveToAddress(IAddress address) { return getThread().isSuspended() && (getCDIThread() instanceof ICDIExecuteMoveInstructionPointer); } @@ -952,6 +1004,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IMoveToAddress#moveToAddress(org.eclipse.cdt.core.IAddress) */ + @Override public void moveToAddress(IAddress address) throws DebugException { if ( !canMoveToAddress( address ) ) return; @@ -968,6 +1021,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IMoveToLine#canMoveToLine(java.lang.String, int) */ + @Override public boolean canMoveToLine(String fileName, int lineNumber) { return getThread().isSuspended() && (getCDIThread() instanceof ICDIExecuteMoveInstructionPointer); } @@ -975,6 +1029,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IMoveToLine#moveToLine(java.lang.String, int) */ + @Override public void moveToLine(String fileName, int lineNumber) throws DebugException { if ( !canMoveToLine( fileName, lineNumber ) ) return; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java index 625a1108086..c98aaf1f0a9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java @@ -123,6 +123,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IThread#getStackFrames() */ + @Override public IStackFrame[] getStackFrames() throws DebugException { List list = Collections.EMPTY_LIST; try { @@ -138,6 +139,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IThread#hasStackFrames() */ + @Override public boolean hasStackFrames() throws DebugException { // Always return true to postpone the stack frames request. // But not if the thread is already resumed. This fixes flickering in the Debug View. @@ -361,6 +363,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IThread#getPriority() */ + @Override public int getPriority() throws DebugException { return 0; } @@ -368,6 +371,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IThread#getTopStackFrame() */ + @Override public IStackFrame getTopStackFrame() throws DebugException { List c = computeStackFrames(); return (c.isEmpty()) ? null : (IStackFrame)c.get( 0 ); @@ -376,6 +380,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IThread#getName() */ + @Override public String getName() throws DebugException { final ICDIThread cdiThread = getCDIThread(); return cdiThread != null ? cdiThread.toString() : ""; //$NON-NLS-1$ @@ -384,6 +389,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IThread#getBreakpoints() */ + @Override public IBreakpoint[] getBreakpoints() { List list = new ArrayList( 1 ); if ( isSuspended() ) { @@ -401,6 +407,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents( ICDIEvent[] events ) { if ( isDisposed() ) return; @@ -431,6 +438,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#canResume() */ + @Override public boolean canResume() { return ( fConfig.supportsResume() && isSuspended() ); } @@ -438,6 +446,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(org.eclipse.core.resources.IFile, int) */ + @Override public boolean canRunToLine( IFile file, int lineNumber ) { return canRunToLine( file.getLocation().lastSegment(), lineNumber ); } @@ -445,6 +454,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(java.lang.String, int) */ + @Override public boolean canRunToLine( String fileName, int lineNumber ) { return canResume(); } @@ -452,6 +462,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() */ + @Override public boolean canSuspend() { CDebugElementState state = getState(); return ( fConfig.supportsSuspend() && (state.equals( CDebugElementState.RESUMED ) || state.equals( CDebugElementState.STEPPED )) ); @@ -460,6 +471,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() */ + @Override public boolean isSuspended() { return getState().equals( CDebugElementState.SUSPENDED ); } @@ -467,6 +479,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ + @Override public void resume() throws DebugException { if ( !canResume() ) return; @@ -487,6 +500,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToLine#runToLine(org.eclipse.core.resources.IFile, int, boolean) */ + @Override public void runToLine( IFile file, int lineNumber, boolean skipBreakpoints ) throws DebugException { runToLine( file.getLocation().lastSegment(), lineNumber, skipBreakpoints ); } @@ -494,6 +508,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRunToLine#runToLine(java.lang.String, int, boolean) */ + @Override public void runToLine( String fileName, int lineNumber, boolean skipBreakpoints ) throws DebugException { if ( !canRunToLine( fileName, lineNumber ) ) return; @@ -522,6 +537,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#suspend() */ + @Override public void suspend() throws DebugException { if ( !canSuspend() ) return; @@ -542,6 +558,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#canStepInto() */ + @Override public boolean canStepInto() { return canStep(); } @@ -549,6 +566,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#canStepOver() */ + @Override public boolean canStepOver() { return canStep(); } @@ -556,6 +574,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#canStepReturn() */ + @Override public boolean canStepReturn() { if ( !fConfig.supportsStepping() || !canResume() ) { return false; @@ -578,6 +597,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#isStepping() */ + @Override public boolean isStepping() { return ( getState().equals( CDebugElementState.STEPPING ) ) || ( getState().equals( CDebugElementState.STEPPED ) ); } @@ -585,6 +605,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#stepInto() */ + @Override public void stepInto() throws DebugException { if ( !canStepInto() ) return; @@ -610,6 +631,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#stepOver() */ + @Override public void stepOver() throws DebugException { if ( !canStepOver() ) return; @@ -635,6 +657,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#stepReturn() */ + @Override public void stepReturn() throws DebugException { if ( !canStepReturn() ) return; @@ -656,6 +679,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#canTerminate() */ + @Override public boolean canTerminate() { return getDebugTarget().canTerminate(); } @@ -663,6 +687,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#isTerminated() */ + @Override public boolean isTerminated() { return getDebugTarget().isTerminated(); } @@ -670,6 +695,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#terminate() */ + @Override public void terminate() throws DebugException { getDebugTarget().terminate(); } @@ -867,6 +893,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRestart#canRestart() */ + @Override public boolean canRestart() { return getDebugTarget() instanceof IRestart && ((IRestart)getDebugTarget()).canRestart(); } @@ -874,6 +901,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IRestart#restart() */ + @Override public void restart() throws DebugException { if ( canRestart() ) { ((IRestart)getDebugTarget()).restart(); @@ -924,6 +952,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter( Class adapter ) { if ( adapter.equals( IRunToLine.class ) || adapter.equals( IRunToAddress.class ) || @@ -977,6 +1006,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal() */ + @Override public boolean canResumeWithoutSignal() { return (getDebugTarget() instanceof IResumeWithoutSignal && ((IResumeWithoutSignal)getDebugTarget()).canResumeWithoutSignal()); } @@ -984,6 +1014,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal() */ + @Override public void resumeWithoutSignal() throws DebugException { if ( canResumeWithoutSignal() ) { ((IResumeWithoutSignal)getDebugTarget()).resumeWithoutSignal(); @@ -993,6 +1024,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { String result = ""; //$NON-NLS-1$ try { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CType.java index 8a30af3f49e..760707b58a9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CType.java @@ -41,6 +41,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#getName() */ + @Override public String getName() { return ( fCDIType != null ) ? fCDIType.getTypeName() : null; } @@ -52,6 +53,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#getArrayDimensions() */ + @Override public int[] getArrayDimensions() { int length = 0; ICDIType type = getCDIType(); @@ -71,6 +73,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#isArray() */ + @Override public boolean isArray() { return ( getCDIType() instanceof ICDIArrayType ); } @@ -78,6 +81,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#isCharacter() */ + @Override public boolean isCharacter() { return ( getCDIType() instanceof ICDICharType ); } @@ -85,6 +89,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#isFloatingPointType() */ + @Override public boolean isFloatingPointType() { return ( getCDIType() instanceof ICDIFloatingPointType ); } @@ -92,6 +97,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#isPointer() */ + @Override public boolean isPointer() { return ( getCDIType() instanceof ICDIPointerType ); } @@ -99,6 +105,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#isReference() */ + @Override public boolean isReference() { return ( getCDIType() instanceof ICDIReferenceType ); } @@ -106,6 +113,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#isStructure() */ + @Override public boolean isStructure() { return ( getCDIType() instanceof ICDIStructType ); } @@ -113,6 +121,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#isUnsigned() */ + @Override public boolean isUnsigned() { return ( isIntegralType() ) ? ((ICDIIntegralType)getCDIType()).isUnsigned() : false; } @@ -120,6 +129,7 @@ public class CType implements ICType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICType#isIntegralType() */ + @Override public boolean isIntegralType() { return ( getCDIType() instanceof ICDIIntegralType ); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java index e3bc0665af7..5614958f953 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java @@ -88,6 +88,7 @@ public class CValue extends AbstractCValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getReferenceTypeName() */ + @Override public String getReferenceTypeName() throws DebugException { return ( getParentVariable() != null ) ? getParentVariable().getReferenceTypeName() : null; } @@ -95,6 +96,7 @@ public class CValue extends AbstractCValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getValueString() */ + @Override public String getValueString() throws DebugException { if ( fValueString == null && getUnderlyingValue() != null ) { resetStatus(); @@ -116,6 +118,7 @@ public class CValue extends AbstractCValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#isAllocated() */ + @Override public boolean isAllocated() throws DebugException { return true; } @@ -123,6 +126,7 @@ public class CValue extends AbstractCValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#getVariables() */ + @Override public IVariable[] getVariables() throws DebugException { List<AbstractCVariable> list = getVariables0(); return list.toArray( new IVariable[list.size()] ); @@ -157,6 +161,7 @@ public class CValue extends AbstractCValue { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValue#hasVariables() */ + @Override public boolean hasVariables() throws DebugException { try { ICDIValue value = getUnderlyingValue(); @@ -193,6 +198,7 @@ public class CValue extends AbstractCValue { return Arrays.asList( vars ); } + @Override protected synchronized void setChanged( boolean changed ) { if ( changed ) { fValueString = null; @@ -212,6 +218,7 @@ public class CValue extends AbstractCValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#dispose() */ + @Override public void dispose() { for (AbstractCVariable var : fVariables) { var.dispose(); @@ -671,6 +678,7 @@ public class CValue extends AbstractCValue { /** * Invalidates the string cache. */ + @Override protected void reset() { resetStatus(); fValueString = null; @@ -679,6 +687,7 @@ public class CValue extends AbstractCValue { } } + @Override public ICType getType() throws DebugException { ICDIValue cdiValue = getUnderlyingValue(); if ( fType == null ) { @@ -703,6 +712,7 @@ public class CValue extends AbstractCValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#preserve() */ + @Override protected void preserve() { setChanged( false ); resetStatus(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java index b2bce6a16b1..c7d6cce063e 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java @@ -30,54 +30,67 @@ public class CValueFactory { static public final ICValue NULL_VALUE = new ICValue() { + @Override public String getReferenceTypeName() throws DebugException { return ""; //$NON-NLS-1$ } + @Override public String getValueString() throws DebugException { return ""; //$NON-NLS-1$ } + @Override public boolean isAllocated() throws DebugException { return true; } + @Override public IVariable[] getVariables() throws DebugException { return new IVariable[0]; } + @Override public boolean hasVariables() throws DebugException { return false; } + @Override public String getModelIdentifier() { return CDebugCorePlugin.getUniqueIdentifier(); } + @Override public IDebugTarget getDebugTarget() { return null; } + @Override public ILaunch getLaunch() { return null; } + @Override public Object getAdapter( Class adapter ) { return null; } + @Override public ICType getType() throws DebugException { return null; } + @Override public String evaluateAsExpression( ICStackFrame frame ) { return ""; //$NON-NLS-1$ } + @Override public CDebugElementState getState() { return CDebugElementState.UNDEFINED; } + @Override public Object getCurrentStateInfo() { return null; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java index 718a7c4c730..87537c2c313 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java @@ -65,6 +65,7 @@ class VariableEventListener implements ICDIEventListener { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents(ICDIEvent[] events) { fVar.handleDebugEvents(events); } @@ -174,6 +175,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICVariable#getType() */ + @Override public ICType getType() throws DebugException { if ( isDisposed() ) return null; @@ -186,6 +188,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICVariable#isEnabled() */ + @Override public boolean isEnabled() { return fIsEnabled; } @@ -195,6 +198,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICVariable#setEnabled(boolean) */ + @Override public void setEnabled( boolean enabled ) throws DebugException { // Debugger engines that use active variable objects will benefit // performance-wise if we dispose the internal variable when it's @@ -224,6 +228,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable() */ + @Override public boolean canEnableDisable() { return !( getParent() instanceof IValue ); } @@ -233,6 +238,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICVariable#isArgument() */ + @Override public boolean isArgument() { IInternalVariable iv = getOriginal(); return ( iv != null ) ? iv.isArgument() : false; @@ -243,6 +249,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.debug.core.model.IVariable#getValue() */ + @Override public IValue getValue() throws DebugException { if ( !isDisposed() && isEnabled() ) { IInternalVariable iv = getCurrentInternalVariable(); @@ -263,6 +270,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.debug.core.model.IVariable#getName() */ + @Override public String getName() throws DebugException { return fName; } @@ -272,6 +280,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName() */ + @Override public String getReferenceTypeName() throws DebugException { ICType type = getType(); return ( type != null ) ? type.getName() : ""; //$NON-NLS-1$ @@ -282,6 +291,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.debug.core.model.IVariable#hasValueChanged() */ + @Override public boolean hasValueChanged() throws DebugException { if ( isDisposed() ) return false; @@ -294,6 +304,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.IFormatSupport#supportsFormatting() */ + @Override public boolean supportsFormatting() { return true; } @@ -303,6 +314,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.IFormatSupport#getFormat() */ + @Override public CVariableFormat getFormat() { return fFormat; } @@ -312,6 +324,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.IFormatSupport#changeFormat(org.eclipse.cdt.debug.core.model.CVariableFormat) */ + @Override public void changeFormat( CVariableFormat format ) throws DebugException { setFormat( format ); storeFormat( format ); @@ -324,6 +337,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICastToArray#canCastToArray() */ + @Override public boolean canCastToArray() { ICType type; try { @@ -340,6 +354,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICastToArray#castToArray(int, int) */ + @Override public void castToArray( int startIndex, int length ) throws DebugException { IInternalVariable current = getCurrentInternalVariable(); if ( current != null ) { @@ -359,6 +374,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.debug.core.model.IValueModification#setValue(java.lang.String) */ + @Override public void setValue( String expression ) throws DebugException { IInternalVariable iv = getCurrentInternalVariable(); if ( iv != null ) { @@ -372,6 +388,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.debug.core.model.IValueModification#setValue(org.eclipse.debug.core.model.IValue) */ + @Override public void setValue( IValue value ) throws DebugException { notSupported( CoreModelMessages.getString( "CVariable.3" ) ); //$NON-NLS-1$ } @@ -381,6 +398,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.debug.core.model.IValueModification#supportsValueModification() */ + @Override public boolean supportsValueModification() { try { return fIsEnabled ? getCurrentInternalVariable().isEditable() : false; @@ -395,6 +413,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.debug.core.model.IValueModification#verifyValue(java.lang.String) */ + @Override public boolean verifyValue( String expression ) throws DebugException { return true; } @@ -404,6 +423,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.debug.core.model.IValueModification#verifyValue(org.eclipse.debug.core.model.IValue) */ + @Override public boolean verifyValue( IValue value ) throws DebugException { return value.getDebugTarget().equals( getDebugTarget() ); } @@ -413,6 +433,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICastToType#canCast() */ + @Override public boolean canCast() { return ( getOriginal() != null && isEnabled() ); } @@ -422,6 +443,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICastToType#getCurrentType() */ + @Override public String getCurrentType() { String typeName = ""; //$NON-NLS-1$ try { @@ -437,6 +459,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICastToType#cast(java.lang.String) */ + @Override public void cast( String type ) throws DebugException { IInternalVariable current = getCurrentInternalVariable(); if ( current != null ) { @@ -456,6 +479,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICastToType#restoreOriginal() */ + @Override public void restoreOriginal() throws DebugException { IInternalVariable oldVar = getShadow(); setShadow( null ); @@ -476,6 +500,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.model.ICastToType#isCasted() */ + @Override public boolean isCasted() { return ( getShadow() != null ); } @@ -485,6 +510,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi * * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents( ICDIEvent[] events ) { IInternalVariable iv = getCurrentInternalVariable(); if ( iv == null ) @@ -650,6 +676,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.ICVariable#getExpressionString() */ + @Override public String getExpressionString() throws DebugException { IInternalVariable iv = getCurrentInternalVariable(); return ( iv != null ) ? iv.getQualifiedName() : null; @@ -883,6 +910,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#getExpression() */ + @Override public String getExpression() { try { return getExpressionString(); @@ -894,6 +922,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#getSize() */ + @Override public void getSize(ICWatchpointTarget.GetSizeRequest request) { // CDI has synchronous APIs, so this is easy... request.setSize(sizeof()); @@ -903,6 +932,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#canCreateWatchpoint(org.eclipse.cdt.debug.internal.core.IWatchpointTarget.CanCreateWatchpointRequest) */ + @Override public void canSetWatchpoint(ICWatchpointTarget.CanCreateWatchpointRequest request) { // CDI has synchronous APIs, so this is easy... request.setCanCreate(sizeof() > 0); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java index c5eca96bdc2..4c24da6676d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java @@ -37,19 +37,23 @@ public class CVariableFactory { return new IGlobalVariableDescriptor() { + @Override public String getName() { return name; } + @Override public IPath getPath() { return ( path != null ) ? path : new Path( "" ); //$NON-NLS-1$ } + @Override public String toString() { return MessageFormat.format( "{0}::{1}", new String[] { getPath().toOSString(), getName() } ); //$NON-NLS-1$ } - public boolean equals( Object obj ) { + @Override + public boolean equals( Object obj ) { if ( !(obj instanceof IGlobalVariableDescriptor) ) return false; IGlobalVariableDescriptor d = (IGlobalVariableDescriptor)obj; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java index 7ef8d7ad296..43bfe7adca4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java @@ -53,6 +53,7 @@ public class Disassembly extends CDebugElement implements IDisassembly, ICDIEven /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IDisassembly#getDisassemblyBlock(org.eclipse.cdt.debug.core.model.ICStackFrame) */ + @Override public IDisassemblyBlock getDisassemblyBlock( ICStackFrame frame ) throws DebugException { if ( fBlocks[0] == null || !fBlocks[0].contains( frame ) ) { fBlocks[0] = createBlock( frame ); @@ -98,6 +99,7 @@ public class Disassembly extends CDebugElement implements IDisassembly, ICDIEven return null; } + @Override public IDisassemblyBlock getDisassemblyBlock( IAddress address ) throws DebugException { fBlocks[0] = createBlock( address, null); return fBlocks[0]; @@ -195,6 +197,7 @@ public class Disassembly extends CDebugElement implements IDisassembly, ICDIEven /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IDisassembly#getAddressFactory() */ + @Override public IAddressFactory getAddressFactory() { return ((CDebugTarget)getDebugTarget()).getAddressFactory(); } @@ -202,6 +205,7 @@ public class Disassembly extends CDebugElement implements IDisassembly, ICDIEven /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ + @Override public void handleDebugEvents( ICDIEvent[] events ) { boolean update = false; for ( int i = 0; i < events.length; ++i ) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyBlock.java index 0b7011ba03c..119dc3bcb5a 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyBlock.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyBlock.java @@ -89,6 +89,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getDisassembly() */ + @Override public IDisassembly getDisassembly() { return fDisassembly; } @@ -96,6 +97,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getModuleFile() */ + @Override public String getModuleFile() { IDisassembly d = getDisassembly(); if ( d != null ) { @@ -110,6 +112,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getSourceElement() */ + @Override public Object getSourceElement() { return fSourceElement; } @@ -117,6 +120,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#contains(org.eclipse.cdt.debug.core.model.ICStackFrame) */ + @Override public boolean contains( ICStackFrame frame ) { if ( !getDisassembly().getDebugTarget().equals( frame.getDebugTarget() ) ) return false; @@ -131,6 +135,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable { * * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getSourceLines() */ + @Override public IAsmSourceLine[] getSourceLines() { return fSourceLines; } @@ -138,6 +143,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter( Class adapter ) { return null; } @@ -145,6 +151,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#isMixedMode() */ + @Override public boolean isMixedMode() { return fMixedMode; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyInstruction.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyInstruction.java index 097cacf486d..7ead330e66b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyInstruction.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyInstruction.java @@ -31,42 +31,48 @@ public class DisassemblyInstruction extends CDebugElement implements IDisassembl /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getAdress() */ - public IAddress getAdress() { + @Override + public IAddress getAdress() { return fAddress; } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getArguments() */ - public String getArguments() { + @Override + public String getArguments() { return fCDIInstruction.getArgs(); } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getFunctionName() */ - public String getFunctionName() { + @Override + public String getFunctionName() { return fCDIInstruction.getFuntionName(); } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getInstructionText() */ - public String getInstructionText() { + @Override + public String getInstructionText() { return fCDIInstruction.getInstruction(); } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOffset() */ - public long getOffset() { + @Override + public long getOffset() { return fCDIInstruction.getOffset(); } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOpcode() */ - public String getOpcode() { + @Override + public String getOpcode() { return fCDIInstruction.getOpcode(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyRetrieval.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyRetrieval.java index df20a075690..01cd7f35f8a 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyRetrieval.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyRetrieval.java @@ -66,7 +66,8 @@ public class DisassemblyRetrieval extends CDebugElement implements ICDIEventList /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) */ - public void handleDebugEvents( ICDIEvent[] events ) { + @Override + public void handleDebugEvents( ICDIEvent[] events ) { for ( ICDIEvent event : events ) { Object source = event.getSource(); if ( (event instanceof ICDICreatedEvent diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblySourceLine.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblySourceLine.java index f78fd8d7cab..e7b8c524d18 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblySourceLine.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblySourceLine.java @@ -32,7 +32,8 @@ public class DisassemblySourceLine extends CDebugElement implements IDisassembly /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IDisassemblySourceLine#getFile() */ - public File getFile() { + @Override + public File getFile() { String name = fCDIMixedInstruction.getFileName(); if ( name != null && name.length() > 0 ) { return new File( name ); @@ -43,14 +44,16 @@ public class DisassemblySourceLine extends CDebugElement implements IDisassembly /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getInstructions() */ - public IAsmInstruction[] getInstructions() { + @Override + public IAsmInstruction[] getInstructions() { return null; } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getLineNumber() */ - public int getLineNumber() { + @Override + public int getLineNumber() { return fCDIMixedInstruction.getLineNumber(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/AbsolutePathSourceContainerType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/AbsolutePathSourceContainerType.java index d527e324c61..41686e3991a 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/AbsolutePathSourceContainerType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/AbsolutePathSourceContainerType.java @@ -18,10 +18,12 @@ import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTyp public class AbsolutePathSourceContainerType extends AbstractSourceContainerTypeDelegate { + @Override public ISourceContainer createSourceContainer(String memento) throws CoreException { return new AbsolutePathSourceContainer(); } + @Override public String getMemento(ISourceContainer container) throws CoreException { return "AbsolutePath"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceContainerType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceContainerType.java index 7d9b218aa56..ff03e1a1b40 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceContainerType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceContainerType.java @@ -27,6 +27,7 @@ public class CDirectorySourceContainerType extends AbstractSourceContainerTypeDe /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String) */ + @Override public ISourceContainer createSourceContainer(String memento) throws CoreException { Node node = parseDocument(memento); if (node.getNodeType() == Node.ELEMENT_NODE) { @@ -49,6 +50,7 @@ public class CDirectorySourceContainerType extends AbstractSourceContainerTypeDe /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer) */ + @Override public String getMemento(ISourceContainer container) throws CoreException { DirectorySourceContainer folder = (DirectorySourceContainer) container; Document document = newDocument(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java index d8f2118652d..b0abe5a8a13 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceLocation.java @@ -86,6 +86,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#findSourceElement(String) */ + @Override public Object findSourceElement(String name) throws CoreException { Object result = null; if (!isEmpty(name) && getDirectory() != null) { @@ -109,6 +110,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) */ + @Override public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (adapter.equals(ICSourceLocation.class)) return this; @@ -133,6 +135,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { * * @return directory */ + @Override public IPath getDirectory() { return fDirectory; } @@ -145,6 +148,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { fAssociation = association; } + @Override public IPath getAssociation() { return fAssociation; } @@ -269,6 +273,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#getMemento() */ + @Override public String getMemento() throws CoreException { Document document = null; Throwable ex = null; @@ -296,6 +301,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#initializeFrom(java.lang.String) */ + @Override public void initializeFrom(String memento) throws CoreException { Exception ex = null; try { @@ -358,6 +364,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof IDirectorySourceLocation) { IPath dir = ((IDirectorySourceLocation)obj).getDirectory(); @@ -387,6 +394,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#setSearchForDuplicateFiles(boolean) */ + @Override public void setSearchForDuplicateFiles(boolean search) { fSearchForDuplicateFiles = search; } @@ -394,6 +402,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#searchForDuplicateFiles() */ + @Override public boolean searchForDuplicateFiles() { return fSearchForDuplicateFiles; } @@ -401,6 +410,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.IDirectorySourceLocation#searchSubfolders() */ + @Override public boolean searchSubfolders() { return fSearchSubfolders; } @@ -435,6 +445,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { ArrayList<File> list = new ArrayList<File>(); File[] folders = file.listFiles( new FileFilter() { + @Override public boolean accept(File pathname) { return pathname.isDirectory(); } @@ -448,6 +459,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { return (getDirectory() != null) ? getDirectory().toOSString() : ""; //$NON-NLS-1$ } @@ -455,6 +467,7 @@ public class CDirectorySourceLocation implements IDirectorySourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#dispose() */ + @Override public void dispose() { } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceContainerType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceContainerType.java index 42b418b03d9..be39346b955 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceContainerType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceContainerType.java @@ -29,6 +29,7 @@ public class CProjectSourceContainerType extends AbstractSourceContainerTypeDele /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer) */ + @Override public String getMemento(ISourceContainer container) throws CoreException { CProjectSourceContainer sourceContainer = (CProjectSourceContainer) container; Document document = newDocument(); @@ -45,6 +46,7 @@ public class CProjectSourceContainerType extends AbstractSourceContainerTypeDele /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String) */ + @Override public ISourceContainer createSourceContainer(String memento) throws CoreException { Node node = parseDocument(memento); if (node.getNodeType() == Node.ELEMENT_NODE) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java index 3c99554bcd1..b046b393c18 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java @@ -80,6 +80,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#findSourceElement(String) */ + @Override public Object findSourceElement(String name) throws CoreException { Object result = null; if (!isEmpty(name) && getProject() != null && !notFoundCacheLookup(name)) { @@ -100,6 +101,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) */ + @Override public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (adapter.equals(ICSourceLocation.class)) return this; @@ -124,6 +126,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { * * @return project */ + @Override public IProject getProject() { return fProject; } @@ -190,6 +193,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { fNotFoundCache.add(name); } + @Override public void dispose() { fCache.clear(); fNotFoundCache.clear(); @@ -198,6 +202,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#getMemento() */ + @Override public String getMemento() throws CoreException { Document document = null; Throwable ex = null; @@ -224,6 +229,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#initializeFrom(java.lang.String) */ + @Override public void initializeFrom(String memento) throws CoreException { Exception ex = null; try { @@ -271,6 +277,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.IProjectSourceLocation#isGenerated() */ + @Override public boolean isGeneric() { return fGenerated; } @@ -282,6 +289,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof IProjectSourceLocation && getProject() != null) return getProject().equals(((IProjectSourceLocation) obj).getProject()); @@ -295,6 +303,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { try { getProject().accept( new IResourceProxyVisitor() { + @Override public boolean visit(IResourceProxy proxy) throws CoreException { switch (proxy.getType()) { case IResource.FILE: @@ -326,6 +335,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#searchForDuplicateFiles() */ + @Override public boolean searchForDuplicateFiles() { return fSearchForDuplicateFiles; } @@ -333,12 +343,14 @@ public class CProjectSourceLocation implements IProjectSourceLocation { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation#setSearchForDuplicateFiles(boolean) */ + @Override public void setSearchForDuplicateFiles(boolean search) { fCache.clear(); fNotFoundCache.clear(); fSearchForDuplicateFiles = search; } + @Override public String toString() { return getProject() != null ? fProject.toString() : ""; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java index f0081914540..6e52bb9b1d1 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java @@ -99,6 +99,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(IStackFrame) */ + @Override public Object getSourceElement(IStackFrame stackFrame) { return getInput(stackFrame); } @@ -108,6 +109,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.cdt.debug.core.ICSourceLocator#getLineNumber(IStackFrameInfo) */ + @Override public int getLineNumber(IStackFrame frame) { return (frame instanceof ICStackFrame) ? ((ICStackFrame)frame).getFrameLineNumber() : 0; } @@ -146,6 +148,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.cdt.debug.core.ICSourceLocator#contains(IResource) */ + @Override public boolean contains(IResource resource) { ICSourceLocation[] locations = getSourceLocations(); for (int i = 0; i < locations.length; ++i) { @@ -173,6 +176,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getSourceLocations() */ + @Override public ICSourceLocation[] getSourceLocations() { return fSourceLocations; } @@ -181,6 +185,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#setSourceLocations(ICSourceLocation[]) */ + @Override public void setSourceLocations(ICSourceLocation[] locations) { fSourceLocations = locations; } @@ -234,6 +239,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#findSourceElement(String) */ + @Override public Object findSourceElement(String fileName) { Object result = null; if (fileName != null && fileName.length() > 0) { @@ -256,6 +262,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.debug.core.model.IPersistableSourceLocator#getMemento() */ + @Override public String getMemento() throws CoreException { Document document = null; Throwable ex = null; @@ -285,6 +292,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeDefaults(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException { setSourceLocations(getDefaultSourceLocations()); } @@ -294,6 +302,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeFromMemento(java.lang.String) */ + @Override public void initializeFromMemento(String memento) throws CoreException { Exception ex = null; try { @@ -457,6 +466,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato return string == null || string.trim().length() == 0; } + @Override public void resourceChanged(IResourceChangeEvent event) { if (event.getSource() instanceof IWorkspace && event.getDelta() != null) { IResourceDelta[] deltas = event.getDelta().getAffectedChildren(); @@ -511,6 +521,7 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getProject() */ + @Override public IProject getProject() { return fProject; } @@ -597,10 +608,12 @@ public class CSourceLocator implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#searchForDuplicateFiles() */ + @Override public boolean searchForDuplicateFiles() { return fDuplicateFiles; } + @Override public void setSearchForDuplicateFiles(boolean search) { fDuplicateFiles = search; ICSourceLocation[] locations = getSourceLocations(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupDirector.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupDirector.java index 400593eea87..e42837ba861 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupDirector.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupDirector.java @@ -59,6 +59,7 @@ public class CSourceLookupDirector extends AbstractSourceLookupDirector { /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceLookupDirector#initializeParticipants() */ + @Override public void initializeParticipants() { addParticipants(new ISourceLookupParticipant[] { new CSourceLookupParticipant() }); } @@ -66,6 +67,7 @@ public class CSourceLookupDirector extends AbstractSourceLookupDirector { /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceLookupDirector#supportsSourceContainerType(org.eclipse.debug.core.sourcelookup.ISourceContainerType) */ + @Override public boolean supportsSourceContainerType(ISourceContainerType type) { readSupportedContainerTypes(); return fSupportedTypes.contains(type.getId()); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java index 1e62570277b..16b721fe1f4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java @@ -59,6 +59,7 @@ public class CSourceLookupParticipant extends AbstractSourceLookupParticipant { /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant#getSourceName(java.lang.Object) */ + @Override public String getSourceName(Object object) throws CoreException { if (object instanceof String) { return (String)object; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java index 1113698ff5c..937156f3c63 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java @@ -47,6 +47,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getLineNumber(IStackFrameInfo) */ + @Override public int getLineNumber(IStackFrame frame) { if (getCSourceLocator() != null) { return getCSourceLocator().getLineNumber(frame); @@ -61,6 +62,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getSourceLocations() */ + @Override public ICSourceLocation[] getSourceLocations() { return (getCSourceLocator() != null) ? getCSourceLocator().getSourceLocations() : new ICSourceLocation[0]; } @@ -69,6 +71,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#setSourceLocations(ICSourceLocation[]) */ + @Override public void setSourceLocations(ICSourceLocation[] locations) { if (getCSourceLocator() != null) { getCSourceLocator().setSourceLocations(locations); @@ -90,6 +93,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#contains(IResource) */ + @Override public boolean contains(IResource resource) { return (getCSourceLocator() != null) ? getCSourceLocator().contains(resource) : false; } @@ -98,6 +102,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) */ + @Override public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (adapter.equals(CSourceManager.class)) return this; @@ -114,6 +119,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(IStackFrame) */ + @Override public Object getSourceElement(IStackFrame stackFrame) { Object result = null; if (getSourceLocator() != null) @@ -143,6 +149,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#findSourceElement(String) */ + @Override public Object findSourceElement(String fileName) { if (getCSourceLocator() != null) { return getCSourceLocator().findSourceElement(fileName); @@ -154,6 +161,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.debug.core.model.IPersistableSourceLocator#getMemento() */ + @Override public String getMemento() throws CoreException { if (getPersistableSourceLocator() != null) return getPersistableSourceLocator().getMemento(); @@ -164,6 +172,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeDefaults(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException { if (getPersistableSourceLocator() != null) getPersistableSourceLocator().initializeDefaults(configuration); @@ -173,6 +182,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeFromMemento(java.lang.String) */ + @Override public void initializeFromMemento(String memento) throws CoreException { if (getPersistableSourceLocator() != null) getPersistableSourceLocator().initializeFromMemento(memento); @@ -188,6 +198,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#getProject() */ + @Override public IProject getProject() { return (getCSourceLocator() != null) ? getCSourceLocator().getProject() : null; } @@ -204,6 +215,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#setSearchForDuplicateFiles(boolean) */ + @Override public void setSearchForDuplicateFiles(boolean search) { if (getCSourceLocator() != null) getCSourceLocator().setSearchForDuplicateFiles(search); @@ -213,6 +225,7 @@ public class CSourceManager implements ICSourceLocator, IPersistableSourceLocato * (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator#searchForDuplicateFiles() */ + @Override public boolean searchForDuplicateFiles() { return getCSourceLocator() != null && getCSourceLocator().searchForDuplicateFiles(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourcePathComputerDelegate.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourcePathComputerDelegate.java index 6662f065389..7efdad5d6f5 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourcePathComputerDelegate.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourcePathComputerDelegate.java @@ -35,6 +35,7 @@ public class CSourcePathComputerDelegate implements ISourcePathComputerDelegate /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException { ISourceContainer[] common = CDebugCorePlugin.getDefault().getCommonSourceLookupDirector().getSourceContainers(); ISourceContainer[] containers = new ISourceContainer[common.length]; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CommonSourceLookupDirector.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CommonSourceLookupDirector.java index 28d5fee46fc..c159c696a30 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CommonSourceLookupDirector.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CommonSourceLookupDirector.java @@ -24,6 +24,7 @@ public class CommonSourceLookupDirector extends CSourceLookupDirector { /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector#setSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public void setSourceContainers(ISourceContainer[] containers) { try { super.setSourceContainers(containers); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainer.java index 296804d7e0c..8423a082f8f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainer.java @@ -81,6 +81,7 @@ public class CompilationDirectorySourceContainer extends CompositeSourceContaine /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() */ + @Override public String getName() { return fDirectory.getAbsolutePath(); } @@ -99,6 +100,7 @@ public class CompilationDirectorySourceContainer extends CompositeSourceContaine /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() */ + @Override public ISourceContainerType getType() { return getSourceContainerType(TYPE_ID); } @@ -107,6 +109,7 @@ public class CompilationDirectorySourceContainer extends CompositeSourceContaine * Source elements returned from this method are instances of <code>IFile</code> or <code>LocalFileStorage</code>. * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(String) */ + @Override public Object[] findSourceElements(String name) throws CoreException { File file = new File(name); if (!file.isAbsolute()) { @@ -144,6 +147,7 @@ public class CompilationDirectorySourceContainer extends CompositeSourceContaine /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#isComposite() */ + @Override public boolean isComposite() { return fSubfolders; } @@ -151,6 +155,7 @@ public class CompilationDirectorySourceContainer extends CompositeSourceContaine /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof CompilationDirectorySourceContainer) { CompilationDirectorySourceContainer container = (CompilationDirectorySourceContainer) obj; @@ -162,6 +167,7 @@ public class CompilationDirectorySourceContainer extends CompositeSourceContaine /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return getDirectory().hashCode(); } @@ -169,6 +175,7 @@ public class CompilationDirectorySourceContainer extends CompositeSourceContaine /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers() */ + @Override protected ISourceContainer[] createSourceContainers() throws CoreException { if (fSubfolders) { String[] files = fDirectory.list(); @@ -193,6 +200,7 @@ public class CompilationDirectorySourceContainer extends CompositeSourceContaine /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.IMappingSourceContainer#getCompilationPath(java.lang.String) */ + @Override public IPath getCompilationPath(String sourceName) { IPath path = new Path(sourceName); IPath base = new Path(fDirectory.getPath()); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainerType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainerType.java index c6c9aedc5cb..f8a7f69e045 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainerType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CompilationDirectorySourceContainerType.java @@ -26,6 +26,7 @@ public class CompilationDirectorySourceContainerType extends AbstractSourceConta /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer) */ + @Override public String getMemento(ISourceContainer container) throws CoreException { CompilationDirectorySourceContainer folder = (CompilationDirectorySourceContainer) container; Document document = newDocument(); @@ -43,6 +44,7 @@ public class CompilationDirectorySourceContainerType extends AbstractSourceConta /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String) */ + @Override public ISourceContainer createSourceContainer(String memento) throws CoreException { Node node = parseDocument(memento); if (node.getNodeType() == Node.ELEMENT_NODE) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java index cc7afeda399..8735d96e3b6 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java @@ -111,6 +111,7 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) */ + @Override public Object[] findSourceElements(String name) throws CoreException { IPath path = createPath(name); if (getBackendPath().isPrefixOf(path)) { @@ -163,6 +164,7 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() */ + @Override public String getName() { return MessageFormat.format("{0} - {1}", new String[] { getBackendPath().toOSString(), getLocalPath().toOSString() }); //$NON-NLS-1$ } @@ -170,6 +172,7 @@ public class MapEntrySourceContainer extends AbstractSourceContainer { /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() */ + @Override public ISourceContainerType getType() { return getSourceContainerType(TYPE_ID); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainerType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainerType.java index 50d4e9cd24e..7e536e80630 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainerType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainerType.java @@ -30,6 +30,7 @@ public class MapEntrySourceContainerType extends AbstractSourceContainerTypeDele /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String) */ + @Override public ISourceContainer createSourceContainer(String memento) throws CoreException { Node node = parseDocument(memento); if (node.getNodeType() == Node.ELEMENT_NODE) { @@ -56,6 +57,7 @@ public class MapEntrySourceContainerType extends AbstractSourceContainerTypeDele /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.core.sourcelookup.ISourceContainer) */ + @Override public String getMemento(ISourceContainer container) throws CoreException { MapEntrySourceContainer entry = (MapEntrySourceContainer) container; Document document = newDocument(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MappingSourceContainerType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MappingSourceContainerType.java index d60699d8de8..229f9d89506 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MappingSourceContainerType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MappingSourceContainerType.java @@ -35,6 +35,7 @@ public class MappingSourceContainerType extends AbstractSourceContainerTypeDeleg /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String) */ + @Override public ISourceContainer createSourceContainer(String memento) throws CoreException { Node node = parseDocument(memento); if (node.getNodeType() == Node.ELEMENT_NODE) { @@ -75,6 +76,7 @@ public class MappingSourceContainerType extends AbstractSourceContainerTypeDeleg /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.core.sourcelookup.ISourceContainer) */ + @Override public String getMemento(ISourceContainer container) throws CoreException { Document document = newDocument(); Element element = document.createElement(ELEMENT_MAPPING); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/ProgramRelativePathSourceContainerType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/ProgramRelativePathSourceContainerType.java index cdd1b39ac6a..6f0f46e8191 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/ProgramRelativePathSourceContainerType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/ProgramRelativePathSourceContainerType.java @@ -18,6 +18,7 @@ import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTyp public class ProgramRelativePathSourceContainerType extends AbstractSourceContainerTypeDelegate { private final static String ELEMENT_NAME = "programRelativePath"; //$NON-NLS-1$ + @Override public ISourceContainer createSourceContainer(String memento) throws CoreException { if (ELEMENT_NAME.equals(memento)) { return new ProgramRelativePathSourceContainer(); @@ -26,6 +27,7 @@ public class ProgramRelativePathSourceContainerType extends AbstractSourceContai return null; } + @Override public String getMemento(ISourceContainer container) throws CoreException { if (container instanceof ProgramRelativePathSourceContainer) { return ELEMENT_NAME; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceFoldersRelativePathSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceFoldersRelativePathSourceContainer.java index 862fa2617bd..d5f7b715a97 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceFoldersRelativePathSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceFoldersRelativePathSourceContainer.java @@ -88,6 +88,7 @@ public class SourceFoldersRelativePathSourceContainer extends CompositeSourceCon /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#isComposite() */ + @Override public boolean isComposite() { return true; } @@ -104,6 +105,7 @@ public class SourceFoldersRelativePathSourceContainer extends CompositeSourceCon /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName() */ + @Override public String getName() { return fProject == null ? InternalSourceLookupMessages.SourceFoldersRelativePathSourceContainer_0 : @@ -113,6 +115,7 @@ public class SourceFoldersRelativePathSourceContainer extends CompositeSourceCon /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() */ + @Override public ISourceContainerType getType() { return getSourceContainerType(TYPE_ID); } @@ -120,6 +123,7 @@ public class SourceFoldersRelativePathSourceContainer extends CompositeSourceCon /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj != null && obj instanceof SourceFoldersRelativePathSourceContainer) { SourceFoldersRelativePathSourceContainer loc = (SourceFoldersRelativePathSourceContainer) obj; @@ -131,6 +135,7 @@ public class SourceFoldersRelativePathSourceContainer extends CompositeSourceCon /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return TYPE_ID.hashCode() * 31 + (fProject == null ? 0 : fProject.hashCode()); } @@ -138,6 +143,7 @@ public class SourceFoldersRelativePathSourceContainer extends CompositeSourceCon /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.sourcelookup.IMappingSourceContainer#getCompilationPath(java.lang.String) */ + @Override public IPath getCompilationPath(String sourceName) { if (fProject == null) return null; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceFoldersRelativePathSourceContainerType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceFoldersRelativePathSourceContainerType.java index 993cbdd3fec..894e25bcb28 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceFoldersRelativePathSourceContainerType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/SourceFoldersRelativePathSourceContainerType.java @@ -27,6 +27,7 @@ public class SourceFoldersRelativePathSourceContainerType extends AbstractSource /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer) */ + @Override public String getMemento(ISourceContainer container) throws CoreException { SourceFoldersRelativePathSourceContainer sourceContainer = (SourceFoldersRelativePathSourceContainer) container; Document document = newDocument(); @@ -43,6 +44,7 @@ public class SourceFoldersRelativePathSourceContainerType extends AbstractSource /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String) */ + @Override public ISourceContainer createSourceContainer(String memento) throws CoreException { Node node = parseDocument(memento); if (node.getNodeType() == Node.ELEMENT_NODE) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinder.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinder.java index 6ffb0fae505..8c6eb445ee7 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinder.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinder.java @@ -105,6 +105,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene /* (non-Javadoc) * @see org.eclipse.cdt.core.ISourceFinder#toLocalPath(java.lang.String) */ + @Override synchronized public String toLocalPath(String compilationPath) { try { Object foundElement = null; @@ -191,6 +192,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene /* (non-Javadoc) * @see org.eclipse.cdt.core.ISourceFinder#toLocalPath(org.eclipse.core.runtime.IAdaptable, java.lang.String) */ + @Override public String toLocalPath(IAdaptable _launch, String compilationPath) { Object foundElement = null; @@ -326,6 +328,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void launchConfigurationAdded(ILaunchConfiguration config) { // Don't care. } @@ -333,6 +336,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override synchronized public void launchConfigurationChanged(ILaunchConfiguration config) { // We don't care if it's a working copy. if (config.isWorkingCopy()) { @@ -349,6 +353,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override synchronized public void launchConfigurationRemoved(ILaunchConfiguration config) { // We don't care if it's a working copy. if (config.isWorkingCopy()) { @@ -364,6 +369,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ + @Override synchronized public void launchesRemoved(ILaunch[] launches) { for (ILaunch launch : launches) { if (launch.getSourceLocator() == fLaunchLocator) { @@ -376,6 +382,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesAdded(ILaunch[] launches) { // If there's a new launch in town, we need to take it into // consideration. E.g., if it targets our binary, and we're currently @@ -394,6 +401,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesChanged(ILaunch[] launches) { // don't care. I don't think setting a new locator in a launch would result in us getting notified } @@ -401,6 +409,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene /* (non-Javadoc) * @see org.eclipse.cdt.core.ISourceFinder#dispose() */ + @Override public void dispose() { ILaunchManager lmgr = DebugPlugin.getDefault().getLaunchManager(); lmgr.removeLaunchConfigurationListener(this); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinderFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinderFactory.java index 1e2df9c70de..d8e6b8bee36 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinderFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinderFactory.java @@ -22,6 +22,7 @@ public class CSourceFinderFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Object adaptableObject, Class adapterType) { if (adaptableObject instanceof IBinary) { @@ -35,6 +36,7 @@ public class CSourceFinderFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override @SuppressWarnings("rawtypes") public Class[] getAdapterList() { return new Class[] { ISourceFinder.class }; |