diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java index ef325ebbcf0..b1682854bcb 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java @@ -37,6 +37,7 @@ public class Activator extends Plugin { * (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); } @@ -45,6 +46,7 @@ public class Activator extends Plugin { * (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { super.stop(context); plugin = null; diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java index 15566475990..1128c7cb1dd 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java @@ -61,6 +61,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { * * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch */ + @Override public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java index 3717d571019..879514df313 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java @@ -14,9 +14,6 @@ package org.eclipse.cdt.launch.remote.tabs; import org.eclipse.cdt.debug.ui.ICDebuggerPage; import org.eclipse.cdt.dsf.gdb.internal.ui.launching.CDebuggerTab; -import org.eclipse.cdt.dsf.gdb.internal.ui.launching.GdbCoreDebuggerPage; -import org.eclipse.cdt.dsf.gdb.internal.ui.launching.GdbDebuggerPage; -import org.eclipse.cdt.dsf.gdb.internal.ui.launching.GdbServerDebuggerPage; import org.eclipse.cdt.dsf.gdb.service.SessionType; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; @@ -62,6 +59,7 @@ public class RemoteCDSFDebuggerTab extends CDebuggerTab { super.initializeFrom(config); } + @Override protected void loadDynamicDebugArea() { Composite dynamicTabHolder = getDynamicTabHolder(); // Dispose of any current child widgets in the tab holder area diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java index 98ddacd1654..f3d7b58cd56 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java @@ -22,7 +22,6 @@ *******************************************************************************/ package org.eclipse.cdt.launch.remote.tabs; -import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.dsf.gdb.internal.ui.launching.CMainTab; import org.eclipse.cdt.internal.launch.remote.Messages; import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants; @@ -127,6 +126,7 @@ public class RemoteCDSFMainTab extends CMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid */ + @Override public boolean isValid(ILaunchConfiguration config) { boolean retVal = super.isValid(config); if (retVal == true) { @@ -184,6 +184,7 @@ public class RemoteCDSFMainTab extends CMainTab { Messages.RemoteCMainTab_New, null); newRemoteConnectionButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleNewRemoteConnectionSelected(); updateLaunchConfigurationDialog(); @@ -196,6 +197,7 @@ public class RemoteCDSFMainTab extends CMainTab { remoteConnectionPropertiesButton .addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleRemoteConnectionPropertiesSelected(); } @@ -239,6 +241,7 @@ public class RemoteCDSFMainTab extends CMainTab { Messages.RemoteCMainTab_Remote_Path_Browse_Button, null); remoteBrowseButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleRemoteBrowseSelected(); updateLaunchConfigurationDialog(); @@ -281,6 +284,7 @@ public class RemoteCDSFMainTab extends CMainTab { SKIP_DOWNLOAD_BUTTON_TEXT); skipDownloadButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { updateLaunchConfigurationDialog(); } @@ -340,6 +344,7 @@ public class RemoteCDSFMainTab extends CMainTab { fbLocalHost = fHost.getSystemType().isLocal(); } + @Override protected Control createDialogArea(Composite parent) { // create composite Composite composite = (Composite) super @@ -385,6 +390,7 @@ public class RemoteCDSFMainTab extends CMainTab { return composite; } + @Override protected void buttonPressed(int buttonId) { if (!fbLocalHost && (buttonId == IDialogConstants.OK_ID)) { IPropertySet propertySet = fHost @@ -646,6 +652,7 @@ public class RemoteCDSFMainTab extends CMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply */ + @Override public void performApply(ILaunchConfigurationWorkingCopy config) { int currentSelection = connectionCombo.getSelectionIndex(); diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java index bd9a37e10f1..10011445840 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java @@ -33,6 +33,7 @@ public class RemoteCDebuggerTab extends CDebuggerTab { super(false); } + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI @@ -48,6 +49,7 @@ public class RemoteCDebuggerTab extends CDebuggerTab { super(attachMode); } + @Override protected void loadDebuggerComboBox(ILaunchConfiguration config, String selection) { ICDebugConfiguration[] debugConfigs = CDebugCorePlugin.getDefault() diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java index 9b9d68f304f..37d897b2b91 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java @@ -103,6 +103,7 @@ public class RemoteCMainTab extends CMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl */ + @Override public void createControl(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); GridLayout topLayout = new GridLayout(); @@ -145,6 +146,7 @@ public class RemoteCMainTab extends CMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid */ + @Override public boolean isValid(ILaunchConfiguration config) { boolean retVal = super.isValid(config); if (retVal == true) { @@ -202,6 +204,7 @@ public class RemoteCMainTab extends CMainTab { Messages.RemoteCMainTab_New, null); newRemoteConnectionButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleNewRemoteConnectionSelected(); updateLaunchConfigurationDialog(); @@ -214,6 +217,7 @@ public class RemoteCMainTab extends CMainTab { remoteConnectionPropertiesButton .addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleRemoteConnectionPropertiesSelected(); } @@ -257,6 +261,7 @@ public class RemoteCMainTab extends CMainTab { Messages.RemoteCMainTab_Remote_Path_Browse_Button, null); remoteBrowseButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleRemoteBrowseSelected(); updateLaunchConfigurationDialog(); @@ -299,6 +304,7 @@ public class RemoteCMainTab extends CMainTab { SKIP_DOWNLOAD_BUTTON_TEXT); skipDownloadButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { updateLaunchConfigurationDialog(); } @@ -311,6 +317,7 @@ public class RemoteCMainTab extends CMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply */ + @Override public void performApply(ILaunchConfigurationWorkingCopy config) { int currentSelection = connectionCombo.getSelectionIndex(); @@ -334,6 +341,7 @@ public class RemoteCMainTab extends CMainTab { /* * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom */ + @Override public void initializeFrom(ILaunchConfiguration config) { isInitializing = true; @@ -421,6 +429,7 @@ public class RemoteCMainTab extends CMainTab { fbLocalHost = fHost.getSystemType().isLocal(); } + @Override protected Control createDialogArea(Composite parent) { // create composite Composite composite = (Composite) super @@ -466,6 +475,7 @@ public class RemoteCMainTab extends CMainTab { return composite; } + @Override protected void buttonPressed(int buttonId) { if (!fbLocalHost && (buttonId == IDialogConstants.OK_ID)) { IPropertySet propertySet = fHost diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java index 486b69265d5..34db365483e 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java @@ -15,8 +15,6 @@ package org.eclipse.cdt.launch.remote.tabs; import org.eclipse.cdt.dsf.gdb.internal.ui.launching.GdbDebuggerPage; -import org.eclipse.cdt.dsf.gdb.internal.ui.launching.SerialPortSettingsBlock; -import org.eclipse.cdt.dsf.gdb.internal.ui.launching.TCPSettingsBlock; import org.eclipse.cdt.internal.launch.remote.Messages; import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants; import org.eclipse.core.runtime.CoreException; @@ -47,10 +45,12 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{ } + @Override public String getName() { return Messages.Remote_GDB_Debugger_Options; } + @Override public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { super.setDefaults(configuration); configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND, @@ -59,6 +59,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{ IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT ); } + @Override public void initializeFrom( ILaunchConfiguration configuration ) { setInitializing(true); super.initializeFrom(configuration); @@ -82,6 +83,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{ setInitializing(false); } + @Override public void performApply( ILaunchConfigurationWorkingCopy configuration ) { super.performApply(configuration); String str = fGDBServerCommandText.getText(); @@ -143,6 +145,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{ /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder) */ + @Override public void createTabs( TabFolder tabFolder ) { super.createTabs( tabFolder ); createGdbserverSettingsTab( tabFolder ); diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java index b5d8ee7c36f..4e3ea3f39d0 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java @@ -43,10 +43,12 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage { protected Text fGDBServerPortNumberText; + @Override public String getName() { return Messages.Remote_GDB_Debugger_Options; } + @Override public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { super.setDefaults(configuration); configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND, @@ -55,6 +57,7 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage { IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT ); } + @Override public void initializeFrom( ILaunchConfiguration configuration ) { super.initializeFrom(configuration); String gdbserverCommand = null; @@ -75,6 +78,7 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage { fGDBServerPortNumberText.setText( gdbserverPortNumber ); } + @Override public void performApply( ILaunchConfigurationWorkingCopy configuration ) { super.performApply(configuration); String str = fGDBServerCommandText.getText(); @@ -136,6 +140,7 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder) */ + @Override public void createTabs( TabFolder tabFolder ) { super.createTabs( tabFolder ); createGdbserverSettingsTab( tabFolder ); 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 ICDIDebugger2. */ +@Deprecated public interface ICDIDebugger { /** * @deprecated use createSession of ICDIDebugger2 */ + @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() { + @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() { + @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 getProjectNatures() { return supportedNatureIds; } + @Override public List getExecutables(IProject project, IProgressMonitor monitor) { List executables = new ArrayList(); @@ -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 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( 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 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 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 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 list = new ArrayList(); 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 IFile or LocalFileStorage. * @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 }; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointHit.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointHit.java index 05dcb39fc17..e4b0eb87709 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointHit.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointHit.java @@ -29,6 +29,7 @@ public class BreakpointHit extends SessionObject implements ICDIBreakpointHit { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpointHit#getBreakpoint() */ + @Override public ICDIBreakpoint getBreakpoint() { int number = breakEvent.getNumber(); // Ask the breakpointManager for the breakpoint diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java index 65fb579f0a5..b5fb510d924 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java @@ -388,6 +388,7 @@ public class BreakpointManager extends Manager { } } + @Override public void update(Target target) throws CDIException { update(target, null); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Condition.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Condition.java index 2701a1f7093..bf51f650629 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Condition.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Condition.java @@ -29,6 +29,7 @@ public class Condition implements ICDICondition { /** * @see org.eclipse.cdt.debug.core.cdi.ICDICondition#getIgnoreCount() */ + @Override public int getIgnoreCount() { return ignoreCount; } @@ -36,6 +37,7 @@ public class Condition implements ICDICondition { /** * @see org.eclipse.cdt.debug.core.cdi.ICDICondition#getExpression() */ + @Override public String getExpression() { return expression; } @@ -43,6 +45,7 @@ public class Condition implements ICDICondition { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.ICDICondition#getThreadId() */ + @Override public String[] getThreadIds() { return tids; } @@ -50,6 +53,7 @@ public class Condition implements ICDICondition { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(ICDICondition obj) { if (obj instanceof Condition) { Condition cond = (Condition)obj; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ErrorInfo.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ErrorInfo.java index b89ffeff50b..1ab0181f40d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ErrorInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ErrorInfo.java @@ -28,6 +28,7 @@ public class ErrorInfo extends SessionObject implements ICDIErrorInfo { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIErrorInfo#getMessage() */ + @Override public String getMessage() { return event.getMessage(); } @@ -35,6 +36,7 @@ public class ErrorInfo extends SessionObject implements ICDIErrorInfo { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIErrorInfo#getDetailMessage() */ + @Override public String getDetailMessage() { return event.getLogMessage(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventBreakpointHit.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventBreakpointHit.java index 92c23a3d8e5..dba0c36932b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventBreakpointHit.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventBreakpointHit.java @@ -37,6 +37,7 @@ public class EventBreakpointHit extends SessionObject implements ICDIEventBreakp fEventType = eventType; } + @Override public String getEventBreakpointType() { return fEventType; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java index 377fb74ea6a..19ed937509a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java @@ -86,6 +86,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs * Process the event from MI, do any state work on the CDI, * and fire the corresponding CDI event. */ + @Override public void update(Observable o, Object arg) { MIEvent miEvent = (MIEvent)arg; @@ -225,6 +226,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs /** * @see org.eclipse.cdt.debug.core.cdi.ICDIEventManager#addEventListener(ICDIEventListener) */ + @Override public void addEventListener(ICDIEventListener listener) { list.add(listener); } @@ -232,6 +234,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs /** * @see org.eclipse.cdt.debug.core.cdi.ICDIEventManager#removeEventListener(ICDIEventListener) */ + @Override public void removeEventListener(ICDIEventListener listener) { list.remove(listener); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java index 61012ea0f30..aa07d51bf31 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java @@ -27,6 +27,7 @@ public class ExitInfo extends SessionObject implements ICDIExitInfo { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIExitInfo#getCode() */ + @Override public int getCode() { return event.getExitCode(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java index 7d59720018e..785169733ec 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java @@ -109,6 +109,7 @@ public class ExpressionManager extends Manager { destroyExpressions(target, expressions); } + @Override public void update(Target target) throws CDIException { // deleteAllVariables(target); List eventList = new ArrayList(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java index 8523faba291..bbd6f4d1c92 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/FunctionFinished.java @@ -39,6 +39,7 @@ public class FunctionFinished extends EndSteppingRange implements ICDIFunctionFi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.ICDIFunctionFinished#getReturnType() */ + @Override public ICDIType getReturnType() throws CDIException { Session session = (Session)getSession(); Target target = session.getTarget(fMIEvent.getMISession()); @@ -53,6 +54,7 @@ public class FunctionFinished extends EndSteppingRange implements ICDIFunctionFi /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.ICDIFunctionFinished#getReturnValue() */ + @Override public ICDIValue getReturnValue() throws CDIException { Session session = (Session)getSession(); Target target = session.getTarget(fMIEvent.getMISession()); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java index 1f883cd8723..687e3bf1bcf 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java @@ -61,6 +61,7 @@ public class MemoryManager extends Manager { * Note: Frozen blocks are not updated. * */ + @Override public void update(Target target) { MISession miSession = target.getMISession(); List blockList = getMemoryBlockList(target); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ProcessManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ProcessManager.java index 0ec433d4edf..ab1ab6706c1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ProcessManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ProcessManager.java @@ -84,6 +84,7 @@ public class ProcessManager extends Manager { return null; } + @Override public void update(Target target) throws CDIException { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java index 6ca5ce068ff..b93dd9f2d01 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java @@ -94,6 +94,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getAttribute(String) */ + @Override public String getAttribute(String key) { return props.getProperty(key); } @@ -109,6 +110,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getEventManager() */ + @Override public ICDIEventManager getEventManager() { return eventManager; } @@ -144,6 +146,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getTargets() */ + @Override public ICDITarget[] getTargets() { ProcessManager pMgr = getProcessManager(); return pMgr.getCDITargets(); @@ -152,6 +155,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#setAttribute(String, String) */ + @Override public void setAttribute(String key, String value) { props.setProperty(key, value); } @@ -159,6 +163,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getConfiguration() */ + @Override public ICDISessionConfiguration getConfiguration() { return configuration; } @@ -170,6 +175,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISessionObject#getSession() */ + @Override public ICDISession getSession() { return this; } @@ -177,6 +183,7 @@ public class Session implements ICDISession, ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISession#terminate(ICDITarget) */ + @Override public void terminate() throws CDIException { ProcessManager pMgr = getProcessManager(); Target[] targets = pMgr.getTargets(); @@ -211,6 +218,8 @@ public class Session implements ICDISession, ICDISessionObject { * @deprecated * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getSessionProcess() */ + @Deprecated + @Override public Process getSessionProcess() throws CDIException { ICDITarget[] targets = getTargets(); if (targets != null && targets.length > 0) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionConfiguration.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionConfiguration.java index c02108c7e50..9bcc0346a34 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionConfiguration.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionConfiguration.java @@ -32,6 +32,7 @@ public class SessionConfiguration extends SessionObject implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.ICDISessionConfiguration#terminateSessionOnExit() */ + @Override public boolean terminateSessionOnExit() { return true; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java index a2522a1f816..c837e666755 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SessionObject.java @@ -26,6 +26,7 @@ public class SessionObject implements ICDISessionObject { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISessionObject#getSession() */ + @Override public ICDISession getSession() { return fSession; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java index f9236545b39..f2c4c1f05bf 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java @@ -130,6 +130,7 @@ public class SharedLibraryManager extends Manager { return miLibs; } + @Override public void update(Target target) throws CDIException { MISession miSession = target.getMISession(); Session session = (Session)target.getSession(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalExitInfo.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalExitInfo.java index f777a296877..1246273beb2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalExitInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalExitInfo.java @@ -27,6 +27,7 @@ public class SignalExitInfo extends SessionObject implements ICDISignalExitInfo /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignalExitInfo#getName() */ + @Override public String getName() { return event.getName(); } @@ -34,6 +35,7 @@ public class SignalExitInfo extends SessionObject implements ICDISignalExitInfo /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignalExitInfo#getDescription() */ + @Override public String getDescription() { return event.getMeaning(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java index 78860113fdd..3f07d963d40 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java @@ -190,6 +190,7 @@ public class SignalManager extends Manager { return EMPTY_SIGNALS; } + @Override public void update(Target target) throws CDIException { MISession miSession = target.getMISession(); MISigHandle[] miSigs = getMISignals(miSession); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java index 5d83c8d4753..be95c783322 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java @@ -29,6 +29,7 @@ public class SignalReceived extends SessionObject implements ICDISignalReceived /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignalReceived#getSignal() */ + @Override public ICDISignal getSignal() { return signal; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java index d61fbd04dab..903b21a84b3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java @@ -182,6 +182,7 @@ public class SourceManager extends Manager { } } + @Override public void update(Target target) throws CDIException { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ThreadManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ThreadManager.java index 216f33861de..dde8830e440 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ThreadManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/ThreadManager.java @@ -106,6 +106,7 @@ public class ThreadManager extends Manager { //implements ICDIThreadManager { return new ThreadSet(cthreads, currentThreadId); } + @Override public void update(Target target) throws CDIException { } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java index fac1f35a122..1bfbe504682 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java @@ -611,6 +611,7 @@ public class VariableManager extends Manager { * This ok, since the IDE only a frame at a time. * */ + @Override public void update(Target target) throws CDIException { int highLevel = 0; int lowLevel = 0; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointScope.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointScope.java index 404fdace9f1..b4e73c7bb0f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointScope.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointScope.java @@ -29,6 +29,7 @@ public class WatchpointScope extends SessionObject implements ICDIWatchpointScop /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpointScope#getWatchpoint() */ + @Override public ICDIWatchpoint getWatchpoint() { int number = watchEvent.getNumber(); // Ask the breakpointManager for the breakpoint diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointTrigger.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointTrigger.java index f24bdb9becc..79184b1f55c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointTrigger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/WatchpointTrigger.java @@ -29,6 +29,7 @@ public class WatchpointTrigger extends SessionObject implements ICDIWatchpointTr /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger#getNewValue() */ + @Override public String getNewValue() { return watchEvent.getNewValue(); } @@ -36,6 +37,7 @@ public class WatchpointTrigger extends SessionObject implements ICDIWatchpointTr /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger#getOldValue() */ + @Override public String getOldValue() { return watchEvent.getOldValue(); } @@ -43,6 +45,7 @@ public class WatchpointTrigger extends SessionObject implements ICDIWatchpointTr /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger#getWatchpoint() */ + @Override public ICDIWatchpoint getWatchpoint() { int number = watchEvent.getNumber(); // Ask the breakpointManager for the breakpoint diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ChangedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ChangedEvent.java index 9ed722268fa..1bef1443607 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ChangedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ChangedEvent.java @@ -128,6 +128,7 @@ public class ChangedEvent implements ICDIChangedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java index a10421b258d..7374fc105be 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java @@ -127,6 +127,7 @@ public class CreatedEvent implements ICDICreatedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java index d85f79b24a4..64c885bf843 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java @@ -104,6 +104,7 @@ public class DestroyedEvent implements ICDIDestroyedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java index 7047320d5c0..cef69fc92b5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java @@ -31,6 +31,7 @@ public class DisconnectedEvent implements ICDIDisconnectedEvent { /** * @see org.eclipse.cdt.debug.core..ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ExitedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ExitedEvent.java index 50d79db793b..6e032ed6da1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ExitedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ExitedEvent.java @@ -47,6 +47,7 @@ public class ExitedEvent implements ICDIExitedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIExitedEvent#getExitInfo() */ + @Override public ICDISessionObject getReason() { if (event instanceof MIInferiorExitEvent) { return new ExitInfo(session, (MIInferiorExitEvent)event); @@ -59,6 +60,7 @@ public class ExitedEvent implements ICDIExitedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { Target target = session.getTarget(event.getMISession()); return target; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/MemoryChangedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/MemoryChangedEvent.java index 508e30f735e..9b3d7b04706 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/MemoryChangedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/MemoryChangedEvent.java @@ -37,6 +37,7 @@ public class MemoryChangedEvent implements ICDIMemoryChangedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getAddresses() */ + @Override public BigInteger[] getAddresses() { /* But only returns the address that are in the block. */ BigInteger[] mi_addresses = miMem.getAddresses(); @@ -52,6 +53,7 @@ public class MemoryChangedEvent implements ICDIMemoryChangedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { return source; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java index 1f95cffcfc9..b46fcfb4e52 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java @@ -31,6 +31,7 @@ public class ResumedEvent implements ICDIResumedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { // We can send the target as the Source. CDI // Will assume that all threads are supended for this. @@ -43,6 +44,7 @@ public class ResumedEvent implements ICDIResumedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent#getType() */ + @Override public int getType() { MIRunningEvent running = event; int type = running.getType(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java index 57be8a1ded9..2be82f30d21 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java @@ -52,6 +52,7 @@ public class SuspendedEvent implements ICDISuspendedEvent { event = e; } + @Override public ICDISessionObject getReason() { if (event instanceof MIBreakpointHitEvent) { // A Catchpoint hit is reported by gdb as a breakpoint hit. We can @@ -88,6 +89,7 @@ public class SuspendedEvent implements ICDISuspendedEvent { /** * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource() */ + @Override public ICDIObject getSource() { Target target = session.getTarget(event.getMISession()); // We can send the target as the Source. CDI diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java index 56b693d2b90..14685ae0c8c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Argument.java @@ -30,6 +30,7 @@ public class Argument extends Variable implements ICDIArgument { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createVariable(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.core.cdi.model.ICDIThread, org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame, java.lang.String, java.lang.String, int, int, org.eclipse.cdt.debug.mi.core.output.MIVar) */ + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { return new Argument(target, thread, frame, name, fullName, pos, depth, miVar); } @@ -37,6 +38,7 @@ public class Argument extends Variable implements ICDIArgument { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor(Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth) { return new ArgumentDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java index 857b61426a6..26a7443a111 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java @@ -46,6 +46,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint2#getType() */ + @Override public int getType() { return type; } @@ -65,6 +66,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#getCondition() */ + @Override public ICDICondition getCondition() throws CDIException { if (condition == null) { if (miBreakpoints != null && miBreakpoints.length > 0) { @@ -89,6 +91,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isEnabled() */ + @Override public boolean isEnabled() throws CDIException { return enabled; } @@ -99,6 +102,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { * CDT 5.0 won't call this deprecated method (since we implement * ICDIBreakpoint2), but we use it ourselves. */ + @Override public boolean isHardware() { // ignore the TEMPORARY bit qualifier return ((type & ~ICBreakpointType.TEMPORARY) == ICBreakpointType.HARDWARE); @@ -110,6 +114,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { * CDT 5.0 won't call this deprecated method (since we implement * ICDIBreakpoint2), but we use it ourselves. */ + @Override public boolean isTemporary() { return (type & ICBreakpointType.TEMPORARY) != 0; } @@ -117,6 +122,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#setCondition(ICDICondition) */ + @Override public void setCondition(ICDICondition newCondition) throws CDIException { Session session = (Session)getTarget().getSession(); BreakpointManager mgr = session.getBreakpointManager(); @@ -131,6 +137,7 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#setEnabled(boolean) */ + @Override public void setEnabled(boolean on) throws CDIException { Session session = (Session)getTarget().getSession(); BreakpointManager mgr = session.getBreakpointManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CObject.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CObject.java index a81c240a0e7..262bc2433d2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CObject.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CObject.java @@ -26,6 +26,7 @@ public class CObject implements ICDIObject { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getTarget() */ + @Override public ICDITarget getTarget() { return fTarget; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CoreFileConfiguration.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CoreFileConfiguration.java index 11b2d0f765e..832ae18d083 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CoreFileConfiguration.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/CoreFileConfiguration.java @@ -21,52 +21,64 @@ public class CoreFileConfiguration extends CObject implements ICDITargetConfigur super(t); } + @Override public boolean supportsTerminate() { return true; } + @Override public boolean supportsDisconnect() { return false; } + @Override public boolean supportsRestart() { return false; } + @Override public boolean supportsStepping() { return false; } + @Override public boolean supportsInstructionStepping() { return false; } + @Override public boolean supportsBreakpoints() { return false; } + @Override public boolean supportsRegisters() { return true; } + @Override public boolean supportsRegisterModification() { return false; } + @Override public boolean supportsMemoryRetrieval() { return true; } + @Override public boolean supportsMemoryModification() { return false; } + @Override public boolean supportsExpressionEvaluation() { return true; } /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsResume() */ + @Override public boolean supportsResume() { return false; } @@ -74,6 +86,7 @@ public class CoreFileConfiguration extends CObject implements ICDITargetConfigur /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsSuspend() */ + @Override public boolean supportsSuspend() { return false; } @@ -81,6 +94,7 @@ public class CoreFileConfiguration extends CObject implements ICDITargetConfigur /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsSharedLibrary() */ + @Override public boolean supportsSharedLibrary() { return true; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java index 916fa6081e0..7504cbc4b2a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java @@ -34,10 +34,12 @@ public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint { this.arg = arg==null?"":arg; //$NON-NLS-1$ } + @Override public String getEventType() { return eventType; } + @Override public String getExtraArgument() { return arg; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java index e192b8d3d00..abf4e5ee99d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java @@ -40,6 +40,7 @@ public class Exceptionpoint extends Breakpoint implements ICDIExceptionpoint { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExceptionpoint#isStopOnThrow() */ + @Override public boolean isStopOnThrow() { return fStopOnThrow; } @@ -47,6 +48,7 @@ public class Exceptionpoint extends Breakpoint implements ICDIExceptionpoint { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExceptionpoint#isStopOnCatch() */ + @Override public boolean isStopOnCatch() { return fStopOnCatch; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java index 828404ff641..7fb45b4e2fe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java @@ -42,6 +42,7 @@ public class Expression extends CObject implements ICDIExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#getExpressionText() */ + @Override public String getExpressionText() { return fExpression; } @@ -49,6 +50,7 @@ public class Expression extends CObject implements ICDIExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#equals(org.eclipse.cdt.debug.core.cdi.model.ICDIExpression) */ + @Override public boolean equals(ICDIExpression obj) { if (obj instanceof Expression) { Expression other = (Expression)obj; @@ -95,6 +97,7 @@ public class Expression extends CObject implements ICDIExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#getValue(org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame) */ + @Override public ICDIValue getValue(ICDIStackFrame context) throws CDIException { Session session = (Session)getTarget().getSession(); ExpressionManager mgr = session.getExpressionManager(); @@ -123,6 +126,7 @@ public class Expression extends CObject implements ICDIExpression { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpression#dispose() */ + @Override public void dispose() throws CDIException { Session session = (Session)getTarget().getSession(); ExpressionManager mgr = session.getExpressionManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/GlobalVariable.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/GlobalVariable.java index 81a35ea0fee..d15c9662e95 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/GlobalVariable.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/GlobalVariable.java @@ -46,6 +46,7 @@ public class GlobalVariable extends Variable implements ICDIGlobalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createVariable(org.eclipse.cdt.debug.mi.core.cdi.model.Target, java.lang.String, java.lang.String, org.eclipse.cdt.debug.core.cdi.model.ICDIThread, org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame, int, int, org.eclipse.cdt.debug.mi.core.output.MIVar) */ + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { return new GlobalVariable(target, thread, frame, name, fullName, pos, depth, miVar); } @@ -53,6 +54,7 @@ public class GlobalVariable extends Variable implements ICDIGlobalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor(Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth) { return new GlobalVariableDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Instruction.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Instruction.java index bf0b71c009b..961ac4f14a7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Instruction.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Instruction.java @@ -29,6 +29,7 @@ public class Instruction extends CObject implements ICDIInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getAdress() */ + @Override public BigInteger getAdress() { return MIFormat.getBigInteger(asm.getAddress()); } @@ -36,6 +37,7 @@ public class Instruction extends CObject implements ICDIInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getFuntionName() */ + @Override public String getFuntionName() { return asm.getFunction(); } @@ -43,6 +45,7 @@ public class Instruction extends CObject implements ICDIInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getInstruction() */ + @Override public String getInstruction() { return asm.getInstruction(); } @@ -50,6 +53,7 @@ public class Instruction extends CObject implements ICDIInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getOffset() */ + @Override public long getOffset() { return asm.getOffset(); } @@ -57,6 +61,7 @@ public class Instruction extends CObject implements ICDIInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getArgs() */ + @Override public String getArgs() { return asm.getArgs(); } @@ -64,6 +69,7 @@ public class Instruction extends CObject implements ICDIInstruction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction#getOpcode() */ + @Override public String getOpcode() { return asm.getOpcode(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocalVariable.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocalVariable.java index 08235629e77..f88cefabfdf 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocalVariable.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocalVariable.java @@ -36,6 +36,7 @@ public class LocalVariable extends Variable implements ICDILocalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createVariable(org.eclipse.cdt.debug.mi.core.cdi.model.Target, java.lang.String, java.lang.String, org.eclipse.cdt.debug.core.cdi.model.ICDIThread, org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame, int, int, org.eclipse.cdt.debug.mi.core.output.MIVar) */ + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { return new LocalVariable(target, thread, frame, name, fullName, pos, depth, miVar); @@ -44,6 +45,7 @@ public class LocalVariable extends Variable implements ICDILocalVariable { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor(Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth) { return new LocalVariableDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MappedSourceLocation.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MappedSourceLocation.java index 9c0041b3cca..f867177d423 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MappedSourceLocation.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MappedSourceLocation.java @@ -28,30 +28,37 @@ public class MappedSourceLocation implements ICDIAddressToSource.IMappedSourceLo this.executable = executable; } + @Override public IAddress getAddress() { return address; } + @Override public IPath getExecutable() { return Path.fromOSString(executable); } + @Override public String getFunctionName() { return lineInfo.getStartLocation(); } + @Override public int getLineNumber() { return lineInfo.getLineNumber(); } + @Override public IPath getSourceFile() { return Path.fromOSString(lineInfo.getFileName()); } + @Override public String getUnmangledFunctionName() { return lineInfo.getStartLocation(); } + @Override public int compareTo(Object arg0) { return address.compareTo(arg0); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java index 34f2c36f722..551f38239de 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java @@ -65,6 +65,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @return the size of each memory word in bytes. */ + @Override public int getWordSize() { return fWordSize; } @@ -186,6 +187,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { return offsets; } + @Override public byte[] getBytes() throws CDIException { return cBytes; } @@ -193,6 +195,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#refresh() */ + @Override public void refresh() throws CDIException { Target target = (Target)getTarget(); MemoryManager mgr = ((Session)target.getSession()).getMemoryManager(); @@ -214,6 +217,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#getLength() */ + @Override public long getLength() { try { // use this instead. If the wordSize @@ -229,6 +233,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#getStartAddress() */ + @Override public BigInteger getStartAddress() { return cStartAddress; } @@ -236,6 +241,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#isFrozen() */ + @Override public boolean isFrozen() { return frozen; } @@ -243,6 +249,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#setFrozen(boolean) */ + @Override public void setFrozen(boolean frozen) { this.frozen = frozen; } @@ -250,6 +257,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#setValue(long, byte[]) */ + @Override public void setValue(long offset, byte[] bytes) throws CDIException { if (offset >= getLength() || offset + bytes.length > getLength()) { throw new CDIException(CdiResources.getString("cdi.model.MemoryBlock.Bad_Offset")); //$NON-NLS-1$ @@ -298,6 +306,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock#getFlags(int) */ + @Override public synchronized byte getFlags(int offset) { if (offset < 0 || offset >= getLength()) { throw new IndexOutOfBoundsException(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MixedInstruction.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MixedInstruction.java index e12d6b5a1e9..007a5cd841b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MixedInstruction.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MixedInstruction.java @@ -29,6 +29,7 @@ public class MixedInstruction extends CObject implements ICDIMixedInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction#getFileName() */ + @Override public String getFileName() { return srcAsm.getFile(); } @@ -36,6 +37,7 @@ public class MixedInstruction extends CObject implements ICDIMixedInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction#getInstructions() */ + @Override public ICDIInstruction[] getInstructions() { MIAsm[] asms = srcAsm.getMIAsms(); ICDIInstruction[] instructions = new ICDIInstruction[asms.length]; @@ -48,6 +50,7 @@ public class MixedInstruction extends CObject implements ICDIMixedInstruction { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction#getLineNumber() */ + @Override public int getLineNumber() { return srcAsm.getLine(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java index e58c545ce56..ce73f3ffe2f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java @@ -46,12 +46,14 @@ public class Register extends Variable implements ICDIRegister { } + @Override protected void addToTypeCache(String nameType, ICDIType type) throws CDIException { Session session = (Session)getTarget().getSession(); RegisterManager mgr = session.getRegisterManager(); mgr.addToTypeCache(nameType, type); } + @Override protected ICDIType getFromTypeCache(String nameType) throws CDIException { Session session = (Session)getTarget().getSession(); RegisterManager mgr = session.getRegisterManager(); @@ -61,6 +63,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.VariableDescriptor#getFullName() */ + @Override public String getFullName() { if (fFullName == null) { String n = getName(); @@ -73,6 +76,7 @@ public class Register extends Variable implements ICDIRegister { return fFullName; } + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { return new Register(target, thread, frame, name, fullName, pos, depth, miVar); } @@ -80,6 +84,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#dispose() */ + @Override public void dispose() throws CDIException { ICDITarget target = getTarget(); RegisterManager regMgr = ((Session)target.getSession()).getRegisterManager(); @@ -89,6 +94,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegister#getValue(org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame) */ + @Override public ICDIValue getValue(ICDIStackFrame context) throws CDIException { Session session = (Session)getTarget().getSession(); RegisterManager mgr = session.getRegisterManager(); @@ -99,6 +105,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegister#equals(org.eclipse.cdt.debug.core.cdi.model.ICDIRegister) */ + @Override public boolean equals(ICDIRegister register) { if (register instanceof Register) { Register reg = (Register) register; @@ -110,6 +117,7 @@ public class Register extends Variable implements ICDIRegister { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor(Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth) { return new RegisterDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterDescriptor.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterDescriptor.java index 7a8f5feb928..35ecd42984a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterDescriptor.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterDescriptor.java @@ -25,6 +25,7 @@ public class RegisterDescriptor extends VariableDescriptor implements ICDIRegist /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.VariableDescriptor#getFullName() */ + @Override public String getFullName() { if (fFullName == null) { String n = getName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterGroup.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterGroup.java index 509928741ee..cfb0a848e10 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterGroup.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RegisterGroup.java @@ -35,6 +35,7 @@ public class RegisterGroup extends CObject implements ICDIRegisterGroup { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterGroup#getRegisterDescriptors() */ + @Override public ICDIRegisterDescriptor[] getRegisterDescriptors() throws CDIException { Target target = (Target)getTarget(); Session session = (Session)target.getSession(); @@ -45,6 +46,7 @@ public class RegisterGroup extends CObject implements ICDIRegisterGroup { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterGroup#getName() */ + @Override public String getName() { return fName; } @@ -52,6 +54,7 @@ public class RegisterGroup extends CObject implements ICDIRegisterGroup { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterGroup#hasRegisters() */ + @Override public boolean hasRegisters() throws CDIException { return true; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RuntimeOptions.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RuntimeOptions.java index faf2718a357..b5cc94b733b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RuntimeOptions.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/RuntimeOptions.java @@ -35,6 +35,7 @@ public class RuntimeOptions extends CObject implements ICDIRuntimeOptions { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions#setArguments(String) */ + @Override public void setArguments(String[] args) throws CDIException { Target target = (Target)getTarget(); if (args == null || args.length == 0) { @@ -57,6 +58,7 @@ public class RuntimeOptions extends CObject implements ICDIRuntimeOptions { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions#setEnvironment(Properties) */ + @Override public void setEnvironment(Properties props) throws CDIException { Target target = (Target)getTarget(); if (props == null) { @@ -90,6 +92,7 @@ public class RuntimeOptions extends CObject implements ICDIRuntimeOptions { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions#setWorkingDirectory(String) */ + @Override public void setWorkingDirectory(String wd) throws CDIException { Target target = (Target)getTarget(); if (wd == null || wd.length() == 0) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java index 1b6157b9b21..1f68edebd6e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java @@ -43,6 +43,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#getFileName() */ + @Override public String getFileName() { return miShared.getName(); } @@ -50,6 +51,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#getStartAddress() */ + @Override public BigInteger getStartAddress() { return MIFormat.getBigInteger(miShared.getFrom()); } @@ -57,6 +59,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#getEndAddress() */ + @Override public BigInteger getEndAddress() { return MIFormat.getBigInteger(miShared.getTo()); } @@ -64,6 +67,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#areSymbolsLoaded() */ + @Override public boolean areSymbolsLoaded() { return miShared.isRead(); } @@ -71,6 +75,7 @@ public class SharedLibrary extends CObject implements ICDISharedLibrary { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#loadSymbols() */ + @Override public void loadSymbols() throws CDIException { Target target = (Target)getTarget(); SharedLibraryManager mgr = ((Session)target.getSession()).getSharedLibraryManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java index d324374776a..ccba13945ce 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java @@ -38,6 +38,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#getMeaning() */ + @Override public String getDescription() { return sig.getDescription(); } @@ -45,6 +46,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#getName() */ + @Override public String getName() { return sig.getName(); } @@ -52,6 +54,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#handle() */ + @Override public void handle(boolean ignore, boolean stop) throws CDIException { SignalManager mgr = ((Session)getTarget().getSession()).getSignalManager(); mgr.handle(this, ignore, stop); @@ -60,6 +63,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#isIgnore() */ + @Override public boolean isIgnore() { return !sig.isPass(); } @@ -67,6 +71,7 @@ public class Signal extends CObject implements ICDISignal { /** * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#isStopSet() */ + @Override public boolean isStopSet() { return sig.isStop(); } @@ -74,6 +79,7 @@ public class Signal extends CObject implements ICDISignal { /** * Continue program giving it signal specified by the argument. */ + @Override public void signal() throws CDIException { getTarget().resume(this); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java index 4e259ee12fd..a9dbe7f0b22 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java @@ -97,6 +97,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getThread() */ + @Override public ICDIThread getThread() { return cthread; } @@ -104,6 +105,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getArgumentDescriptors() */ + @Override public ICDIArgumentDescriptor[] getArgumentDescriptors() throws CDIException { if (argDescs == null) { Session session = (Session)getTarget().getSession(); @@ -116,6 +118,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLocalVariableDescriptors() */ + @Override public ICDILocalVariableDescriptor[] getLocalVariableDescriptors() throws CDIException { if (localDescs == null) { Session session = (Session)getTarget().getSession(); @@ -128,6 +131,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#createArgument(org.eclipse.cdt.debug.core.cdi.model.ICDIArgumentDescriptor) */ + @Override public ICDIArgument createArgument(ICDIArgumentDescriptor varDesc) throws CDIException { if (varDesc instanceof ArgumentDescriptor) { Session session = (Session)getTarget().getSession(); @@ -140,6 +144,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#createLocalVariable(org.eclipse.cdt.debug.core.cdi.model.ICDILocalVariableDescriptor) */ + @Override public ICDILocalVariable createLocalVariable(ICDILocalVariableDescriptor varDesc) throws CDIException { if (varDesc instanceof ArgumentDescriptor) { return createArgument((ICDIArgumentDescriptor)varDesc); @@ -154,6 +159,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLocation() */ + @Override public ICDILocator getLocator() { BigInteger addr = BigInteger.ZERO; if (frame != null) { @@ -175,6 +181,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLevel() */ + @Override public int getLevel() { return level; } @@ -182,6 +189,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#equals(ICDIStackFrame) */ + @Override public boolean equals(ICDIStackFrame stackframe) { if (stackframe instanceof StackFrame) { StackFrame stack = (StackFrame)stackframe; @@ -204,6 +212,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStepReturn#stepReturn() */ + @Override public void stepReturn() throws CDIException { finish(); } @@ -211,6 +220,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStepReturn#stepReturn(org.eclipse.cdt.debug.core.cdi.model.ICDIValue) */ + @Override public void stepReturn(ICDIValue value) throws CDIException { execReturn(value.toString()); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java index 57c681511e8..135a5af7def 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java @@ -160,6 +160,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIObject#getTarget() */ + @Override public ICDITarget getTarget() { return this; } @@ -374,6 +375,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM return cthreads; } + @Override public ICDIThread getCurrentThread() throws CDIException { ICDIThread[] threads = getThreads(); for (int i = 0; i < threads.length; i++) { @@ -388,6 +390,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getThreads() */ + @Override public synchronized ICDIThread[] getThreads() throws CDIException { if (currentThreads.length == 0) { currentThreads = getCThreads(); @@ -430,6 +433,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#restart() */ + @Override public void restart() throws CDIException { // Reset the inferior pid MIInferior inferior = getMISession().getMIInferior(); @@ -452,6 +456,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepInto() */ + @Override public void stepInto() throws CDIException { stepInto(1); } @@ -459,6 +464,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepInto(int) */ + @Override public void stepInto(int count) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); MIExecStep step = factory.createMIExecStep(count); @@ -476,6 +482,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepIntoInstruction() */ + @Override public void stepIntoInstruction() throws CDIException { stepIntoInstruction(1); } @@ -483,6 +490,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepIntoInstruction(int) */ + @Override public void stepIntoInstruction(int count) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); MIExecStepInstruction stepi = factory.createMIExecStepInstruction(count); @@ -501,6 +509,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepOver() */ + @Override public void stepOver() throws CDIException { stepOver(1); } @@ -508,6 +517,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepOver(int) */ + @Override public void stepOver(int count) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); MIExecNext next = factory.createMIExecNext(count); @@ -525,6 +535,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#stepOverInstruction() */ + @Override public void stepOverInstruction() throws CDIException { stepOverInstruction(1); } @@ -532,6 +543,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepOverInstruction(int) */ + @Override public void stepOverInstruction(int count) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); MIExecNextInstruction nexti = factory.createMIExecNextInstruction(count); @@ -556,6 +568,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#runUntil(ICDILocation) */ + @Override public void runUntil(ICDILocation location) throws CDIException { stepUntil(location); } @@ -563,6 +576,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepUntil(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void stepUntil(ICDILocation location) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); String loc = null; @@ -610,6 +624,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#suspend() */ + @Override public void suspend() throws CDIException { try { miSession.getMIInferior().interrupt(); @@ -631,6 +646,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#disconnect() */ + @Override public void disconnect() throws CDIException { // if Target is running try to suspend first. if (isRunning()) { @@ -661,6 +677,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#resume() */ + @Override public void resume() throws CDIException { resume(false); } @@ -668,6 +685,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void resume(ICDILocation location) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); String loc = null; @@ -719,6 +737,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @since 6.0 */ + @Override public void moveInstructionPointer(ICDILocation location) throws CDIException { // Most of this code was taken from our Resume() // method. The only differences are that we create a temporary @@ -771,6 +790,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(org.eclipse.cdt.debug.core.cdi.model.ICDISignal) */ + @Override public void resume(ICDISignal signal) throws CDIException { CommandFactory factory = miSession.getCommandFactory(); CLISignal sig = factory.createCLISignal(signal.getName()); @@ -788,6 +808,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(boolean) */ + @Override public void resume(boolean passSignal) throws CDIException { if (miSession.getMIInferior().isRunning()) { throw new CDIException(CdiResources.getString("cdi.model.Target.Inferior_already_running")); //$NON-NLS-1$ @@ -831,6 +852,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#jump(ICDILocation) */ + @Override public void jump(ICDILocation location) throws CDIException { resume(location); } @@ -838,6 +860,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#signal() */ + @Override public void signal() throws CDIException { resume(true); } @@ -845,10 +868,12 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#signal(ICDISignal) */ + @Override public void signal(ICDISignal signal) throws CDIException { resume(signal); } + @Override public String evaluateExpressionToString(ICDIStackFrame frame, String expressionText) throws CDIException { Target target = (Target)frame.getTarget(); Thread currentThread = (Thread)target.getCurrentThread(); @@ -877,6 +902,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#terminate() */ + @Override public void terminate() throws CDIException { try { miSession.getMIInferior().terminate(); @@ -888,6 +914,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isTerminated() */ + @Override public boolean isTerminated() { return miSession.getMIInferior().isTerminated(); } @@ -895,6 +922,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isDisconnected() */ + @Override public boolean isDisconnected() { return !miSession.getMIInferior().isConnected(); } @@ -902,6 +930,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#isSuspended() */ + @Override public boolean isSuspended() { return miSession.getMIInferior().isSuspended(); } @@ -913,6 +942,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getProcess() */ + @Override public Process getProcess() { if (miSession.isCoreSession()) { return new CoreProcess(); @@ -926,6 +956,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setLineBreakpoint(int, org.eclipse.cdt.debug.core.cdi.ICDILineLocation, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDILineBreakpoint setLineBreakpoint(int type, ICDILineLocation location, ICDICondition condition, boolean deferred) throws CDIException { return this.setLineBreakpoint(type, location, condition, deferred, true); @@ -934,6 +965,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setFunctionBreakpoint(int, org.eclipse.cdt.debug.core.cdi.ICDIFunctionLocation, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDIFunctionBreakpoint setFunctionBreakpoint(int type, ICDIFunctionLocation location, ICDICondition condition, boolean deferred) throws CDIException { return this.setFunctionBreakpoint(type, location, condition, deferred, true); @@ -942,6 +974,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setAddressBreakpoint(int, org.eclipse.cdt.debug.core.cdi.ICDIAddressLocation, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDIAddressBreakpoint setAddressBreakpoint(int type, ICDIAddressLocation location, ICDICondition condition, boolean deferred) throws CDIException { return this.setAddressBreakpoint(type, location, condition, deferred, true); @@ -950,6 +983,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setWatchpoint(int, int, java.lang.String, org.eclipse.cdt.debug.core.cdi.ICDICondition) */ + @Override public ICDIWatchpoint setWatchpoint(int type, int watchType, String expression, ICDICondition condition) throws CDIException { return this.setWatchpoint(type, watchType, expression, condition, true); @@ -958,6 +992,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement2#setWatchpoint(int, int, java.lang.String, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDIWatchpoint setWatchpoint(int type, int watchType, String expression, ICDICondition condition, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); @@ -969,6 +1004,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement2#setWatchpoint(int, int, java.lang.String, java.math.BigInteger, org.eclipse.cdt.debug.core.cdi.ICDICondition, boolean) */ + @Override public ICDIWatchpoint setWatchpoint(int type, int watchType, String expression, String memorySpace, BigInteger range, ICDICondition condition, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); @@ -980,6 +1016,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#setExceptionBreakpoint(java.lang.String, boolean, boolean) */ + @Override public ICDIExceptionpoint setExceptionBreakpoint(String clazz, boolean stopOnThrow, boolean stopOnCatch) throws CDIException { throw new CDIException(CdiResources.getString("cdi.Common.Not_implemented")); //$NON-NLS-1$ @@ -988,6 +1025,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#getBreakpoints() */ + @Override public ICDIBreakpoint[] getBreakpoints() throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.getBreakpoints(this); @@ -996,6 +1034,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#deleteBreakpoints(org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint[]) */ + @Override public void deleteBreakpoints(ICDIBreakpoint[] breakpoints) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); bMgr.deleteBreakpoints(this, breakpoints); @@ -1004,6 +1043,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement#deleteAllBreakpoints() */ + @Override public void deleteAllBreakpoints() throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); bMgr.deleteAllBreakpoints(this); @@ -1012,6 +1052,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createCondition(int, java.lang.String, String) */ + @Override public ICDICondition createCondition(int ignoreCount, String expression) { return createCondition(ignoreCount, expression, null); } @@ -1019,6 +1060,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createCondition(int, java.lang.String, String) */ + @Override public ICDICondition createCondition(int ignoreCount, String expression, String[] tids) { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.createCondition(ignoreCount, expression, tids); @@ -1027,6 +1069,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createLineLocation(java.lang.String, int) */ + @Override public ICDILineLocation createLineLocation(String file, int line) { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.createLineLocation(file, line); @@ -1035,6 +1078,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createFunctionLocation(java.lang.String, java.lang.String) */ + @Override public ICDIFunctionLocation createFunctionLocation(String file, String function) { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.createFunctionLocation(file, function); @@ -1043,6 +1087,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createLocation(long) */ + @Override public ICDIAddressLocation createAddressLocation(BigInteger address) { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.createAddressLocation(address); @@ -1051,6 +1096,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getRuntimeOptions() */ + @Override public ICDIRuntimeOptions getRuntimeOptions() { return new RuntimeOptions(this); } @@ -1058,6 +1104,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpressionManagement#createExpression(java.lang.String) */ + @Override public ICDIExpression createExpression(String code) throws CDIException { ExpressionManager expMgr = ((Session)getSession()).getExpressionManager(); return expMgr.createExpression(this, code); @@ -1066,6 +1113,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpressionManagement#getExpressions() */ + @Override public ICDIExpression[] getExpressions() throws CDIException { ExpressionManager expMgr = ((Session)getSession()).getExpressionManager(); return expMgr.getExpressions(this); @@ -1074,6 +1122,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpressionManagement#destroyExpression(org.eclipse.cdt.debug.core.cdi.model.ICDIExpression[]) */ + @Override public void destroyExpressions(ICDIExpression[] expressions) throws CDIException { ExpressionManager expMgr = ((Session)getSession()).getExpressionManager(); expMgr.destroyExpressions(this, expressions); @@ -1082,6 +1131,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExpressionManagement#destroyAllExpression() */ + @Override public void destroyAllExpressions() throws CDIException { ExpressionManager expMgr = ((Session)getSession()).getExpressionManager(); expMgr.destroyAllExpressions(this); @@ -1093,6 +1143,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM * @return the array of signals * @throws CDIException on failure. Reasons include: */ + @Override public ICDISignal[] getSignals() throws CDIException { SignalManager sigMgr = ((Session)getSession()).getSignalManager(); return sigMgr.getSignals(this); @@ -1101,6 +1152,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#setSourcePaths(java.lang.String[]) */ + @Override public void setSourcePaths(String[] srcPaths) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); srcMgr.setSourcePaths(this, srcPaths); @@ -1109,6 +1161,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getSourcePaths() */ + @Override public String[] getSourcePaths() throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getSourcePaths(this); @@ -1117,6 +1170,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getInstructions(java.math.BigInteger, java.math.BigInteger) */ + @Override public ICDIInstruction[] getInstructions(BigInteger startAddress, BigInteger endAddress) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getInstructions(this, startAddress, endAddress); @@ -1125,6 +1179,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getInstructions(java.lang.String, int) */ + @Override public ICDIInstruction[] getInstructions(String filename, int linenum) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getInstructions(this, filename, linenum); @@ -1133,6 +1188,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getInstructions(java.lang.String, int, int) */ + @Override public ICDIInstruction[] getInstructions(String filename, int linenum, int lines) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getInstructions(this, filename, linenum, lines); @@ -1141,6 +1197,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getMixedInstructions(java.math.BigInteger, java.math.BigInteger) */ + @Override public ICDIMixedInstruction[] getMixedInstructions(BigInteger startAddress, BigInteger endAddress) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getMixedInstructions(this, startAddress, endAddress); @@ -1149,6 +1206,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getMixedInstructions(java.lang.String, int) */ + @Override public ICDIMixedInstruction[] getMixedInstructions(String filename, int linenum) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getMixedInstructions(this, filename, linenum); @@ -1157,6 +1215,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISourceManagement#getMixedInstructions(java.lang.String, int, int) */ + @Override public ICDIMixedInstruction[] getMixedInstructions(String filename, int linenum, int lines) throws CDIException { SourceManager srcMgr = ((Session)getSession()).getSourceManager(); return srcMgr.getMixedInstructions(this, filename, linenum, lines); @@ -1165,6 +1224,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#createMemoryBlock(java.lang.String, int) */ + @Override public ICDIMemoryBlock createMemoryBlock(String address, int units, int wordSize) throws CDIException { MemoryManager memMgr = ((Session)getSession()).getMemoryManager(); return memMgr.createMemoryBlock(this, address, units, wordSize); @@ -1173,6 +1233,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#removeBlocks(org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock[]) */ + @Override public void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException { MemoryManager memMgr = ((Session)getSession()).getMemoryManager(); memMgr.removeBlocks(this, memoryBlocks); @@ -1181,6 +1242,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#removeAllBlocks() */ + @Override public void removeAllBlocks() throws CDIException { MemoryManager memMgr = ((Session)getSession()).getMemoryManager(); memMgr.removeAllBlocks(this); @@ -1189,6 +1251,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#getMemoryBlocks() */ + @Override public ICDIMemoryBlock[] getMemoryBlocks() throws CDIException { MemoryManager memMgr = ((Session)getSession()).getMemoryManager(); return memMgr.getMemoryBlocks(this); @@ -1197,6 +1260,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibraryManagement#getSharedLibraries() */ + @Override public ICDISharedLibrary[] getSharedLibraries() throws CDIException { SharedLibraryManager sharedMgr = ((Session)getSession()).getSharedLibraryManager(); return sharedMgr.getSharedLibraries(this); @@ -1205,6 +1269,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getGlobalVariableDescriptors(java.lang.String, java.lang.String, java.lang.String) */ + @Override public ICDIGlobalVariableDescriptor getGlobalVariableDescriptors(String filename, String function, String name) throws CDIException { VariableManager varMgr = ((Session)getSession()).getVariableManager(); return varMgr.getGlobalVariableDescriptor(this, filename, function, name); @@ -1213,6 +1278,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getRegisterGroups() */ + @Override public ICDIRegisterGroup[] getRegisterGroups() throws CDIException { RegisterManager regMgr = ((Session)getSession()).getRegisterManager(); return regMgr.getRegisterGroups(this); @@ -1221,6 +1287,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#getConfiguration() */ + @Override public ICDITargetConfiguration getConfiguration() { if (fConfiguration == null) { if (miSession.isProgramSession()) { @@ -1239,6 +1306,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createGlobalVariable(org.eclipse.cdt.debug.core.cdi.model.ICDIGlobalVariableDescriptor) */ + @Override public ICDIGlobalVariable createGlobalVariable(ICDIGlobalVariableDescriptor varDesc) throws CDIException { if (varDesc instanceof GlobalVariableDescriptor) { VariableManager varMgr = ((Session)getSession()).getVariableManager(); @@ -1250,6 +1318,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#createRegister(org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterDescriptor) */ + @Override public ICDIRegister createRegister(ICDIRegisterDescriptor varDesc) throws CDIException { if (varDesc instanceof RegisterDescriptor) { Session session = (Session)getTarget().getSession(); @@ -1275,25 +1344,30 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM return miSession.isVerboseModeEnabled(); } + @Override public ICDIAddressBreakpoint setAddressBreakpoint(int type, ICDIAddressLocation location, ICDICondition condition, boolean deferred, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.setAddressBreakpoint(this, type, location, condition, deferred, enabled); } + @Override public ICDIExceptionpoint setExceptionBreakpoint(String clazz, boolean stopOnThrow, boolean stopOnCatch, boolean enabled) throws CDIException { throw new CDIException(CdiResources.getString("cdi.Common.Not_implemented")); //$NON-NLS-1$ } + @Override public ICDIFunctionBreakpoint setFunctionBreakpoint(int type, ICDIFunctionLocation location, ICDICondition condition, boolean deferred, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.setFunctionBreakpoint(this, type, location, condition, deferred, enabled); } + @Override public ICDILineBreakpoint setLineBreakpoint(int type, ICDILineLocation location, ICDICondition condition, boolean deferred, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); return bMgr.setLineBreakpoint(this, type, location, condition, deferred, enabled); } + @Override public IMappedSourceLocation getSourceForAddress(IAddress address) throws CDIException { // Ask gdb for info for this address, use the module list // to determine the executable. @@ -1317,6 +1391,7 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM } } + @Override public ICDIEventBreakpoint setEventBreakpoint(String type, String arg, int cdiType, ICDICondition condition, boolean deferred, boolean enabled) throws CDIException { BreakpointManager bMgr = ((Session)getSession()).getBreakpointManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/TargetConfiguration.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/TargetConfiguration.java index 5af2f3b7103..90c65016fa0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/TargetConfiguration.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/TargetConfiguration.java @@ -25,6 +25,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsBreakpoints() */ + @Override public boolean supportsBreakpoints() { return true; } @@ -32,6 +33,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsDisconnect() */ + @Override public boolean supportsDisconnect() { MISession miSession = ((Target)getTarget()).getMISession(); return miSession.isAttachSession() ? true : false; @@ -40,6 +42,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsExpressionEvaluation() */ + @Override public boolean supportsExpressionEvaluation() { return true; } @@ -47,6 +50,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsInstructionStepping() */ + @Override public boolean supportsInstructionStepping() { return true; } @@ -54,6 +58,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsMemoryModification() */ + @Override public boolean supportsMemoryModification() { return true; } @@ -61,6 +66,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsMemoryRetrieval() */ + @Override public boolean supportsMemoryRetrieval() { return true; } @@ -68,6 +74,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsRegisterModification() */ + @Override public boolean supportsRegisterModification() { return true; } @@ -75,6 +82,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsRegisters() */ + @Override public boolean supportsRegisters() { return true; } @@ -82,6 +90,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsSharedLibrary() */ + @Override public boolean supportsSharedLibrary() { return true; } @@ -89,6 +98,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsRestart() */ + @Override public boolean supportsRestart() { MISession miSession = ((Target)getTarget()).getMISession(); return miSession.isAttachSession() ? false : true; @@ -97,6 +107,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsStepping() */ + @Override public boolean supportsStepping() { return true; } @@ -104,6 +115,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsTerminate() */ + @Override public boolean supportsTerminate() { return true; @@ -111,6 +123,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsResume() */ + @Override public boolean supportsResume() { return true; } @@ -118,6 +131,7 @@ public class TargetConfiguration extends CObject implements ICDITargetConfigurat /** * @see org.eclipse.cdt.debug.core.cdi.ICDIConfiguration#supportsSuspend() */ + @Override public boolean supportsSuspend() { String os = null; try { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java index 69880720eaa..1c34fdbdac9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java @@ -103,6 +103,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#getStackFrames() */ + @Override public ICDIStackFrame[] getStackFrames() throws CDIException { // get the frames depth @@ -154,6 +155,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#getStackFrames() */ + @Override public int getStackFrameCount() throws CDIException { if (stackdepth == 0) { Target target = (Target)getTarget(); @@ -208,6 +210,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#getStackFrames() */ + @Override public ICDIStackFrame[] getStackFrames(int low, int high) throws CDIException { if (currentFrames == null || currentFrames.size() < high) { currentFrames = new ArrayList(); @@ -326,6 +329,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepInto() */ + @Override public void stepInto() throws CDIException { stepInto(1); } @@ -333,6 +337,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepInto(int) */ + @Override public void stepInto(int count) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -344,6 +349,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepIntoInstruction() */ + @Override public void stepIntoInstruction() throws CDIException { stepIntoInstruction(1); } @@ -351,6 +357,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepIntoInstruction(int) */ + @Override public void stepIntoInstruction(int count) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -362,6 +369,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepOver() */ + @Override public void stepOver() throws CDIException { stepOver(1); } @@ -369,6 +377,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepOver(int) */ + @Override public void stepOver(int count) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -380,6 +389,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepOverInstruction() */ + @Override public void stepOverInstruction() throws CDIException { stepOverInstruction(1); } @@ -387,6 +397,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepOverInstruction(int) */ + @Override public void stepOverInstruction(int count) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -398,6 +409,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#stepReturn() */ + @Override public void stepReturn() throws CDIException { getCurrentStackFrame().stepReturn(); } @@ -405,6 +417,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#runUntil(ICDILocation) */ + @Override public void runUntil(ICDILocation location) throws CDIException { stepUntil(location); } @@ -412,6 +425,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteStep#stepUntil(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void stepUntil(ICDILocation location) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -423,6 +437,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#isSuspended() */ + @Override public boolean isSuspended() { return getTarget().isSuspended(); } @@ -430,6 +445,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#suspend() */ + @Override public void suspend() throws CDIException { getTarget().suspend(); } @@ -437,6 +453,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#resume() */ + @Override public void resume() throws CDIException { resume(false); } @@ -445,6 +462,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(boolean) */ + @Override public void resume(boolean passSignal) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -455,6 +473,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void resume(ICDILocation location) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -466,6 +485,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteResume#resume(org.eclipse.cdt.debug.core.cdi.model.ICDISignal) */ + @Override public void resume(ICDISignal signal) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { @@ -477,6 +497,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#jump(org.eclipse.cdt.debug.core.cdi.ICDILocation) */ + @Override public void jump(ICDILocation location) throws CDIException { resume(location); } @@ -484,6 +505,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#signal() */ + @Override public void signal() throws CDIException { resume(false); } @@ -491,6 +513,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#signal(org.eclipse.cdt.debug.core.cdi.model.ICDISignal) */ + @Override public void signal(ICDISignal signal) throws CDIException { resume(signal); } @@ -499,6 +522,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#equals(ICDIThread) */ + @Override public boolean equals(ICDIThread thread) { if (thread instanceof Thread) { Thread cthread = (Thread) thread; @@ -535,6 +559,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#getThreadStorageDescriptors() */ + @Override public ICDIThreadStorageDescriptor[] getThreadStorageDescriptors() throws CDIException { Session session = (Session)getTarget().getSession(); VariableManager varMgr = session.getVariableManager(); @@ -544,6 +569,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#createThreadStorage(org.eclipse.cdt.debug.core.cdi.model.ICDIThreadStorageDescriptor) */ + @Override public ICDIThreadStorage createThreadStorage(ICDIThreadStorageDescriptor varDesc) throws CDIException { if (varDesc instanceof ThreadStorageDescriptor) { Session session = (Session)getTarget().getSession(); @@ -559,6 +585,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /** * @since 6.0 */ + @Override public void moveInstructionPointer(ICDILocation location) throws CDIException { Target target = (Target)getTarget(); synchronized(target.getLock()) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/ThreadStorage.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/ThreadStorage.java index 01ee69593ca..155e9f5deb7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/ThreadStorage.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/ThreadStorage.java @@ -46,6 +46,7 @@ public class ThreadStorage extends Variable implements ICDIThreadStorage { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createVariable(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int, org.eclipse.cdt.debug.mi.core.output.MIVar) */ + @Override protected Variable createVariable(Target target, Thread thread, StackFrame frame, String name, String fullName, int pos, int depth, MIVar miVar) { @@ -55,6 +56,7 @@ public class ThreadStorage extends Variable implements ICDIThreadStorage { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#createDescriptor(org.eclipse.cdt.debug.mi.core.cdi.model.Target, org.eclipse.cdt.debug.mi.core.cdi.model.Thread, org.eclipse.cdt.debug.mi.core.cdi.model.StackFrame, java.lang.String, java.lang.String, int, int) */ + @Override protected VariableDescriptor createDescriptor( Target target, Thread thread, StackFrame frame, String n, String fn, int pos, int depth ) { return new ThreadStorageDescriptor(target, thread, frame, n, fn, pos, depth); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java index a59775a7549..e1c4f339973 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java @@ -48,6 +48,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getTypeName() */ + @Override public String getTypeName() throws CDIException { return getVariable().getTypeName(); } @@ -55,6 +56,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getValueString() */ + @Override public String getValueString() throws CDIException { // make sure the variable is updated. if (! getVariable().isUpdated()) { @@ -95,6 +97,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getVariables() */ + @Override public int getChildrenNumber() throws CDIException { return getVariable().getMIVar().getNumChild(); } @@ -102,6 +105,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getVariables() */ + @Override public boolean hasChildren() throws CDIException { /* int number = 0; @@ -127,6 +131,7 @@ public class Value extends CObject implements ICDIValue { /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getVariables() */ + @Override public ICDIVariable[] getVariables() throws CDIException { return getVariable().getChildren(); } @@ -134,6 +139,7 @@ public class Value extends CObject implements ICDIValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIValue#getType() */ + @Override public ICDIType getType() throws CDIException { return getVariable().getType(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java index 03d7472d94f..bba0600af06 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java @@ -341,6 +341,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getValue() */ + @Override public ICDIValue getValue() throws CDIException { if (value == null) { ICDIType t = getType(); @@ -384,6 +385,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#setValue(ICDIValue) */ + @Override public void setValue(ICDIValue value) throws CDIException { setValue(value.getValueString()); } @@ -391,6 +393,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#setValue(String) */ + @Override public void setValue(String expression) throws CDIException { Target target = (Target)getTarget(); MISession miSession = target.getMISession(); @@ -446,6 +449,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl * handle it. * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#isEditable() */ + @Override public boolean isEditable() throws CDIException { if (editable == null) { MISession mi = ((Target) getTarget()).getMISession(); @@ -487,6 +491,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#equals() */ + @Override public boolean equals(ICDIVariable var) { if (var instanceof Variable) { Variable variable = (Variable) var; @@ -511,6 +516,7 @@ public abstract class Variable extends VariableDescriptor implements ICDIVariabl /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#dispose() */ + @Override public void dispose() throws CDIException { ICDITarget target = getTarget(); VariableManager varMgr = ((Session)target.getSession()).getVariableManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java index 9c3e524a828..94c90308def 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/VariableDescriptor.java @@ -172,6 +172,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /** * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableDescriptor#getName() */ + @Override public String getName() { return fName; } @@ -179,6 +180,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariable#getType() */ + @Override public ICDIType getType() throws CDIException { if (fType == null) { String nametype = getTypeName(); @@ -234,6 +236,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#sizeof() */ + @Override public int sizeof() throws CDIException { if (sizeof == null) { Target target = (Target) getTarget(); @@ -296,6 +299,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#getTypeName() */ + @Override public String getTypeName() throws CDIException { if (fTypename == null) { Target target = (Target)getTarget(); @@ -322,6 +326,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#getQualifiedName() */ + @Override public String getQualifiedName() throws CDIException { if (qualifiedName == null) { qualifiedName = encodeVariable(); @@ -347,6 +352,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#equals(ICDIVariableDescriptor) */ + @Override public boolean equals(ICDIVariableDescriptor varDesc) { if (varDesc instanceof VariableDescriptor) { VariableDescriptor desc = (VariableDescriptor) varDesc; @@ -395,6 +401,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#getVariableDescriptorAsArray(org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor, int, int) */ + @Override public ICDIVariableDescriptor getVariableDescriptorAsArray(int start, int length) throws CDIException { Session session = (Session)getTarget().getSession(); VariableManager mgr = session.getVariableManager(); @@ -404,6 +411,7 @@ public abstract class VariableDescriptor extends CObject implements ICDIVariable /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor#getVariableDescriptorAsType(org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor, java.lang.String) */ + @Override public ICDIVariableDescriptor getVariableDescriptorAsType(String type) throws CDIException { Session session = (Session)getTarget().getSession(); VariableManager mgr = session.getVariableManager(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java index 3f7a5801a9c..6f2e064feb0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java @@ -77,6 +77,7 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint#getWatchExpression() */ + @Override public String getWatchExpression() throws CDIException { if (expression == null) { MIBreakpoint[] miPoints = getMIBreakpoints(); @@ -90,6 +91,7 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint#isReadType() */ + @Override public boolean isReadType() { return ((watchType & ICDIWatchpoint.READ) == ICDIWatchpoint.READ); // MIBreakpoint miPoint = getMIBreakpoint(); @@ -101,6 +103,7 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIWatchpoint#isWriteType() */ + @Override public boolean isWriteType() { return ((watchType & ICDIWatchpoint.WRITE) == ICDIWatchpoint.WRITE); // MIBreakpoint miPoint = getMIBreakpoint(); @@ -109,10 +112,12 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { // return ((watchType & ICDIWatchpoint.WRITE) == ICDIWatchpoint.WRITE); } + @Override public String getMemorySpace() throws CDIException { return memorySpace; } + @Override public BigInteger getRange() throws CDIException { return range; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java index d9573a1ba91..4fa680c15eb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayType.java @@ -32,6 +32,7 @@ public class ArrayType extends DerivedType implements ICDIArrayType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIArrayType#getDimension() */ + @Override public int getDimension() { if (derivedType == null) { getComponentType(); @@ -42,6 +43,7 @@ public class ArrayType extends DerivedType implements ICDIArrayType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIArrayType#getComponentType() */ + @Override public ICDIType getComponentType() { if (derivedType == null) { String orig = getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayValue.java index 1e75abb6220..7675d87c3f5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ArrayValue.java @@ -96,6 +96,7 @@ public class ArrayValue extends DerivedValue implements ICDIArrayValue, ICDIPoin * * an Array of range[index, index + length - 1] */ + @Override public ICDIVariable[] getVariables(int index, int length) throws CDIException { //int children = getChildrenNumber(); //if (index >= children || index + length >= children) { @@ -125,6 +126,7 @@ public class ArrayValue extends DerivedValue implements ICDIArrayValue, ICDIPoin /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIPointerValue#pointerValue() */ + @Override public BigInteger pointerValue() throws CDIException { String address = getAddressString(); if (address.length() > 0 ){ diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java index f4c93be5778..9c80858ef0c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/BoolValue.java @@ -29,6 +29,7 @@ public class BoolValue extends IntegralValue implements ICDIBoolValue { super(v); } + @Override public BigInteger bigIntegerValue() throws CDIException { String valueString = getValueString(); if (valueString.equalsIgnoreCase("false"))//$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java index b91eb16c743..34dfceb572f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointType.java @@ -32,6 +32,7 @@ public abstract class FloatingPointType extends Type implements ICDIFloatingPoin /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType#isComplex() */ + @Override public boolean isComplex() { return complex; } @@ -39,6 +40,7 @@ public abstract class FloatingPointType extends Type implements ICDIFloatingPoin /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType#isImaginary() */ + @Override public boolean isImaginary() { return imaginary; } @@ -46,6 +48,7 @@ public abstract class FloatingPointType extends Type implements ICDIFloatingPoin /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointType#isLong() */ + @Override public boolean isLong() { return islong; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java index 0a864a6bb4f..89e7df4f88c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FloatingPointValue.java @@ -30,6 +30,7 @@ public abstract class FloatingPointValue extends Value implements ICDIFloatingPo /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointValue#doubleValue() */ + @Override public double doubleValue() throws CDIException { double result = 0; String valueString = getValueString(); @@ -51,6 +52,7 @@ public abstract class FloatingPointValue extends Value implements ICDIFloatingPo /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIFloatingPointValue#floatValue() */ + @Override public float floatValue() throws CDIException { float result = 0; String valueString = getValueString(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java index 6dfd946eb13..0bc98d24ab8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/FunctionType.java @@ -28,6 +28,7 @@ public class FunctionType extends DerivedType implements ICDIFunctionType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIDerivedType#getComponentType() */ + @Override public ICDIType getComponentType() { if (derivedType != null) { String orig = getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java index 71a0f972111..0df093c5912 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralType.java @@ -28,6 +28,7 @@ public abstract class IntegralType extends Type implements ICDIIntegralType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralType#isUnsigned() */ + @Override public boolean isUnsigned() { return unSigned; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java index b3d662438e5..ac7e4ac8e2c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/IntegralValue.java @@ -35,6 +35,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#biIntegerValue() */ + @Override public BigInteger bigIntegerValue() throws CDIException { return bigIntegerValue(getValueString()); } @@ -64,6 +65,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#longValue() */ + @Override public long longValue() throws CDIException { return bigIntegerValue().longValue(); } @@ -71,6 +73,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#longValue() */ + @Override public int intValue() throws CDIException { return bigIntegerValue().intValue(); } @@ -78,6 +81,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#shortValue() */ + @Override public short shortValue() throws CDIException { return bigIntegerValue().shortValue(); } @@ -85,6 +89,7 @@ public abstract class IntegralValue extends Value implements ICDIIntegralValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIIntegralValue#byteValue() */ + @Override public int byteValue() throws CDIException { return bigIntegerValue().byteValue(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java index 7eea7e47ad8..4f3ff8964ff 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerType.java @@ -26,6 +26,7 @@ public class PointerType extends DerivedType implements ICDIPointerType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIDerivedType#getComponentType() */ + @Override public ICDIType getComponentType() { if (derivedType == null) { String orig = getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerValue.java index 7604784bcc5..95d2f1b1719 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/PointerValue.java @@ -31,6 +31,7 @@ public class PointerValue extends DerivedValue implements ICDIPointerValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIPointerValue#pointerValue() */ + @Override public BigInteger pointerValue() throws CDIException { return IntegralValue.bigIntegerValue(getValueString()); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java index c5e3931766a..ab32a107cb3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceType.java @@ -29,6 +29,7 @@ public class ReferenceType extends DerivedType implements ICDIReferenceType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIDerivedType#getComponentType() */ + @Override public ICDIType getComponentType() { if (derivedType == null) { String orig = getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java index 42c4e2085d0..ac602fe073c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java @@ -52,6 +52,7 @@ public class ReferenceValue extends DerivedValue implements ICDIReferenceValue { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIReferenceValue#referenceValue() */ + @Override public ICDIValue referenceValue() throws CDIException { Value value = null; ICDIReferenceType rt = (ICDIReferenceType)getType(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java index 1b6523ab66c..941595c67d3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/StructType.java @@ -29,6 +29,7 @@ public class StructType extends AggregateType implements ICDIStructType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType#isClass() */ + @Override public boolean isClass() { return getDetailTypeName().startsWith("class"); //$NON-NLS-1$ } @@ -36,6 +37,7 @@ public class StructType extends AggregateType implements ICDIStructType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType#isStruct() */ + @Override public boolean isStruct() { return getDetailTypeName().startsWith("struct"); //$NON-NLS-1$ } @@ -43,6 +45,7 @@ public class StructType extends AggregateType implements ICDIStructType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.type.ICDIStructType#isUnion() */ + @Override public boolean isUnion() { return getDetailTypeName().startsWith("union"); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java index 4c9823eb242..c786b5be176 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/Type.java @@ -30,6 +30,7 @@ public abstract class Type extends CObject implements ICDIType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIType#getTypeName() */ + @Override public String getTypeName() { return typename; } @@ -41,6 +42,7 @@ public abstract class Type extends CObject implements ICDIType { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIType#getDetailTypeName() */ + @Override public String getDetailTypeName() { if (detailName == null) { return getTypeName(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CoreProcess.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CoreProcess.java index 55572103642..0c94049ccb2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CoreProcess.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CoreProcess.java @@ -22,6 +22,7 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#exitValue() */ + @Override public int exitValue() { return 0; } @@ -29,6 +30,7 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#waitFor() */ + @Override public int waitFor() throws InterruptedException { return 0; } @@ -36,14 +38,17 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#destroy() */ + @Override public void destroy() { } /* (non-Javadoc) * @see java.lang.Process#getErrorStream() */ + @Override public InputStream getErrorStream() { return new InputStream() { + @Override public int read() throws IOException { return -1; } @@ -53,8 +58,10 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#getInputStream() */ + @Override public InputStream getInputStream() { return new InputStream() { + @Override public int read() throws IOException { return -1; } @@ -64,8 +71,10 @@ public class CoreProcess extends Process { /* (non-Javadoc) * @see java.lang.Process#getOutputStream() */ + @Override public OutputStream getOutputStream() { return new OutputStream() { + @Override public void write(int b) throws IOException { } }; diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/ErrorThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/ErrorThread.java index 3150718bad7..c3f53dc8754 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/ErrorThread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/ErrorThread.java @@ -33,6 +33,7 @@ public class ErrorThread extends Thread { /* * Sit on the error stream output, and append to the GDB console */ + @Override public void run() { BufferedReader reader = new BufferedReader(new InputStreamReader(session.getChannelErrorStream())); try { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/EventThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/EventThread.java index ac432c45455..4161e6fd95d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/EventThread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/EventThread.java @@ -27,6 +27,7 @@ public class EventThread extends Thread { session = s; } + @Override public void run() { // Signal by the session of time to die. while (session.getChannelOutputStream() != null) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java index 7dc492a1e8d..4441c22ad71 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java @@ -167,6 +167,7 @@ public class GDBTypeParser { type = t; } + @Override public String toString() { return unParse(this); } @@ -214,6 +215,7 @@ public class GDBTypeParser { return child != null; } + @Override public String verbose() { StringBuffer sb = new StringBuffer(); switch (getType()) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java index e5aded32406..03574d2fd53 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MIInferior.java @@ -72,9 +72,11 @@ public class MIInferior extends Process { /** * @see java.lang.Process#getOutputStream() */ + @Override public OutputStream getOutputStream() { if (out == null) { out = new OutputStream() { + @Override public void write(int b) throws IOException { if (!isRunning()) { throw new IOException(MIPlugin.getResourceString("src.MIInferior.target_is_suspended")); //$NON-NLS-1$ @@ -93,6 +95,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#getInputStream() */ + @Override public InputStream getInputStream() { if (in == null) { try { @@ -107,6 +110,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#getErrorStream() */ + @Override public InputStream getErrorStream() { // FIXME: We do not have any err stream from gdb/mi // so this gdb err channel instead. @@ -129,6 +133,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#waitFor() */ + @Override public int waitFor() throws InterruptedException { waitForSync(); return exitValue(); @@ -137,6 +142,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#exitValue() */ + @Override public int exitValue() { if (isTerminated()) { if (!session.isTerminated()) { @@ -161,6 +167,7 @@ public class MIInferior extends Process { /** * @see java.lang.Process#destroy() */ + @Override public void destroy() { try { terminate(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java index d4ffd106fbe..ecf1bea25f9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/MISession.java @@ -111,6 +111,7 @@ public class MISession extends Observable { * @throws MIException * @deprecated */ + @Deprecated public MISession(MIProcess process, IMITTY tty, int type, int commandTimeout, int launchTimeout, String miVersion, IProgressMonitor monitor) throws MIException { this(process, tty, type, new CommandFactory(miVersion), commandTimeout, launchTimeout, monitor); } @@ -126,6 +127,7 @@ public class MISession extends Observable { * @param type the type of debugin session. * @deprecated */ + @Deprecated public MISession(MIProcess process, IMITTY tty, int commandTimeout, int type, int launchTimeout) throws MIException { this(process, tty, type, commandTimeout, launchTimeout, MIVersion.MI1, new NullProgressMonitor()); if (useExecConsole()) { @@ -144,6 +146,7 @@ public class MISession extends Observable { * @param timeout time in milliseconds to wait for command response. * @deprecated */ + @Deprecated public MISession(MIProcess process, IMITTY tty, int type, CommandFactory commandFactory, int commandTimeout, int launchTimeout, IProgressMonitor monitor) throws MIException { gdbProcess = process; inChannel = process.getInputStream(); @@ -274,6 +277,7 @@ public class MISession extends Observable { /** * @deprecated use setup() without parameters */ + @Deprecated protected void setup(int launchTimeout, IProgressMonitor monitor) throws MIException { // The Process may have terminated earlier because // of bad arguments etc .. check this here and bail out. @@ -364,6 +368,7 @@ public class MISession extends Observable { /** * @deprecated use initialize() without parameters */ + @Deprecated protected void initialize(int launchTimeout, IProgressMonitor monitor) throws MIException { // Disable a certain number of irritations from gdb. // Like confirmation and screen size. @@ -786,6 +791,7 @@ public class MISession extends Observable { /** * Notify the observers of new MI OOB events. */ + @Override public void notifyObservers(Object arg) { setChanged(); super.notifyObservers(arg); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java index 2687606e997..3eb0cc86c4b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java @@ -83,6 +83,7 @@ public class RxThread extends Thread { * Get the response, parse the output, dispatch for OOB * search for the corresponding token in rxQueue for the ResultRecord. */ + @Override public void run() { BufferedReader reader = new BufferedReader(new InputStreamReader(session.getChannelInputStream())); try { @@ -108,6 +109,7 @@ public class RxThread extends Thread { // session.terminate() will set the channelInputStream to null. if (session.getChannelInputStream() != null) { Runnable cleanup = new Runnable() { + @Override public void run() { // Change the state of the inferior. session.getMIInferior().setTerminated(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/SessionProcess.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/SessionProcess.java index 31407dc5f98..349eb5e3375 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/SessionProcess.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/SessionProcess.java @@ -33,6 +33,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#destroy() */ + @Override public void destroy() { session.terminate(); } @@ -40,6 +41,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#exitValue() */ + @Override public int exitValue() { return session.getGDBProcess().exitValue(); } @@ -47,6 +49,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#getErrorStream() */ + @Override public InputStream getErrorStream() { return session.getMILogStream(); } @@ -54,6 +57,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#getInputStream() */ + @Override public InputStream getInputStream() { return session.getMIConsoleStream(); } @@ -61,10 +65,12 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#getOutputStream() */ + @Override public OutputStream getOutputStream() { if (out == null) { out = new OutputStream() { StringBuffer buf = new StringBuffer(); + @Override public void write(int b) throws IOException { buf.append((char)b); if (b == '\n') { @@ -113,6 +119,7 @@ public class SessionProcess extends Process { /** * @see java.lang.Process#waitFor() */ + @Override public int waitFor() throws InterruptedException { return session.getGDBProcess().waitFor(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/TxThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/TxThread.java index 08e79ac1262..11a64d500e2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/TxThread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/TxThread.java @@ -34,6 +34,7 @@ public class TxThread extends Thread { cli = new CLIProcessor(session); } + @Override public void run () { try { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICatch.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICatch.java index 0e297358831..7735a37eaa1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICatch.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICatch.java @@ -32,6 +32,7 @@ public class CLICatch extends CLICommand { /** * This command return breakpoint inserted */ + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICommand.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICommand.java index c893408b73d..063e71ea811 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICommand.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICommand.java @@ -38,6 +38,7 @@ public class CLICommand extends Command * * @return the text representation of this command */ + @Override public String toString(){ String str = getToken() + " " + operation; //$NON-NLS-1$ if (str.endsWith("\n")) //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoLine.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoLine.java index 3aa9548a1dc..5409c62f82f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoLine.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoLine.java @@ -26,6 +26,7 @@ public class CLIInfoLine extends CLICommand { return (CLIInfoLineInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProc.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProc.java index f9cf396cbcb..9dc560a1cc1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProc.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProc.java @@ -31,6 +31,7 @@ public class CLIInfoProc extends CLICommand return (CLIInfoProcInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProgram.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProgram.java index f7daf62729b..a6307e6923c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProgram.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoProgram.java @@ -31,6 +31,7 @@ public class CLIInfoProgram extends CLICommand return (CLIInfoProgramInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSharedLibrary.java index 238299be835..a6e8f234c41 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSharedLibrary.java @@ -31,6 +31,7 @@ public class CLIInfoSharedLibrary extends CLICommand return (CLIInfoSharedLibraryInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSignals.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSignals.java index e0cf445bbf4..31741e64e19 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSignals.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoSignals.java @@ -35,6 +35,7 @@ public class CLIInfoSignals extends CLICommand return (CLIInfoSignalsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoThreads.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoThreads.java index 97f54527b52..89c50c4ea8c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoThreads.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIInfoThreads.java @@ -31,6 +31,7 @@ public class CLIInfoThreads extends CLICommand return (CLIInfoThreadsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIJump.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIJump.java index f86ff186145..0cd2e218120 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIJump.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIJump.java @@ -34,6 +34,7 @@ public class CLIJump extends CLICommand { * it does not return so we have to fake * a return value. We return "^running" */ + @Override public MIOutput getMIOutput() { if (out == null) { out = new MIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIPType.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIPType.java index 70aca7a1d77..ac32fd75f39 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIPType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIPType.java @@ -31,6 +31,7 @@ public class CLIPType extends CLICommand return (CLIPTypeInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLISignal.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLISignal.java index 516ff7558f8..22a2afe87eb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLISignal.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLISignal.java @@ -35,6 +35,7 @@ public class CLISignal extends CLICommand { * it does not return so we have to fake * a return value. We return "^running" */ + @Override public MIOutput getMIOutput() { if (out == null) { out = new MIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIWhatis.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIWhatis.java index 79aefcdfc21..6f8977b7212 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIWhatis.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLIWhatis.java @@ -31,6 +31,7 @@ public class CLIWhatis extends CLICommand return (CLIWhatisInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java index 898e681d19c..41f6ed48442 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java @@ -30,6 +30,7 @@ public class MIBreakCondition extends MICommand { * Do not do any munging on the string i.e. quoting spaces * etc .. doing this will break the command -break-condition. */ + @Override protected String parametersToString() { String[] parameters = getParameters(); StringBuffer buffer = new StringBuffer(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakInsert.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakInsert.java index c337fc791ef..8835d17416e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakInsert.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakInsert.java @@ -123,6 +123,7 @@ public class MIBreakInsert extends MICommand return (MIBreakInsertInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java index 54aa279b5e6..f840472ef6b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java @@ -59,6 +59,7 @@ public class MIBreakList extends MICommand return (MIBreakListInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakWatch.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakWatch.java index b35de309305..052e8cf2cbe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakWatch.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakWatch.java @@ -49,6 +49,7 @@ public class MIBreakWatch extends MICommand return (MIBreakWatchInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MICommand.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MICommand.java index 395090c49af..33eeddcecfc 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MICommand.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MICommand.java @@ -182,6 +182,7 @@ public class MICommand extends Command { return buffer.toString().trim(); } + @Override public String toString() { StringBuffer command = new StringBuffer(getToken() + getOperation()); String opt = optionsToString(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataDisassemble.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataDisassemble.java index 6ec648ee2eb..db47d221d43 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataDisassemble.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataDisassemble.java @@ -116,6 +116,7 @@ public class MIDataDisassemble extends MICommand return (MIDataDisassembleInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); @@ -132,6 +133,7 @@ public class MIDataDisassemble extends MICommand * GDB the -data-disassemble uses "--" as a separator wit only the MODE * So override the MICommand */ + @Override protected String parametersToString() { String[] parameters = getParameters(); if (parameters != null && parameters.length > 0) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataEvaluateExpression.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataEvaluateExpression.java index 69a58b38e30..9474c3237e0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataEvaluateExpression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataEvaluateExpression.java @@ -35,6 +35,7 @@ public class MIDataEvaluateExpression extends MICommand return (MIDataEvaluateExpressionInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListChangedRegisters.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListChangedRegisters.java index 08408f43ba2..ab7daeb16d7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListChangedRegisters.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListChangedRegisters.java @@ -33,6 +33,7 @@ public class MIDataListChangedRegisters extends MICommand return (MIDataListChangedRegistersInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterNames.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterNames.java index 44c9d53afe0..ff16d2db64f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterNames.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterNames.java @@ -49,6 +49,7 @@ public class MIDataListRegisterNames extends MICommand return (MIDataListRegisterNamesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterValues.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterValues.java index 2a255572c69..7b973d554b8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterValues.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterValues.java @@ -80,6 +80,7 @@ public class MIDataListRegisterValues extends MICommand return (MIDataListRegisterValuesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataReadMemory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataReadMemory.java index 26edb1590ec..d23f886360f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataReadMemory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataReadMemory.java @@ -139,6 +139,7 @@ public class MIDataReadMemory extends MICommand { return (MIDataReadMemoryInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPWD.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPWD.java index 2d18cf1a721..e98508ba9f1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPWD.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPWD.java @@ -29,6 +29,7 @@ public class MIEnvironmentPWD extends MICommand super(miVersion, "-environment-pwd"); //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetEnvironment.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetEnvironment.java index 87bae6b83a7..7c467e144a6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetEnvironment.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetEnvironment.java @@ -38,6 +38,7 @@ public class MIGDBSetEnvironment extends MIGDBSet { * * So pass the strings raw without interpretation. */ + @Override protected String parametersToString() { String[] parameters = getParameters(); StringBuffer buffer = new StringBuffer(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShow.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShow.java index 8bbf07d91ec..35c1b5812cd 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShow.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShow.java @@ -32,6 +32,7 @@ public class MIGDBShow extends MICommand { return (MIGDBShowInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowAddressSize.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowAddressSize.java index 0d61c5491ca..7a9c496d647 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowAddressSize.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowAddressSize.java @@ -24,6 +24,7 @@ public class MIGDBShowAddressSize extends MIGDBShow { super(miVersion, new String[] { "remoteaddresssize" }); //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIGDBShowAddressSizeInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowDirectories.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowDirectories.java index 20da64e6873..8855f9242b2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowDirectories.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowDirectories.java @@ -31,6 +31,7 @@ public class MIGDBShowDirectories extends MIGDBShow { public MIGDBShowDirectoriesInfo getMIGDBShowDirectoriesInfo() throws MIException { return (MIGDBShowDirectoriesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowEndian.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowEndian.java index d207d834dce..fb8a7dfb4d1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowEndian.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowEndian.java @@ -26,6 +26,7 @@ public class MIGDBShowEndian extends MIGDBShow { return (MIGDBShowEndianInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowExitCode.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowExitCode.java index d2e68e99693..b3bb1dc79fa 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowExitCode.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowExitCode.java @@ -34,6 +34,7 @@ public class MIGDBShowExitCode extends MIDataEvaluateExpression { return (MIGDBShowExitCodeInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowSolibSearchPath.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowSolibSearchPath.java index f44efbb5739..a9f6c1fca97 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowSolibSearchPath.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowSolibSearchPath.java @@ -31,6 +31,7 @@ public class MIGDBShowSolibSearchPath extends MIGDBShow { public MIGDBShowSolibSearchPathInfo getMIGDBShowSolibSearchPathInfo() throws MIException { return (MIGDBShowSolibSearchPathInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIInfoSharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIInfoSharedLibrary.java index 16c349d277b..d4c42a0b3a8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIInfoSharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIInfoSharedLibrary.java @@ -21,6 +21,7 @@ public class MIInfoSharedLibrary extends MICommand { super(miVersion, "info sharedlibrary"); //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackInfoDepth.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackInfoDepth.java index 8bb1bc5c61e..8e8ebb7eeea 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackInfoDepth.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackInfoDepth.java @@ -38,6 +38,7 @@ public class MIStackInfoDepth extends MICommand return (MIStackInfoDepthInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListArguments.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListArguments.java index e44848574ec..6f2cf534bd8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListArguments.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListArguments.java @@ -58,6 +58,7 @@ public class MIStackListArguments extends MICommand return (MIStackListArgumentsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java index 701f9aeb67c..6d3450cb15a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java @@ -64,6 +64,7 @@ public class MIStackListFrames extends MICommand return (MIStackListFramesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListLocals.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListLocals.java index f4136a0e5f6..f2da9efd560 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListLocals.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListLocals.java @@ -40,6 +40,7 @@ public class MIStackListLocals extends MICommand return (MIStackListLocalsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadListIds.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadListIds.java index 0835fce8fc8..14884808621 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadListIds.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadListIds.java @@ -34,6 +34,7 @@ public class MIThreadListIds extends MICommand return (MIThreadListIdsInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java index fdfdf63939e..dc3c4077fbe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java @@ -34,6 +34,7 @@ public class MIThreadSelect extends MICommand return (MIThreadSelectInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java index 4660b81ee98..5bb922a4d83 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java @@ -63,6 +63,7 @@ public class MIVarCreate extends MICommand return (MIVarCreateInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarDelete.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarDelete.java index 4db2ad8be1a..ee800431483 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarDelete.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarDelete.java @@ -35,6 +35,7 @@ public class MIVarDelete extends MICommand return (MIVarDeleteInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java index 9ee716f4aed..bd5294a5a73 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java @@ -37,6 +37,7 @@ public class MIVarEvaluateExpression extends MICommand { return (MIVarEvaluateExpressionInfo) getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoExpression.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoExpression.java index cc3d1638593..9967fa548f5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoExpression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoExpression.java @@ -37,6 +37,7 @@ public class MIVarInfoExpression extends MICommand return (MIVarInfoExpressionInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoNumChildren.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoNumChildren.java index 4148217d673..3b8af6c0c5d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoNumChildren.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoNumChildren.java @@ -35,6 +35,7 @@ public class MIVarInfoNumChildren extends MICommand return (MIVarInfoNumChildrenInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoType.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoType.java index 2c0d88b9791..9d7f1b7bd43 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoType.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoType.java @@ -36,6 +36,7 @@ public class MIVarInfoType extends MICommand return (MIVarInfoTypeInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java index d347adee021..cc8bbab0821 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java @@ -36,6 +36,7 @@ public class MIVarListChildren extends MICommand return (MIVarListChildrenInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java index 09e7e22a39e..8af24b6639a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java @@ -37,6 +37,7 @@ public class MIVarShowAttributes extends MICommand return (MIVarShowAttributesInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java index b4614f0bba1..9ac786f5132 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java @@ -39,6 +39,7 @@ public class MIVarUpdate extends MICommand { return (MIVarUpdateInfo)getMIInfo(); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/RawCommand.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/RawCommand.java index 63af4eb7cee..87f982d3857 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/RawCommand.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/RawCommand.java @@ -26,6 +26,7 @@ public class RawCommand extends Command { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { if (fRaw == null) { fRaw = "\n"; //$NON-NLS-1$; @@ -38,6 +39,7 @@ public class RawCommand extends Command { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.Command#getMIOutput() */ + @Override public MIOutput getMIOutput() { return new MIOutput(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibrary.java index f1de8a84a84..ba630440cfb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibrary.java @@ -23,6 +23,7 @@ public class LinuxCLIInfoSharedLibrary extends CLIInfoSharedLibrary { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.CLIInfoSharedLibrary#getMIInfo() */ + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibraryInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibraryInfo.java index 4f5f2f58649..03057eb74db 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibraryInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/LinuxCLIInfoSharedLibraryInfo.java @@ -30,6 +30,7 @@ public class LinuxCLIInfoSharedLibraryInfo extends CLIInfoSharedLibraryInfo { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.output.CLIInfoSharedLibraryInfo#parseShared(java.lang.String, java.util.List) */ + @Override protected void parseShared( String str, List aList ) { if ( str.length() > 0 && !str.startsWith( "From" ) ) { //$NON-NLS-1$ // Pass the header diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/StandardLinuxCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/StandardLinuxCommandFactory.java index cc42b57e251..a6870a1fbaf 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/StandardLinuxCommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/linux/StandardLinuxCommandFactory.java @@ -36,6 +36,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.CommandFactory#createCLIInfoSharedLibrary() */ + @Override public CLIInfoSharedLibrary createCLIInfoSharedLibrary() { return new LinuxCLIInfoSharedLibrary(); } @@ -43,6 +44,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.CommandFactory#createMIGDBSetNewConsole() */ + @Override public MIGDBSetNewConsole createMIGDBSetNewConsole() { // Suppress "set new-console" - returns error on Linux return new MIGDBSetNewConsole( getMIVersion() ) { @@ -50,6 +52,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getOperation() */ + @Override public String getOperation() { return ""; //$NON-NLS-1$ } @@ -57,6 +60,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getOptions() */ + @Override public String[] getOptions() { return new String[0]; } @@ -64,6 +68,7 @@ public class StandardLinuxCommandFactory extends StandardCommandFactory { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.MICommand#getParameters() */ + @Override public String[] getParameters() { return new String[0]; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoPID.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoPID.java index d64eccc1a3c..8d0fd44209f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoPID.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoPID.java @@ -32,6 +32,7 @@ class MacOSCLIInfoPID extends CLIInfoProc { setOperation("info pid"); //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); @@ -75,6 +76,7 @@ class MacOSCLIInfoPID extends CLIInfoProc { } } + @Override public int getPID() { return pid; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoThreads.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoThreads.java index 14fff6498c6..b1ae6bf2271 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoThreads.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIInfoThreads.java @@ -27,10 +27,12 @@ class MacOSCLIInfoThreads extends CLIInfoThreads { // MI doesn't work with a space between the token and the // operation, so we override CLICommmand's toString + @Override public String toString() { return getToken() + getOperation() + "\n"; //$NON-NLS-1$ } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); @@ -43,6 +45,7 @@ class MacOSCLIInfoThreads extends CLIInfoThreads { return info; } + @Override public CLIInfoThreadsInfo getMIInfoThreadsInfo() throws MIException { return (CLIInfoThreadsInfo) getMIInfo(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIPtype.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIPtype.java index 74dfbb84011..2abaa44ff4a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIPtype.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSCLIPtype.java @@ -23,6 +23,7 @@ class MacOSCLIPtype extends CLIPType { // MI doesn't work with a space between the token and the // operation, so we override CLICommmand's toString + @Override public String toString() { return getToken() + getOperation() + "\n"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIEnvironmentCD.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIEnvironmentCD.java index 36c1ff61a3e..117e9d825b2 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIEnvironmentCD.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIEnvironmentCD.java @@ -20,6 +20,7 @@ public class MacOSMIEnvironmentCD extends MIEnvironmentCD { this.setOperation("-environment-cd");//$NON-NLS-1$ } + @Override protected String parametersToString() { String[] parameters = getParameters(); if (parameters != null && parameters.length == 1) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdate.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdate.java index 6644a130b24..311ec88b6d5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdate.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdate.java @@ -32,6 +32,7 @@ class MacOSMIVarUpdate extends MIVarUpdate { super(miVersion, name); } + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdateInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdateInfo.java index 6c073094374..27b4655e4d1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdateInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOSMIVarUpdateInfo.java @@ -38,6 +38,7 @@ class MacOSMIVarUpdateInfo extends MIVarUpdateInfo { parse(); } + @Override public MIVarChange[] getMIVarChanges() { return changeList; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java index 27f93bb1423..86e00d0dc6a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java @@ -31,6 +31,7 @@ class MacOsCLIInfoThreadsInfo extends CLIInfoThreadsInfo { super(out); } + @Override protected void parse() { if (isDone()) { MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/StandardMacOSCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/StandardMacOSCommandFactory.java index bc96bf3f25b..b6b5894f06f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/StandardMacOSCommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/StandardMacOSCommandFactory.java @@ -31,6 +31,7 @@ public class StandardMacOSCommandFactory extends StandardCommandFactory { super(); } + @Override public String getWorkingDirectory(File cwd) { return "--cd=" + '"' + cwd.getAbsolutePath() + '"'; //$NON-NLS-1$ } @@ -42,34 +43,42 @@ public class StandardMacOSCommandFactory extends StandardCommandFactory { super( miVersion ); } + @Override public MIEnvironmentCD createMIEnvironmentCD(String pathdir) { return new MacOSMIEnvironmentCD(getMIVersion(), pathdir); } + @Override public CLIPType createCLIPType(String name) { return new MacOSCLIPtype(name); } + @Override public MIInfoSharedLibrary createMIInfoSharedLibrary() { return new MIInfoSharedLibrary(getMIVersion()); } + @Override public MIVarUpdate createMIVarUpdate() { return new MacOSMIVarUpdate(getMIVersion()); } + @Override public MIVarUpdate createMIVarUpdate(String name) { return new MacOSMIVarUpdate(getMIVersion(), name); } + @Override public CLIInfoProc createCLIInfoProc() { return new MacOSCLIInfoPID(); } + @Override public MIExecInterrupt createMIExecInterrupt() { return new MIExecInterrupt(getMIVersion()); } + @Override public CLIInfoThreads createCLIInfoThreads() { return new MacOSCLIInfoThreads(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinCommandFactory.java index 57e0707ed50..91bf5d13553 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinCommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinCommandFactory.java @@ -36,10 +36,12 @@ public class CygwinCommandFactory extends StandardWinCommandFactory { super( miVersion ); } + @Override public MIEnvironmentDirectory createMIEnvironmentDirectory(boolean reset, String[] pathdirs) { return new CygwinMIEnvironmentDirectory( getMIVersion(), reset, pathdirs ); } + @Override public MIProcess createMIProcess(String[] args, int launchTimeout, IProgressMonitor monitor) throws IOException { return new CygwinMIProcessAdapter(args, launchTimeout, monitor); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java index 60fb9d5025b..76a66f0640a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/StandardWinCommandFactory.java @@ -37,68 +37,83 @@ public class StandardWinCommandFactory extends StandardCommandFactory { super( miVersion ); } + @Override public MIEnvironmentCD createMIEnvironmentCD( String pathdir ) { return new WinMIEnvironmentCD( getMIVersion(), pathdir ); } + @Override public CLIInfoSharedLibrary createCLIInfoSharedLibrary() { return new WinCLIInfoSharedLibrary(); } + @Override public MIGDBSetAutoSolib createMIGDBSetAutoSolib( boolean set ) { // Suppress "set auto-solib" - returns error on Windows return new MIGDBSetAutoSolib( getMIVersion(), true ) { + @Override public String getOperation() { return ""; //$NON-NLS-1$ } + @Override public String[] getOptions() { return new String[0]; } + @Override public String[] getParameters() { return new String[0]; } }; } + @Override public MIGDBShowSolibSearchPath createMIGDBShowSolibSearchPath() { // Suppress "show solib-search-path" - returns error on Windows return new MIGDBShowSolibSearchPath( getMIVersion() ) { + @Override public String getOperation() { return ""; //$NON-NLS-1$ } + @Override public String[] getOptions() { return new String[0]; } + @Override public String[] getParameters() { return new String[0]; } }; } + @Override public MIGDBSetSolibSearchPath createMIGDBSetSolibSearchPath( String[] params ) { // Suppress "set solib-search-path" - returns error on Windows return new MIGDBSetSolibSearchPath( getMIVersion(), params ) { + @Override public String getOperation() { return ""; //$NON-NLS-1$ } + @Override public String[] getOptions() { return new String[0]; } + @Override public String[] getParameters() { return new String[0]; } }; } + @Override public MIGDBSetNewConsole createMIGDBSetNewConsole() { // By default in Windows, turn off new console so that the // Ctrl-C's get propogated automatically to the inferior. diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibrary.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibrary.java index 0025c734d1a..6ddf5a8119b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibrary.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibrary.java @@ -23,6 +23,7 @@ public class WinCLIInfoSharedLibrary extends CLIInfoSharedLibrary { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.CLIInfoSharedLibrary#getMIInfo() */ + @Override public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibraryInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibraryInfo.java index 53ee5ef1802..b7b0c88d622 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibraryInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinCLIInfoSharedLibraryInfo.java @@ -27,6 +27,7 @@ public class WinCLIInfoSharedLibraryInfo extends CLIInfoSharedLibraryInfo { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.output.CLIInfoSharedLibraryInfo#parseShared(java.lang.String, java.util.List) */ + @Override protected void parseShared( String str, List aList ) { // skip the header (DLL Name) if ( !str.startsWith( "DLL" ) ) { //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinMIEnvironmentCD.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinMIEnvironmentCD.java index b1bc4b04c7e..54e69eb9bc4 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinMIEnvironmentCD.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/WinMIEnvironmentCD.java @@ -24,6 +24,7 @@ public class WinMIEnvironmentCD extends MIEnvironmentCD { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.command.MICommand#parametersToString() */ + @Override protected String parametersToString() { String[] params = getParameters(); if ( params != null && params.length == 1 ) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIBreakpointHitEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIBreakpointHitEvent.java index 29c5339bb83..9f5cec3d5fb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIBreakpointHitEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIBreakpointHitEvent.java @@ -61,6 +61,7 @@ public class MIBreakpointHitEvent extends MIStoppedEvent { return frame; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("number=").append(bkptno).append('\n'); //$NON-NLS-1$ @@ -69,6 +70,7 @@ public class MIBreakpointHitEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIResult[] results = null; MIExecAsyncOutput exec = getMIExecAsyncOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java index 47f83bac5c7..208bccb1260 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java @@ -24,6 +24,7 @@ public class MIDetachedEvent extends MIDestroyedEvent { super(source, token); } + @Override public String toString() { return "Detached"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIErrorEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIErrorEvent.java index 2555e00cebf..15dadc0bbc6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIErrorEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIErrorEvent.java @@ -47,6 +47,7 @@ public class MIErrorEvent extends MIStoppedEvent { return log; } + @Override void parse () { MIResultRecord rr = getMIResultRecord(); if (rr != null) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java index 035cd3d9443..efbd854960f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java @@ -50,6 +50,7 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent { return returnType; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("gdb-result-var=" + gdbResult + "\n"); //$NON-NLS-1$//$NON-NLS-2$ @@ -63,6 +64,7 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIExecAsyncOutput exec = getMIExecAsyncOutput(); MIResultRecord rr = getMIResultRecord(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java index 906699ea0af..2d6dd79591d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java @@ -51,6 +51,7 @@ public class MIInferiorSignalExitEvent extends MIDestroyedEvent { return sigMeaning; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("signal-name=" + sigName + "\n"); //$NON-NLS-1$//$NON-NLS-2$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java index 79540d9a84c..d8d020df668 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java @@ -34,6 +34,7 @@ public class MILocationReachedEvent extends MIStoppedEvent { parse(); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("thread-id=").append(getThreadId()).append('\n'); //$NON-NLS-1$ @@ -44,6 +45,7 @@ public class MILocationReachedEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIResult[] results = null; MIExecAsyncOutput exec = getMIExecAsyncOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java index 545af972c1c..01240955dbc 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java @@ -40,6 +40,7 @@ public class MIRunningEvent extends MIEvent { return type; } + @Override public String toString() { return "Running"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java index 08d0c001343..6a1426e0411 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java @@ -46,6 +46,7 @@ public class MISignalEvent extends MIStoppedEvent { return sigMeaning; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("signal-name=" + sigName + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -58,6 +59,7 @@ public class MISignalEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIExecAsyncOutput exec = getMIExecAsyncOutput(); MIResultRecord rr = getMIResultRecord(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java index d2f0cf0a838..b586e027e72 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java @@ -35,6 +35,7 @@ public class MISteppingRangeEvent extends MIStoppedEvent { parse(); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("thread-id=").append(getThreadId()).append('\n'); //$NON-NLS-1$ @@ -45,6 +46,7 @@ public class MISteppingRangeEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse () { MIResult[] results = null; MIExecAsyncOutput exec = getMIExecAsyncOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java index dfaf6c300eb..9da7102d8f0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java @@ -41,6 +41,7 @@ public class MIWatchpointScopeEvent extends MIStoppedEvent { return number; } + @Override void parse() { MIExecAsyncOutput exec = getMIExecAsyncOutput(); MIResultRecord rr = getMIResultRecord(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java index 965e932dd8d..92c02219c21 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java @@ -57,6 +57,7 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent { } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("number=").append(number).append('\n'); //$NON-NLS-1$ @@ -71,6 +72,7 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent { return buffer.toString(); } + @Override void parse() { MIResult[] results = null; MIExecAsyncOutput exec = getMIExecAsyncOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIArg.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIArg.java index 60372a79ccc..734f26f4410 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIArg.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIArg.java @@ -124,6 +124,7 @@ public class MIArg { return arg; } + @Override public String toString() { return name + "=" + value; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsm.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsm.java index 945207797ba..45bb8ce8154 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsm.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsm.java @@ -40,6 +40,7 @@ public class MIAsm { return opcode + " " + args; //$NON-NLS-1$ } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append('{'); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java index 84782aab735..edb8f10c0b9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java @@ -49,6 +49,7 @@ public abstract class MIAsyncRecord extends MIOOBRecord { results = res; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); if (token != 0) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIConst.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIConst.java index bc32352adad..d23715e6829 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIConst.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIConst.java @@ -68,6 +68,7 @@ public class MIConst extends MIValue { return buffer.toString(); } + @Override public String toString() { return getCString(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataDisassembleInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataDisassembleInfo.java index 7fa24c8e119..0e151c12834 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataDisassembleInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataDisassembleInfo.java @@ -41,6 +41,7 @@ public class MIDataDisassembleInfo extends MIInfo { return src_asm; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("asm_insns=["); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java index 16af22cd4d2..7e0d4786519 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java @@ -57,6 +57,7 @@ public class MIFrame { return level; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("level=\"" + level + "\""); //$NON-NLS-1$//$NON-NLS-2$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfo.java index 036fc473ea9..8794ce70fb3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfo.java @@ -45,6 +45,7 @@ public class MIInfo { return isResultClass(MIResultRecord.EXIT); } + @Override public String toString() { if (miOutput != null) { return miOutput.toString(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIList.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIList.java index 566e17131c7..032a1091724 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIList.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIList.java @@ -37,6 +37,7 @@ public class MIList extends MIValue { values = vals; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append('['); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIOutput.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIOutput.java index c30ae6c6887..730e0570e96 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIOutput.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIOutput.java @@ -36,6 +36,7 @@ public class MIOutput { oobs = bands; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); for (int i = 0; i < oobs.length; i++) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIParser.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIParser.java index 507427c3944..ff5783d0eed 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIParser.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIParser.java @@ -547,6 +547,7 @@ public class MIParser { return buf.substring(start + pos, end + pos); } + @Override public String toString() { return buf.substring(pos, buf.length()); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIRegisterValue.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIRegisterValue.java index c29f548f6c4..72e25b208fe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIRegisterValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIRegisterValue.java @@ -35,6 +35,7 @@ public class MIRegisterValue { return value; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("number=\"").append(number).append('"'); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResult.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResult.java index 3e3fd974713..80a92be0e14 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResult.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResult.java @@ -33,6 +33,7 @@ public class MIResult { value = val; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append(variable); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResultRecord.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResultRecord.java index 9619f886908..46cf3a3774b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResultRecord.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIResultRecord.java @@ -52,6 +52,7 @@ public class MIResultRecord { results = res; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append(token).append('^').append(resultClass); diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MISrcAsm.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MISrcAsm.java index 37bb5e2b68b..51aff7e4ebe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MISrcAsm.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MISrcAsm.java @@ -37,6 +37,7 @@ public class MISrcAsm { return asm; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("src_and_asm_line={"); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIStreamRecord.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIStreamRecord.java index 2c8983fb454..38b198156d6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIStreamRecord.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIStreamRecord.java @@ -29,6 +29,7 @@ public abstract class MIStreamRecord extends MIOOBRecord { return MIConst.getString(getCString()); } + @Override public String toString() { if (this instanceof MIConsoleStreamOutput) { return "~\"" + cstring + "\"\n"; //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MITuple.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MITuple.java index e3b324decad..749ee553f2b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MITuple.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MITuple.java @@ -36,6 +36,7 @@ public class MITuple extends MIValue { values = vals; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append('{'); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java index c25f64844fd..060e6a7ccb9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java @@ -48,6 +48,7 @@ abstract public class AbstractGDBCDIDebugger implements ICDIDebugger2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICDIDebugger#createDebuggerSession(org.eclipse.debug.core.ILaunch, org.eclipse.cdt.core.IBinaryParser.IBinaryObject, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public ICDISession createDebuggerSession( ILaunch launch, IBinaryObject exe, IProgressMonitor monitor ) throws CoreException { return createSession( launch, exe.getPath().toFile(), monitor ); } @@ -55,6 +56,7 @@ abstract public class AbstractGDBCDIDebugger implements ICDIDebugger2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICDIDebugger2#createSession(org.eclipse.debug.core.ILaunch, java.io.File, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public ICDISession createSession( ILaunch launch, File executable, IProgressMonitor monitor ) throws CoreException { boolean failed = false; if ( monitor == null ) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIProcessAdapter.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIProcessAdapter.java index 4f521844e4b..0b017c6ce21 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIProcessAdapter.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinMIProcessAdapter.java @@ -32,6 +32,7 @@ public class CygwinMIProcessAdapter extends MIProcessAdapter { super(args, launchTimeout, monitor); } + @Override public void interrupt(MIInferior inferior) { if (fGDBProcess instanceof Spawner) { if (inferior.isRunning()) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java index cdebd9caeef..8c99933bbd5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java @@ -54,6 +54,7 @@ public class GDBCDIDebugger implements ICDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.ICDIDebugger#createDebuggerSession(org.eclipse.debug.core.ILaunch, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { fLaunch = launch; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java index b2575f5f71b..c58b5f482e3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java @@ -42,6 +42,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; */ public class GDBCDIDebugger2 extends AbstractGDBCDIDebugger { + @Override protected String[] getExtraArguments( ILaunchConfiguration config ) throws CoreException { String debugMode = config.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN ); if ( ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN.equals( debugMode ) ) @@ -66,6 +67,7 @@ public class GDBCDIDebugger2 extends AbstractGDBCDIDebugger { return new String[]{ getWorkingDirectory( config ), getCommandFile( config ), "-c", coreFile.toFile().getAbsolutePath() }; //$NON-NLS-1$ } + @Override protected CommandFactory getCommandFactory( ILaunchConfiguration config ) throws CoreException { String factoryID = MIPlugin.getCommandFactory( config ); CommandFactory factory = MIPlugin.getDefault().getCommandFactoryManager().getCommandFactory( factoryID ); @@ -102,6 +104,7 @@ public class GDBCDIDebugger2 extends AbstractGDBCDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.AbstractGDBCDIDebugger#doStartSession(org.eclipse.debug.core.ILaunch, org.eclipse.cdt.debug.mi.core.cdi.Session, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void doStartSession( ILaunch launch, Session session, IProgressMonitor monitor ) throws CoreException { ILaunchConfiguration config = launch.getLaunchConfiguration(); initializeLibraries( config, session ); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java index 24ff881dfb6..13039da7afe 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java @@ -69,6 +69,7 @@ public class GDBDebugger implements ICDebugger { } } + @Override public ICDISession createLaunchSession(ILaunchConfiguration config, IFile exe) throws CDIException { Session session = null; boolean failed = false; @@ -102,6 +103,7 @@ public class GDBDebugger implements ICDebugger { } } + @Override public ICDISession createAttachSession(ILaunchConfiguration config, IFile exe, int pid) throws CDIException { Session session = null; boolean failed = false; @@ -135,6 +137,7 @@ public class GDBDebugger implements ICDebugger { } } + @Override public ICDISession createCoreSession(ILaunchConfiguration config, IFile exe, IPath corefile) throws CDIException { Session session = null; boolean failed = false; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java index 979ec8523cd..63ed50f0cf7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger.java @@ -33,6 +33,7 @@ public class GDBServerCDIDebugger extends GDBCDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createLaunchSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public Session createLaunchSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { Session session = null; @@ -102,6 +103,7 @@ public class GDBServerCDIDebugger extends GDBCDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createAttachSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public Session createAttachSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { String msg = MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_attaching_unsupported"); //$NON-NLS-1$ @@ -111,6 +113,7 @@ public class GDBServerCDIDebugger extends GDBCDIDebugger { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createCoreSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public Session createCoreSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { String msg = MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_corefiles_unsupported"); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger2.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger2.java index ed1d41f0360..e61fd0031f8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger2.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerCDIDebugger2.java @@ -32,6 +32,7 @@ public class GDBServerCDIDebugger2 extends GDBCDIDebugger2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger2#doStartSession(org.eclipse.debug.core.ILaunch, org.eclipse.cdt.debug.mi.core.cdi.Session, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void doStartSession( ILaunch launch, Session session, IProgressMonitor monitor ) throws CoreException { ILaunchConfiguration config = launch.getLaunchConfiguration(); initializeLibraries( config, session ); @@ -129,6 +130,7 @@ public class GDBServerCDIDebugger2 extends GDBCDIDebugger2 { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.AbstractGDBCDIDebugger#usePty(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override protected boolean usePty( ILaunchConfiguration config ) throws CoreException { return false; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java index b68ac359a5e..4654741bd85 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java @@ -59,6 +59,7 @@ public class GDBServerDebugger implements ICDebugger { } } + @Override public ICDISession createLaunchSession(ILaunchConfiguration config, IFile exe) throws CDIException { Session session = null; boolean failed = false; @@ -125,10 +126,12 @@ public class GDBServerDebugger implements ICDebugger { } } + @Override public ICDISession createAttachSession(ILaunchConfiguration config, IFile exe, int pid) throws CDIException { throw new CDIException(MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_attaching_unsupported")); //$NON-NLS-1$ } + @Override public ICDISession createCoreSession(ILaunchConfiguration config, IFile exe, IPath corefile) throws CDIException { throw new CDIException(MIPlugin.getResourceString("src.GDBServerDebugger.GDBServer_corefiles_unsupported")); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java index 42297d1a7bf..a9cbffc7dc7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java @@ -116,6 +116,7 @@ public class MIPlugin extends Plugin { * * @deprecated */ + @Deprecated public MISession createMISession(MIProcess process, IMITTY pty, int timeout, int type, int launchTimeout, String miVersion, IProgressMonitor monitor) throws MIException { return new MISession(process, pty, type, timeout, launchTimeout, miVersion, monitor); } @@ -130,6 +131,7 @@ public class MIPlugin extends Plugin { * * @deprecated */ + @Deprecated public MISession createMISession(MIProcess process, IMITTY pty, int type, String miVersion, IProgressMonitor monitor) throws MIException { MIPlugin miPlugin = getDefault(); Preferences prefs = miPlugin.getPluginPreferences(); @@ -151,6 +153,7 @@ public class MIPlugin extends Plugin { * * @deprecated use createSession */ + @Deprecated public Session createCSession(String gdb, String miVersion, File program, File cwd, String gdbinit, IProgressMonitor monitor) throws IOException, MIException { IMITTY pty = null; boolean failed = false; @@ -198,6 +201,7 @@ public class MIPlugin extends Plugin { * * @deprecated use createSession */ + @Deprecated public Session createCSession(String gdb, String miVersion, File program, File cwd, String gdbinit, IMITTY pty, IProgressMonitor monitor) throws IOException, MIException { if (gdb == null || gdb.length() == 0) { gdb = GDB; @@ -273,6 +277,7 @@ public class MIPlugin extends Plugin { * * @deprecated use createSession */ + @Deprecated public Session createCSession(String gdb, String miVersion, File program, File core, File cwd, String gdbinit, IProgressMonitor monitor) throws IOException, MIException { if (gdb == null || gdb.length() == 0) { gdb = GDB; @@ -324,6 +329,7 @@ public class MIPlugin extends Plugin { * * @deprecated use createSession */ + @Deprecated public Session createCSession(String gdb, String miVersion, File program, int pid, String[] targetParams, File cwd, String gdbinit, IProgressMonitor monitor) throws IOException, MIException { if (gdb == null || gdb.length() == 0) { gdb = GDB; @@ -542,6 +548,7 @@ public class MIPlugin extends Plugin { /* (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#startup() */ + @Override public void start(BundleContext context) throws Exception { super.start(context); ICDebugConfiguration dc = CDebugCorePlugin.getDefault().getDefaultDefaultDebugConfiguration(); @@ -553,6 +560,7 @@ public class MIPlugin extends Plugin { /* (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#shutdown() */ + @Override public void stop(BundleContext context) throws Exception { savePluginPreferences(); super.stop(context); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java index 0358cafc36f..f228011d53c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPreferenceInitializer.java @@ -24,6 +24,7 @@ public class MIPreferenceInitializer extends AbstractPreferenceInitializer { /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { MIPlugin.getDefault().getPluginPreferences().setDefault(IMIConstants.PREF_REQUEST_TIMEOUT, IMIConstants.DEF_REQUEST_TIMEOUT); MIPlugin.getDefault().getPluginPreferences().setDefault(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT, IMIConstants.DEF_REQUEST_LAUNCH_TIMEOUT); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIProcessAdapter.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIProcessAdapter.java index f504ba5b5eb..15e4b0c66c5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIProcessAdapter.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIProcessAdapter.java @@ -50,6 +50,7 @@ public class MIProcessAdapter implements MIProcess { protected Process getGDBProcess(String[] args, int launchTimeout, IProgressMonitor monitor) throws IOException { final Process pgdb = createGDBProcess(args); Thread syncStartup = new Thread("GDB Start") { //$NON-NLS-1$ + @Override public void run() { try { PushbackInputStream pb = new PushbackInputStream(pgdb.getInputStream()); @@ -115,10 +116,12 @@ public class MIProcessAdapter implements MIProcess { return ProcessFactory.getFactory().exec(args); } + @Override public boolean canInterrupt(MIInferior inferior) { return fGDBProcess instanceof Spawner; } + @Override public void interrupt(MIInferior inferior) { if (fGDBProcess instanceof Spawner) { if (inferior.isRunning()) { @@ -163,14 +166,17 @@ public class MIProcessAdapter implements MIProcess { } } + @Override public int exitValue() { return fGDBProcess.exitValue(); } + @Override public int waitFor() throws InterruptedException { return fGDBProcess.waitFor(); } + @Override public void destroy() { // We are responsible for closing the streams we have used or else // we will leak pipes. @@ -188,14 +194,17 @@ public class MIProcessAdapter implements MIProcess { fGDBProcess.destroy(); } + @Override public InputStream getErrorStream() { return fGDBProcess.getErrorStream(); } + @Override public InputStream getInputStream() { return gdbInputStream; } + @Override public OutputStream getOutputStream() { return fGDBProcess.getOutputStream(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MITTYAdapter.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MITTYAdapter.java index e632e659c32..79b6bb44f49 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MITTYAdapter.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MITTYAdapter.java @@ -31,6 +31,7 @@ public class MITTYAdapter implements IMITTY { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.IMITTY#getSlaveName() */ + @Override public String getSlaveName() { return fPty.getSlaveName(); } @@ -38,6 +39,7 @@ public class MITTYAdapter implements IMITTY { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.IMITTY#getOutputStream() */ + @Override public OutputStream getOutputStream() { return fPty.getOutputStream(); } @@ -45,6 +47,7 @@ public class MITTYAdapter implements IMITTY { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.IMITTY#getInputStream() */ + @Override public InputStream getInputStream() { return fPty.getInputStream(); } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/ActionFilterAdapterFactory.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/ActionFilterAdapterFactory.java index 2aa761d4bda..f85e2ff836b 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/ActionFilterAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/ActionFilterAdapterFactory.java @@ -22,6 +22,7 @@ public class ActionFilterAdapterFactory 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 ( adapterType.isInstance( adaptableObject ) ) { return adaptableObject; @@ -37,6 +38,7 @@ public class ActionFilterAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override public Class[] getAdapterList() { return new Class[] { IActionFilter.class diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/CygwinDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/CygwinDebuggerPage.java index 561c8ed16f0..fe3d6d78492 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/CygwinDebuggerPage.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/CygwinDebuggerPage.java @@ -17,6 +17,7 @@ import org.eclipse.swt.widgets.TabFolder; */ public class CygwinDebuggerPage extends GDBDebuggerPage { + @Override public String getName() { return MIUIMessages.getString( "CygwinDebuggerPage.0" ); //$NON-NLS-1$ } @@ -24,6 +25,7 @@ public class CygwinDebuggerPage extends GDBDebuggerPage { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder) */ + @Override public void createTabs( TabFolder tabFolder ) { createMainTab( tabFolder ); } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java index 7dadda9bc6c..26bb7ffbb79 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java @@ -62,6 +62,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { private Button fBreakpointsFullPath; + @Override public void createControl( Composite parent ) { Composite comp = new Composite( parent, SWT.NONE ); comp.setLayout( new GridLayout() ); @@ -73,6 +74,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { setControl( parent ); } + @Override public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb" ); //$NON-NLS-1$ configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_GDB_INIT, IMILaunchConfigurationConstants.DEBUGGER_GDB_INIT_DEFAULT ); @@ -81,6 +83,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { fSolibBlock.setDefaults( configuration ); } + @Override public boolean isValid( ILaunchConfiguration launchConfig ) { boolean valid = fGDBCommandText.getText().length() != 0; if ( valid ) { @@ -94,6 +97,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { return valid; } + @Override public void initializeFrom( ILaunchConfiguration configuration ) { setInitializing( true ); String gdbCommand = "gdb"; //$NON-NLS-1$ @@ -137,6 +141,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { setInitializing( false ); } + @Override public void performApply( ILaunchConfigurationWorkingCopy configuration ) { String str = fGDBCommandText.getText(); str.trim(); @@ -154,6 +159,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { fSolibBlock.performApply( configuration ); } + @Override public String getName() { return MIUIMessages.getString( "GDBDebuggerPage.1" ); //$NON-NLS-1$ } @@ -161,6 +167,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { /** * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getShell() */ + @Override protected Shell getShell() { return super.getShell(); } @@ -168,6 +175,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { /** * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog() */ + @Override protected void updateLaunchConfigurationDialog() { super.updateLaunchConfigurationDialog(); } @@ -177,6 +185,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { * * @see java.util.Observer#update(java.util.Observable, java.lang.Object) */ + @Override public void update( Observable o, Object arg ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -210,6 +219,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { fGDBCommandText = ControlFactory.createTextField( subComp, SWT.SINGLE | SWT.BORDER ); fGDBCommandText.addModifyListener( new ModifyListener() { + @Override public void modifyText( ModifyEvent evt ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -218,6 +228,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { Button button = createPushButton( subComp, MIUIMessages.getString( "GDBDebuggerPage.4" ), null ); //$NON-NLS-1$ button.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent evt ) { handleGDBButtonSelected(); updateLaunchConfigurationDialog(); @@ -247,6 +258,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { fGDBInitText.setLayoutData( gd ); fGDBInitText.addModifyListener( new ModifyListener() { + @Override public void modifyText( ModifyEvent evt ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -255,6 +267,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { button = createPushButton( subComp, MIUIMessages.getString( "GDBDebuggerPage.7" ), null ); //$NON-NLS-1$ button.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent evt ) { handleGDBInitButtonSelected(); updateLaunchConfigurationDialog(); @@ -306,6 +319,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose() */ + @Override public void dispose() { if ( fSolibBlock != null ) { if ( fSolibBlock instanceof Observable ) @@ -318,6 +332,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated( ILaunchConfigurationWorkingCopy workingCopy ) { // Override the default behavior } @@ -337,11 +352,13 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { fProtocolCombo.setItems( protocolItems ); fProtocolCombo.addSelectionListener( new SelectionListener() { + @Override public void widgetDefaultSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); } + @Override public void widgetSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -352,10 +369,12 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer { protected void createBreakpointFullPathName( Composite parent ) { fBreakpointsFullPath = createCheckButton( parent, MIUIMessages.getString( "StandardGDBDebuggerPage.14" ) ); //$NON-NLS-1$ fBreakpointsFullPath.addSelectionListener( new SelectionListener() { + @Override public void widgetDefaultSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); } + @Override public void widgetSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java index 5f974c51be2..16a0852c1ae 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java @@ -85,6 +85,7 @@ public class GDBServerDebuggerPage extends StandardGDBDebuggerPage { field.setItems( fConnections ); field.setDialogFieldListener( new IDialogFieldListener() { + @Override public void dialogFieldChanged( DialogField f ) { if ( !isInitializing() ) connectionTypeChanged(); @@ -111,6 +112,7 @@ public class GDBServerDebuggerPage extends StandardGDBDebuggerPage { fConnectionStack.layout(); } + @Override public boolean isValid( ILaunchConfiguration launchConfig ) { if ( super.isValid( launchConfig ) ) { setErrorMessage( null ); @@ -136,6 +138,7 @@ public class GDBServerDebuggerPage extends StandardGDBDebuggerPage { return false; } + @Override public void initializeFrom( ILaunchConfiguration configuration ) { setInitializing( true ); super.initializeFrom( configuration ); @@ -152,6 +155,7 @@ public class GDBServerDebuggerPage extends StandardGDBDebuggerPage { setInitializing( false ); } + @Override public void performApply( ILaunchConfigurationWorkingCopy configuration ) { super.performApply( configuration ); if ( fConnectionField != null ) @@ -160,6 +164,7 @@ public class GDBServerDebuggerPage extends StandardGDBDebuggerPage { fSerialBlock.performApply( configuration ); } + @Override public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { super.setDefaults( configuration ); configuration.setAttribute( IGDBServerMILaunchConfigurationConstants.ATTR_REMOTE_TCP, false ); @@ -167,6 +172,7 @@ public class GDBServerDebuggerPage extends StandardGDBDebuggerPage { fSerialBlock.setDefaults( configuration ); } + @Override protected boolean isInitializing() { return fIsInitializing; } @@ -178,6 +184,7 @@ public class GDBServerDebuggerPage extends StandardGDBDebuggerPage { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder) */ + @Override public void createTabs( TabFolder tabFolder ) { super.createTabs( tabFolder ); createConnectionTab( tabFolder ); diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java index ba2bd14862c..359c73fdfb6 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBSolibBlock.java @@ -55,6 +55,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl( Composite parent ) { Composite subComp = ControlFactory.createCompositeEx( parent, 1, GridData.FILL_HORIZONTAL ); ((GridLayout)subComp.getLayout()).makeColumnsEqualWidth = false; @@ -69,6 +70,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC fAutoSoLibButton = ControlFactory.createCheckBox( subComp, MIUIMessages.getString( "GDBSolibBlock.0" ) ); //$NON-NLS-1$ fAutoSoLibButton.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { updateButtons(); changed(); @@ -79,6 +81,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC fStopOnSolibEventsButton = ControlFactory.createCheckBox( subComp, MIUIMessages.getString( "GDBSolibBlock.1" ) ); //$NON-NLS-1$ fStopOnSolibEventsButton.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { updateButtons(); changed(); @@ -91,6 +94,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom( ILaunchConfiguration configuration ) { if ( fSolibSearchPathBlock != null ) fSolibSearchPathBlock.initializeFrom( configuration ); @@ -109,6 +113,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply( ILaunchConfigurationWorkingCopy configuration ) { if ( fSolibSearchPathBlock != null ) fSolibSearchPathBlock.performApply( configuration ); @@ -127,6 +132,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { if ( fSolibSearchPathBlock != null ) fSolibSearchPathBlock.setDefaults( configuration ); @@ -140,6 +146,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#dispose() */ + @Override public void dispose() { deleteObservers(); if ( fSolibSearchPathBlock != null ) { @@ -154,6 +161,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC * * @see java.util.Observer#update(java.util.Observable, java.lang.Object) */ + @Override public void update( Observable o, Object arg ) { changed(); } @@ -178,6 +186,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#getControl() */ + @Override public Control getControl() { return fControl; } @@ -185,6 +194,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#isValid(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public boolean isValid( ILaunchConfiguration launchConfig ) { // TODO Auto-generated method stub return false; diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBTargetActionFilter.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBTargetActionFilter.java index ec02bca3b01..64cba06acbe 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBTargetActionFilter.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBTargetActionFilter.java @@ -23,6 +23,7 @@ public class GDBTargetActionFilter implements IActionFilter { /* (non-Javadoc) * @see org.eclipse.ui.IActionFilter#testAttribute(java.lang.Object, java.lang.String, java.lang.String) */ + @Override public boolean testAttribute( Object target, String name, String value ) { if ( target instanceof ICDebugTarget ) { if ( name.equals( "GDBTargetActionFilter" ) && value.equals( "isGDBTarget" ) ) { //$NON-NLS-1$//$NON-NLS-2$ diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MinGWDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MinGWDebuggerPage.java index 9dec034b93f..ebfd635be80 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MinGWDebuggerPage.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MinGWDebuggerPage.java @@ -35,6 +35,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; */ public class MinGWDebuggerPage extends StandardGDBDebuggerPage { + @Override protected String defaultGdbCommand(ILaunchConfiguration configuration) { // Lets look it up in the project try { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java index 6e8077d0ab9..05315816024 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java @@ -102,6 +102,7 @@ public class SerialPortSettingsBlock extends Observable { field.setLabelText( MIUIMessages.getString( "SerialPortSettingsBlock.0" ) ); //$NON-NLS-1$ field.setDialogFieldListener( new IDialogFieldListener() { + @Override public void dialogFieldChanged( DialogField f ) { deviceFieldChanged(); } @@ -115,6 +116,7 @@ public class SerialPortSettingsBlock extends Observable { field.setItems( fSpeedChoices ); field.setDialogFieldListener( new IDialogFieldListener() { + @Override public void dialogFieldChanged( DialogField f ) { speedFieldChanged(); } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java index 8a7da35746b..e34d4258df4 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java @@ -110,6 +110,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu fText.setLayoutData( new GridData( GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL ) ); fText.addModifyListener( new ModifyListener() { + @Override public void modifyText( ModifyEvent e ) { updateOKButton(); } @@ -245,9 +246,11 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu buttonLabels[i] = customButtonLabels[i - fgStaticButtonLabels.length]; } IListAdapter listAdapter = new IListAdapter() { + @Override public void customButtonPressed( DialogField field, int index ) { buttonPressed( index ); } + @Override public void selectionChanged( DialogField field ) { } }; @@ -271,6 +274,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl( Composite parent ) { fShell = parent.getShell(); Composite comp = ControlFactory.createCompositeEx( parent, 2, GridData.FILL_BOTH ); @@ -289,6 +293,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom( ILaunchConfiguration configuration ) { IProject project = null; try { @@ -328,6 +333,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST ); } @@ -335,6 +341,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply( ILaunchConfigurationWorkingCopy configuration ) { if ( fDirList != null ) { List elements = fDirList.getElements(); @@ -398,6 +405,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#dispose() */ + @Override public void dispose() { deleteObservers(); } @@ -405,6 +413,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#getControl() */ + @Override public Control getControl() { return fControl; } @@ -412,6 +421,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#isValid(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public boolean isValid( ILaunchConfiguration launchConfig ) { // TODO Auto-generated method stub return false; @@ -443,20 +453,24 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu if ( generateLibraryList( (IPath[])dirList.toArray( new IPath[dirList.size()] ), libs ) ) { ITreeContentProvider cp = new ITreeContentProvider() { + @Override public Object[] getChildren( Object parentElement ) { return getElements( parentElement ); } + @Override public Object getParent( Object element ) { if ( libs.contains( element ) ) return libs; return null; } + @Override public boolean hasChildren( Object element ) { return false; } + @Override public Object[] getElements( Object inputElement ) { if ( inputElement instanceof Set ) { return ((Set)inputElement).toArray(); @@ -464,9 +478,11 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu return new Object[0]; } + @Override public void dispose() { } + @Override public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) { } }; @@ -500,6 +516,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu boolean result = true; IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run( IProgressMonitor monitor ) throws InvocationTargetException, InterruptedException { for ( int i = 0; i < paths.length; ++i ) { @@ -597,6 +614,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu return ( name.indexOf( ".so." ) >= 0 ); //$NON-NLS-1$ } + @Override public void dialogFieldChanged(DialogField field) { setChanged(); notifyObservers(); diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java index 242a19134ab..21381c219bb 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java @@ -78,6 +78,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob private static boolean cachedGdb64Exists; + @Override public void createControl( Composite parent ) { Composite comp = new Composite( parent, SWT.NONE ); comp.setLayout( new GridLayout() ); @@ -89,6 +90,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob setControl( parent ); } + @Override public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, defaultGdbCommand(configuration)); configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_GDB_INIT, IMILaunchConfigurationConstants.DEBUGGER_GDB_INIT_DEFAULT ); @@ -144,6 +146,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob } + @Override public boolean isValid( ILaunchConfiguration launchConfig ) { boolean valid = fGDBCommandText.getText().length() != 0; if ( valid ) { @@ -157,6 +160,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob return valid; } + @Override public void initializeFrom( ILaunchConfiguration configuration ) { setInitializing( true ); String gdbCommand = defaultGdbCommand(configuration); @@ -180,6 +184,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob fCommandFactoryDescriptors = MIPlugin.getDefault().getCommandFactoryManager().getDescriptors( debuggerID ); Arrays.sort( fCommandFactoryDescriptors, new Comparator() { + @Override public int compare( Object arg0, Object arg1 ) { return ((CommandFactoryDescriptor)arg0).getName().compareTo( ((CommandFactoryDescriptor)arg1).getName() ); } @@ -250,6 +255,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob } return result; } + @Override public void performApply( ILaunchConfigurationWorkingCopy configuration ) { String str = fGDBCommandText.getText(); str.trim(); @@ -269,6 +275,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_FULLPATH_BREAKPOINTS, fBreakpointsFullPath.getSelection() ); } + @Override public String getName() { return MIUIMessages.getString( "StandardGDBDebuggerPage.1" ); //$NON-NLS-1$ } @@ -276,6 +283,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob /** * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getShell() */ + @Override protected Shell getShell() { return super.getShell(); } @@ -283,6 +291,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob /** * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog() */ + @Override protected void updateLaunchConfigurationDialog() { super.updateLaunchConfigurationDialog(); } @@ -292,6 +301,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob * * @see java.util.Observer#update(java.util.Observable, java.lang.Object) */ + @Override public void update( Observable o, Object arg ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -325,6 +335,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob fGDBCommandText = ControlFactory.createTextField( subComp, SWT.SINGLE | SWT.BORDER ); fGDBCommandText.addModifyListener( new ModifyListener() { + @Override public void modifyText( ModifyEvent evt ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -333,6 +344,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob Button button = createPushButton( subComp, MIUIMessages.getString( "StandardGDBDebuggerPage.4" ), null ); //$NON-NLS-1$ button.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent evt ) { handleGDBButtonSelected(); updateLaunchConfigurationDialog(); @@ -362,6 +374,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob fGDBInitText.setLayoutData( gd ); fGDBInitText.addModifyListener( new ModifyListener() { + @Override public void modifyText( ModifyEvent evt ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -370,6 +383,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob button = createPushButton( subComp, MIUIMessages.getString( "StandardGDBDebuggerPage.7" ), null ); //$NON-NLS-1$ button.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent evt ) { handleGDBInitButtonSelected(); updateLaunchConfigurationDialog(); @@ -430,6 +444,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose() */ + @Override public void dispose() { if ( fSolibBlock != null ) { if ( fSolibBlock instanceof Observable ) @@ -442,6 +457,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated( ILaunchConfigurationWorkingCopy workingCopy ) { // Override the default behavior } @@ -460,11 +476,13 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob fCommandFactoryCombo = new Combo( parent, SWT.READ_ONLY | SWT.DROP_DOWN ); fCommandFactoryCombo.addSelectionListener( new SelectionListener() { + @Override public void widgetDefaultSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); } + @Override public void widgetSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -478,11 +496,13 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob fProtocolCombo = new Combo( parent, SWT.READ_ONLY | SWT.DROP_DOWN ); fProtocolCombo.addSelectionListener( new SelectionListener() { + @Override public void widgetDefaultSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); } + @Override public void widgetSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -504,11 +524,13 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob fVerboseModeButton = createCheckButton( parent, MIUIMessages.getString( "StandardGDBDebuggerPage.13" ) ); //$NON-NLS-1$ fVerboseModeButton.addSelectionListener( new SelectionListener() { + @Override public void widgetDefaultSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); } + @Override public void widgetSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); @@ -520,11 +542,13 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob fBreakpointsFullPath.addSelectionListener( new SelectionListener() { + @Override public void widgetDefaultSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); } + @Override public void widgetSelected( SelectionEvent e ) { if ( !isInitializing() ) updateLaunchConfigurationDialog(); diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java index 47bedd141c5..47236c0d422 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java @@ -97,6 +97,7 @@ public class TCPSettingsBlock extends Observable { field.setLabelText( MIUIMessages.getString( "TCPSettingsBlock.0" ) ); //$NON-NLS-1$ field.setDialogFieldListener( new IDialogFieldListener() { + @Override public void dialogFieldChanged( DialogField f ) { hostNameFieldChanged(); } @@ -109,6 +110,7 @@ public class TCPSettingsBlock extends Observable { field.setLabelText( MIUIMessages.getString( "TCPSettingsBlock.1" ) ); //$NON-NLS-1$ field.setDialogFieldListener( new IDialogFieldListener() { + @Override public void dialogFieldChanged( DialogField f ) { portNumberFieldChanged(); } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/actions/SetAutoSolibActionDelegate.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/actions/SetAutoSolibActionDelegate.java index 167ebf1d17e..6accc0d5cad 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/actions/SetAutoSolibActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/actions/SetAutoSolibActionDelegate.java @@ -59,6 +59,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate, ISelecti * * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart) */ + @Override public void init( IViewPart view ) { fView = view; view.getSite().getPage().addPartListener( this ); @@ -70,6 +71,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate, ISelecti * * @see org.eclipse.ui.ISelectionListener#selectionChanged(IWorkbenchPart, ISelection) */ + @Override public void selectionChanged( IWorkbenchPart part, ISelection selection ) { if ( part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) ) { update( getAction() ); @@ -81,9 +83,11 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate, ISelecti * * @see org.eclipse.ui.IActionDelegate#run(IAction) */ + @Override public void run( IAction action ) { BusyIndicator.showWhile( Display.getCurrent(), new Runnable() { + @Override public void run() { try { doAction( DebugUITools.getDebugContext() ); @@ -111,6 +115,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate, ISelecti * * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { setAction( action ); if ( getView() != null ) { @@ -131,6 +136,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate, ISelecti * * @see org.eclipse.ui.IPartListener#partActivated(IWorkbenchPart) */ + @Override public void partActivated( IWorkbenchPart part ) { } @@ -139,6 +145,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate, ISelecti * * @see org.eclipse.ui.IPartListener#partBroughtToTop(IWorkbenchPart) */ + @Override public void partBroughtToTop( IWorkbenchPart part ) { } @@ -147,6 +154,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate, ISelecti * * @see org.eclipse.ui.IPartListener#partClosed(IWorkbenchPart) */ + @Override public void partClosed( IWorkbenchPart part ) { if ( part.equals( getView() ) ) { dispose(); @@ -158,6 +166,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate, ISelecti * * @see org.eclipse.ui.IPartListener#partDeactivated(IWorkbenchPart) */ + @Override public void partDeactivated( IWorkbenchPart part ) { } @@ -166,6 +175,7 @@ public class SetAutoSolibActionDelegate implements IViewActionDelegate, ISelecti * * @see org.eclipse.ui.IPartListener#partOpened(IWorkbenchPart) */ + @Override public void partOpened( IWorkbenchPart part ) { } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/actions/VerboseModeActionDelegate.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/actions/VerboseModeActionDelegate.java index 944308f4b05..f0af6c30859 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/actions/VerboseModeActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/actions/VerboseModeActionDelegate.java @@ -26,12 +26,14 @@ public class VerboseModeActionDelegate extends ActionDelegate implements IObject /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart( IAction action, IWorkbenchPart targetPart ) { } /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { if ( fProcess != null ) { boolean enabled = fProcess.getTarget().isVerboseModeEnabled(); @@ -43,6 +45,7 @@ public class VerboseModeActionDelegate extends ActionDelegate implements IObject /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { IStructuredSelection s = (IStructuredSelection)selection; fProcess = ( !s.isEmpty() ) ? (GDBProcess)s.getFirstElement() : null; diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/CheckedListDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/CheckedListDialogField.java index 892f2c06302..4f48a06155a 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/CheckedListDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/CheckedListDialogField.java @@ -69,10 +69,12 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#createTableViewer */ + @Override protected TableViewer createTableViewer(Composite parent) { Table table= new Table(parent, SWT.CHECK + getListStyle()); CheckboxTableViewer tableViewer= new CheckboxTableViewer(table); tableViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent e) { doCheckStateChanged(e); } @@ -84,6 +86,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#getListControl */ + @Override public Control getListControl(Composite parent) { Control control= super.getListControl(parent); if (parent != null) { @@ -96,6 +99,7 @@ public class CheckedListDialogField extends ListDialogField { * @see DialogField#dialogFieldChanged * Hooks in to get element changes to update check model. */ + @Override public void dialogFieldChanged() { for (int i= fCheckElements.size() -1; i >= 0; i--) { if (!fElements.contains(fCheckElements.get(i))) { @@ -192,6 +196,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#getManagedButtonState */ + @Override protected boolean getManagedButtonState(ISelection sel, int index) { if (index == fCheckAllButtonIndex) { return !fElements.isEmpty(); @@ -204,6 +209,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#extraButtonPressed */ + @Override protected boolean managedButtonPressed(int index) { if (index == fCheckAllButtonIndex) { checkAll(true); diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ComboDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ComboDialogField.java index 85fa7d643a6..e8e2674ad8e 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ComboDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ComboDialogField.java @@ -45,6 +45,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -59,6 +60,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 2; } @@ -76,6 +78,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#setFocus */ + @Override public boolean setFocus() { if (isOkToUse(fComboControl)) { fComboControl.setFocus(); @@ -94,15 +97,18 @@ public class ComboDialogField extends DialogField { if (fComboControl == null) { assertCompositeNotNull(parent); fModifyListener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { doModifyText(e); } }; SelectionListener selectionListener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { doSelectionChanged(e); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }; @@ -145,6 +151,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fComboControl)) { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/DialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/DialogField.java index 7d23cbeea8e..92cbd3324a7 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/DialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/DialogField.java @@ -85,6 +85,7 @@ public class DialogField { if (display != null) { display.asyncExec( new Runnable() { + @Override public void run() { setFocus(); } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/LayoutUtil.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/LayoutUtil.java index 963dd16cda2..bdf51aefa18 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/LayoutUtil.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/LayoutUtil.java @@ -56,6 +56,7 @@ public class LayoutUtil { * @param marginHeight The margin height to be used by the composite * @deprecated */ + @Deprecated public static void doDefaultLayout(Composite parent, DialogField[] editors, boolean labelOnTop, int minWidth, int minHeight, int marginWidth, int marginHeight) { int nCulumns= getNumberOfColumns(editors); Control[][] controls= new Control[editors.length][]; diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ListDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ListDialogField.java index cc744a38b9d..2bfd745a8e8 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ListDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/ListDialogField.java @@ -177,6 +177,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { PixelConverter converter= new PixelConverter(parent); @@ -214,6 +215,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 3; } @@ -315,9 +317,11 @@ public class ListDialogField extends DialogField { assertCompositeNotNull(parent); SelectionListener listener= new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { doButtonSelected(e); } + @Override public void widgetSelected(SelectionEvent e) { doButtonSelected(e); } @@ -368,6 +372,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#dialogFieldChanged */ + @Override public void dialogFieldChanged() { super.dialogFieldChanged(); updateButtonState(); @@ -403,6 +408,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); @@ -614,6 +620,7 @@ public class ListDialogField extends DialogField { if (isOkToUse(fTableControl)) { Display d= fTableControl.getDisplay(); d.asyncExec(new Runnable() { + @Override public void run() { if (isOkToUse(fTableControl)) { selectElements(selection); @@ -736,6 +743,7 @@ public class ListDialogField extends DialogField { // ------- ITableContentProvider Interface ------------ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // will never happen } @@ -744,15 +752,18 @@ public class ListDialogField extends DialogField { return false; } + @Override public void dispose() { } + @Override public Object[] getElements(Object obj) { return fElements.toArray(); } // ------- ISelectionChangedListener Interface ------------ + @Override public void selectionChanged(SelectionChangedEvent event) { doListSelected(event); } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogField.java index 6e1ea5432b2..5edcadf4cce 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogField.java @@ -78,6 +78,7 @@ public class SelectionButtonDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -97,6 +98,7 @@ public class SelectionButtonDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 1; } @@ -118,9 +120,11 @@ public class SelectionButtonDialogField extends DialogField { fButton.setEnabled(isEnabled()); fButton.setSelection(fIsSelected); fButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { doWidgetSelected(e); } + @Override public void widgetSelected(SelectionEvent e) { doWidgetSelected(e); } @@ -177,6 +181,7 @@ public class SelectionButtonDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fButton)) { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java index ea108921e38..8469ae89742 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java @@ -80,6 +80,7 @@ public class SelectionButtonDialogFieldGroup extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -105,6 +106,7 @@ public class SelectionButtonDialogFieldGroup extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public int getNumberOfControls() { return (fGroupBorderStyle == SWT.NONE) ? 2 : 1; } @@ -150,9 +152,11 @@ public class SelectionButtonDialogFieldGroup extends DialogField { fButtonComposite.setLayout(layout); SelectionListener listener= new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { doWidgetSelected(e); } + @Override public void widgetSelected(SelectionEvent e) { doWidgetSelected(e); } @@ -224,6 +228,7 @@ public class SelectionButtonDialogFieldGroup extends DialogField { // ------ enable / disable management + @Override protected void updateEnableState() { super.updateEnableState(); if (fButtons != null) { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/Separator.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/Separator.java index c0e8173867e..2a81fd2365c 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/Separator.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/Separator.java @@ -55,6 +55,7 @@ public class Separator extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { return doFillIntoGrid(parent, nColumns, 4); } @@ -62,6 +63,7 @@ public class Separator extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 1; } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonDialogField.java index d8bbdaecbe4..1a6900775fd 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonDialogField.java @@ -60,6 +60,7 @@ public class StringButtonDialogField extends StringDialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -76,6 +77,7 @@ public class StringButtonDialogField extends StringDialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 3; } @@ -104,9 +106,11 @@ public class StringButtonDialogField extends StringDialogField { fBrowseButton.setText(fBrowseButtonLabel); fBrowseButton.setEnabled(isEnabled() && fButtonEnabled); fBrowseButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { changeControlPressed(); } + @Override public void widgetSelected(SelectionEvent e) { changeControlPressed(); } @@ -131,6 +135,7 @@ public class StringButtonDialogField extends StringDialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fBrowseButton)) { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonStatusDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonStatusDialogField.java index 18b6994afda..ce039f9a563 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonStatusDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringButtonStatusDialogField.java @@ -89,6 +89,7 @@ public class StringButtonStatusDialogField extends StringButtonDialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -107,6 +108,7 @@ public class StringButtonStatusDialogField extends StringButtonDialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 4; } @@ -157,6 +159,7 @@ public class StringButtonStatusDialogField extends StringButtonDialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fStatusLabelControl)) { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringDialogField.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringDialogField.java index 586c7d57d69..5b7e08b3476 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringDialogField.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/StringDialogField.java @@ -38,6 +38,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -52,6 +53,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 2; } @@ -69,6 +71,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#setFocus */ + @Override public boolean setFocus() { if (isOkToUse(fTextControl)) { fTextControl.setFocus(); @@ -88,6 +91,7 @@ public class StringDialogField extends DialogField { if (fTextControl == null) { assertCompositeNotNull(parent); fModifyListener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { doModifyText(e); } @@ -116,6 +120,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fTextControl)) { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java index b27223893a2..926045e4300 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/preferences/MIPreferencePage.java @@ -55,6 +55,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /** * @see org.eclipse.jface.preference.FieldEditor#refreshValidState() */ + @Override protected void refreshValidState() { super.refreshValidState(); } @@ -63,6 +64,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer * Clears the error message from the message line if the error * message is the error message from this field editor. */ + @Override protected void clearErrorMessage() { if (canClearErrorMessage()) { super.clearErrorMessage(); @@ -82,9 +84,11 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void addPropertyChangeListener( final IPropertyChangeListener listener ) { Preferences.IPropertyChangeListener l = new Preferences.IPropertyChangeListener() { + @Override public void propertyChange( org.eclipse.core.runtime.Preferences.PropertyChangeEvent event ) { listener.propertyChange( new PropertyChangeEvent( MIPreferenceStore.this, event.getProperty(), event.getNewValue(), event.getOldValue() ) ); } @@ -95,6 +99,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String) */ + @Override public boolean contains( String name ) { return getPreferences().contains( name ); } @@ -102,6 +107,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String, java.lang.Object, java.lang.Object) */ + @Override public void firePropertyChangeEvent( String name, Object oldValue, Object newValue ) { Iterator it = fListeners.keySet().iterator(); while( it.hasNext() ) { @@ -112,6 +118,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String) */ + @Override public boolean getBoolean( String name ) { return fPreferences.getBoolean( name ); } @@ -119,6 +126,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String) */ + @Override public boolean getDefaultBoolean( String name ) { return fPreferences.getDefaultBoolean( name ); } @@ -126,6 +134,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String) */ + @Override public double getDefaultDouble( String name ) { return fPreferences.getDefaultDouble( name ); } @@ -133,6 +142,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String) */ + @Override public float getDefaultFloat( String name ) { return fPreferences.getDefaultFloat( name ); } @@ -140,6 +150,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String) */ + @Override public int getDefaultInt( String name ) { return fPreferences.getDefaultInt( name ); } @@ -147,6 +158,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String) */ + @Override public long getDefaultLong( String name ) { return fPreferences.getDefaultLong( name ); } @@ -154,6 +166,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String) */ + @Override public String getDefaultString( String name ) { return fPreferences.getDefaultString( name ); } @@ -161,6 +174,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String) */ + @Override public double getDouble( String name ) { return fPreferences.getDouble( name ); } @@ -168,6 +182,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String) */ + @Override public float getFloat( String name ) { return fPreferences.getFloat( name ); } @@ -175,6 +190,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String) */ + @Override public int getInt( String name ) { return fPreferences.getInt( name ); } @@ -182,6 +198,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String) */ + @Override public long getLong( String name ) { return fPreferences.getLong( name ); } @@ -189,6 +206,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String) */ + @Override public String getString( String name ) { return fPreferences.getString( name ); } @@ -196,6 +214,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String) */ + @Override public boolean isDefault( String name ) { return fPreferences.isDefault( name ); } @@ -203,6 +222,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#needsSaving() */ + @Override public boolean needsSaving() { return getPreferences().needsSaving(); } @@ -210,6 +230,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String, java.lang.String) */ + @Override public void putValue( String name, String value ) { getPreferences().setValue( name, value ); } @@ -217,6 +238,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) */ + @Override public void removePropertyChangeListener( IPropertyChangeListener listener ) { fListeners.remove( listener ); } @@ -224,6 +246,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, double) */ + @Override public void setDefault( String name, double value ) { getPreferences().setDefault( name, value ); } @@ -231,6 +254,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, float) */ + @Override public void setDefault( String name, float value ) { getPreferences().setDefault( name, value ); } @@ -238,6 +262,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, int) */ + @Override public void setDefault( String name, int value ) { getPreferences().setDefault( name, value ); } @@ -245,6 +270,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, long) */ + @Override public void setDefault( String name, long value ) { getPreferences().setDefault( name, value ); } @@ -252,6 +278,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, java.lang.String) */ + @Override public void setDefault( String name, String defaultObject ) { getPreferences().setDefault( name, defaultObject ); } @@ -259,6 +286,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, boolean) */ + @Override public void setDefault( String name, boolean value ) { getPreferences().setDefault( name, value ); } @@ -266,6 +294,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String) */ + @Override public void setToDefault( String name ) { getPreferences().setToDefault( name ); } @@ -273,6 +302,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, double) */ + @Override public void setValue( String name, double value ) { getPreferences().setValue( name, value ); } @@ -280,6 +310,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, float) */ + @Override public void setValue( String name, float value ) { getPreferences().setValue( name, value ); } @@ -287,6 +318,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, int) */ + @Override public void setValue( String name, int value ) { getPreferences().setValue( name, value ); } @@ -294,6 +326,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, long) */ + @Override public void setValue( String name, long value ) { getPreferences().setValue( name, value ); } @@ -301,6 +334,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, java.lang.String) */ + @Override public void setValue( String name, String value ) { getPreferences().setValue( name, value ); } @@ -308,6 +342,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, boolean) */ + @Override public void setValue( String name, boolean value ) { getPreferences().setValue( name, value ); } @@ -343,6 +378,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer * * @see org.eclipse.jface.preference.PreferencePage#createContents(Composite) */ + @Override protected Control createContents( Composite parent ) { getWorkbench().getHelpSystem().setHelp( getControl(), IMIHelpContextIds.MI_PREFERENCE_PAGE ); //The main composite @@ -376,6 +412,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /** * @see IPreferencePage#performOk() */ + @Override public boolean performOk() { boolean result = super.performOk(); storeValues(); @@ -389,6 +426,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer * * @see PreferencePage#performDefaults() */ + @Override protected void performDefaults() { setDefaultValues(); super.performDefaults(); @@ -405,6 +443,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer * * @see org.eclipse.ui.IWorkbenchPreferencePage#init(IWorkbench) */ + @Override public void init( IWorkbench workbench ) { fWorkbench = workbench; } @@ -472,6 +511,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#dispose() */ + @Override public void dispose() { fDebugTimeoutText.dispose(); fLaunchTimeoutText.dispose(); @@ -490,6 +530,7 @@ public class MIPreferencePage extends PreferencePage implements IWorkbenchPrefer /** * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(FieldEditor.IS_VALID)) { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/propertypages/OptionsPropertyPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/propertypages/OptionsPropertyPage.java index 562ba3cede4..aa036425068 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/propertypages/OptionsPropertyPage.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/propertypages/OptionsPropertyPage.java @@ -40,6 +40,7 @@ public class OptionsPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents( Composite parent ) { Composite comp = ControlFactory.createComposite( parent, 1 ); fRefreshSolibsButton = createCheckButton( comp, PropertyMessages.getString( "OptionsPropertyPage.1" ) ); //$NON-NLS-1$ @@ -66,11 +67,13 @@ public class OptionsPropertyPage extends PropertyPage { } + @Override protected void performApply() { storeValues(); super.performApply(); } + @Override public boolean performOk() { storeValues(); return super.performOk(); @@ -86,6 +89,7 @@ public class OptionsPropertyPage extends PropertyPage { if ( target.isSuspended() && solibUpdate ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { if ( target.isSuspended() ) { if ( solibUpdate ) { diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/MiConsolePageParticipant.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/MiConsolePageParticipant.java index 031678d07e3..01014bf8baf 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/MiConsolePageParticipant.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/MiConsolePageParticipant.java @@ -40,12 +40,15 @@ public class MiConsolePageParticipant implements IConsolePageParticipant, IDebug private org.eclipse.debug.ui.console.IConsole fConsole = null; private org.eclipse.cdt.debug.mi.core.GDBProcess GDBProcess = null; + @Override public void activated() { } + @Override public void deactivated() { } + @Override public void dispose() { if (GDBProcess != null) { DebugPlugin.getDefault().removeDebugEventListener(this); @@ -56,6 +59,7 @@ public class MiConsolePageParticipant implements IConsolePageParticipant, IDebug fConsole = null; } + @Override public void init(IPageBookViewPage page, IConsole console) { if(console instanceof org.eclipse.debug.ui.console.IConsole) @@ -87,11 +91,13 @@ public class MiConsolePageParticipant implements IConsolePageParticipant, IDebug } } + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { return null; } + @Override public void handleDebugEvents(DebugEvent[] events) { for (int i = 0; i < events.length; i++) { DebugEvent event = events[i]; @@ -111,7 +117,8 @@ public class MiConsolePageParticipant implements IConsolePageParticipant, IDebug /** * Handle MISession notification */ - public void update(Observable arg0, Object arg1) { + @Override + public void update(Observable arg0, Object arg1) { if((arg1!=null) && (arg1 instanceof VerboseModeChangedEvent) && (fVerboseMode != null)) { try { fVerboseMode.updateStateAndEnablement(); diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleSaveAction.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleSaveAction.java index 38111c7e051..bebbf740209 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleSaveAction.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleSaveAction.java @@ -41,6 +41,7 @@ public class MiConsoleSaveAction extends Action{ fConsole = console; } + @Override public void run() { FileDialog fileDialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.SAVE); @@ -50,6 +51,7 @@ public class MiConsoleSaveAction extends Action{ } Runnable saveJob = new Runnable() { + @Override public void run() { saveContent(); } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleVerboseModeAction.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleVerboseModeAction.java index 6fe1ad28f1a..86ff6972aa6 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleVerboseModeAction.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleVerboseModeAction.java @@ -43,6 +43,7 @@ public class MiConsoleVerboseModeAction extends Action { } } + @Override public void run() { GDBProcess fProcess = (GDBProcess) fConsole.getProcess(); fProcess.getTarget().enableVerboseMode(isChecked()); diff --git a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/AbstractDebugTest.java b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/AbstractDebugTest.java index 5fc693af2e4..e1367ee9771 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/AbstractDebugTest.java +++ b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/AbstractDebugTest.java @@ -94,8 +94,8 @@ public abstract class AbstractDebugTest extends TestCase { /*********************************************************************** * Create a new project and import the test source. */ - Path imputFile = new Path(getProjectZip()); //$NON-NLS-1$ - testProject = CProjectHelper.createCProjectWithImport(getProjectName(), imputFile); //$NON-NLS-1$ + Path imputFile = new Path(getProjectZip()); + testProject = CProjectHelper.createCProjectWithImport(getProjectName(), imputFile); if (testProject == null) fail("Unable to create project"); //$NON-NLS-1$ /* Build the test project.. */ @@ -181,11 +181,13 @@ public abstract class AbstractDebugTest extends TestCase { } } + @Override protected void setUp() throws FileNotFoundException, IOException, InterruptedException, InvocationTargetException, CoreException { newInstance.oneTimeSetUp(); } + @Override protected void tearDown() throws FileNotFoundException, IOException, CoreException { newInstance.oneTimeTearDown(); } diff --git a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/BreakpointTests.java b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/BreakpointTests.java index f0647431755..c28f4fb478a 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/BreakpointTests.java +++ b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/BreakpointTests.java @@ -400,7 +400,7 @@ public class BreakpointTests extends AbstractDebugTest { int maxBreakpoints = 5; for (int x = 0; x < maxBreakpoints; x++) { ICDILineLocation lineLocation = cdiTarget.createLineLocation("main.c", x + lineStart); - ICDILocationBreakpoint bp = (ICDILocationBreakpoint) cdiTarget.setLineBreakpoint(0, lineLocation, null, false); + ICDILocationBreakpoint bp = cdiTarget.setLineBreakpoint(0, lineLocation, null, false); assertNotNull(bp); assertEquals(x + lineStart, (bp.getLocator().getLineNumber())); savedbreakpoints[0] = bp; @@ -598,7 +598,7 @@ public class BreakpointTests extends AbstractDebugTest { * Create a break point on first instruction **********************************************************************/ - location = currentTarget.createAddressLocation(address); //$NON-NLS-1$ + location = currentTarget.createAddressLocation(address); assertNotNull(location); currentTarget.setAddressBreakpoint(0, location, null, false); diff --git a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/DebugTests.java b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/DebugTests.java index 9a629a3400e..1659f30da32 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/DebugTests.java +++ b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/DebugTests.java @@ -75,7 +75,8 @@ public class DebugTests extends TestCase { * Example code test the packages in the project * "com.qnx.tools.ide.cdt.core" */ - protected void setUp() throws CoreException, InvocationTargetException, IOException { + @Override + protected void setUp() throws CoreException, InvocationTargetException, IOException { ResourcesPlugin.getWorkspace().getDescription().setAutoBuilding(false); /*** * Create a new project and import the test source. @@ -95,7 +96,8 @@ public class DebugTests extends TestCase { * * Called after every test case method. */ - protected void tearDown() throws CoreException, CDIException { + @Override + protected void tearDown() throws CoreException, CDIException { if (session!=null) { session.terminate(); session=null; diff --git a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java index b303a9acf64..9225b269638 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java +++ b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java @@ -29,14 +29,17 @@ public class EventBreakpointTests extends AbstractDebugTest { return new DebugTestWrapper(EventBreakpointTests.class){}; } + @Override protected String getProjectName() { return "catchpoints"; } + @Override protected String getProjectZip() { return "resources/debugCxxTest.zip"; } + @Override protected String getProjectBinary() { return "catchpoints.exe"; } diff --git a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/TargetTests.java b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/TargetTests.java index 84039517b51..1d1dcc30c1e 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/TargetTests.java +++ b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/TargetTests.java @@ -65,7 +65,8 @@ public class TargetTests extends TestCase { * Example code test the packages in the project * "com.qnx.tools.ide.cdt.core" */ - protected void setUp() throws CoreException,FileNotFoundException { + @Override + protected void setUp() throws CoreException,FileNotFoundException { /*** * Setup the various files, paths and projects that are needed by the @@ -81,7 +82,8 @@ public class TargetTests extends TestCase { * * Called after every test case method. */ - protected void tearDown() throws CoreException { + @Override + protected void tearDown() throws CoreException { CProjectHelper.delete(testProject); } diff --git a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/CProjectHelper.java b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/CProjectHelper.java index 355ac12d93b..2d86568fca7 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/CProjectHelper.java +++ b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/CProjectHelper.java @@ -69,6 +69,7 @@ public class CProjectHelper { /* Try to guess at the correct binary parser.. elf or pe at this point.. */ ICDescriptorOperation op = new ICDescriptorOperation() { + @Override public void execute(ICDescriptor descriptor, IProgressMonitor monitor) throws CoreException { descriptor.remove(CCorePlugin.BINARY_PARSER_UNIQ_ID); String os = System.getProperty("os.name"); @@ -226,6 +227,7 @@ public class CProjectHelper { } private static class ImportOverwriteQuery implements IOverwriteQuery { + @Override public String queryOverwrite(String file) { return ALL; } diff --git a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/util/ExpectedStringsTests.java b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/util/ExpectedStringsTests.java index 844e20a8ab5..f931924a8c8 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/util/ExpectedStringsTests.java +++ b/debug/org.eclipse.cdt.debug.ui.tests/src/org/eclipse/cdt/debug/testplugin/util/ExpectedStringsTests.java @@ -35,7 +35,8 @@ public class ExpectedStringsTests extends TestCase { * Example code test the packages in the project * "com.qnx.tools.ide.cdt.core" */ - protected void setUp() { + @Override + protected void setUp() { } @@ -45,7 +46,8 @@ public class ExpectedStringsTests extends TestCase { * * Called after every test case method. */ - protected void tearDown() { + @Override + protected void tearDown() { // release resources here and clean-up } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/BreakpointImageProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/BreakpointImageProvider.java index aafb62eeb32..3b490af3c32 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/BreakpointImageProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/BreakpointImageProvider.java @@ -29,6 +29,7 @@ public class BreakpointImageProvider implements IAnnotationImageProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getManagedImage(org.eclipse.jface.text.source.Annotation) */ + @Override public Image getManagedImage( Annotation annotation ) { if ( annotation instanceof MarkerAnnotation ) { IMarker marker = ((MarkerAnnotation)annotation).getMarker(); @@ -45,6 +46,7 @@ public class BreakpointImageProvider implements IAnnotationImageProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptorId(org.eclipse.jface.text.source.Annotation) */ + @Override public String getImageDescriptorId( Annotation annotation ) { return null; } @@ -52,6 +54,7 @@ public class BreakpointImageProvider implements IAnnotationImageProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptor(java.lang.String) */ + @Override public ImageDescriptor getImageDescriptor( String imageDescritporId ) { return null; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointContext.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointContext.java index becd7dd9d0c..22a7bd92f31 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointContext.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointContext.java @@ -76,7 +76,8 @@ class CBreakpointContextActionFilter implements IActionFilter { private static String[] EMPTY_IDENTIFIERS_ARRAY = new String[0]; - public boolean testAttribute(Object target, String name, String value) { + @Override + public boolean testAttribute(Object target, String name, String value) { if (target instanceof CBreakpointContext) { if ("debugModelId".equals(name)) { //$NON-NLS-1$ String[] targetModelIds = getDebugModelIds( (CBreakpointContext)target ); @@ -120,7 +121,8 @@ class CBreakpointContextAdapterFactory implements IAdapterFactory { private static final IActionFilter fgActionFilter = new CBreakpointContextActionFilter(); - public Object getAdapter(Object obj, Class adapterType) { + @Override + public Object getAdapter(Object obj, Class adapterType) { if (adapterType.isInstance( ((CBreakpointContext)obj).getBreakpoint() )) { return ((CBreakpointContext)obj).getBreakpoint(); } @@ -131,7 +133,8 @@ class CBreakpointContextAdapterFactory implements IAdapterFactory { return null; } - public Class[] getAdapterList() { + @Override + public Class[] getAdapterList() { return fgAdapterList; } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java index a1e2e1169c3..01556ead2e2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointUpdater.java @@ -41,6 +41,7 @@ public class CBreakpointUpdater 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 ) { return true; } @@ -51,11 +52,13 @@ public class CBreakpointUpdater 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( final IDebugTarget target, IBreakpoint breakpoint ) { if ( breakpoint instanceof ICBreakpoint && target instanceof ICDebugTarget ) { final ICBreakpoint b = (ICBreakpoint)breakpoint; asyncExec( new Runnable() { + @Override public void run() { try { if ( b.incrementInstallCount() == 1 ) @@ -75,9 +78,11 @@ public class CBreakpointUpdater implements ICBreakpointListener { * @see org.eclipse.cdt.debug.core.ICBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IDebugTarget, * org.eclipse.debug.core.model.IBreakpoint, java.util.Map) */ + @Override public void breakpointChanged( IDebugTarget target, final IBreakpoint breakpoint, final Map attributes ) { asyncExec( new Runnable() { + @Override public void run() { try { Boolean enabled = (Boolean)attributes.get( IBreakpoint.ENABLED ); @@ -100,9 +105,11 @@ public class CBreakpointUpdater implements ICBreakpointListener { * @see org.eclipse.cdt.debug.core.ICBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IDebugTarget, * org.eclipse.debug.core.model.IBreakpoint[]) */ + @Override public void breakpointsRemoved( IDebugTarget target, final IBreakpoint[] breakpoints ) { asyncExec( new Runnable() { + @Override public void run() { for ( int i = 0; i < breakpoints.length; ++i ) { try { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointWorkbenchAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointWorkbenchAdapterFactory.java index 65137c543b8..38014d83d93 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointWorkbenchAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointWorkbenchAdapterFactory.java @@ -25,11 +25,13 @@ public class CBreakpointWorkbenchAdapterFactory 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 ( adapterType != IWorkbenchAdapter.class || !(adaptableObject instanceof ICBreakpoint) ) { return null; } return new WorkbenchAdapter() { + @Override public String getLabel( Object o ) { // for now if ( o instanceof ICLineBreakpoint ) { @@ -46,6 +48,7 @@ public class CBreakpointWorkbenchAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override public Class[] getAdapterList() { return new Class[] { IWorkbenchAdapter.class }; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImageDescriptorRegistry.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImageDescriptorRegistry.java index 61f5c5d601d..07c85a1acd6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImageDescriptorRegistry.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImageDescriptorRegistry.java @@ -77,8 +77,10 @@ public class CDebugImageDescriptorRegistry { private void hookDisplay() { fDisplay.asyncExec(new Runnable() { + @Override public void run() { getDisplay().disposeExec(new Runnable() { + @Override public void run() { dispose(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java index 9447f043b0a..e75c80e840c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java @@ -128,6 +128,7 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugModelPresentation#setAttribute(java.lang.String, java.lang.Object) */ + @Override public void setAttribute( String attribute, Object value ) { if ( value == null ) return; @@ -137,6 +138,7 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode /* (non-Javadoc) * @see org.eclipse.debug.ui.IDebugModelPresentation#computeDetail(org.eclipse.debug.core.model.IValue, org.eclipse.debug.ui.IValueDetailListener) */ + @Override public void computeDetail( IValue value, IValueDetailListener listener ) { CValueDetailProvider.getDefault().computeDetail( value, listener ); } @@ -144,6 +146,7 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode /* (non-Javadoc) * @see org.eclipse.debug.ui.ISourcePresentation#getEditorInput(java.lang.Object) */ + @Override public IEditorInput getEditorInput( Object element ) { if ( element instanceof IMarker ) { IResource resource = ((IMarker)element).getResource(); @@ -209,6 +212,7 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode /* (non-Javadoc) * @see org.eclipse.debug.ui.ISourcePresentation#getEditorId(org.eclipse.ui.IEditorInput, java.lang.Object) */ + @Override public String getEditorId( IEditorInput input, Object element ) { if (element instanceof CSourceNotFoundElement) return ICDebugUIConstants.CSOURCENOTFOUND_EDITOR_ID; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebuggerPageAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebuggerPageAdapter.java index 787b499fa84..13a573b2ba1 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebuggerPageAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebuggerPageAdapter.java @@ -40,6 +40,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.cdt.debug.ui.ICDebuggerPage#init(java.lang.String) */ + @Override public void init( String debuggerID ) { fDebuggerId = debuggerID; } @@ -47,6 +48,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.cdt.debug.ui.ICDebuggerPage#getDebuggerIdentifier() */ + @Override public String getDebuggerIdentifier() { return fDebuggerId; } @@ -54,6 +56,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl( Composite parent ) { fDelegate.createControl( parent ); } @@ -61,6 +64,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getControl() */ + @Override public Control getControl() { return fDelegate.getControl(); } @@ -68,6 +72,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { fDelegate.setDefaults( configuration ); } @@ -75,6 +80,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom( ILaunchConfiguration configuration ) { fDelegate.initializeFrom( configuration ); } @@ -82,6 +88,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose() */ + @Override public void dispose() { fDelegate.dispose(); } @@ -89,6 +96,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply( ILaunchConfigurationWorkingCopy configuration ) { fDelegate.performApply( configuration ); } @@ -96,6 +104,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getErrorMessage() */ + @Override public String getErrorMessage() { return fDelegate.getErrorMessage(); } @@ -103,6 +112,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getMessage() */ + @Override public String getMessage() { return fDelegate.getMessage(); } @@ -110,6 +120,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public boolean isValid( ILaunchConfiguration launchConfig ) { return fDelegate.isValid( launchConfig ); } @@ -117,6 +128,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#canSave() */ + @Override public boolean canSave() { return fDelegate.canSave(); } @@ -124,6 +136,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setLaunchConfigurationDialog(org.eclipse.debug.ui.ILaunchConfigurationDialog) */ + @Override public void setLaunchConfigurationDialog( ILaunchConfigurationDialog dialog ) { fDelegate.setLaunchConfigurationDialog( dialog ); } @@ -131,6 +144,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#launched(org.eclipse.debug.core.ILaunch) */ + @Override public void launched( ILaunch launch ) { fDelegate.launched( launch ); } @@ -138,6 +152,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return fDelegate.getName(); } @@ -145,6 +160,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return fDelegate.getImage(); } @@ -152,6 +168,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated( ILaunchConfigurationWorkingCopy workingCopy ) { fDelegate.activated( workingCopy ); } @@ -159,6 +176,7 @@ public class CDebuggerPageAdapter implements ICDebuggerPage { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void deactivated( ILaunchConfigurationWorkingCopy workingCopy ) { fDelegate.deactivated( workingCopy ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CValueDetailProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CValueDetailProvider.java index 0c8f7a90305..4751d0bd3a7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CValueDetailProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CValueDetailProvider.java @@ -37,6 +37,7 @@ public class CValueDetailProvider { if ( frame != null ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { listener.detailComputed( value, ((ICValue)value).evaluateAsExpression( frame ) ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CWatchExpressionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CWatchExpressionDelegate.java index d1a917891d1..6ec95d842d9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CWatchExpressionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CWatchExpressionDelegate.java @@ -24,6 +24,7 @@ public class CWatchExpressionDelegate implements IWatchExpressionDelegate { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IWatchExpressionDelegate#evaluateExpression(java.lang.String, org.eclipse.debug.core.model.IDebugElement, org.eclipse.debug.core.model.IWatchExpressionListener) */ + @Override public void evaluateExpression( final String expression, IDebugElement context, final IWatchExpressionListener listener ) { if ( !(context instanceof ICStackFrame) ) { listener.watchEvaluationFinished( null ); @@ -31,6 +32,7 @@ public class CWatchExpressionDelegate implements IWatchExpressionDelegate { } final ICStackFrame frame = (ICStackFrame)context; Runnable runnable = new Runnable() { + @Override public void run() { IValue value = null; DebugException de = null; @@ -50,14 +52,17 @@ public class CWatchExpressionDelegate implements IWatchExpressionDelegate { protected IWatchExpressionResult evaluationComplete( final String expression, final IValue value, final DebugException de ) { return new IWatchExpressionResult() { + @Override public IValue getValue() { return value; } + @Override public boolean hasErrors() { return ( de != null ); } + @Override public String getExpressionText() { return expression; } @@ -65,10 +70,12 @@ public class CWatchExpressionDelegate implements IWatchExpressionDelegate { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IWatchExpressionResult#getException() */ + @Override public DebugException getException() { return de; } + @Override public String[] getErrorMessages() { return ( de != null ) ? new String[] { de.getMessage() } : new String[0]; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModel.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModel.java index 8ca9512bc97..368da30a8d0 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModel.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModel.java @@ -30,6 +30,7 @@ public class DebugMarkerAnnotationModel extends AbstractMarkerAnnotationModel im fFile = file; } + @Override protected IMarker[] retrieveMarkers() throws CoreException { IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(); IMarker[] markers = new IMarker[breakpoints.length]; @@ -39,9 +40,11 @@ public class DebugMarkerAnnotationModel extends AbstractMarkerAnnotationModel im return markers; } + @Override protected void deleteMarkers( IMarker[] markers ) throws CoreException { } + @Override protected void listenToMarkerChanges( boolean listen ) { if ( listen ) DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener( this ); @@ -49,6 +52,7 @@ public class DebugMarkerAnnotationModel extends AbstractMarkerAnnotationModel im DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener( this ); } + @Override protected boolean isAcceptable( IMarker marker ) { String handle = marker.getAttribute(ICBreakpoint.SOURCE_HANDLE, null); if (handle != null) { @@ -62,6 +66,7 @@ public class DebugMarkerAnnotationModel extends AbstractMarkerAnnotationModel im return fFile; } + @Override public void breakpointsAdded( IBreakpoint[] breakpoints ) { for ( int i = 0; i < breakpoints.length; ++i ) { addMarkerAnnotation( breakpoints[i].getMarker() ); @@ -69,6 +74,7 @@ public class DebugMarkerAnnotationModel extends AbstractMarkerAnnotationModel im fireModelChanged(); } + @Override public void breakpointsRemoved( IBreakpoint[] breakpoints, IMarkerDelta[] deltas ) { for ( int i = 0; i < breakpoints.length; ++i ) { removeMarkerAnnotation( breakpoints[i].getMarker() ); @@ -76,6 +82,7 @@ public class DebugMarkerAnnotationModel extends AbstractMarkerAnnotationModel im fireModelChanged(); } + @Override public void breakpointsChanged( IBreakpoint[] breakpoints, IMarkerDelta[] deltas ) { for ( int i = 0; i < breakpoints.length; ++i ) { modifyMarkerAnnotation( breakpoints[i].getMarker() ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModelFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModelFactory.java index 9a32d491f00..1b912ecb755 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModelFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/DebugMarkerAnnotationModelFactory.java @@ -22,6 +22,7 @@ public class DebugMarkerAnnotationModelFactory extends ResourceMarkerAnnotationM /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ResourceMarkerAnnotationModelFactory#createAnnotationModel(org.eclipse.core.runtime.IPath) */ + @Override public IAnnotationModel createAnnotationModel( IPath location ) { IFile file = FileBuffers.getWorkspaceFileAtLocation( location ); if ( file != null ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java index 71985837ded..95cd400e097 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java @@ -26,6 +26,7 @@ public class ErrorStatusHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus( final IStatus status, Object source ) throws CoreException { if ( status != null && source != null ) { String title = ""; //$NON-NLS-1$ @@ -41,6 +42,7 @@ public class ErrorStatusHandler implements IStatusHandler { final String title_f = title; CDebugUIPlugin.getStandardDisplay().asyncExec( new Runnable() { + @Override public void run() { ErrorDialog.openError( CDebugUIPlugin.getActiveWorkbenchShell(), title_f, null, status ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/EvaluationContextManager.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/EvaluationContextManager.java index 2a4ec8fde55..2bd74b34b26 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/EvaluationContextManager.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/EvaluationContextManager.java @@ -46,6 +46,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, public static void startup() { Runnable r = new Runnable() { + @Override public void run() { if (fgManager == null) { fgManager = new EvaluationContextManager(); @@ -64,6 +65,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowActivated(IWorkbenchWindow window) { windowOpened(window); } @@ -71,12 +73,14 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowDeactivated(IWorkbenchWindow window) { } /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowClosed(IWorkbenchWindow window) { window.removePageListener(this); } @@ -84,6 +88,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowOpened(IWorkbenchWindow window) { IWorkbenchPage[] pages = window.getPages(); for(int i = 0; i < pages.length; i++) { @@ -95,6 +100,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageActivated(org.eclipse.ui.IWorkbenchPage) */ + @Override public void pageActivated(IWorkbenchPage page) { pageOpened(page); } @@ -102,6 +108,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageClosed(org.eclipse.ui.IWorkbenchPage) */ + @Override public void pageClosed(IWorkbenchPage page) { page.removeSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this); page.removePartListener(this); @@ -110,6 +117,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, /* (non-Javadoc) * @see org.eclipse.ui.IPageListener#pageOpened(org.eclipse.ui.IWorkbenchPage) */ + @Override public void pageOpened(IWorkbenchPage page) { page.addSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this); page.addPartListener(this); @@ -122,6 +130,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, /* (non-Javadoc) * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { IWorkbenchPage page = part.getSite().getPage(); if (selection instanceof IStructuredSelection) { @@ -144,18 +153,21 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partActivated(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partClosed(IWorkbenchPartReference partRef) { if (IDebugUIConstants.ID_DEBUG_VIEW.equals(partRef.getId())) { removeContext(partRef.getPage()); @@ -165,30 +177,35 @@ public class EvaluationContextManager implements IWindowListener, IPageListener, /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partDeactivated(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partOpened(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partHidden(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partVisible(IWorkbenchPartReference partRef) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partInputChanged(IWorkbenchPartReference partRef) { } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/InfoStatusHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/InfoStatusHandler.java index 5139ac57b30..e21d8a27ae3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/InfoStatusHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/InfoStatusHandler.java @@ -25,12 +25,14 @@ public class InfoStatusHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus( IStatus status, Object source ) throws CoreException { if ( status != null && source != null && source instanceof IDebugTarget ) { final String title = ((IDebugTarget)source).getName(); final String message = status.getMessage(); CDebugUIPlugin.getStandardDisplay().asyncExec( new Runnable() { + @Override public void run() { MessageDialog.openInformation( CDebugUIPlugin.getActiveWorkbenchShell(), title, message ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/OverlayImageDescriptor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/OverlayImageDescriptor.java index 10002e9bba3..ff33876ebb6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/OverlayImageDescriptor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/OverlayImageDescriptor.java @@ -79,6 +79,7 @@ public class OverlayImageDescriptor extends CompositeImageDescriptor { } } + @Override public boolean equals( Object o ) { if ( !(o instanceof OverlayImageDescriptor) ) return false; @@ -86,6 +87,7 @@ public class OverlayImageDescriptor extends CompositeImageDescriptor { return getBase().equals( other.getBase() ) && Arrays.equals( getOverlays(), other.getOverlays() ); } + @Override public int hashCode() { int code = getBase().hashCode(); for (int i = 0; i < getOverlays().length; i++) { @@ -101,6 +103,7 @@ public class OverlayImageDescriptor extends CompositeImageDescriptor { * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, * int) */ + @Override protected void drawCompositeImage( int width, int height ) { drawImage( getBase().getImageData(), 0, 0 ); drawOverlays( getOverlays() ); @@ -111,6 +114,7 @@ public class OverlayImageDescriptor extends CompositeImageDescriptor { * * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize() */ + @Override protected Point getSize() { return this.fSize; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/QuestionStatusHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/QuestionStatusHandler.java index ecb9d33e7ef..2e661594847 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/QuestionStatusHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/QuestionStatusHandler.java @@ -25,6 +25,7 @@ public class QuestionStatusHandler implements IStatusHandler { /* (non-Javadoc) * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object) */ + @Override public Object handleStatus( IStatus status, Object source ) throws CoreException { final boolean result[] = new boolean[1]; if ( status != null && source != null && source instanceof IDebugTarget ) { @@ -32,6 +33,7 @@ public class QuestionStatusHandler implements IStatusHandler { final String message = status.getMessage(); CDebugUIPlugin.getStandardDisplay().syncExec( new Runnable() { + @Override public void run() { result[0] = MessageDialog.openQuestion( CDebugUIPlugin.getActiveWorkbenchShell(), title, message ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SingleCharReader.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SingleCharReader.java index ad5e42b877b..52bff3bf178 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SingleCharReader.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SingleCharReader.java @@ -18,11 +18,13 @@ public abstract class SingleCharReader extends Reader { /** * @see Reader#read() */ + @Override public abstract int read() throws IOException; /** * @see Reader#read(char[],int,int) */ + @Override public int read(char cbuf[], int off, int len) throws IOException { int end= off + len; for (int i= off; i < end; i++) { @@ -38,7 +40,8 @@ public abstract class SingleCharReader extends Reader { /** * @see Reader#ready() */ - public boolean ready() throws IOException { + @Override + public boolean ready() throws IOException { return true; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SubstitutionTextReader.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SubstitutionTextReader.java index 969dc79d616..50510b22137 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SubstitutionTextReader.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/SubstitutionTextReader.java @@ -93,6 +93,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader { /** * @see Reader#read() */ + @Override public int read() throws IOException { int c; do { @@ -115,13 +116,15 @@ public abstract class SubstitutionTextReader extends SingleCharReader { /** * @see Reader#ready() */ - public boolean ready() throws IOException { + @Override + public boolean ready() throws IOException { return fReader.ready(); } /** * @see Reader#close() */ + @Override public void close() throws IOException { fReader.close(); } @@ -129,6 +132,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader { /** * @see Reader#reset() */ + @Override public void reset() throws IOException { fReader.reset(); fWasWhiteSpace= true; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ToggleCBreakpointTester.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ToggleCBreakpointTester.java index 4a494ad263c..74cae165f56 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ToggleCBreakpointTester.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ToggleCBreakpointTester.java @@ -36,6 +36,7 @@ public class ToggleCBreakpointTester extends PropertyTester { * (non-Javadoc) * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) */ + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { // test for CEditor if ("isCEditorSupportsCBreakpoint".equals(property) && (receiver instanceof CEditor)) { //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractDebugActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractDebugActionDelegate.java index 2ed64f51df9..809d4cf6931 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractDebugActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractDebugActionDelegate.java @@ -89,7 +89,8 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ - protected IStatus run(IProgressMonitor monitor) { + @Override + protected IStatus run(IProgressMonitor monitor) { MultiStatus status= new MultiStatus(CDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, getStatusMessage(), null); for (int i = 0; i < fElements.length; i++) { @@ -125,6 +126,7 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose(){ if (getWindow() != null) { getWindow().getSelectionService().removeSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this); @@ -136,6 +138,7 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window){ // listen to selection changes in the debug view setWindow(window); @@ -145,6 +148,7 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action){ if (action.isEnabled()) { IStructuredSelection selection = getSelection(); @@ -177,6 +181,7 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct final MultiStatus status= new MultiStatus(CDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, getStatusMessage(), null); BusyIndicator.showWhile(Display.getCurrent(), new Runnable() { + @Override public void run() { Iterator selectionIter = selection.iterator(); while (selectionIter.hasNext()) { @@ -230,6 +235,7 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct * * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection s) { boolean wasInitialized= initialize(action, s); if (!wasInitialized) { @@ -284,6 +290,7 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fViewPart = view; } @@ -348,6 +355,7 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct /* (non-Javadoc) * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { update(getAction(), selection); } @@ -404,6 +412,7 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -411,6 +420,7 @@ public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractEditorActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractEditorActionDelegate.java index 0d4d3246184..29c7da4aa80 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractEditorActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractEditorActionDelegate.java @@ -55,6 +55,7 @@ public abstract class AbstractEditorActionDelegate extends ActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { IWorkbenchWindow win = getWorkbenchWindow(); @@ -68,6 +69,7 @@ public abstract class AbstractEditorActionDelegate extends ActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(IWorkbenchWindow) */ + @Override public void init( IWorkbenchWindow window ) { setWorkbenchWindow( window ); @@ -85,6 +87,7 @@ public abstract class AbstractEditorActionDelegate extends ActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(IAction, IEditorPart) */ + @Override public void setActiveEditor( IAction action, IEditorPart targetEditor ) { setAction( action ); @@ -105,6 +108,7 @@ public abstract class AbstractEditorActionDelegate extends ActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partActivated(IWorkbenchPart) */ + @Override public void partActivated( IWorkbenchPart part ) { setTargetPart( part ); @@ -113,6 +117,7 @@ public abstract class AbstractEditorActionDelegate extends ActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partBroughtToTop(IWorkbenchPart) */ + @Override public void partBroughtToTop( IWorkbenchPart part ) { } @@ -120,6 +125,7 @@ public abstract class AbstractEditorActionDelegate extends ActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partClosed(IWorkbenchPart) */ + @Override public void partClosed( IWorkbenchPart part ) { if ( part == getTargetPart() ) @@ -131,6 +137,7 @@ public abstract class AbstractEditorActionDelegate extends ActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partDeactivated(IWorkbenchPart) */ + @Override public void partDeactivated(IWorkbenchPart part) { } @@ -138,20 +145,24 @@ public abstract class AbstractEditorActionDelegate extends ActionDelegate /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partOpened(IWorkbenchPart) */ + @Override public void partOpened( IWorkbenchPart part ) { } + @Override public abstract void selectionChanged( IWorkbenchPart part, ISelection selection ); /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(IAction) */ + @Override public abstract void run( IAction action ); /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { setAction( action ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractListenerActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractListenerActionDelegate.java index d1e05a7dd51..1d83eeb869c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractListenerActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractListenerActionDelegate.java @@ -26,6 +26,7 @@ public abstract class AbstractListenerActionDelegate extends AbstractDebugAction * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { super.dispose(); DebugPlugin.getDefault().removeDebugEventListener(this); @@ -34,6 +35,7 @@ public abstract class AbstractListenerActionDelegate extends AbstractDebugAction /** * @see IDebugEventSetListener#handleDebugEvents(DebugEvent[]) */ + @Override public void handleDebugEvents(final DebugEvent[] events) { if (getWindow() == null || getAction() == null) { return; @@ -43,6 +45,7 @@ public abstract class AbstractListenerActionDelegate extends AbstractDebugAction return; } Runnable r= new Runnable() { + @Override public void run() { for (int i = 0; i < events.length; i++) { if (events[i].getSource() != null) { @@ -80,6 +83,7 @@ public abstract class AbstractListenerActionDelegate extends AbstractDebugAction /** * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window){ super.init(window); DebugPlugin.getDefault().addDebugEventListener(this); @@ -88,6 +92,7 @@ public abstract class AbstractListenerActionDelegate extends AbstractDebugAction /** * @see IViewActionDelegate#init(IViewPart) */ + @Override public void init(IViewPart view) { super.init(view); DebugPlugin.getDefault().addDebugEventListener(this); @@ -97,12 +102,14 @@ public abstract class AbstractListenerActionDelegate extends AbstractDebugAction /** * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { } /** * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractToggleBreakpointAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractToggleBreakpointAdapter.java index b6039bb2c7a..466d291bbdb 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractToggleBreakpointAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractToggleBreakpointAdapter.java @@ -60,6 +60,7 @@ abstract public class AbstractToggleBreakpointAdapter implements IToggleBreakpoi /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleLineBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void toggleLineBreakpoints( IWorkbenchPart part, ISelection selection ) throws CoreException { String errorMessage = null; if ( part instanceof ITextEditor ) { @@ -109,6 +110,7 @@ abstract public class AbstractToggleBreakpointAdapter implements IToggleBreakpoi /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleLineBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public boolean canToggleLineBreakpoints( IWorkbenchPart part, ISelection selection ) { return (selection instanceof ITextSelection); } @@ -116,6 +118,7 @@ abstract public class AbstractToggleBreakpointAdapter implements IToggleBreakpoi /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void toggleMethodBreakpoints( IWorkbenchPart part, ISelection selection ) throws CoreException { ICElement element = getCElementFromSelection( part, selection ); if ( element instanceof IFunction || element instanceof IMethod ) { @@ -126,6 +129,7 @@ abstract public class AbstractToggleBreakpointAdapter implements IToggleBreakpoi /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public boolean canToggleMethodBreakpoints( IWorkbenchPart part, ISelection selection ) { ICElement element = getCElementFromSelection( part, selection ); return (element instanceof IFunction || element instanceof IMethod); @@ -184,6 +188,7 @@ abstract public class AbstractToggleBreakpointAdapter implements IToggleBreakpoi /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void toggleWatchpoints( IWorkbenchPart part, ISelection selection ) throws CoreException { IVariable variable = getVariableFromSelection( part, selection ); if ( variable != null ) { @@ -194,6 +199,7 @@ abstract public class AbstractToggleBreakpointAdapter implements IToggleBreakpoi /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public boolean canToggleWatchpoints( IWorkbenchPart part, ISelection selection ) { return getVariableFromSelection( part, selection ) != null; } @@ -201,6 +207,7 @@ abstract public class AbstractToggleBreakpointAdapter implements IToggleBreakpoi /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#canToggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public boolean canToggleBreakpoints( IWorkbenchPart part, ISelection selection ) { return ( canToggleLineBreakpoints( part, selection ) || canToggleWatchpoints( part, selection ) @@ -210,6 +217,7 @@ abstract public class AbstractToggleBreakpointAdapter implements IToggleBreakpoi /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#toggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void toggleBreakpoints( IWorkbenchPart part, ISelection selection ) throws CoreException { if ( canToggleLineBreakpoints( part, selection ) ) { toggleLineBreakpoints( part, selection ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractViewActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractViewActionDelegate.java index 7a6987eb2be..e64b23b7fc2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractViewActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractViewActionDelegate.java @@ -50,6 +50,7 @@ public abstract class AbstractViewActionDelegate extends ActionDelegate implemen /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init( IViewPart view ) { setView( view ); DebugPlugin.getDefault().addDebugEventListener( this ); @@ -65,6 +66,7 @@ public abstract class AbstractViewActionDelegate extends ActionDelegate implemen /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { IWorkbenchWindow window = getWindow(); if ( window != null ) { @@ -77,6 +79,7 @@ public abstract class AbstractViewActionDelegate extends ActionDelegate implemen /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init( IAction action ) { setAction( action ); action.setEnabled( false ); @@ -94,10 +97,12 @@ public abstract class AbstractViewActionDelegate extends ActionDelegate implemen /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { final MultiStatus ms = new MultiStatus( CDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, "", null ); //$NON-NLS-1$ BusyIndicator.showWhile( Display.getCurrent(), new Runnable() { + @Override public void run() { try { doAction(); @@ -137,6 +142,7 @@ public abstract class AbstractViewActionDelegate extends ActionDelegate implemen /* (non-Javadoc) * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IWorkbenchPart part, ISelection selection ) { setSelection( selection ); update(); @@ -153,6 +159,7 @@ public abstract class AbstractViewActionDelegate extends ActionDelegate implemen /* (non-Javadoc) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ + @Override public void handleDebugEvents( final DebugEvent[] events ) { if ( getWindow() == null || getAction() == null ) { return; @@ -163,6 +170,7 @@ public abstract class AbstractViewActionDelegate extends ActionDelegate implemen } Runnable r = new Runnable() { + @Override public void run() { for( int i = 0; i < events.length; i++ ) { if ( events[i].getSource() != null ) { @@ -177,6 +185,7 @@ public abstract class AbstractViewActionDelegate extends ActionDelegate implemen /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { update(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddEventBreakpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddEventBreakpointActionDelegate.java index 91eccdb25b7..c4637bfbfe5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddEventBreakpointActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddEventBreakpointActionDelegate.java @@ -36,6 +36,7 @@ public class AddEventBreakpointActionDelegate extends ActionDelegate implements /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { setView(view); } @@ -51,6 +52,7 @@ public class AddEventBreakpointActionDelegate extends ActionDelegate implements /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { AddEventBreakpointDialog dlg = new AddEventBreakpointDialog(CDebugUIPlugin.getActiveWorkbenchShell()); if (dlg.isActive() == false) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionEditorActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionEditorActionDelegate.java index 0b1c15b9b06..a2f9d8f46bd 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionEditorActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionEditorActionDelegate.java @@ -42,6 +42,7 @@ public class AddExpressionEditorActionDelegate extends ActionDelegate implements /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) */ + @Override public void setActiveEditor( IAction action, IEditorPart targetEditor ) { setEditorPart( targetEditor ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java index 134543ddc1a..3f68222e94f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java @@ -58,6 +58,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct super( parentShell, input, contentProvider, labelProvider, message ); } + @Override protected Control createDialogArea( Composite parent ) { Control da = super.createDialogArea( parent ); getViewer().setSorter( new ViewerSorter() ); @@ -80,6 +81,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.IViewActionDelegate#init(IViewPart) */ + @Override public void init( IViewPart view ) { fView = view; view.getSite().getPage().addPartListener( this ); @@ -91,6 +93,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.ISelectionListener#selectionChanged(IWorkbenchPart, ISelection) */ + @Override public void selectionChanged( IWorkbenchPart part, ISelection selection ) { if ( part != null && part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) ) { if ( selection instanceof IStructuredSelection ) { @@ -108,12 +111,14 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.IActionDelegate#run(IAction) */ + @Override public void run( IAction action ) { final IStructuredSelection selection = getSelection(); if ( selection == null || selection.size() != 1 ) return; BusyIndicator.showWhile( Display.getCurrent(), new Runnable() { + @Override public void run() { try { doAction( selection.getFirstElement() ); @@ -144,6 +149,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { setAction( action ); if ( getView() != null ) { @@ -162,6 +168,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.IPartListener#partActivated(IWorkbenchPart) */ + @Override public void partActivated( IWorkbenchPart part ) { } @@ -170,6 +177,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.IPartListener#partBroughtToTop(IWorkbenchPart) */ + @Override public void partBroughtToTop( IWorkbenchPart part ) { } @@ -178,6 +186,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.IPartListener#partClosed(IWorkbenchPart) */ + @Override public void partClosed( IWorkbenchPart part ) { if ( part.equals( getView() ) ) { dispose(); @@ -189,6 +198,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.IPartListener#partDeactivated(IWorkbenchPart) */ + @Override public void partDeactivated( IWorkbenchPart part ) { } @@ -197,6 +207,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.IPartListener#partOpened(IWorkbenchPart) */ + @Override public void partOpened( IWorkbenchPart part ) { } @@ -224,6 +235,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct return fSelection; } + @Override public void dispose() { if ( getView() != null ) { getView().getViewSite().getPage().removeSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, this ); @@ -242,17 +254,21 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct private SortedListSelectionDialog createDialog() { return new SortedListSelectionDialog( getView().getSite().getShell(), fGlobals, new IStructuredContentProvider() { + @Override public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) { } + @Override public void dispose() { } + @Override public Object[] getElements( Object parent ) { return getGlobals(); } }, new LabelProvider() { + @Override public String getText( Object element ) { if ( element instanceof IGlobalVariableDescriptor ) { String path = ""; //$NON-NLS-1$ @@ -313,6 +329,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct * * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init( IAction action ) { super.init( action ); Object element = DebugUITools.getDebugContext(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddRegisterGroupActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddRegisterGroupActionDelegate.java index 8cab43b6736..f673c7f09f8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddRegisterGroupActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddRegisterGroupActionDelegate.java @@ -27,6 +27,7 @@ public class AddRegisterGroupActionDelegate extends AbstractViewActionDelegate { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#getErrorDialogTitle() */ + @Override protected String getErrorDialogTitle() { return ActionMessages.getString( "AddRegisterGroupActionDelegate.0" ); //$NON-NLS-1$ } @@ -34,6 +35,7 @@ public class AddRegisterGroupActionDelegate extends AbstractViewActionDelegate { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#getErrorDialogMessage() */ + @Override protected String getErrorDialogMessage() { return ActionMessages.getString( "AddRegisterGroupActionDelegate.1" ); //$NON-NLS-1$ } @@ -41,6 +43,7 @@ public class AddRegisterGroupActionDelegate extends AbstractViewActionDelegate { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#doAction() */ + @Override protected void doAction() throws DebugException { RegisterGroupDialog dialog = new RegisterGroupDialog( getView().getSite().getShell(), getDebugTarget().getRegisterDescriptors() ); if ( dialog.open() == Window.OK ) { @@ -51,6 +54,7 @@ public class AddRegisterGroupActionDelegate extends AbstractViewActionDelegate { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#update() */ + @Override protected void update() { IAction action = getAction(); if ( action != null ) { @@ -62,12 +66,14 @@ public class AddRegisterGroupActionDelegate extends AbstractViewActionDelegate { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#doHandleDebugEvent(org.eclipse.debug.core.DebugEvent) */ + @Override protected void doHandleDebugEvent( DebugEvent event ) { } /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#init(org.eclipse.jface.action.IAction) */ + @Override public void init( IAction action ) { super.init( action ); Object element = DebugUITools.getDebugContext(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java index a66a6ad4393..2cdfb1f1aa7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointActionDelegate.java @@ -39,6 +39,7 @@ public class AddWatchpointActionDelegate extends ActionDelegate implements IView /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init( IViewPart view ) { setView( view ); } @@ -54,6 +55,7 @@ public class AddWatchpointActionDelegate extends ActionDelegate implements IView /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { AddWatchpointDialog dlg = new AddWatchpointDialog( CDebugUIPlugin.getActiveWorkbenchShell(), getMemorySpaceManagement() ); if ( dlg.open() == Window.OK ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java index 8851f4048a7..8d6bab94516 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java @@ -83,6 +83,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea( Composite parent ) { // The button bar will work better if we make the parent composite // a single column grid layout. For the widgets we add, we want a @@ -257,6 +258,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec fRangeField.setLayoutData( gridData ); fRangeField.setText( fRange ); fRangeField.addVerifyListener( new VerifyListener() { + @Override public void verifyText( VerifyEvent e ) { e.doit = verifyIntegerTextAddition( fRangeField.getText(), e.character ); } @@ -294,6 +296,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell( Shell newShell ) { super.configureShell( newShell ); @@ -304,6 +307,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { fExpression = fExpressionInput.getText().trim(); if ( fExpression.length() > 0 ) { @@ -321,6 +325,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec /* (non-Javadoc) * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) */ + @Override public void modifyText( ModifyEvent e ) { updateUI(); } @@ -328,6 +333,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TrayDialog#createButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createButtonBar( Composite parent ) { return super.createButtonBar( parent ); } @@ -352,6 +358,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec /* (non-Javadoc) * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetDefaultSelected( SelectionEvent e ) { // ignore } @@ -359,6 +366,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec /* (non-Javadoc) * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected( SelectionEvent e ) { updateUI(); } @@ -417,6 +425,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec fMemorySpace = memorySpace; } + @Override protected void createButtonsForButtonBar(Composite parent) { // override so we can change the initial okay enabled state createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnMemoryActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnMemoryActionDelegate.java index a0afdb1187e..c403a5e34ee 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnMemoryActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnMemoryActionDelegate.java @@ -47,6 +47,7 @@ public class AddWatchpointOnMemoryActionDelegate extends AddWatchpointActionDele /** * @see IActionDelegate#run(IAction) */ + @Override public void run(IAction action) { IStructuredSelection selection = getSelection(); @@ -119,6 +120,7 @@ public class AddWatchpointOnMemoryActionDelegate extends AddWatchpointActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) {} private IStructuredSelection getSelection() { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java index c78a083c8f2..131616fb9af 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java @@ -50,15 +50,18 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { fActivePart = targetPart; } private static class GetSizeRequest extends CRequest implements ICWatchpointTarget.GetSizeRequest { int fSize = -1; + @Override public int getSize() { return fSize; } + @Override public void setSize(int size) { fSize = size; } @@ -67,6 +70,7 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AddWatchpointActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fVar == null) { return; @@ -82,6 +86,7 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe // operation...or at least the API is (the CDI implementation reacts // synchronously) final ICWatchpointTarget.GetSizeRequest request = new GetSizeRequest() { + @Override public void done() { if (isSuccess()) { // Now that we have the size, put up a dialog to create the watchpoint @@ -123,9 +128,11 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe private class CanCreateWatchpointRequest extends CRequest implements ICWatchpointTarget.CanCreateWatchpointRequest { boolean fCanCreate; + @Override public boolean getCanCreate() { return fCanCreate; } + @Override public void setCanCreate(boolean value) { fCanCreate = value; } @@ -137,6 +144,7 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe * @see org.eclipse.ui.actions.ActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, * org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(final IAction action, ISelection selection) { fVar = null; if (selection == null || selection.isEmpty()) { @@ -148,6 +156,7 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe fVar = (ICWatchpointTarget)DebugPlugin.getAdapter(obj, ICWatchpointTarget.class); if (fVar != null) { final ICWatchpointTarget.CanCreateWatchpointRequest request = new CanCreateWatchpointRequest() { + @Override public void done() { action.setEnabled(getCanCreate()); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesHandler.java index 3035a3c9987..5dc43b5f299 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesHandler.java @@ -41,6 +41,7 @@ public class CBreakpointPropertiesHandler extends AbstractHandler { super(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchPart part = HandlerUtil.getActivePartChecked(event); ICBreakpoint bp = getBreakpoint(event.getApplicationContext()); @@ -53,17 +54,21 @@ public class CBreakpointPropertiesHandler extends AbstractHandler { PropertyDialogAction propertyAction = new PropertyDialogAction( part.getSite(), new ISelectionProvider() { - public void addSelectionChangedListener( ISelectionChangedListener listener ) { + @Override + public void addSelectionChangedListener( ISelectionChangedListener listener ) { } - public ISelection getSelection() { + @Override + public ISelection getSelection() { return new StructuredSelection( bpContext ); } - public void removeSelectionChangedListener( ISelectionChangedListener listener ) { + @Override + public void removeSelectionChangedListener( ISelectionChangedListener listener ) { } - public void setSelection( ISelection selection ) { + @Override + public void setSelection( ISelection selection ) { assert false; // Not supported } } ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java index 542d8233abc..1a82827cb9f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerAction.java @@ -46,20 +46,25 @@ public class CBreakpointPropertiesRulerAction extends AbstractBreakpointRulerAct /* (non-Javadoc) * @see Action#run() */ + @Override public void run() { if ( fContext != null ) { PropertyDialogAction action = new PropertyDialogAction( getTargetPart().getSite(), new ISelectionProvider() { + @Override public void addSelectionChangedListener( ISelectionChangedListener listener ) { } + @Override public ISelection getSelection() { return new StructuredSelection( fContext ); } + @Override public void removeSelectionChangedListener( ISelectionChangedListener listener ) { } + @Override public void setSelection( ISelection selection ) { } } ); @@ -71,6 +76,7 @@ public class CBreakpointPropertiesRulerAction extends AbstractBreakpointRulerAct /* (non-Javadoc) * @see IUpdate#update() */ + @Override public void update() { IBreakpoint breakpoint = getBreakpoint(); if (breakpoint instanceof ICBreakpoint) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerActionDelegate.java index 3bedd465647..30adad5629c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CBreakpointPropertiesRulerActionDelegate.java @@ -20,6 +20,7 @@ public class CBreakpointPropertiesRulerActionDelegate extends AbstractRulerActio /* (non-Javadoc) * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo) */ + @Override protected IAction createAction( ITextEditor editor, IVerticalRulerInfo rulerInfo ) { return new CBreakpointPropertiesRulerAction( editor, rulerInfo ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CanFormatObjectTester.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CanFormatObjectTester.java index eafc57d4489..e8fa5b431bd 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CanFormatObjectTester.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CanFormatObjectTester.java @@ -28,6 +28,7 @@ public class CanFormatObjectTester extends PropertyTester { } + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { if (property.equals("canFormatObject")) { //$NON-NLS-1$ if (receiver instanceof ICVariable) { return expectedValue == Boolean.TRUE; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionHandler.java index 278950ea01f..3264b4644d7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToArrayActionHandler.java @@ -96,6 +96,7 @@ public class CastToArrayActionHandler extends AbstractHandler { * * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell( Shell newShell ) { super.configureShell( newShell ); newShell.setText( ActionMessages.getString( "CastToArrayActionDelegate.0" ) ); //$NON-NLS-1$ @@ -107,6 +108,7 @@ public class CastToArrayActionHandler extends AbstractHandler { * * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar( Composite parent ) { // create OK and Cancel buttons by default fOkButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true ); @@ -129,6 +131,7 @@ public class CastToArrayActionHandler extends AbstractHandler { * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea( Composite parent ) { Composite composite = (Composite)super.createDialogArea( parent ); createDialogFields( composite ); @@ -147,6 +150,7 @@ public class CastToArrayActionHandler extends AbstractHandler { fFirstIndexText = ControlFactory.createTextField( composite ); fFirstIndexText.addModifyListener( new ModifyListener() { + @Override public void modifyText( ModifyEvent e ) { validateInput(); } @@ -156,6 +160,7 @@ public class CastToArrayActionHandler extends AbstractHandler { fLengthText = ControlFactory.createTextField( composite ); fLengthText.addModifyListener( new ModifyListener() { + @Override public void modifyText( ModifyEvent e ) { validateInput(); } @@ -209,6 +214,7 @@ public class CastToArrayActionHandler extends AbstractHandler { * * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) */ + @Override protected void buttonPressed( int buttonId ) { if ( buttonId == IDialogConstants.OK_ID ) { String firstIndex = fFirstIndexText.getText().trim(); @@ -239,6 +245,7 @@ public class CastToArrayActionHandler extends AbstractHandler { super(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { fTargetPart = HandlerUtil.getActivePartChecked(event); if ( getCastToArray() == null || getCastToArray().length == 0 ) @@ -246,6 +253,7 @@ public class CastToArrayActionHandler extends AbstractHandler { BusyIndicator.showWhile( Display.getCurrent(), new Runnable() { + @Override public void run() { try { doAction( getCastToArray() ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToTypeActionHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToTypeActionHandler.java index df9a1409c6e..f3b2341e1c3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToTypeActionHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CastToTypeActionHandler.java @@ -50,6 +50,7 @@ public class CastToTypeActionHandler extends AbstractHandler { public CastToTypeInputValidator() { } + @Override public String isValid( String newText ) { if ( newText.trim().length() == 0 ) { return ActionMessages.getString( "CastToTypeActionDelegate.0" ); //$NON-NLS-1$ @@ -72,6 +73,7 @@ public class CastToTypeActionHandler extends AbstractHandler { * * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell( Shell shell ) { super.configureShell( shell ); shell.setImage( CDebugImages.get( CDebugImages.IMG_LCL_CAST_TO_TYPE ) ); @@ -88,6 +90,7 @@ public class CastToTypeActionHandler extends AbstractHandler { super(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { fTargetPart = HandlerUtil.getActivePartChecked(event); @@ -96,6 +99,7 @@ public class CastToTypeActionHandler extends AbstractHandler { BusyIndicator.showWhile( Display.getCurrent(), new Runnable() { + @Override public void run() { try { doAction( getCastToType() ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CollapseAllModulesAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CollapseAllModulesAction.java index 8d7377c3098..622e833b8dc 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CollapseAllModulesAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CollapseAllModulesAction.java @@ -29,6 +29,7 @@ public class CollapseAllModulesAction extends ActionDelegate implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init( IViewPart view ) { Assert.isLegal( view instanceof IDebugView ); fView = (IDebugView)view; @@ -37,6 +38,7 @@ public class CollapseAllModulesAction extends ActionDelegate implements IViewAct /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { Viewer viewer = getView().getViewer(); if ( viewer instanceof TreeViewer ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ConfigureColumnsAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ConfigureColumnsAction.java index 984d76e82c9..b3be5d23528 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ConfigureColumnsAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ConfigureColumnsAction.java @@ -45,20 +45,23 @@ public class ConfigureColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ - public Object[] getElements( Object inputElement ) { + @Override + public Object[] getElements( Object inputElement ) { return ((IColumnPresentation)inputElement).getAvailableColumns(); } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) { + @Override + public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) { } } @@ -66,7 +69,8 @@ public class ConfigureColumnsAction extends Action implements IUpdate { private Map fImages = new HashMap(); - public Image getImage( Object element ) { + @Override + public Image getImage( Object element ) { ImageDescriptor imageDescriptor = fViewer.getColumnPresentation().getImageDescriptor( (String)element ); if ( imageDescriptor != null ) { Image image = (Image)fImages.get( imageDescriptor ); @@ -79,11 +83,13 @@ public class ConfigureColumnsAction extends Action implements IUpdate { return null; } - public String getText( Object element ) { + @Override + public String getText( Object element ) { return fViewer.getColumnPresentation().getHeader( (String)element ); } - public void dispose() { + @Override + public void dispose() { super.dispose(); Iterator iterator = fImages.values().iterator(); while( iterator.hasNext() ) { @@ -104,14 +110,16 @@ public class ConfigureColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ - public void update() { + @Override + public void update() { setEnabled( fViewer.isShowColumns() ); } /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ - public void run() { + @Override + public void run() { ListSelectionDialog dialog = new ListSelectionDialog( fViewer.getControl().getShell(), fViewer.getColumnPresentation(), new ColumnContentProvider(), new ColumnLabelProvider(), "Select the &columns to display:" ); PlatformUI.getWorkbench().getHelpSystem().setHelp( this, ICDebugHelpContextIds.CONFIGURE_COLUMNS_DIALOG ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/DisableVariablesActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/DisableVariablesActionDelegate.java index 8cf09bec14f..b73e7ace2a2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/DisableVariablesActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/DisableVariablesActionDelegate.java @@ -21,6 +21,7 @@ public class DisableVariablesActionDelegate extends EnableVariablesActionDelegat /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate#isEnableAction() */ + @Override protected boolean isEnableAction() { return false; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EditRegisterGroupActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EditRegisterGroupActionDelegate.java index b10252fcdb6..f1b27ff9ae7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EditRegisterGroupActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EditRegisterGroupActionDelegate.java @@ -34,12 +34,14 @@ public class EditRegisterGroupActionDelegate extends ActionDelegate implements I /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart( IAction action, IWorkbenchPart targetPart ) { } /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { if ( selection instanceof IStructuredSelection ) { IStructuredSelection ss = (IStructuredSelection)selection; @@ -59,6 +61,7 @@ public class EditRegisterGroupActionDelegate extends ActionDelegate implements I /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { IPersistableRegisterGroup group = getRegisterGroup(); IRegisterDescriptor[] all; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java index 27b81542b07..858d371b37b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java @@ -37,6 +37,7 @@ public class EnableDisableBreakpointRulerAction extends AbstractBreakpointRulerA /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { if ( fBreakpoint != null ) { try { @@ -53,6 +54,7 @@ public class EnableDisableBreakpointRulerAction extends AbstractBreakpointRulerA /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { fBreakpoint = getBreakpoint(); setEnabled( fBreakpoint != null ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerActionDelegate.java index 7ded3f47aac..de3df78eb7d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableDisableBreakpointRulerActionDelegate.java @@ -20,6 +20,7 @@ public class EnableDisableBreakpointRulerActionDelegate extends AbstractRulerAct /* * @see AbstractRulerActionDelegate#createAction(ITextEditor, IVerticalRulerInfo) */ + @Override protected IAction createAction( ITextEditor editor, IVerticalRulerInfo rulerInfo ) { return new EnableDisableBreakpointRulerAction( editor, rulerInfo ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java index dec761bb097..819c642ad98 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java @@ -64,6 +64,7 @@ public class EnableVariablesActionDelegate implements IViewActionDelegate { * * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init( IViewPart view ) { setView( view ); } @@ -73,6 +74,7 @@ public class EnableVariablesActionDelegate implements IViewActionDelegate { * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { IStructuredSelection selection = getSelection(); final int size = selection.size(); @@ -82,6 +84,7 @@ public class EnableVariablesActionDelegate implements IViewActionDelegate { final MultiStatus ms = new MultiStatus( CDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, ActionMessages.getString( "EnableVariablesActionDelegate.0" ), null ); //$NON-NLS-1$ BusyIndicator.showWhile( Display.getCurrent(), new Runnable() { + @Override public void run() { while( it.hasNext() ) { IEnableDisableTarget target = getEnableDisableTarget( it.next() ); @@ -111,6 +114,7 @@ public class EnableVariablesActionDelegate implements IViewActionDelegate { * * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { setAction( action ); if ( !(selection instanceof IStructuredSelection) ) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java index 24cde1cdc8b..2248cf98e06 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ExpressionDialog.java @@ -50,18 +50,21 @@ public class ExpressionDialog extends Dialog { fExpression = expression; } + @Override protected void configureShell( Shell shell ) { super.configureShell( shell ); shell.setText( ActionMessages.getString( "ExpressionDialog.0" ) ); //$NON-NLS-1$ shell.setImage( DebugUITools.getImage( IDebugUIConstants.IMG_OBJS_EXPRESSION ) ); } + @Override protected Control createContents( Composite parent ) { Control control = super.createContents( parent ); setOkButtonState(); return control; } + @Override protected Control createDialogArea( Composite parent ) { Composite composite = new Composite( parent, SWT.NONE ); composite.setLayout( new GridLayout() ); @@ -72,6 +75,7 @@ public class ExpressionDialog extends Dialog { return composite; } + @Override protected void createButtonsForButtonBar( Composite parent ) { fBtnOk = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true ); createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false ); @@ -112,6 +116,7 @@ public class ExpressionDialog extends Dialog { private void addModifyListener( Text text ) { text.addModifyListener( new ModifyListener() { + @Override public void modifyText( ModifyEvent e ) { setOkButtonState(); } @@ -127,6 +132,7 @@ public class ExpressionDialog extends Dialog { * * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { storeData(); super.okPressed(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/LoadModuleSymbolsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/LoadModuleSymbolsActionDelegate.java index 5ce4ee18a6b..148373788fe 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/LoadModuleSymbolsActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/LoadModuleSymbolsActionDelegate.java @@ -36,6 +36,7 @@ public class LoadModuleSymbolsActionDelegate extends ActionDelegate implements I /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart( IAction action, IWorkbenchPart targetPart ) { } @@ -50,12 +51,14 @@ public class LoadModuleSymbolsActionDelegate extends ActionDelegate implements I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { final ICModule module = getModule(); if ( module != null ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { try { doAction( module ); @@ -75,6 +78,7 @@ public class LoadModuleSymbolsActionDelegate extends ActionDelegate implements I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { if ( selection instanceof IStructuredSelection ) { if ( ((IStructuredSelection)selection).size() == 1 ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/LoadSymbolsForAllActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/LoadSymbolsForAllActionDelegate.java index b50c106a2f5..82e2034c781 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/LoadSymbolsForAllActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/LoadSymbolsForAllActionDelegate.java @@ -32,6 +32,7 @@ public class LoadSymbolsForAllActionDelegate extends AbstractViewActionDelegate /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#getErrorDialogTitle() */ + @Override protected String getErrorDialogTitle() { return ActionMessages.getString( "LoadSymbolsForAllActionDelegate.Error_1" ); //$NON-NLS-1$ } @@ -39,6 +40,7 @@ public class LoadSymbolsForAllActionDelegate extends AbstractViewActionDelegate /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#getErrorDialogMessage() */ + @Override protected String getErrorDialogMessage() { return ActionMessages.getString( "LoadSymbolsForAllActionDelegate.Error(s)_occurred_loading_the_symbols_1" ); //$NON-NLS-1$ } @@ -46,6 +48,7 @@ public class LoadSymbolsForAllActionDelegate extends AbstractViewActionDelegate /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#doAction() */ + @Override protected void doAction() throws DebugException { ICDebugTarget target = getDebugTarget( getView().getViewer().getInput() ); if ( target != null ) { @@ -54,6 +57,7 @@ public class LoadSymbolsForAllActionDelegate extends AbstractViewActionDelegate DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { try { mr.loadSymbolsForAllModules(); @@ -70,6 +74,7 @@ public class LoadSymbolsForAllActionDelegate extends AbstractViewActionDelegate /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#update() */ + @Override protected void update() { IAction action = getAction(); if ( getView() != null && getView().getViewer() != null && action != null ) { @@ -81,6 +86,7 @@ public class LoadSymbolsForAllActionDelegate extends AbstractViewActionDelegate /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#doHandleDebugEvent(org.eclipse.debug.core.DebugEvent) */ + @Override protected void doHandleDebugEvent( DebugEvent event ) { } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ModulesPropertiesActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ModulesPropertiesActionDelegate.java index daec7a180df..1541f27d239 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ModulesPropertiesActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ModulesPropertiesActionDelegate.java @@ -49,6 +49,7 @@ public class ModulesPropertiesActionDelegate extends ActionDelegate implements I /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart( IAction action, IWorkbenchPart targetPart ) { fTargetPart = targetPart; } @@ -56,19 +57,24 @@ public class ModulesPropertiesActionDelegate extends ActionDelegate implements I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { PropertyDialogAction propertyAction = new PropertyDialogAction( getActivePart().getSite(), new ISelectionProvider() { + @Override public void addSelectionChangedListener( ISelectionChangedListener listener ) { } + @Override public ISelection getSelection() { return new StructuredSelection( getModule() ); } + @Override public void removeSelectionChangedListener( ISelectionChangedListener listener ) { } + @Override public void setSelection( ISelection selection ) { } } ); @@ -78,6 +84,7 @@ public class ModulesPropertiesActionDelegate extends ActionDelegate implements I /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { if ( selection instanceof IStructuredSelection ) { Object element = ((IStructuredSelection)selection).getFirstElement(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MoveToLineActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MoveToLineActionDelegate.java index 17bab32640c..213dd7f1caa 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MoveToLineActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MoveToLineActionDelegate.java @@ -64,6 +64,7 @@ public class MoveToLineActionDelegate implements IEditorActionDelegate, IActionD update(); } + @Override public void debugContextChanged(DebugContextEvent event) { contextActivated(event.getContext()); } @@ -73,6 +74,7 @@ public class MoveToLineActionDelegate implements IEditorActionDelegate, IActionD /*(non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { DebugUITools.getDebugContextManager().getContextService(fActivePart.getSite().getWorkbenchWindow()).removeDebugContextListener(fContextListener); fActivePart = null; @@ -82,6 +84,7 @@ public class MoveToLineActionDelegate implements IEditorActionDelegate, IActionD /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fPartTarget != null && fTargetElement != null) { try { @@ -94,6 +97,7 @@ public class MoveToLineActionDelegate implements IEditorActionDelegate, IActionD /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { this.fAction = action; update(); @@ -107,6 +111,7 @@ public class MoveToLineActionDelegate implements IEditorActionDelegate, IActionD return; } Runnable r = new Runnable() { + @Override public void run() { boolean enabled = false; if (fPartTarget != null && fTargetElement != null) { @@ -128,18 +133,21 @@ public class MoveToLineActionDelegate implements IEditorActionDelegate, IActionD /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { this.fAction = action; } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) */ + @Override public void setActiveEditor(IAction action, IEditorPart targetEditor) { init(action); bindTo(targetEditor); @@ -148,6 +156,7 @@ public class MoveToLineActionDelegate implements IEditorActionDelegate, IActionD /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { bindTo(view); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MoveToLineAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MoveToLineAdapter.java index 04a8af63761..98fe0c88f2b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MoveToLineAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MoveToLineAdapter.java @@ -48,6 +48,7 @@ public class MoveToLineAdapter implements IMoveToLineTarget { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.IMoveToLineTarget#moveToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume) */ + @Override public void moveToLine( IWorkbenchPart part, ISelection selection, ISuspendResume target ) throws CoreException { String errorMessage = null; if ( part instanceof ITextEditor ) { @@ -75,6 +76,7 @@ public class MoveToLineAdapter implements IMoveToLineTarget { final IMoveToLine moveToLine = (IMoveToLine)((IAdaptable)target).getAdapter( IMoveToLine.class ); if ( moveToLine != null && moveToLine.canMoveToLine( path.toPortableString(), lineNumber ) ) { Runnable r = new Runnable() { + @Override public void run() { try { moveToLine.moveToLine(path.toPortableString(), lineNumber ); @@ -100,6 +102,7 @@ public class MoveToLineAdapter implements IMoveToLineTarget { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.IMoveToLineTarget#canMoveToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume) */ + @Override public boolean canMoveToLine( IWorkbenchPart part, ISelection selection, ISuspendResume target ) { if ( target instanceof IAdaptable ) { if ( part instanceof IEditorPart ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/NumberFormatsContribution.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/NumberFormatsContribution.java index e56506918d4..36b018bc6ce 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/NumberFormatsContribution.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/NumberFormatsContribution.java @@ -113,6 +113,7 @@ public class NumberFormatsContribution extends CompoundContributionItem implemen return items; } + @Override public void initialize(IServiceLocator serviceLocator) { fServiceLocator = serviceLocator; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/OpenNewViewActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/OpenNewViewActionDelegate.java index 49d651fe840..a06155ab6a6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/OpenNewViewActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/OpenNewViewActionDelegate.java @@ -33,6 +33,7 @@ public class OpenNewViewActionDelegate implements IViewActionDelegate { * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IViewSite site = fView.getViewSite(); String viewId = site.getId(); @@ -66,6 +67,7 @@ public class OpenNewViewActionDelegate implements IViewActionDelegate { * (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { } @@ -73,6 +75,7 @@ public class OpenNewViewActionDelegate implements IViewActionDelegate { * (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fView = view; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/PinDebugContextActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/PinDebugContextActionDelegate.java index 1af96dc6ba8..fbc1a5fde76 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/PinDebugContextActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/PinDebugContextActionDelegate.java @@ -58,6 +58,7 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -65,6 +66,7 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (action.isChecked()) { fProvider = DebugEventFilterService.getInstance().addDebugEventFilter(fPart, getActiveDebugContext()); @@ -85,12 +87,14 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; } @@ -98,6 +102,7 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fPart = view; @@ -108,6 +113,7 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi } fPart.addPropertyListener(new IPropertyListener() { + @Override public void propertyChanged(Object source, int propId) { if (IWorkbenchPartConstants.PROP_CONTENT_DESCRIPTION == propId) { // if the content description is not the pinned context label, @@ -133,7 +139,9 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi // in our case, we don't want this behavior. // Listens to part close and set the check state off. fPartListener = new IPartListener2() { + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) {} + @Override public void partClosed(IWorkbenchPartReference partRef) { IWorkbenchPart part = partRef.getPart(false); if (part.equals(fPart)) { @@ -143,11 +151,17 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi } } } + @Override public void partDeactivated(IWorkbenchPartReference partRef) {} + @Override public void partOpened(IWorkbenchPartReference partRef) {} + @Override public void partHidden(IWorkbenchPartReference partRef) {} + @Override public void partVisible(IWorkbenchPartReference partRef) {} + @Override public void partInputChanged(IWorkbenchPartReference partRef) {} + @Override public void partActivated(IWorkbenchPartReference partRef) {} }; fPart.getSite().getWorkbenchWindow().getPartService().addPartListener(fPartListener); @@ -156,6 +170,7 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { DebugUITools.removePartDebugContextListener(fPart.getSite(), this); fPart.getSite().getWorkbenchWindow().getPartService().removePartListener(fPartListener); @@ -268,11 +283,13 @@ public class PinDebugContextActionDelegate implements IViewActionDelegate, IActi /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextListener#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { if (fAction != null && !fAction.isChecked()) { final boolean pinnable = PinCloneUtils.isPinnable(fPart, event.getContext()); if (pinnable != fAction.isEnabled()) { PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + @Override public void run() { fAction.setEnabled(pinnable); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java index 991a12607ba..dff545f0d1a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RegisterGroupDialog.java @@ -46,6 +46,7 @@ public class RegisterGroupDialog extends TitleAreaDialog { public class RegisterLabelProvider extends LabelProvider { + @Override public Image getImage( Object element ) { if ( element instanceof IRegisterDescriptor ) { return CDebugImages.get( CDebugImages.IMG_OBJS_REGISTER ); @@ -53,6 +54,7 @@ public class RegisterGroupDialog extends TitleAreaDialog { return super.getImage( element ); } + @Override public String getText( Object element ) { if ( element instanceof IRegisterDescriptor ) { IRegisterDescriptor rd = (IRegisterDescriptor)element; @@ -80,17 +82,20 @@ public class RegisterGroupDialog extends TitleAreaDialog { fNameField.setLabelText( ActionMessages.getString( "RegisterGroupDialog.3" ) ); //$NON-NLS-1$ fNameField.setTextWithoutUpdate( groupName ); fNameField.setDialogFieldListener( new IDialogFieldListener() { + @Override public void dialogFieldChanged( DialogField field ) { update(); } } ); fListField = new CheckedListDialogField( new IListAdapter() { + @Override public void customButtonPressed( DialogField field, int index ) { // TODO Auto-generated method stub } + @Override public void selectionChanged( DialogField field ) { // TODO Auto-generated method stub @@ -106,6 +111,7 @@ public class RegisterGroupDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea( Composite parent ) { getShell().setText( ActionMessages.getString( "RegisterGroupDialog.5" ) ); //$NON-NLS-1$ setTitle( ActionMessages.getString( "RegisterGroupDialog.6" ) ); //$NON-NLS-1$ @@ -144,6 +150,7 @@ public class RegisterGroupDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { super.okPressed(); fName = fNameField.getText().trim(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveAllGlobalsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveAllGlobalsActionDelegate.java index 73632f5f44f..78d94000c11 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveAllGlobalsActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveAllGlobalsActionDelegate.java @@ -35,6 +35,7 @@ public class RemoveAllGlobalsActionDelegate extends ActionDelegate implements IV /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init( IViewPart view ) { DebugPlugin.getDefault().addDebugEventListener(this); } @@ -43,6 +44,7 @@ public class RemoveAllGlobalsActionDelegate extends ActionDelegate implements IV * (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#init(org.eclipse.jface.action.IAction) */ + @Override public void init( IAction action ) { DebugPlugin.getDefault().addDebugEventListener(this); fAction = action; @@ -52,6 +54,7 @@ public class RemoveAllGlobalsActionDelegate extends ActionDelegate implements IV * (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { update(); } @@ -60,6 +63,7 @@ public class RemoveAllGlobalsActionDelegate extends ActionDelegate implements IV * (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#dispose() */ + @Override public void dispose() { DebugPlugin.getDefault().removeDebugEventListener(this); fAction = null; @@ -68,6 +72,7 @@ public class RemoveAllGlobalsActionDelegate extends ActionDelegate implements IV /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { IAdaptable context = DebugUITools.getDebugContext(); if ( context instanceof IDebugElement ) { @@ -75,6 +80,7 @@ public class RemoveAllGlobalsActionDelegate extends ActionDelegate implements IV if ( gvm != null ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { gvm.removeAllGlobals(); } @@ -110,6 +116,7 @@ public class RemoveAllGlobalsActionDelegate extends ActionDelegate implements IV * (non-Javadoc) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ + @Override public void handleDebugEvents( DebugEvent[] events ) { // The ICGlobalVariableManager will fire a target content-changed // event when a global is added or removed. Update the enable/disable diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveGlobalsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveGlobalsActionDelegate.java index dbfd833b772..bbf5cb56b64 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveGlobalsActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveGlobalsActionDelegate.java @@ -34,12 +34,14 @@ public class RemoveGlobalsActionDelegate extends ActionDelegate implements IView /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init( IViewPart view ) { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init( IAction action ) { setAction( action ); update(); @@ -48,6 +50,7 @@ public class RemoveGlobalsActionDelegate extends ActionDelegate implements IView /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { ISelection selection = getSelection(); if ( !(selection instanceof IStructuredSelection) ) @@ -67,6 +70,7 @@ public class RemoveGlobalsActionDelegate extends ActionDelegate implements IView if ( gvm == null ) return; Runnable r = new Runnable() { + @Override public void run() { gvm.removeGlobals( globals ); } @@ -79,6 +83,7 @@ public class RemoveGlobalsActionDelegate extends ActionDelegate implements IView * * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { setSelection( selection ); update(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveRegisterGroupActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveRegisterGroupActionDelegate.java index 62c45d1f803..f35bddb93fa 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveRegisterGroupActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RemoveRegisterGroupActionDelegate.java @@ -40,12 +40,14 @@ public class RemoveRegisterGroupActionDelegate extends ActionDelegate implements /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart( IAction action, IWorkbenchPart targetPart ) { } /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { ArrayList list = new ArrayList(); if ( selection instanceof IStructuredSelection ) { @@ -72,6 +74,7 @@ public class RemoveRegisterGroupActionDelegate extends ActionDelegate implements /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { IRegisterGroup[] groups = getRegisterGroups(); if ( groups.length > 0 ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestoreDefaultRegisterGroupsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestoreDefaultRegisterGroupsActionDelegate.java index 2248b64db8f..62dd536590d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestoreDefaultRegisterGroupsActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestoreDefaultRegisterGroupsActionDelegate.java @@ -21,18 +21,22 @@ import org.eclipse.jface.viewers.StructuredSelection; public class RestoreDefaultRegisterGroupsActionDelegate extends AbstractViewActionDelegate { + @Override protected String getErrorDialogTitle() { return ActionMessages.getString( "RestoreDefaultRegisterGroupsActionDelegate.0" ); //$NON-NLS-1$ } + @Override protected String getErrorDialogMessage() { return ActionMessages.getString( "RestoreDefaultRegisterGroupsActionDelegate.1" ); //$NON-NLS-1$ } + @Override protected void doAction() throws DebugException { getDebugTarget().restoreDefaultRegisterGroups(); } + @Override protected void update() { IAction action = getAction(); if ( action != null ) { @@ -41,6 +45,7 @@ public class RestoreDefaultRegisterGroupsActionDelegate extends AbstractViewActi } } + @Override protected void doHandleDebugEvent( DebugEvent event ) { } @@ -55,6 +60,7 @@ public class RestoreDefaultRegisterGroupsActionDelegate extends AbstractViewActi /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractViewActionDelegate#init(org.eclipse.jface.action.IAction) */ + @Override public void init( IAction action ) { super.init( action ); Object element = DebugUITools.getDebugContext(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestoreDefaultTypeActionHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestoreDefaultTypeActionHandler.java index 20e33687ee8..fa69d9576b4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestoreDefaultTypeActionHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RestoreDefaultTypeActionHandler.java @@ -47,12 +47,14 @@ public class RestoreDefaultTypeActionHandler extends AbstractHandler { fCastableItems = castableItems; } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { if ( getCastToType() == null || getCastToType().length == 0 ) return null; BusyIndicator.showWhile( Display.getCurrent(), new Runnable() { + @Override public void run() { try { doAction( getCastToType() ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineActionDelegate.java index cd06a23cdcc..1591f55db7c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineActionDelegate.java @@ -64,6 +64,7 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IActio update(); } + @Override public void debugContextChanged(DebugContextEvent event) { contextActivated(event.getContext()); } @@ -73,6 +74,7 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IActio /*(non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { DebugUITools.getDebugContextManager().getContextService(fActivePart.getSite().getWorkbenchWindow()).removeDebugContextListener(fContextListener); fActivePart = null; @@ -82,6 +84,7 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IActio /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fPartTarget != null && fTargetElement != null) { try { @@ -94,6 +97,7 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IActio /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { this.fAction = action; update(); @@ -107,6 +111,7 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IActio return; } Runnable r = new Runnable() { + @Override public void run() { boolean enabled = false; if (fPartTarget != null && fTargetElement != null) { @@ -128,18 +133,21 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IActio /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { this.fAction = action; } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) */ + @Override public void setActiveEditor(IAction action, IEditorPart targetEditor) { init(action); bindTo(targetEditor); @@ -148,6 +156,7 @@ public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IActio /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { bindTo(view); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java index 0a41a1ba817..7503f8fe846 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java @@ -48,6 +48,7 @@ public class ResumeAtLineAdapter implements IResumeAtLineTarget { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.IResumeAtLineTarget#resumeAtLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume) */ + @Override public void resumeAtLine( IWorkbenchPart part, ISelection selection, ISuspendResume target ) throws CoreException { String errorMessage = null; if ( part instanceof ITextEditor ) { @@ -74,6 +75,7 @@ public class ResumeAtLineAdapter implements IResumeAtLineTarget { final IResumeAtLine resumeAtLine = (IResumeAtLine)((IAdaptable)target).getAdapter( IResumeAtLine.class ); if ( resumeAtLine != null && resumeAtLine.canResumeAtLine( path.toPortableString(), lineNumber ) ) { Runnable r = new Runnable() { + @Override public void run() { try { resumeAtLine.resumeAtLine( path.toPortableString(), lineNumber ); @@ -99,6 +101,7 @@ public class ResumeAtLineAdapter implements IResumeAtLineTarget { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.IResumeAtLineTarget#canResumeAtLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume) */ + @Override public boolean canResumeAtLine( IWorkbenchPart part, ISelection selection, ISuspendResume target ) { if ( target instanceof IAdaptable ) { if ( part instanceof IEditorPart ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetAction.java index a133137362c..1bbe1882f9a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetAction.java @@ -50,6 +50,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelection#isEmpty() */ + @Override public boolean isEmpty() { return true; } @@ -79,6 +80,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { fWindow.getPartService().removePartListener(this); fActivePart = null; @@ -88,6 +90,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { this.fWindow = window; IPartService partService = window.getPartService(); @@ -100,6 +103,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (fTargetAdapter != null) { try { @@ -137,6 +141,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { // if the active part did not provide an adapter, see if the selection does if (fTargetAdapter == null && selection instanceof IStructuredSelection) { @@ -158,6 +163,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partActivated(IWorkbenchPart part) { fActivePart = part; IResource resource = (IResource) part.getAdapter(IResource.class); @@ -196,11 +202,13 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partBroughtToTop(IWorkbenchPart part) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partClosed(IWorkbenchPart part) { clearPart(part); } @@ -220,12 +228,14 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partDeactivated(IWorkbenchPart part) { clearPart(part); } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart) */ + @Override public void partOpened(IWorkbenchPart part) { } @@ -256,6 +266,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; } @@ -263,6 +274,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetMoveToLineAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetMoveToLineAction.java index d477b609a05..3b6ba5b424f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetMoveToLineAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetMoveToLineAction.java @@ -49,6 +49,7 @@ public class RetargetMoveToLineAction extends RetargetAction { } } + @Override public void debugContextChanged(DebugContextEvent event) { contextActivated(event.getContext()); } @@ -57,6 +58,7 @@ public class RetargetMoveToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { DebugUITools.getDebugContextManager().getContextService(fWindow).removeDebugContextListener(fContextListener); super.dispose(); @@ -64,6 +66,7 @@ public class RetargetMoveToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { super.init(window); IDebugContextService service = DebugUITools.getDebugContextManager().getContextService(window); @@ -75,6 +78,7 @@ public class RetargetMoveToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#canPerformAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected boolean canPerformAction(Object target, ISelection selection, IWorkbenchPart part) { return fTargetElement != null && ((IMoveToLineTarget)target).canMoveToLine(part, selection, fTargetElement); @@ -83,12 +87,14 @@ public class RetargetMoveToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getAdapterClass() */ + @Override protected Class getAdapterClass() { return IMoveToLineTarget.class; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#performAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected void performAction(Object target, ISelection selection, IWorkbenchPart part) throws CoreException { ((IMoveToLineTarget)target).moveToLine(part, selection, fTargetElement); } @@ -96,6 +102,7 @@ public class RetargetMoveToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getOperationUnavailableMessage() */ + @Override protected String getOperationUnavailableMessage() { return ActionMessages.getString("RetargetMoveToLineAction.0"); //$NON-NLS-1$ } @@ -103,6 +110,7 @@ public class RetargetMoveToLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (fTargetElement == null) { action.setEnabled(false); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetResumeAtLineAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetResumeAtLineAction.java index b8554f84278..651f12ae750 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetResumeAtLineAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargetResumeAtLineAction.java @@ -49,6 +49,7 @@ public class RetargetResumeAtLineAction extends RetargetAction { } } + @Override public void debugContextChanged(DebugContextEvent event) { contextActivated(event.getContext()); } @@ -57,6 +58,7 @@ public class RetargetResumeAtLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { DebugUITools.getDebugContextManager().getContextService(fWindow).removeDebugContextListener(fContextListener); super.dispose(); @@ -64,6 +66,7 @@ public class RetargetResumeAtLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { super.init(window); IDebugContextService service = DebugUITools.getDebugContextManager().getContextService(window); @@ -75,6 +78,7 @@ public class RetargetResumeAtLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#canPerformAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected boolean canPerformAction(Object target, ISelection selection, IWorkbenchPart part) { return fTargetElement != null && ((IResumeAtLineTarget)target).canResumeAtLine(part, selection, fTargetElement); @@ -83,12 +87,14 @@ public class RetargetResumeAtLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getAdapterClass() */ + @Override protected Class getAdapterClass() { return IResumeAtLineTarget.class; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#performAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart) */ + @Override protected void performAction(Object target, ISelection selection, IWorkbenchPart part) throws CoreException { ((IResumeAtLineTarget)target).resumeAtLine(part, selection, fTargetElement); } @@ -96,6 +102,7 @@ public class RetargetResumeAtLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.actions.RetargetAction#getOperationUnavailableMessage() */ + @Override protected String getOperationUnavailableMessage() { return ActionMessages.getString("RetargetResumeAtLineAction.0"); //$NON-NLS-1$ } @@ -103,6 +110,7 @@ public class RetargetResumeAtLineAction extends RetargetAction { /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (fTargetElement == null) { action.setEnabled(false); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargettableActionAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargettableActionAdapterFactory.java index d7d2a6322d5..a9e0f17cdaf 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargettableActionAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RetargettableActionAdapterFactory.java @@ -25,6 +25,7 @@ public class RetargettableActionAdapterFactory 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 ( adapterType == IRunToLineTarget.class ) { @@ -45,6 +46,7 @@ public class RetargettableActionAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override @SuppressWarnings("rawtypes") public Class[] getAdapterList() { return new Class[]{ IRunToLineTarget.class, diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java index 49e589e9934..a9ca8aa26b4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java @@ -51,6 +51,7 @@ public class RunToLineAdapter implements IRunToLineTarget { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IRunToLineTarget#runToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume) */ + @Override public void runToLine( IWorkbenchPart part, ISelection selection, ISuspendResume target ) throws CoreException { String errorMessage = null; if ( part instanceof ITextEditor ) { @@ -78,6 +79,7 @@ public class RunToLineAdapter implements IRunToLineTarget { if ( runToLine != null && runToLine.canRunToLine( path.toPortableString(), lineNumber ) ) { Runnable r = new Runnable() { + @Override public void run() { try { runToLine.runToLine( path.toPortableString(), lineNumber, DebugUITools.getPreferenceStore().getBoolean( IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE ) ); @@ -103,6 +105,7 @@ public class RunToLineAdapter implements IRunToLineTarget { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IRunToLineTarget#canRunToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume) */ + @Override public boolean canRunToLine( IWorkbenchPart part, ISelection selection, ISuspendResume target ) { if ( target instanceof IAdaptable ) { if ( part instanceof IEditorPart ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ShowFullPathsAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ShowFullPathsAction.java index 5f8a8d328ed..6c933ffca9a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ShowFullPathsAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ShowFullPathsAction.java @@ -41,6 +41,7 @@ public class ShowFullPathsAction extends ViewFilterAction { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.actions.ViewFilterAction#getPreferenceKey() */ + @Override protected String getPreferenceKey() { return ICDebugInternalConstants.SHOW_FULL_PATHS_PREF_KEY; } @@ -48,6 +49,7 @@ public class ShowFullPathsAction extends ViewFilterAction { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select( Viewer viewer, Object parentElement, Object element ) { return true; } @@ -65,6 +67,7 @@ public class ShowFullPathsAction extends ViewFilterAction { pres.setAttribute( CDebugModelPresentation.DISPLAY_FULL_PATHS, Boolean.valueOf( getValue() ) ); BusyIndicator.showWhile( viewer.getControl().getDisplay(), new Runnable() { + @Override public void run() { String key = getView().getSite().getId() + "." + getPreferenceKey(); //$NON-NLS-1$ getPreferenceStore().setValue( key, getValue() ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalActionDelegate.java index 62beb967d5c..75a1b4ad3b7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalActionDelegate.java @@ -36,6 +36,7 @@ public class SignalActionDelegate extends ActionDelegate implements IObjectActio * * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart) */ + @Override public void setActivePart( IAction action, IWorkbenchPart targetPart ) { } @@ -44,11 +45,13 @@ public class SignalActionDelegate extends ActionDelegate implements IObjectActio * * @see org.eclipse.ui.IActionDelegate#run(IAction) */ + @Override public void run( IAction action ) { if ( getSignal() != null ) { final MultiStatus ms = new MultiStatus( CDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, ActionMessages.getString( "SignalActionDelegate.0" ), null ); //$NON-NLS-1$ BusyIndicator.showWhile( Display.getCurrent(), new Runnable() { + @Override public void run() { try { doAction( getSignal() ); @@ -75,6 +78,7 @@ public class SignalActionDelegate extends ActionDelegate implements IObjectActio * * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { if ( selection instanceof IStructuredSelection ) { Object element = ((IStructuredSelection)selection).getFirstElement(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalPropertiesActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalPropertiesActionDelegate.java index 9e57e43d59f..a9532e59051 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalPropertiesActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/SignalPropertiesActionDelegate.java @@ -43,6 +43,7 @@ public class SignalPropertiesActionDelegate extends ActionDelegate implements IO /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart( IAction action, IWorkbenchPart targetPart ) { fTargetPart = targetPart; } @@ -50,6 +51,7 @@ public class SignalPropertiesActionDelegate extends ActionDelegate implements IO /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IAction action, ISelection selection ) { if ( selection instanceof IStructuredSelection ) { Object element = ((IStructuredSelection)selection).getFirstElement(); @@ -74,19 +76,24 @@ public class SignalPropertiesActionDelegate extends ActionDelegate implements IO /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run( IAction action ) { PropertyDialogAction propertyAction = new PropertyDialogAction( getActivePart().getSite(), new ISelectionProvider() { + @Override public void addSelectionChangedListener( ISelectionChangedListener listener ) { } + @Override public ISelection getSelection() { return new StructuredSelection( getSignal() ); } + @Override public void removeSelectionChangedListener( ISelectionChangedListener listener ) { } + @Override public void setSelection( ISelection selection ) { } } ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCBreakpointsTargetFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCBreakpointsTargetFactory.java index 8b45b869a01..d394abe0a3a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCBreakpointsTargetFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCBreakpointsTargetFactory.java @@ -41,14 +41,16 @@ public class ToggleCBreakpointsTargetFactory implements IToggleBreakpointsTarget private ToggleBreakpointAdapter fCToggleBreakpointTarget = new ToggleBreakpointAdapter(); - public IToggleBreakpointsTarget createToggleTarget(String targetID) { + @Override + public IToggleBreakpointsTarget createToggleTarget(String targetID) { if (TOGGLE_C_BREAKPOINT_TARGET_ID.equals(targetID)) { return fCToggleBreakpointTarget; } return null; } - public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) { + @Override + public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) { // Return the debug context as a default if the currently selected context // is a CDT element. Otherwise return null. Object element = getDebugContext(part).getFirstElement(); @@ -73,15 +75,18 @@ public class ToggleCBreakpointsTargetFactory implements IToggleBreakpointsTarget return null; } - public String getToggleTargetDescription(String targetID) { + @Override + public String getToggleTargetDescription(String targetID) { return ActionMessages.getString("ToggleCBreakpointsTargetFactory.CBreakpointDescription"); //$NON-NLS-1$ } - public String getToggleTargetName(String targetID) { + @Override + public String getToggleTargetName(String targetID) { return ActionMessages.getString("ToggleCBreakpointsTargetFactory.CBreakpointName"); //$NON-NLS-1$ } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public Set getToggleTargets(IWorkbenchPart part, ISelection selection) { return TOGGLE_TARGET_IDS; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCTracepointsTargetFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCTracepointsTargetFactory.java index 9e5822c157a..75789e586b7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCTracepointsTargetFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCTracepointsTargetFactory.java @@ -36,32 +36,37 @@ public class ToggleCTracepointsTargetFactory implements IToggleBreakpointsTarget private ToggleTracepointAdapter fCToggleTracepointTarget = new ToggleTracepointAdapter(); - public IToggleBreakpointsTarget createToggleTarget(String targetID) { + @Override + public IToggleBreakpointsTarget createToggleTarget(String targetID) { if (TOGGLE_C_TRACEPOINT_TARGET_ID.equals(targetID)) { return fCToggleTracepointTarget; } return null; } - public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) { + @Override + public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) { return null; } - public String getToggleTargetDescription(String targetID) { + @Override + public String getToggleTargetDescription(String targetID) { if (TOGGLE_C_TRACEPOINT_TARGET_ID.equals(targetID)) { return ActionMessages.getString("ToggleCBreakpointsTargetFactory.CTracepointDescription"); //$NON-NLS-1$ } return null; } - public String getToggleTargetName(String targetID) { + @Override + public String getToggleTargetName(String targetID) { if (TOGGLE_C_TRACEPOINT_TARGET_ID.equals(targetID)) { return ActionMessages.getString("ToggleCBreakpointsTargetFactory.CTracepointName"); //$NON-NLS-1$ } return null; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public Set getToggleTargets(IWorkbenchPart part, ISelection selection) { return TOGGLE_TARGET_IDS; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleInstructionStepModeActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleInstructionStepModeActionDelegate.java index 4f86b027b72..c7cb99c91ba 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleInstructionStepModeActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleInstructionStepModeActionDelegate.java @@ -46,6 +46,7 @@ public class ToggleInstructionStepModeActionDelegate extends ActionDelegate impl /* (non-Javadoc) * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent) */ + @Override public void propertyChange( PropertyChangeEvent event ) { IAction action = getAction(); if ( action != null ) { @@ -60,6 +61,7 @@ public class ToggleInstructionStepModeActionDelegate extends ActionDelegate impl /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init( IViewPart view ) { fView = view; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleShowColumnsAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleShowColumnsAction.java index 62828a745a7..b0b57142df3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleShowColumnsAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleShowColumnsAction.java @@ -42,12 +42,14 @@ public class ToggleShowColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ - public void run() { + @Override + public void run() { if ( fViewer.getControl().isDisposed() ) { return; } BusyIndicator.showWhile( fViewer.getControl().getDisplay(), new Runnable() { - public void run() { + @Override + public void run() { fViewer.setShowColumns( isChecked() ); } } ); @@ -56,7 +58,8 @@ public class ToggleShowColumnsAction extends Action implements IUpdate { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ - public void update() { + @Override + public void update() { setEnabled( fViewer.canToggleColumns() ); setChecked( fViewer.isShowColumns() ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java index cfe6089621d..8a9182aac30 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java @@ -50,17 +50,20 @@ public class VariableFormatActionDelegate implements IObjectActionDelegate { /** * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart) */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { } /** * @see org.eclipse.ui.IActionDelegate#run(IAction) */ + @Override public void run(IAction action) { ICVariable[] vars = getVariables(); if (vars != null && vars.length > 0) { final MultiStatus ms = new MultiStatus(CDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, "", null); //$NON-NLS-1$ BusyIndicator.showWhile(Display.getCurrent(), new Runnable() { + @Override public void run() { try { doAction(getVariables()); @@ -83,6 +86,7 @@ public class VariableFormatActionDelegate implements IObjectActionDelegate { /** * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { if (selection instanceof IStructuredSelection) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ViewFilterAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ViewFilterAction.java index 7cc12f5e3f1..90900895df8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ViewFilterAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ViewFilterAction.java @@ -48,6 +48,7 @@ public abstract class ViewFilterAction extends ViewerFilter implements IViewActi /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { fView = view; fAction.setChecked(getPreferenceValue(view)); @@ -57,6 +58,7 @@ public abstract class ViewFilterAction extends ViewerFilter implements IViewActi /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) */ + @Override public void init(IAction action) { fAction = action; } @@ -64,12 +66,14 @@ public abstract class ViewFilterAction extends ViewerFilter implements IViewActi /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#dispose() */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { run(action); } @@ -77,6 +81,7 @@ public abstract class ViewFilterAction extends ViewerFilter implements IViewActi /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { StructuredViewer viewer = getStructuredViewer(); ViewerFilter[] filters = viewer.getFilters(); @@ -116,6 +121,7 @@ public abstract class ViewFilterAction extends ViewerFilter implements IViewActi * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, * org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { boolean enable = false; IDebugView view = (IDebugView)getView().getAdapter(IDebugView.class); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/commands/ReverseToggleCommandHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/commands/ReverseToggleCommandHandler.java index 36c119fa673..d6b2e7971e0 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/commands/ReverseToggleCommandHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/commands/ReverseToggleCommandHandler.java @@ -89,7 +89,8 @@ public class ReverseToggleCommandHandler extends DebugCommandHandler implements super.dispose(); } - public void debugContextChanged(DebugContextEvent event) { + @Override + public void debugContextChanged(DebugContextEvent event) { refresh(event.getContext()); } @@ -139,7 +140,8 @@ public class ReverseToggleCommandHandler extends DebugCommandHandler implements }.schedule(); } - public void updateElement(UIElement element, + @Override + public void updateElement(UIElement element, @SuppressWarnings("rawtypes") Map parameters) { // Make sure the toggle state reflects the actual state // We must check this, in case we have multiple launches diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/commands/ViewMemoryHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/commands/ViewMemoryHandler.java index faf9b5be4ea..41fb08f40e7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/commands/ViewMemoryHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/commands/ViewMemoryHandler.java @@ -42,6 +42,7 @@ public class ViewMemoryHandler extends AbstractHandler { * (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof IStructuredSelection) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/CheckedListDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/CheckedListDialogField.java index 7351cf5ca90..0ac0dd1abe5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/CheckedListDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/CheckedListDialogField.java @@ -69,10 +69,12 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#createTableViewer */ + @Override protected TableViewer createTableViewer(Composite parent) { Table table= new Table(parent, SWT.CHECK + getListStyle()); CheckboxTableViewer tableViewer= new CheckboxTableViewer(table); tableViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent e) { doCheckStateChanged(e); } @@ -84,6 +86,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#getListControl */ + @Override public Control getListControl(Composite parent) { Control control= super.getListControl(parent); if (parent != null) { @@ -96,6 +99,7 @@ public class CheckedListDialogField extends ListDialogField { * @see DialogField#dialogFieldChanged * Hooks in to get element changes to update check model. */ + @Override public void dialogFieldChanged() { for (int i= fCheckElements.size() -1; i >= 0; i--) { if (!fElements.contains(fCheckElements.get(i))) { @@ -192,6 +196,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#getManagedButtonState */ + @Override protected boolean getManagedButtonState(ISelection sel, int index) { if (index == fCheckAllButtonIndex) { return !fElements.isEmpty(); @@ -204,6 +209,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#extraButtonPressed */ + @Override protected boolean managedButtonPressed(int index) { if (index == fCheckAllButtonIndex) { checkAll(true); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ComboDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ComboDialogField.java index 215495c4fd1..ba9ae2635d5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ComboDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ComboDialogField.java @@ -45,6 +45,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -59,6 +60,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 2; } @@ -76,6 +78,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#setFocus */ + @Override public boolean setFocus() { if (isOkToUse(fComboControl)) { fComboControl.setFocus(); @@ -94,15 +97,18 @@ public class ComboDialogField extends DialogField { if (fComboControl == null) { assertCompositeNotNull(parent); fModifyListener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { doModifyText(e); } }; SelectionListener selectionListener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { doSelectionChanged(e); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }; @@ -145,6 +151,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fComboControl)) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/DialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/DialogField.java index f6864d8d48e..6d4d4dd465a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/DialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/DialogField.java @@ -85,6 +85,7 @@ public class DialogField { if (display != null) { display.asyncExec( new Runnable() { + @Override public void run() { setFocus(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/LayoutUtil.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/LayoutUtil.java index b48eeb35ede..595e6cae1d1 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/LayoutUtil.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/LayoutUtil.java @@ -56,6 +56,7 @@ public class LayoutUtil { * @param marginHeight The margin height to be used by the composite * @deprecated */ + @Deprecated public static void doDefaultLayout(Composite parent, DialogField[] editors, boolean labelOnTop, int minWidth, int minHeight, int marginWidth, int marginHeight) { int nCulumns= getNumberOfColumns(editors); Control[][] controls= new Control[editors.length][]; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java index 96a01afb524..b7cd8274353 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/ListDialogField.java @@ -177,6 +177,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { PixelConverter converter= new PixelConverter(parent); @@ -214,6 +215,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 3; } @@ -315,9 +317,11 @@ public class ListDialogField extends DialogField { assertCompositeNotNull(parent); SelectionListener listener= new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { doButtonSelected(e); } + @Override public void widgetSelected(SelectionEvent e) { doButtonSelected(e); } @@ -368,6 +372,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#dialogFieldChanged */ + @Override public void dialogFieldChanged() { super.dialogFieldChanged(); updateButtonState(); @@ -403,6 +408,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); @@ -614,6 +620,7 @@ public class ListDialogField extends DialogField { if (isOkToUse(fTableControl)) { Display d= fTableControl.getDisplay(); d.asyncExec(new Runnable() { + @Override public void run() { if (isOkToUse(fTableControl)) { selectElements(selection); @@ -736,6 +743,7 @@ public class ListDialogField extends DialogField { // ------- ITableContentProvider Interface ------------ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // will never happen } @@ -744,15 +752,18 @@ public class ListDialogField extends DialogField { return false; } + @Override public void dispose() { } + @Override public Object[] getElements(Object obj) { return fElements.toArray(); } // ------- ISelectionChangedListener Interface ------------ + @Override public void selectionChanged(SelectionChangedEvent event) { doListSelected(event); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java index c318d849548..da1aba5eb4f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogField.java @@ -78,6 +78,7 @@ public class SelectionButtonDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -97,6 +98,7 @@ public class SelectionButtonDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 1; } @@ -118,9 +120,11 @@ public class SelectionButtonDialogField extends DialogField { fButton.setEnabled(isEnabled()); fButton.setSelection(fIsSelected); fButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { doWidgetSelected(e); } + @Override public void widgetSelected(SelectionEvent e) { doWidgetSelected(e); } @@ -177,6 +181,7 @@ public class SelectionButtonDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fButton)) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java index 451899b7ef2..52c14fdc03e 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java @@ -80,6 +80,7 @@ public class SelectionButtonDialogFieldGroup extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -105,6 +106,7 @@ public class SelectionButtonDialogFieldGroup extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public int getNumberOfControls() { return (fGroupBorderStyle == SWT.NONE) ? 2 : 1; } @@ -150,9 +152,11 @@ public class SelectionButtonDialogFieldGroup extends DialogField { fButtonComposite.setLayout(layout); SelectionListener listener= new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { doWidgetSelected(e); } + @Override public void widgetSelected(SelectionEvent e) { doWidgetSelected(e); } @@ -224,6 +228,7 @@ public class SelectionButtonDialogFieldGroup extends DialogField { // ------ enable / disable management + @Override protected void updateEnableState() { super.updateEnableState(); if (fButtons != null) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/Separator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/Separator.java index 635e3b6b881..ab1a6423879 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/Separator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/Separator.java @@ -55,6 +55,7 @@ public class Separator extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { return doFillIntoGrid(parent, nColumns, 4); } @@ -62,6 +63,7 @@ public class Separator extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 1; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java index b802f78b93b..4641ee2db16 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonDialogField.java @@ -60,6 +60,7 @@ public class StringButtonDialogField extends StringDialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -76,6 +77,7 @@ public class StringButtonDialogField extends StringDialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 3; } @@ -104,9 +106,11 @@ public class StringButtonDialogField extends StringDialogField { fBrowseButton.setText(fBrowseButtonLabel); fBrowseButton.setEnabled(isEnabled() && fButtonEnabled); fBrowseButton.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { changeControlPressed(); } + @Override public void widgetSelected(SelectionEvent e) { changeControlPressed(); } @@ -131,6 +135,7 @@ public class StringButtonDialogField extends StringDialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fBrowseButton)) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonStatusDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonStatusDialogField.java index 3458cf39684..47d99a8427e 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonStatusDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringButtonStatusDialogField.java @@ -89,6 +89,7 @@ public class StringButtonStatusDialogField extends StringButtonDialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -107,6 +108,7 @@ public class StringButtonStatusDialogField extends StringButtonDialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 4; } @@ -157,6 +159,7 @@ public class StringButtonStatusDialogField extends StringButtonDialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fStatusLabelControl)) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringDialogField.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringDialogField.java index 0cafbe492d5..63412307e81 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringDialogField.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogfields/StringDialogField.java @@ -38,6 +38,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -52,6 +53,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 2; } @@ -69,6 +71,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#setFocus */ + @Override public boolean setFocus() { if (isOkToUse(fTextControl)) { fTextControl.setFocus(); @@ -88,6 +91,7 @@ public class StringDialogField extends DialogField { if (fTextControl == null) { assertCompositeNotNull(parent); fModifyListener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { doModifyText(e); } @@ -116,6 +120,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fTextControl)) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogs/AddEventBreakpointDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogs/AddEventBreakpointDialog.java index 3d7dc2fc1a1..a7760a44005 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogs/AddEventBreakpointDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogs/AddEventBreakpointDialog.java @@ -134,6 +134,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { // The button bar will work better if we make the parent composite // a single column grid layout. For the widgets we add, we want a @@ -227,6 +228,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, * * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(DialogMessages.getString("AddEventBreakpointDialog.2")); //$NON-NLS-1$ @@ -237,6 +239,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, * * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { if (fEventTypeInput != null) { updateEventType(); @@ -269,6 +272,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, * * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) */ + @Override public void modifyText(ModifyEvent e) { if (e.getSource() == fEventTypeInput) { updateArgumentsControl(); @@ -281,6 +285,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, * * @see org.eclipse.jface.dialogs.TrayDialog#createButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createButtonBar(Composite parent) { return super.createButtonBar(parent); } @@ -290,6 +295,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, * * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetDefaultSelected(SelectionEvent e) { // ignore } @@ -299,6 +305,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, * * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { if (e.getSource() == fEventTypeInput) { updateArgumentsControl(); @@ -326,6 +333,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, return true; } + @Override protected void createButtonsForButtonBar(Composite parent) { // override so we can change the initial okay enabled state createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true).setEnabled( diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/DisassemblyDisplayModeHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/DisassemblyDisplayModeHandler.java index dd0ca22db0a..7e05314cdd2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/DisassemblyDisplayModeHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/DisassemblyDisplayModeHandler.java @@ -40,7 +40,8 @@ public class DisassemblyDisplayModeHandler extends AbstractHandler implements IE /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ - public Object execute( ExecutionEvent event ) throws ExecutionException { + @Override + public Object execute( ExecutionEvent event ) throws ExecutionException { DisassemblyEditorPresentation presentation = getEditorPresentation( event ); if ( presentation != null ) { String param = event.getParameter( ID_PARAMETER_MODE ); @@ -57,7 +58,8 @@ public class DisassemblyDisplayModeHandler extends AbstractHandler implements IE /* (non-Javadoc) * @see org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui.menus.UIElement, java.util.Map) */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public void updateElement( UIElement element, Map parameters ) { IWorkbenchPartSite site = (IWorkbenchPartSite)element.getServiceLocator().getService( IWorkbenchPartSite.class ); if ( site != null ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/OpenDisassemblyHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/OpenDisassemblyHandler.java index c25fae9145c..369bce95d0d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/OpenDisassemblyHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/OpenDisassemblyHandler.java @@ -30,7 +30,8 @@ public class OpenDisassemblyHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ - public Object execute( ExecutionEvent event ) throws ExecutionException { + @Override + public Object execute( ExecutionEvent event ) throws ExecutionException { ISelection s = HandlerUtil.getCurrentSelection( event ); if ( s instanceof IStructuredSelection ) { Object element = ((IStructuredSelection)s).getFirstElement(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/SetSteppingModeHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/SetSteppingModeHandler.java index 9aabb8dfa09..731672c0ed8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/SetSteppingModeHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/commands/SetSteppingModeHandler.java @@ -48,7 +48,8 @@ public class SetSteppingModeHandler extends AbstractHandler implements IElementU /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ - public Object execute( ExecutionEvent event ) throws ExecutionException { + @Override + public Object execute( ExecutionEvent event ) throws ExecutionException { String param = event.getParameter( ID_PARAMETER_MODE ); if ( param == null || param.equals( fCurrentValue ) ) return null; @@ -66,7 +67,8 @@ public class SetSteppingModeHandler extends AbstractHandler implements IElementU /* (non-Javadoc) * @see org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui.menus.UIElement, java.util.Map) */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public void updateElement( UIElement element, Map parameters ) { String param = (String)parameters.get( ID_PARAMETER_MODE ); if ( param != null ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java index f4e3e396585..1b968dc7df1 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AbstractDisassemblyBackend.java @@ -27,6 +27,7 @@ public abstract class AbstractDisassemblyBackend implements IDisassemblyBackend protected AbstractDisassemblyBackend() { } + @Override public void init(IDisassemblyPartCallback callback) { assert callback != null; fCallback = callback; @@ -44,11 +45,13 @@ public abstract class AbstractDisassemblyBackend implements IDisassemblyBackend public abstract BigInteger evaluateAddressExpression(String expression, boolean suppressError); + @Override public String evaluateRegister(String register) { return null; } - public String getHoverInfoData(AddressRangePosition pos, String ident) { + @Override + public String getHoverInfoData(AddressRangePosition pos, String ident) { return null; } @@ -69,6 +72,7 @@ public abstract class AbstractDisassemblyBackend implements IDisassemblyBackend /** * Do nothing, sub-class can override to update PC annotation. */ + @Override public void updateExtendedPCAnnotation(IAnnotationModel model) { } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java index 0310b2db00b..db14e2b09ab 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/CDIDisassemblyRetrieval.java @@ -47,8 +47,10 @@ public class CDIDisassemblyRetrieval implements IDisassemblyRetrieval { /* * @see org.eclipse.cdt.debug.ui.infinitedisassembly.views.IDisassemblyRetrieval#asyncGetDisassembly(java.math.BigInteger, java.math.BigInteger, java.lang.String, int, org.eclipse.cdt.debug.ui.infinitedisassembly.views.IDisassemblyRetrieval.DisassemblyRequest) */ + @Override public void asyncGetDisassembly(final BigInteger startAddress, final BigInteger endAddress, final String file, final int lineNumber, final int lines, final boolean mixed, final DisassemblyRequest disassemblyRequest) { Runnable op= new Runnable() { + @Override public void run() { ICDITarget cdiTarget= (ICDITarget) fDebugTarget.getAdapter(ICDITarget.class); try { @@ -96,8 +98,10 @@ public class CDIDisassemblyRetrieval implements IDisassemblyRetrieval { /* * @see org.eclipse.cdt.debug.ui.infinitedisassembly.views.IDisassemblyRetrieval#asyncGetFrameAddress(org.eclipse.debug.core.model.IStackFrame, org.eclipse.cdt.debug.ui.infinitedisassembly.views.IDisassemblyRetrieval.AddressRequest) */ + @Override public void asyncGetFrameAddress(final IStackFrame stackFrame, final AddressRequest addressRequest) { Runnable op= new Runnable() { + @Override public void run() { if (stackFrame instanceof ICStackFrame) { IAddress address = ((ICStackFrame)stackFrame).getAddress(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java index dfcf537f5a5..ee43bf96cfa 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java @@ -82,6 +82,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#hasDebugContext() */ + @Override public boolean hasDebugContext() { return fTargetContext != null; } @@ -101,6 +102,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#setDebugContext(org.eclipse.core.runtime.IAdaptable) */ + @Override public SetDebugContextResult setDebugContext(IAdaptable context) { assert supportsDebugContext(context) : "caller should not have invoked us"; //$NON-NLS-1$ @@ -182,6 +184,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#supportsDebugContext(org.eclipse.core.runtime.IAdaptable) */ + @Override public boolean supportsDebugContext(IAdaptable context) { return supportsDebugContext_(context); } @@ -197,6 +200,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#clearDebugContext() */ + @Override public void clearDebugContext() { fTargetContext= null; fCdiSessionId = null; @@ -207,13 +211,16 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements private class AddressRequest extends CRequest implements IDisassemblyRetrieval.AddressRequest { private BigInteger fAddress; + @Override public BigInteger getAddress() { return fAddress; } + @Override public void setAddress(BigInteger address) { fAddress = address; } }; /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#retrieveFrameAddress(int) */ + @Override public void retrieveFrameAddress(final int targetFrame) { try { final IStackFrame[] stackFrames= fTargetContext.getStackFrames(); @@ -245,6 +252,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#getFrameLevel() */ + @Override public int getFrameLevel() { return fFrameLevel; } @@ -252,6 +260,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#isSuspended() */ + @Override public boolean isSuspended() { return fTargetContext != null && fTargetContext.isSuspended(); } @@ -259,6 +268,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#getFrameFile() */ + @Override public String getFrameFile() { return fTargetFrameContext != null ? fTargetFrameContext.getFile() : null; } @@ -266,19 +276,23 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#getFrameLine() */ + @Override public int getFrameLine() { return fTargetFrameContext.getFrameLineNumber(); } private class DisassemblyRequest extends CRequest implements IDisassemblyRetrieval.DisassemblyRequest { private IDisassemblyBlock fBlock; + @Override public IDisassemblyBlock getDisassemblyBlock() { return fBlock; } + @Override public void setDisassemblyBlock(IDisassemblyBlock block) { fBlock = block; } }; /* (non-Javadoc) * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.IDisassemblyBackend#retrieveDisassembly(java.math.BigInteger, java.math.BigInteger, java.lang.String, boolean, boolean, boolean, int, int, int) */ + @Override public void retrieveDisassembly(final BigInteger startAddress, BigInteger endAddress, final String file, int lineNumber, final int lines, final boolean mixed, final boolean showSymbols, final boolean showDisassembly, final int linesHint) { @@ -310,6 +324,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements } else { // give up fCallback.doScrollLocked(new Runnable() { + @Override public void run() { fCallback.insertError(startAddress, "Unable to retrieve disassembly data from backend."); //$NON-NLS-1$ } @@ -320,6 +335,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements final IStatus status= getStatus(); if (status != null && !status.isOK()) { fCallback.doScrollLocked(new Runnable() { + @Override public void run() { fCallback.insertError(startAddress, status.getMessage()); } @@ -336,6 +352,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#insertSource(org.eclipse.jface.text.Position, java.math.BigInteger, java.lang.String, int) */ + @Override public Object insertSource(Position pos, BigInteger address, String file, int lineNumber) { ISourceLocator locator = fTargetContext.getLaunch().getSourceLocator(); @@ -348,6 +365,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#hasFrameContext() */ + @Override public boolean hasFrameContext() { return fTargetFrameContext != null; } @@ -355,10 +373,12 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.IDisassemblyBackend#gotoSymbol(java.lang.String) */ + @Override public void gotoSymbol(String symbol) { final BigInteger address = evaluateAddressExpression(symbol, false); if (address != null) { fCallback.asyncExec(new Runnable() { + @Override public void run() { fCallback.gotoAddress(address); }}); @@ -410,6 +430,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements catch (final CDIException exc) { if (!suppressError) { fCallback.asyncExec(new Runnable() { + @Override public void run() { ErrorDialog.openError(fCallback.getSite().getShell(), CDebugUIMessages.getString("DisassemblyBackendCdi_Error_Dlg_Title"), //$NON-NLS-1$ @@ -420,6 +441,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements catch (final DebugException exc) { if (!suppressError) { fCallback.asyncExec(new Runnable() { + @Override public void run() { ErrorDialog.openError(fCallback.getSite().getShell(), CDebugUIMessages.getString("DisassemblyBackendCdi_Error_Dlg_Title"), //$NON-NLS-1$ @@ -434,6 +456,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.IDisassemblyBackend#retrieveDisassembly(java.lang.String, int, java.math.BigInteger, boolean, boolean, boolean) */ + @Override public void retrieveDisassembly(String file, int lines, final BigInteger endAddress, final boolean mixed, final boolean showSymbols, final boolean showDisassembly) { @@ -446,6 +469,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements final IStatus status= getStatus(); if (status != null && !status.isOK()) { fCallback.asyncExec(new Runnable() { + @Override public void run() { ErrorDialog.openError(fCallback.getSite().getShell(), "Error", null, getStatus()); //$NON-NLS-1$ } @@ -634,6 +658,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ + @Override public void handleDebugEvents(DebugEvent[] events) { for (DebugEvent event : events) { if (event.getKind() == DebugEvent.TERMINATE) { @@ -649,6 +674,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#dispose() */ + @Override public void dispose() { DebugPlugin.getDefault().removeDebugEventListener(this); } @@ -656,6 +682,7 @@ public class DisassemblyBackendCdi extends AbstractDisassemblyBackend implements /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#evaluateExpression(java.lang.String) */ + @Override public String evaluateExpression(String expression) { // This is called to service text hovering. We either resolve the // expression or we don't. No error reporting needed. diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdiFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdiFactory.java index 96d67f6f827..e104d7309d9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdiFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdiFactory.java @@ -20,6 +20,7 @@ public class DisassemblyBackendCdiFactory 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 (IDisassemblyBackend.class.equals(adapterType)) { @@ -33,6 +34,7 @@ public class DisassemblyBackendCdiFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override @SuppressWarnings("rawtypes") public Class[] getAdapterList() { return ADAPTERS; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditor.java index 4247aac68c8..00f7a7e1d3d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditor.java @@ -184,7 +184,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextListener#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent) */ - public void debugContextChanged( DebugContextEvent event ) { + @Override + public void debugContextChanged( DebugContextEvent event ) { ISelection selection = event.getContext(); if ( selection instanceof IStructuredSelection ) { IStructuredSelection ss = (IStructuredSelection)selection; @@ -223,7 +224,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#close(boolean) */ - public void close( boolean save ) { + @Override + public void close( boolean save ) { // TODO Auto-generated method stub } @@ -231,7 +233,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#doRevertToSaved() */ - public void doRevertToSaved() { + @Override + public void doRevertToSaved() { // TODO Auto-generated method stub } @@ -239,7 +242,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#getAction(java.lang.String) */ - public IAction getAction( String actionId ) { + @Override + public IAction getAction( String actionId ) { // TODO Auto-generated method stub return null; } @@ -247,14 +251,16 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#getDocumentProvider() */ - public IDocumentProvider getDocumentProvider() { + @Override + public IDocumentProvider getDocumentProvider() { return CDebugUIPlugin.getDefault().getDisassemblyEditorManager().getDocumentProvider(); } /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#getHighlightRange() */ - public IRegion getHighlightRange() { + @Override + public IRegion getHighlightRange() { // TODO Auto-generated method stub return null; } @@ -262,7 +268,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#getSelectionProvider() */ - public ISelectionProvider getSelectionProvider() { + @Override + public ISelectionProvider getSelectionProvider() { VirtualSourceViewer viewer = getViewer(); return ( viewer != null ) ? viewer.getSelectionProvider() : null; } @@ -270,14 +277,16 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#isEditable() */ - public boolean isEditable() { + @Override + public boolean isEditable() { return false; } /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#removeActionActivationCode(java.lang.String) */ - public void removeActionActivationCode( String actionId ) { + @Override + public void removeActionActivationCode( String actionId ) { // TODO Auto-generated method stub } @@ -285,7 +294,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#resetHighlightRange() */ - public void resetHighlightRange() { + @Override + public void resetHighlightRange() { // TODO Auto-generated method stub } @@ -293,7 +303,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#selectAndReveal(int, int) */ - public void selectAndReveal( int offset, int length ) { + @Override + public void selectAndReveal( int offset, int length ) { // TODO Auto-generated method stub } @@ -301,14 +312,16 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#setAction(java.lang.String, org.eclipse.jface.action.IAction) */ - public void setAction( String actionID, IAction action ) { + @Override + public void setAction( String actionID, IAction action ) { fDisassemblyPane.setAction( actionID, action ); } /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#setActionActivationCode(java.lang.String, char, int, int) */ - public void setActionActivationCode( String actionId, char activationCharacter, int activationKeyCode, int activationStateMask ) { + @Override + public void setActionActivationCode( String actionId, char activationCharacter, int activationKeyCode, int activationStateMask ) { // TODO Auto-generated method stub } @@ -316,7 +329,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#setHighlightRange(int, int, boolean) */ - public void setHighlightRange( int offset, int length, boolean moveCursor ) { + @Override + public void setHighlightRange( int offset, int length, boolean moveCursor ) { // TODO Auto-generated method stub } @@ -324,7 +338,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#showHighlightRangeOnly(boolean) */ - public void showHighlightRangeOnly( boolean showHighlightRangeOnly ) { + @Override + public void showHighlightRangeOnly( boolean showHighlightRangeOnly ) { // TODO Auto-generated method stub } @@ -332,7 +347,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.ui.texteditor.ITextEditor#showsHighlightRangeOnly() */ - public boolean showsHighlightRangeOnly() { + @Override + public boolean showsHighlightRangeOnly() { // TODO Auto-generated method stub return false; } @@ -350,7 +366,8 @@ public class DisassemblyEditor extends EditorPart implements ITextEditor, IReusa /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange( PropertyChangeEvent event ) { + @Override + public void propertyChange( PropertyChangeEvent event ) { getViewer().refresh(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorInput.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorInput.java index 32784a990fe..16bc025fa44 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorInput.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorInput.java @@ -28,7 +28,8 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#exists() */ - public boolean exists() { + @Override + public boolean exists() { // TODO Auto-generated method stub return false; } @@ -36,7 +37,8 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getImageDescriptor() */ - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { // TODO Auto-generated method stub return null; } @@ -44,7 +46,8 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getName() */ - public String getName() { + @Override + public String getName() { // TODO Auto-generated method stub return ""; //$NON-NLS-1$ } @@ -52,7 +55,8 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getPersistable() */ - public IPersistableElement getPersistable() { + @Override + public IPersistableElement getPersistable() { // TODO Auto-generated method stub return null; } @@ -60,7 +64,8 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getToolTipText() */ - public String getToolTipText() { + @Override + public String getToolTipText() { // TODO Auto-generated method stub return ""; //$NON-NLS-1$ } @@ -68,7 +73,8 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public Object getAdapter( Class adapter ) { // TODO Auto-generated method stub return null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorManager.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorManager.java index fc97f3826fe..34c661f8ae5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorManager.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorManager.java @@ -136,19 +136,22 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) */ - public void partActivated( IWorkbenchPartReference partRef ) { + @Override + public void partActivated( IWorkbenchPartReference partRef ) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference) */ - public void partBroughtToTop( IWorkbenchPartReference partRef ) { + @Override + public void partBroughtToTop( IWorkbenchPartReference partRef ) { } /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) */ - public void partClosed( IWorkbenchPartReference partRef ) { + @Override + public void partClosed( IWorkbenchPartReference partRef ) { if ( isDisassemblyEditorPart( partRef ) ) { IWorkbenchPart part = partRef.getPart( false ); if ( part instanceof IEditorPart ) { @@ -169,7 +172,8 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) */ - public void partDeactivated( IWorkbenchPartReference partRef ) { + @Override + public void partDeactivated( IWorkbenchPartReference partRef ) { // TODO Auto-generated method stub } @@ -177,7 +181,8 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) */ - public void partHidden( IWorkbenchPartReference partRef ) { + @Override + public void partHidden( IWorkbenchPartReference partRef ) { // TODO Auto-generated method stub } @@ -185,7 +190,8 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) */ - public void partInputChanged( IWorkbenchPartReference partRef ) { + @Override + public void partInputChanged( IWorkbenchPartReference partRef ) { // TODO Auto-generated method stub } @@ -193,7 +199,8 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference) */ - public void partOpened( IWorkbenchPartReference partRef ) { + @Override + public void partOpened( IWorkbenchPartReference partRef ) { if ( isDisassemblyEditorPart( partRef ) ) { IWorkbenchPart part = partRef.getPart( false ); if ( part instanceof IEditorPart ) { @@ -209,7 +216,8 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo /* (non-Javadoc) * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) */ - public void partVisible( IWorkbenchPartReference partRef ) { + @Override + public void partVisible( IWorkbenchPartReference partRef ) { // TODO Auto-generated method stub } @@ -217,20 +225,23 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow) */ - public void windowActivated( IWorkbenchWindow window ) { + @Override + public void windowActivated( IWorkbenchWindow window ) { } /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow) */ - public void windowClosed( IWorkbenchWindow window ) { + @Override + public void windowClosed( IWorkbenchWindow window ) { window.getPartService().removePartListener( this ); } /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow) */ - public void windowDeactivated( IWorkbenchWindow window ) { + @Override + public void windowDeactivated( IWorkbenchWindow window ) { // TODO Auto-generated method stub } @@ -238,14 +249,16 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo /* (non-Javadoc) * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow) */ - public void windowOpened( IWorkbenchWindow window ) { + @Override + public void windowOpened( IWorkbenchWindow window ) { window.getPartService().addPartListener( this ); } /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextListener#contextAdded(java.lang.Object) */ - public void contextAdded( Object context ) { + @Override + public void contextAdded( Object context ) { // TODO Auto-generated method stub } @@ -253,7 +266,8 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextListener#contextRemoved(java.lang.Object) */ - public void contextRemoved( Object context ) { + @Override + public void contextRemoved( Object context ) { final IEditorPart editor = fEditorParts.remove( context ); if ( editor != null ) { UIJob job = new UIJob( editor.getSite().getShell().getDisplay(), "Closing disassembly" ) { //$NON-NLS-1$ @@ -285,12 +299,14 @@ public class DisassemblyEditorManager implements IWindowListener, IDisassemblyCo return new ISourcePresentation() { - public IEditorInput getEditorInput( Object element ) { + @Override + public IEditorInput getEditorInput( Object element ) { Object disassemblyContext = getDiassemblyContext( element ); return new DisassemblyEditorInput( element, disassemblyContext ); } - public String getEditorId( IEditorInput input, Object element ) { + @Override + public String getEditorId( IEditorInput input, Object element ) { return ICDebugUIConstants.ID_DEFAULT_DISASSEMBLY_EDITOR; } }; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyAnnotationModel.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyAnnotationModel.java index d5d45cb3700..2fbc4744571 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyAnnotationModel.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyAnnotationModel.java @@ -48,6 +48,7 @@ public class DisassemblyAnnotationModel extends AnnotationModel { DisassemblyEditorInput.PENDING_EDITOR_INPUT.equals( input ) ) return; asyncExec( new Runnable() { + @Override public void run() { breakpointsAdded0( breakpoints, document ); } @@ -60,6 +61,7 @@ public class DisassemblyAnnotationModel extends AnnotationModel { DisassemblyEditorInput.PENDING_EDITOR_INPUT.equals( input ) ) return; asyncExec( new Runnable() { + @Override public void run() { breakpointsRemoved0( breakpoints, document ); } @@ -72,6 +74,7 @@ public class DisassemblyAnnotationModel extends AnnotationModel { DisassemblyEditorInput.PENDING_EDITOR_INPUT.equals( input ) ) return; asyncExec( new Runnable() { + @Override public void run() { breakpointsChanged0( breakpoints, document ); } @@ -199,6 +202,7 @@ public class DisassemblyAnnotationModel extends AnnotationModel { private void updateAnnotations( final IDocument document ) { asyncExec( new Runnable() { + @Override public void run() { doUpdateAnnotations( document ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyEditorInput.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyEditorInput.java index 9c036aa50d4..0adaa914595 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyEditorInput.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyEditorInput.java @@ -42,6 +42,7 @@ public class DisassemblyEditorInput implements IEditorInput { public static final IEditorInput PENDING_EDITOR_INPUT = new DisassemblyEditorInput() { + @Override public String getContents() { return DisassemblyMessages.getString( "DisassemblyDocumentProvider.Pending_1" ); //$NON-NLS-1$ } @@ -76,6 +77,7 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#exists() */ + @Override public boolean exists() { return true; } @@ -83,6 +85,7 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { return null; } @@ -90,6 +93,7 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getName() */ + @Override public String getName() { return null; } @@ -97,6 +101,7 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getPersistable() */ + @Override public IPersistableElement getPersistable() { return null; } @@ -104,6 +109,7 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.ui.IEditorInput#getToolTipText() */ + @Override public String getToolTipText() { return null; } @@ -111,6 +117,7 @@ public class DisassemblyEditorInput implements IEditorInput { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter( Class adapter ) { return null; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyMemoryRendering.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyMemoryRendering.java index b09a6d115f5..f95a0e8b874 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyMemoryRendering.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyMemoryRendering.java @@ -39,7 +39,8 @@ public class DisassemblyMemoryRendering extends AbstractMemoryRendering { /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#createControl(org.eclipse.swt.widgets.Composite) */ - public Control createControl( Composite parent ) { + @Override + public Control createControl( Composite parent ) { Composite composite = new Composite( parent, SWT.BORDER ); GridLayout layout = new GridLayout(); layout.marginHeight = 0; @@ -54,7 +55,8 @@ public class DisassemblyMemoryRendering extends AbstractMemoryRendering { /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRendering#getControl() */ - public Control getControl() { + @Override + public Control getControl() { return fDisassemblyPane.getControl(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyRenderingTypeDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyRenderingTypeDelegate.java index d37e296d582..4a32d9bad20 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyRenderingTypeDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/rendering/DisassemblyRenderingTypeDelegate.java @@ -20,7 +20,8 @@ public class DisassemblyRenderingTypeDelegate implements IMemoryRenderingTypeDel /* (non-Javadoc) * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String) */ - public IMemoryRendering createRendering( String id ) throws CoreException { + @Override + public IMemoryRendering createRendering( String id ) throws CoreException { return new DisassemblyMemoryRendering( id ); } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DisassemblyDocumentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DisassemblyDocumentProvider.java index c6630a1d834..e5d347cedc8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DisassemblyDocumentProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DisassemblyDocumentProvider.java @@ -73,13 +73,15 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#aboutToChange(java.lang.Object) */ - public void aboutToChange( Object element ) { + @Override + public void aboutToChange( Object element ) { } /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#addElementStateListener(org.eclipse.ui.texteditor.IElementStateListener) */ - public void addElementStateListener( IElementStateListener listener ) { + @Override + public void addElementStateListener( IElementStateListener listener ) { // TODO Auto-generated method stub } @@ -87,20 +89,23 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#canSaveDocument(java.lang.Object) */ - public boolean canSaveDocument( Object element ) { + @Override + public boolean canSaveDocument( Object element ) { return false; } /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#changed(java.lang.Object) */ - public void changed( Object element ) { + @Override + public void changed( Object element ) { } /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#connect(java.lang.Object) */ - public synchronized void connect( Object element ) throws CoreException { + @Override + public synchronized void connect( Object element ) throws CoreException { Object disassemblyContext = ((DisassemblyEditorInput)element).getDisassemblyContext(); if ( fDocumentInfos.get( disassemblyContext ) == null ) { IDocumentPresentation presentation = createDocumentPresentation( disassemblyContext ); @@ -113,7 +118,8 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#disconnect(java.lang.Object) */ - public synchronized void disconnect( Object element ) { + @Override + public synchronized void disconnect( Object element ) { Object disassemblyContext = ((DisassemblyEditorInput)element).getDisassemblyContext(); DocumentInfo info = fDocumentInfos.remove( disassemblyContext ); if ( info != null ) { @@ -124,7 +130,8 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#getAnnotationModel(java.lang.Object) */ - public IAnnotationModel getAnnotationModel( Object element ) { + @Override + public IAnnotationModel getAnnotationModel( Object element ) { Object disassemblyContext = ((DisassemblyEditorInput)element).getDisassemblyContext(); DocumentInfo info = fDocumentInfos.get( disassemblyContext ); return ( info != null ) ? info.getAnnotationModel() : null; @@ -133,7 +140,8 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#getDocument(java.lang.Object) */ - public IDocument getDocument( Object element ) { + @Override + public IDocument getDocument( Object element ) { Object disassemblyContext = ((DisassemblyEditorInput)element).getDisassemblyContext(); DocumentInfo info = fDocumentInfos.get( disassemblyContext ); return ( info != null ) ? info.getDocument() : null; @@ -142,7 +150,8 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#getModificationStamp(java.lang.Object) */ - public long getModificationStamp( Object element ) { + @Override + public long getModificationStamp( Object element ) { // TODO Auto-generated method stub return 0; } @@ -150,7 +159,8 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#getSynchronizationStamp(java.lang.Object) */ - public long getSynchronizationStamp( Object element ) { + @Override + public long getSynchronizationStamp( Object element ) { // TODO Auto-generated method stub return 0; } @@ -158,21 +168,24 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#isDeleted(java.lang.Object) */ - public boolean isDeleted( Object element ) { + @Override + public boolean isDeleted( Object element ) { return false; } /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#mustSaveDocument(java.lang.Object) */ - public boolean mustSaveDocument( Object element ) { + @Override + public boolean mustSaveDocument( Object element ) { return false; } /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#removeElementStateListener(org.eclipse.ui.texteditor.IElementStateListener) */ - public void removeElementStateListener( IElementStateListener listener ) { + @Override + public void removeElementStateListener( IElementStateListener listener ) { // TODO Auto-generated method stub } @@ -180,7 +193,8 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#resetDocument(java.lang.Object) */ - public void resetDocument( Object element ) throws CoreException { + @Override + public void resetDocument( Object element ) throws CoreException { // TODO Auto-generated method stub } @@ -188,7 +202,8 @@ public class DisassemblyDocumentProvider implements IDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IDocumentProvider#saveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.jface.text.IDocument, boolean) */ - public void saveDocument( IProgressMonitor monitor, Object element, IDocument document, boolean overwrite ) throws CoreException { + @Override + public void saveDocument( IProgressMonitor monitor, Object element, IDocument document, boolean overwrite ) throws CoreException { // TODO Auto-generated method stub } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DisassemblyPane.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DisassemblyPane.java index fff09af7794..6c58b2be48c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DisassemblyPane.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DisassemblyPane.java @@ -197,7 +197,8 @@ public class DisassemblyPane implements IPropertyChangeListener { if ( fMenuListener == null ) { fMenuListener = new IMenuListener() { - public void menuAboutToShow( IMenuManager menu ) { + @Override + public void menuAboutToShow( IMenuManager menu ) { String id = menu.getId(); if ( getRulerContextMenuId().equals( id ) ) { // setFocus(); @@ -229,21 +230,24 @@ public class DisassemblyPane implements IPropertyChangeListener { } } - public void mouseUp( MouseEvent e ) { + @Override + public void mouseUp( MouseEvent e ) { // setFocus(); if ( 1 == e.button && !fDoubleClicked ) triggerAction( ITextEditorActionConstants.RULER_CLICK ); fDoubleClicked = false; } - public void mouseDoubleClick( MouseEvent e ) { + @Override + public void mouseDoubleClick( MouseEvent e ) { if ( 1 == e.button ) { fDoubleClicked = true; triggerAction( IInternalCDebugUIConstants.ACTION_TOGGLE_BREAKPOINT ); } } - public void mouseDown( MouseEvent e ) { + @Override + public void mouseDown( MouseEvent e ) { StyledText text = getViewer().getTextWidget(); if ( text != null && !text.isDisposed() ) { Display display = text.getDisplay(); @@ -393,7 +397,8 @@ public class DisassemblyPane implements IPropertyChangeListener { /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange( PropertyChangeEvent event ) { + @Override + public void propertyChange( PropertyChangeEvent event ) { // TODO Auto-generated method stub } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentAnnotationUpdate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentAnnotationUpdate.java index 1b37c40e198..1d999a76ff1 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentAnnotationUpdate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentAnnotationUpdate.java @@ -37,7 +37,8 @@ public class DocumentAnnotationUpdate extends DocumentUpdate implements IDocumen /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentElementAnnotationUpdate#addAnnotation(org.eclipse.jface.text.source.Annotation) */ - public void addAnnotation( Annotation annotation ) { + @Override + public void addAnnotation( Annotation annotation ) { fAnnotations.add( annotation ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentBaseChangeUpdate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentBaseChangeUpdate.java index 49c01db78b0..233cfc704de 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentBaseChangeUpdate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentBaseChangeUpdate.java @@ -41,14 +41,16 @@ public class DocumentBaseChangeUpdate extends DocumentUpdate implements IDocumen /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentBaseChangeUpdate#setOffset(int) */ - public void setOffset( int offset ) { + @Override + public void setOffset( int offset ) { fOffset = offset; } /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentBaseChangeUpdate#getOriginalOffset() */ - public int getOriginalOffset() { + @Override + public int getOriginalOffset() { return fOriginalOffset; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentContentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentContentProvider.java index 14375fed2db..96420d87bb6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentContentProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentContentProvider.java @@ -183,7 +183,8 @@ public class DocumentContentProvider implements IModelChangedListener { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelChangedListener#modelChanged(org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta, org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy) */ - public void modelChanged( final IModelDelta delta, final IModelProxy proxy ) { + @Override + public void modelChanged( final IModelDelta delta, final IModelProxy proxy ) { WorkbenchJob job = new WorkbenchJob( "process model delta" ) { //$NON-NLS-1$ /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentContentUpdate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentContentUpdate.java index db73dd044f5..106376dd3e6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentContentUpdate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentContentUpdate.java @@ -39,14 +39,16 @@ public class DocumentContentUpdate extends DocumentUpdate implements IDocumentEl /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentElementContentUpdate#setLineCount(int) */ - public void setLineCount( int lineCount ) { + @Override + public void setLineCount( int lineCount ) { fElements = new Object[lineCount]; } /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentElementContentUpdate#addElement(int, java.lang.Object) */ - public void addElement( int line, Object element ) throws IndexOutOfBoundsException { + @Override + public void addElement( int line, Object element ) throws IndexOutOfBoundsException { if ( line < 0 || line >= fElements.length ) throw new IndexOutOfBoundsException( Integer.toString( line ) ); fElements[line] = element; @@ -55,28 +57,32 @@ public class DocumentContentUpdate extends DocumentUpdate implements IDocumentEl /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentElementContentUpdate#getOriginalOffset() */ - public int getOriginalOffset() { + @Override + public int getOriginalOffset() { return fOriginalOffset; } /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentElementContentUpdate#getRequestedLineCount() */ - public int getRequestedLineCount() { + @Override + public int getRequestedLineCount() { return fLineCount; } /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentElementContentUpdate#setOffset(int) */ - public void setOffset( int offset ) { + @Override + public void setOffset( int offset ) { fOffset = offset; } /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentElementContentUpdate#reveal() */ - public boolean reveal() { + @Override + public boolean reveal() { return fReveal; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentLabelUpdate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentLabelUpdate.java index 98ca24458e9..5c9cf02ed23 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentLabelUpdate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentLabelUpdate.java @@ -31,7 +31,8 @@ public class DocumentLabelUpdate extends DocumentUpdate implements IDocumentElem /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentElementLabelUpdate#setLabel(java.lang.String, java.lang.String) */ - public void setLabel( String attribute, String text ) { + @Override + public void setLabel( String attribute, String text ) { fLabels.put( attribute, text ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentUpdate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentUpdate.java index a99d6ecf5a1..fb03ea9becd 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentUpdate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/DocumentUpdate.java @@ -38,28 +38,32 @@ public abstract class DocumentUpdate extends Request implements IDocumentUpdate /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentUpdate#getBaseElement() */ - public Object getBaseElement() { + @Override + public Object getBaseElement() { return fBaseElement; } /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IDocumentUpdate#getRootElement() */ - public Object getRootElement() { + @Override + public Object getRootElement() { return fRootElement; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElement() */ - public Object getElement() { + @Override + public Object getElement() { return fElement; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getElementPath() */ - public TreePath getElementPath() { + @Override + public TreePath getElementPath() { // TODO Auto-generated method stub return null; } @@ -67,7 +71,8 @@ public abstract class DocumentUpdate extends Request implements IDocumentUpdate /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getPresentationContext() */ - public IPresentationContext getPresentationContext() { + @Override + public IPresentationContext getPresentationContext() { return fPresentationContext; } @@ -122,7 +127,8 @@ public abstract class DocumentUpdate extends Request implements IDocumentUpdate /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate#getViewerInput() */ - public Object getViewerInput() { + @Override + public Object getViewerInput() { return null; } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/VirtualSourceViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/VirtualSourceViewer.java index 5667b89e2e2..f7166ca96d2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/VirtualSourceViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/viewer/VirtualSourceViewer.java @@ -48,10 +48,12 @@ public class VirtualSourceViewer extends SourceViewer { private void initControlListener() { getTextWidget().addControlListener( new ControlListener() { - public void controlMoved( ControlEvent e ) { + @Override + public void controlMoved( ControlEvent e ) { } - public void controlResized( ControlEvent e ) { + @Override + public void controlResized( ControlEvent e ) { handleControlResized(); } } ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHoverAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHoverAdapterFactory.java index c3ac264d037..58be1bd1922 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHoverAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHoverAdapterFactory.java @@ -24,7 +24,8 @@ public class DebugTextHoverAdapterFactory implements IAdapterFactory { private static final Class[] TYPES = { ICEditorTextHover.class }; private static final Object fDebugTextHover= new DebugTextHover(); - @SuppressWarnings("rawtypes") + @Override + @SuppressWarnings("rawtypes") public Object getAdapter(Object adaptableObject, Class adapterType) { if (adaptableObject instanceof ICStackFrame) { return fDebugTextHover; @@ -32,7 +33,8 @@ public class DebugTextHoverAdapterFactory implements IAdapterFactory { return null; } - @SuppressWarnings("rawtypes") + @Override + @SuppressWarnings("rawtypes") public Class[] getAdapterList() { return TYPES; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DelegatingDebugTextHover.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DelegatingDebugTextHover.java index 29b9dd3c313..963d9f5640c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DelegatingDebugTextHover.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DelegatingDebugTextHover.java @@ -34,6 +34,7 @@ public class DelegatingDebugTextHover implements ICEditorTextHover, ITextHoverEx /* * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int) */ + @Override public IRegion getHoverRegion(ITextViewer viewer, int offset) { fDelegate = getDelegate(); if (fDelegate != null) { @@ -45,7 +46,8 @@ public class DelegatingDebugTextHover implements ICEditorTextHover, ITextHoverEx /* * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion) */ - @SuppressWarnings("deprecation") + @Override + @SuppressWarnings("deprecation") public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { fDelegate = getDelegate(); if (fDelegate != null) { @@ -57,7 +59,8 @@ public class DelegatingDebugTextHover implements ICEditorTextHover, ITextHoverEx /* * @see org.eclipse.jface.text.ITextHoverExtension2#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion) */ - @SuppressWarnings("deprecation") + @Override + @SuppressWarnings("deprecation") public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) { fDelegate = getDelegate(); if (fDelegate instanceof ITextHoverExtension2) { @@ -73,7 +76,8 @@ public class DelegatingDebugTextHover implements ICEditorTextHover, ITextHoverEx /* * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator() */ - public IInformationControlCreator getHoverControlCreator() { + @Override + public IInformationControlCreator getHoverControlCreator() { if (fDelegate instanceof ITextHoverExtension) { return ((ITextHoverExtension) fDelegate).getHoverControlCreator(); } @@ -83,7 +87,8 @@ public class DelegatingDebugTextHover implements ICEditorTextHover, ITextHoverEx /* * @see org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover#setEditor(org.eclipse.ui.IEditorPart) */ - public final void setEditor(IEditorPart editor) { + @Override + public final void setEditor(IEditorPart editor) { fEditor = editor; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java index 2b109383e9b..77a174adf89 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java @@ -68,6 +68,7 @@ public class CDebugElementAdapterFactory 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 ( adapterType.isInstance( adaptableObject ) ) { @@ -171,6 +172,7 @@ public class CDebugElementAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override @SuppressWarnings( "rawtypes" ) public Class[] getAdapterList() { return new Class[] { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementLabelProviderFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementLabelProviderFactory.java index 3bb793a3aa2..6e64f25cafd 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementLabelProviderFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementLabelProviderFactory.java @@ -32,6 +32,7 @@ public class CDebugElementLabelProviderFactory 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 ( adapterType.equals( IElementLabelProvider.class ) ) { @@ -54,6 +55,7 @@ public class CDebugElementLabelProviderFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override @SuppressWarnings("rawtypes") public Class[] getAdapterList() { return new Class[] { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CMemoryAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CMemoryAdapterFactory.java index 4440524a26b..e5257bb24eb 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CMemoryAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CMemoryAdapterFactory.java @@ -27,6 +27,7 @@ public class CMemoryAdapterFactory 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 (adapterType.isInstance(adaptableObject)) { @@ -49,6 +50,7 @@ public class CMemoryAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override @SuppressWarnings("rawtypes") public Class[] getAdapterList() { return new Class[] { IAddMemoryBlocksTarget.class }; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CRegisterManagerProxy.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CRegisterManagerProxy.java index 0cbb2c7d597..2d48ad74c6d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CRegisterManagerProxy.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CRegisterManagerProxy.java @@ -50,7 +50,8 @@ public class CRegisterManagerProxy implements IDebugEventSetListener, IDebugCont /* (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextListener#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent) */ - public void debugContextChanged( DebugContextEvent event ) { + @Override + public void debugContextChanged( DebugContextEvent event ) { ICDebugElement context = null; ISelection s = event.getContext(); if ( s instanceof IStructuredSelection ) { @@ -67,7 +68,8 @@ public class CRegisterManagerProxy implements IDebugEventSetListener, IDebugCont /* (non-Javadoc) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ - public void handleDebugEvents( DebugEvent[] events ) { + @Override + public void handleDebugEvents( DebugEvent[] events ) { CRegisterManagerModelProxy modelProxy = getModelProxy(); for( int i = 0; i < events.length; i++ ) { DebugEvent event = events[i]; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CVariableLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CVariableLabelProvider.java index 0afb14f605f..42a8ff107c8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CVariableLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CVariableLabelProvider.java @@ -40,6 +40,7 @@ public class CVariableLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getLabel(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected String getLabel( TreePath elementPath, IPresentationContext context, String columnId ) throws CoreException { if ( columnId != null ) { IVariable variable = (IVariable)elementPath.getLastSegment(); @@ -80,6 +81,7 @@ public class CVariableLabelProvider extends DebugElementLabelProvider { return null; // super.getColumnText( variable, value, context, columnId ); } + @Override protected ImageDescriptor getImageDescriptor( TreePath elementPath, IPresentationContext presentationContext, String columnId ) throws CoreException { if ( columnId == null || VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals( columnId ) ) { return super.getImageDescriptor( elementPath, presentationContext, columnId ); @@ -90,6 +92,7 @@ public class CVariableLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getBackground(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected RGB getBackground( TreePath elementPath, IPresentationContext presentationContext, String columnId ) throws CoreException { Object element = elementPath.getLastSegment(); if ( columnId != null ) { @@ -107,6 +110,7 @@ public class CVariableLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getFontData(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected FontData getFontData( TreePath elementPath, IPresentationContext presentationContext, String columnId ) throws CoreException { // No public access to the Variables view text font id. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=187509 return JFaceResources.getFontDescriptor( IDebugUIConstants.PREF_VARIABLE_TEXT_FONT ).getFontData()[0]; @@ -115,6 +119,7 @@ public class CVariableLabelProvider extends DebugElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider#getForeground(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected RGB getForeground( TreePath elementPath, IPresentationContext presentationContext, String columnId ) throws CoreException { Object element = elementPath.getLastSegment(); if ( columnId == null ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CWatchExpressionFactoryAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CWatchExpressionFactoryAdapter.java index 8f8258ee97b..2558c0dc6e4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CWatchExpressionFactoryAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CWatchExpressionFactoryAdapter.java @@ -20,6 +20,7 @@ public class CWatchExpressionFactoryAdapter implements IWatchExpressionFactoryAd /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapterExtension#canCreateWatchExpression(org.eclipse.debug.core.model.IVariable) */ + @Override public boolean canCreateWatchExpression( IVariable variable ) { return ( variable instanceof ICVariable ); } @@ -27,6 +28,7 @@ public class CWatchExpressionFactoryAdapter implements IWatchExpressionFactoryAd /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter#createWatchExpression(org.eclipse.debug.core.model.IVariable) */ + @Override public String createWatchExpression( IVariable variable ) throws CoreException { return ( variable instanceof ICVariable ) ? ((ICVariable)variable).getExpressionString() : null; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CWatchExpressionFactoryAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CWatchExpressionFactoryAdapterFactory.java index 256f9f97eca..603aaff6822 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CWatchExpressionFactoryAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CWatchExpressionFactoryAdapterFactory.java @@ -21,6 +21,7 @@ public class CWatchExpressionFactoryAdapterFactory 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 ( adapterType.equals( IWatchExpressionFactoryAdapter.class ) ) { if ( adaptableObject instanceof ICVariable ) { @@ -33,6 +34,7 @@ public class CWatchExpressionFactoryAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override public Class[] getAdapterList() { return new Class[] { IWatchExpressionFactoryAdapter.class, diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DefaultViewColumnPresentationFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DefaultViewColumnPresentationFactory.java index b4ec30a2ec3..2171597d4b9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DefaultViewColumnPresentationFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DefaultViewColumnPresentationFactory.java @@ -19,13 +19,15 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationCont public class DefaultViewColumnPresentationFactory implements IColumnPresentationFactory { - public IColumnPresentation createColumnPresentation( IPresentationContext context, Object element ) { + @Override + public IColumnPresentation createColumnPresentation( IPresentationContext context, Object element ) { if ( context.getId().equals( ICDebugUIConstants.ID_SIGNALS_VIEW ) ) return new SignalsViewColumnPresentation(); return null; } - public String getColumnPresentationId( IPresentationContext context, Object element ) { + @Override + public String getColumnPresentationId( IPresentationContext context, Object element ) { if ( context.getId().equals( ICDebugUIConstants.ID_SIGNALS_VIEW ) ) return SignalsViewColumnPresentation.ID; return null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementContentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementContentProvider.java index 1fec2b4618d..134e46ac1b8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementContentProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementContentProvider.java @@ -29,7 +29,8 @@ public class DisassemblyElementContentProvider implements IDocumentElementConten /* (non-Javadoc) * @see org.eclipse.cdt.debug.ui.disassembly.IDocumentElementContentProvider#updateContent(org.eclipse.cdt.debug.ui.disassembly.IDocumentElementContentUpdate) */ - public void updateContent( final IDocumentElementContentUpdate update ) { + @Override + public void updateContent( final IDocumentElementContentUpdate update ) { Job job = new Job( "Source content update" ) { //$NON-NLS-1$ /* (non-Javadoc) @@ -51,7 +52,8 @@ public class DisassemblyElementContentProvider implements IDocumentElementConten /* (non-Javadoc) * @see org.eclipse.cdt.debug.ui.disassembly.IDocumentElementContentProvider#updateInput(org.eclipse.cdt.debug.ui.disassembly.IDocumentBaseChangeUpdate) */ - public void updateInput( final IDocumentBaseChangeUpdate update ) { + @Override + public void updateInput( final IDocumentBaseChangeUpdate update ) { Job job = new Job( "Input update" ) { //$NON-NLS-1$ /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementLabelProvider.java index a9ab9685ac4..ca9d96d211c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementLabelProvider.java @@ -44,7 +44,8 @@ public class DisassemblyElementLabelProvider implements IDocumentElementLabelPro /* (non-Javadoc) * @see org.eclipse.cdt.debug.ui.disassembly.IDocumentElementLabelProvider#update(org.eclipse.cdt.debug.ui.disassembly.IDocumentElementLabelUpdate[]) */ - public void update( final IDocumentElementLabelUpdate[] updates ) { + @Override + public void update( final IDocumentElementLabelUpdate[] updates ) { Job job = new Job( "Label update" ) { //$NON-NLS-1$ /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementProxy.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementProxy.java index c4161b7c703..848567a4377 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementProxy.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyElementProxy.java @@ -48,7 +48,8 @@ public class DisassemblyElementProxy extends AbstractModelProxy implements IDebu fireModelChanged( new ModelDelta( fElement, IModelDelta.CONTENT ) ); } - public void handleDebugEvents( DebugEvent[] events ) { + @Override + public void handleDebugEvents( DebugEvent[] events ) { for ( DebugEvent event : events ) { Object source = event.getSource(); int kind = event.getKind(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyToggleBreakpointAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyToggleBreakpointAdapter.java index 90764658bda..968e0baba89 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyToggleBreakpointAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/DisassemblyToggleBreakpointAdapter.java @@ -37,7 +37,8 @@ public class DisassemblyToggleBreakpointAdapter implements IElementToggleBreakpo /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IElementToggleBreakpointAdapter#canToggleLineBreakpoints(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object) */ - public boolean canToggleLineBreakpoints( IPresentationContext presentationContext, Object element ) { + @Override + public boolean canToggleLineBreakpoints( IPresentationContext presentationContext, Object element ) { if ( element instanceof IDisassemblyInstruction ) { return true; } @@ -47,7 +48,8 @@ public class DisassemblyToggleBreakpointAdapter implements IElementToggleBreakpo /* (non-Javadoc) * @see com.arm.eclipse.rvd.ui.disassembly.IElementToggleBreakpointAdapter#toggleLineBreakpoints(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object) */ - public void toggleLineBreakpoints( IPresentationContext presentationContext, Object element ) throws CoreException { + @Override + public void toggleLineBreakpoints( IPresentationContext presentationContext, Object element ) throws CoreException { if ( element instanceof IDisassemblyInstruction ) { IDisassemblyInstruction instruction = (IDisassemblyInstruction)element; IBreakpoint breakpoint = findBreakpoint( instruction ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/RegistersViewColumnPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/RegistersViewColumnPresentation.java index 38888e35cb3..040beae5bec 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/RegistersViewColumnPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/RegistersViewColumnPresentation.java @@ -44,33 +44,38 @@ public class RegistersViewColumnPresentation implements IColumnPresentation { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#init(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ - public void init( IPresentationContext context ) { + @Override + public void init( IPresentationContext context ) { } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#dispose() */ - public void dispose() { + @Override + public void dispose() { } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#getAvailableColumns() */ - public String[] getAvailableColumns() { + @Override + public String[] getAvailableColumns() { return ALL_COLUMNS; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#getInitialColumns() */ - public String[] getInitialColumns() { + @Override + public String[] getInitialColumns() { return INITIAL_COLUMNS; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#getHeader(java.lang.String) */ - public String getHeader( String id ) { + @Override + public String getHeader( String id ) { if ( COLUMN_ID_TYPE.equals( id ) ) { return ElementAdapterMessages.RegistersViewColumnPresentation_0; } @@ -86,21 +91,24 @@ public class RegistersViewColumnPresentation implements IColumnPresentation { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#getImageDescriptor(java.lang.String) */ - public ImageDescriptor getImageDescriptor( String id ) { + @Override + public ImageDescriptor getImageDescriptor( String id ) { return null; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#getId() */ - public String getId() { + @Override + public String getId() { return ID; } /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation#isOptional() */ - public boolean isOptional() { + @Override + public boolean isOptional() { return true; } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/RegistersViewColumnPresentationFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/RegistersViewColumnPresentationFactory.java index eefcf7f67a7..5ed14d6262e 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/RegistersViewColumnPresentationFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/RegistersViewColumnPresentationFactory.java @@ -21,7 +21,8 @@ public class RegistersViewColumnPresentationFactory implements IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory#createColumnPresentation(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object) */ - public IColumnPresentation createColumnPresentation( IPresentationContext context, Object element ) { + @Override + public IColumnPresentation createColumnPresentation( IPresentationContext context, Object element ) { if ( context.getId().equals( IDebugUIConstants.ID_REGISTER_VIEW ) ) return new RegistersViewColumnPresentation(); return null; @@ -30,7 +31,8 @@ public class RegistersViewColumnPresentationFactory implements IColumnPresentati /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory#getColumnPresentationId(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object) */ - public String getColumnPresentationId( IPresentationContext context, Object element ) { + @Override + public String getColumnPresentationId( IPresentationContext context, Object element ) { if ( context.getId().equals( IDebugUIConstants.ID_REGISTER_VIEW ) ) return RegistersViewColumnPresentation.ID; return null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java index 8ddf6aba751..8a76a0afcd4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CApplicationLaunchShortcut.java @@ -71,10 +71,12 @@ import org.eclipse.ui.dialogs.TwoPaneElementSelector; public class CApplicationLaunchShortcut implements ILaunchShortcut2 { + @Override public void launch(IEditorPart editor, String mode) { searchAndLaunch(new Object[] { editor.getEditorInput() }, mode); } + @Override public void launch(ISelection selection, String mode) { if (selection instanceof IStructuredSelection) { searchAndLaunch(((IStructuredSelection) selection).toArray(), mode); @@ -253,6 +255,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { * ILabelProvider method returns the element's toString * string. Subclasses may override. */ + @Override public String getText(Object element) { if (element == null) { return ""; //$NON-NLS-1$ @@ -328,6 +331,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { */ protected IBinary chooseBinary(List binList, String mode) { ILabelProvider programLabelProvider = new CElementLabelProvider() { + @Override public String getText(Object element) { if (element instanceof IBinary) { IBinary bin = (IBinary)element; @@ -340,6 +344,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { }; ILabelProvider qualifierLabelProvider = new CElementLabelProvider() { + @Override public String getText(Object element) { if (element instanceof IBinary) { IBinary bin = (IBinary)element; @@ -394,6 +399,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { final List results = new ArrayList(); ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell()); IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor pm) throws InterruptedException { int nElements = elements.length; pm.beginTask("Looking for executables", nElements); //$NON-NLS-1$ @@ -453,18 +459,21 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { } } + @Override public ILaunchConfiguration[] getLaunchConfigurations(ISelection selection) { // This returns null so the platform will use the ILaunchShortcut behavior // and get the configurations based on the project resource association. return null; } + @Override public ILaunchConfiguration[] getLaunchConfigurations(IEditorPart editorpart) { // This returns null so the platform will use the ILaunchShortcut behavior // and get the configurations based on the project resource association. return null; } + @Override public IResource getLaunchableResource(ISelection selection) { // Take the selection and determine which project is intended to // be used for the launch. @@ -553,6 +562,7 @@ public class CApplicationLaunchShortcut implements ILaunchShortcut2 { return projects; } + @Override public IResource getLaunchableResource(IEditorPart editorpart) { // This handles the case where the selection is text in an editor. IEditorInput editorInput = editorpart.getEditorInput(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CPropertyTester.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CPropertyTester.java index 46234d245ea..c889e1cce96 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CPropertyTester.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/CPropertyTester.java @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IAdaptable; */ public class CPropertyTester extends PropertyTester { + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { if ("isExecutable".equals(property)) //$NON-NLS-1$ return isExecutable(receiver); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/PlaceHolderLaunchConfigurationTabGroup.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/PlaceHolderLaunchConfigurationTabGroup.java index 08bccd4de4e..ed24c0296bd 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/PlaceHolderLaunchConfigurationTabGroup.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/launch/PlaceHolderLaunchConfigurationTabGroup.java @@ -27,7 +27,8 @@ public class PlaceHolderLaunchConfigurationTabGroup extends AbstractLaunchConfig /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String) */ - public void createTabs(ILaunchConfigurationDialog dialog, String mode) { + @Override + public void createTabs(ILaunchConfigurationDialog dialog, String mode) { setTabs(new ILaunchConfigurationTab[0]); } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/DebugContextPinProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/DebugContextPinProvider.java index ff05de7fb52..e12755251a4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/DebugContextPinProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/DebugContextPinProvider.java @@ -54,6 +54,7 @@ public class DebugContextPinProvider extends AbstractDebugContextProvider implem fActiveContext = activeContext; fPinHandles = pin(part, activeContext, new IPinModelListener() { + @Override public void modelChanged(ISelection selection) { // send a change notification for the view to update delegateEvent(new DebugContextEvent(DebugContextPinProvider.this, @@ -76,6 +77,7 @@ public class DebugContextPinProvider extends AbstractDebugContextProvider implem * (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextProvider2#isWindowContextProvider() */ + @Override public boolean isWindowContextProvider() { return false; } @@ -84,6 +86,7 @@ public class DebugContextPinProvider extends AbstractDebugContextProvider implem * (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextProvider#getActiveContext() */ + @Override public ISelection getActiveContext() { return fActiveContext; } @@ -144,6 +147,7 @@ public class DebugContextPinProvider extends AbstractDebugContextProvider implem */ public void delegateEvent(final DebugContextEvent event) { Display.getDefault().syncExec(new Runnable() { + @Override public void run() { fActiveContext = event.getContext(); fire(event); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/DebugEventFilterService.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/DebugEventFilterService.java index 5687cadbdc7..11fb8de3e10 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/DebugEventFilterService.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/DebugEventFilterService.java @@ -45,6 +45,7 @@ public class DebugEventFilterService { * (non-Javadoc) * @see org.eclipse.debug.ui.contexts.IDebugContextListener#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { ISelection eventContext = event.getContext(); if (eventContext instanceof IStructuredSelection) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/PinCloneUtils.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/PinCloneUtils.java index 512a26d858d..197029a7b21 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/PinCloneUtils.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/PinCloneUtils.java @@ -40,9 +40,11 @@ public class PinCloneUtils { * Default pin element color descriptor. */ private static class DefaultPinElementColorDescriptor implements IPinElementColorDescriptor { + @Override public int getOverlayColor() { return GREEN; } + @Override public ImageDescriptor getToolbarIconDescriptor() { return null; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/ViewIDCounterManager.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/ViewIDCounterManager.java index cda1a8310d6..11f2249e6b7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/ViewIDCounterManager.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/pinclone/ViewIDCounterManager.java @@ -109,8 +109,10 @@ public final class ViewIDCounterManager { // add a workbench listener to listen to preShutdown and ignore view part close event IWorkbench wb = PlatformUI.getWorkbench(); wb.addWorkbenchListener(new IWorkbenchListener() { + @Override public void postShutdown(IWorkbench workbench) {} + @Override public boolean preShutdown(IWorkbench workbench, boolean forced) { fShuttingDown = true; return true; @@ -118,13 +120,20 @@ public final class ViewIDCounterManager { }); final IPartListener2 partListener = new IPartListener2() { + @Override public void partVisible(IWorkbenchPartReference partRef) {} + @Override public void partInputChanged(IWorkbenchPartReference partRef) {} + @Override public void partHidden(IWorkbenchPartReference partRef) {} + @Override public void partDeactivated(IWorkbenchPartReference partRef) {} + @Override public void partBroughtToTop(IWorkbenchPartReference partRef) {} + @Override public void partActivated(IWorkbenchPartReference partRef) {} + @Override public void partOpened(IWorkbenchPartReference partRef) { if (partRef instanceof IViewReference) { IViewPart part = ((IViewReference) partRef).getView(false); @@ -134,6 +143,7 @@ public final class ViewIDCounterManager { } } + @Override public void partClosed(IWorkbenchPartReference partRef) { if (!fShuttingDown) recycleCounterId(partRef); @@ -147,10 +157,14 @@ public final class ViewIDCounterManager { // subscribe to new workbench window listener wb.addWindowListener(new IWindowListener() { + @Override public void windowDeactivated(IWorkbenchWindow window) {} + @Override public void windowActivated(IWorkbenchWindow window) {} + @Override public void windowClosed(IWorkbenchWindow window) {} + @Override public void windowOpened(IWorkbenchWindow window) { window.getPartService().addPartListener(partListener); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java index b1fde544166..8e0da95abd1 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java @@ -75,6 +75,7 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr private boolean fHasStateChanged = false; + @Override public void propertyChange( PropertyChangeEvent event ) { if ( event.getProperty().equals( ICDebugPreferenceConstants.PREF_SHOW_HEX_VALUES ) ) { fHasStateChanged = true; @@ -157,6 +158,7 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr * * @see org.eclipse.ui.IWorkbenchPreferencePage#init(IWorkbench) */ + @Override public void init( IWorkbench workbench ) { fWorkbench = workbench; } @@ -262,6 +264,7 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr private void refreshViews() { BusyIndicator.showWhile( getShell().getDisplay(), new Runnable() { + @Override public void run() { // Refresh interested views IWorkbenchWindow[] windows = CDebugUIPlugin.getDefault().getWorkbench().getWorkbenchWindows(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ComboFieldEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ComboFieldEditor.java index f8d04a77b3b..bf197c2186c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ComboFieldEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ComboFieldEditor.java @@ -71,6 +71,7 @@ public class ComboFieldEditor extends FieldEditor { /** * @see FieldEditor#adjustForNumColumns(int) */ + @Override protected void adjustForNumColumns(int numColumns) { if ( numColumns <= 1 ) return; @@ -86,6 +87,7 @@ public class ComboFieldEditor extends FieldEditor { /** * @see FieldEditor#doFillIntoGrid(Composite, int) */ + @Override protected void doFillIntoGrid(Composite parent, int numColumns) { Control control = getLabelControl(parent); GridData gd = new GridData(); @@ -100,6 +102,7 @@ public class ComboFieldEditor extends FieldEditor { /** * @see FieldEditor#doLoad() */ + @Override protected void doLoad() { updateComboForValue(getPreferenceStore().getString(getPreferenceName())); } @@ -107,6 +110,7 @@ public class ComboFieldEditor extends FieldEditor { /** * @see FieldEditor#doLoadDefault() */ + @Override protected void doLoadDefault() { updateComboForValue(getPreferenceStore().getDefaultString(getPreferenceName())); } @@ -114,6 +118,7 @@ public class ComboFieldEditor extends FieldEditor { /** * @see FieldEditor#doStore() */ + @Override protected void doStore() { if (fValue == null) { getPreferenceStore().setToDefault(getPreferenceName()); @@ -126,6 +131,7 @@ public class ComboFieldEditor extends FieldEditor { /** * @see FieldEditor#getNumberOfControls() */ + @Override public int getNumberOfControls() { return 1; } @@ -141,6 +147,7 @@ public class ComboFieldEditor extends FieldEditor { } fCombo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { String oldValue = fValue; String name = fCombo.getText(); @@ -185,6 +192,7 @@ public class ComboFieldEditor extends FieldEditor { /* (non-Javadoc) * @see org.eclipse.jface.preference.FieldEditor#fireValueChanged(String, Object, Object) */ + @Override protected void fireValueChanged( String property, Object oldValue, Object newValue ) { super.fireValueChanged( property, oldValue, newValue ); @@ -193,6 +201,7 @@ public class ComboFieldEditor extends FieldEditor { /* (non-Javadoc) * @see org.eclipse.jface.preference.FieldEditor#setPresentsDefaultValue(boolean) */ + @Override protected void setPresentsDefaultValue( boolean b ) { super.setPresentsDefaultValue( b ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DebuggerTypesPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DebuggerTypesPage.java index 20e7e8593b2..a89beb801fb 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DebuggerTypesPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DebuggerTypesPage.java @@ -52,14 +52,17 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe public DebuggerTypesDialogField() { super( new IListAdapter() { + @Override public void customButtonPressed( DialogField field, int index ) { } + @Override public void selectionChanged( DialogField field ) { } }, fgButtonLabels, new DebuggerTypeLabelProvider() ); } + @Override public Control[] doFillIntoGrid( Composite parent, int nColumns ) { PixelConverter converter = new PixelConverter( parent ); assertEnoughColumns( nColumns ); @@ -87,6 +90,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.dialogfields.CheckedListDialogField#getManagedButtonState(org.eclipse.jface.viewers.ISelection, int) */ + @Override protected boolean getManagedButtonState( ISelection sel, int index ) { // Enable/disable the "Default" button if ( index == 2 && sel instanceof IStructuredSelection ) { @@ -99,6 +103,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.dialogfields.CheckedListDialogField#managedButtonPressed(int) */ + @Override protected boolean managedButtonPressed( int index ) { if ( index == 2 ) { List list = getSelectedElements(); @@ -114,6 +119,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.dialogfields.ListDialogField#getListStyle() */ + @Override protected int getListStyle() { return SWT.BORDER + SWT.SINGLE + SWT.H_SCROLL + SWT.V_SCROLL; } @@ -121,6 +127,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.dialogfields.CheckedListDialogField#doCheckStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) */ + @Override protected void doCheckStateChanged( CheckStateChangedEvent e ) { super.doCheckStateChanged( e ); ICDebugConfiguration dc = (ICDebugConfiguration)e.getElement(); @@ -138,6 +145,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.dialogfields.CheckedListDialogField#checkAll(boolean) */ + @Override public void checkAll( boolean state ) { super.checkAll( state ); List list = getCheckedElements(); @@ -151,6 +159,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe */ class DebuggerTypeLabelProvider extends LabelProvider { + @Override public String getText( Object element ) { if ( element instanceof ICDebugConfiguration ) { ICDebugConfiguration dc = (ICDebugConfiguration)element; @@ -170,6 +179,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents( Composite parent ) { Font font = parent.getFont(); Composite comp = new Composite( parent, SWT.NONE ); @@ -198,6 +208,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init( IWorkbench workbench ) { fWorkbench = workbench; } @@ -216,6 +227,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performOk() */ + @Override public boolean performOk() { CDebugCorePlugin.getDefault().saveDefaultDebugConfiguration( getDefault() ); List elements = fListField.getElements(); @@ -235,6 +247,7 @@ public class DebuggerTypesPage extends PreferencePage implements IWorkbenchPrefe /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { fListField.setCheckedElements( Arrays.asList( CDebugCorePlugin.getDefault().getDefaultActiveDebugConfigurations() ) ); ICDebugConfiguration defaultConfiguration = CDebugCorePlugin.getDefault().getDefaultDefaultDebugConfiguration(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DisassemblyPreferencePage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DisassemblyPreferencePage.java index d76ce57380f..1d226c90438 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DisassemblyPreferencePage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/DisassemblyPreferencePage.java @@ -74,6 +74,7 @@ public class DisassemblyPreferencePage extends FieldEditorPreferencePage impleme /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ - public void init( IWorkbench workbench ) { + @Override + public void init( IWorkbench workbench ) { } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/SourcePreferencePage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/SourcePreferencePage.java index 9ea87e3c139..f6c21117963 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/SourcePreferencePage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/SourcePreferencePage.java @@ -53,6 +53,7 @@ public class SourcePreferencePage extends PreferencePage implements IWorkbenchPr /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Font font = parent.getFont(); Composite comp = new Composite(parent, SWT.NONE); @@ -116,6 +117,7 @@ public class SourcePreferencePage extends PreferencePage implements IWorkbenchPr * * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { fWorkbench = workbench; } @@ -167,6 +169,7 @@ public class SourcePreferencePage extends PreferencePage implements IWorkbenchPr /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { fPathViewer.setEntries(new ISourceContainer[0]); super.performDefaults(); @@ -175,6 +178,7 @@ public class SourcePreferencePage extends PreferencePage implements IWorkbenchPr /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performOk() */ + @Override public boolean performOk() { CDebugCorePlugin.getDefault().getCommonSourceLookupDirector().setSourceContainers(fPathViewer.getEntries()); CDebugCorePlugin.getDefault().savePluginPreferences(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointFilteringPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointFilteringPage.java index 3351bf7c36d..7879cd8ccc4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointFilteringPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointFilteringPage.java @@ -28,6 +28,7 @@ public class CBreakpointFilteringPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents( Composite parent ) { noDefaultAndApplyButton(); Composite mainComposite = new Composite( parent, SWT.NONE ); @@ -65,6 +66,7 @@ public class CBreakpointFilteringPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { doStore(); return super.performOk(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java index 33d7d39d729..1b188d0660f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java @@ -64,6 +64,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement /** * @see IntegerFieldEditor#checkState() */ + @Override protected boolean checkState() { Text control = getTextControl(); if ( !control.isEnabled() ) { @@ -76,6 +77,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement /** * Overrode here to be package visible. */ + @Override protected void refreshValidState() { super.refreshValidState(); } @@ -85,6 +87,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement * * @see FieldEditor#doStore() */ + @Override protected void doStore() { Text text = getTextControl(); if ( text.isEnabled() ) { @@ -95,6 +98,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement /** * Clears the error message from the message line if the error message is the error message from this field editor. */ + @Override protected void clearErrorMessage() { if ( getPage() != null ) { String message = getPage().getErrorMessage(); @@ -119,6 +123,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement /** * @see StringFieldEditor#checkState() */ + @Override protected boolean checkState() { Text control = getTextControl(); if ( !control.isEnabled() ) { @@ -128,6 +133,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement return super.checkState(); } + @Override protected void doStore() { Text text = getTextControl(); if ( text.isEnabled() ) { @@ -138,6 +144,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement /** * @see FieldEditor#refreshValidState() */ + @Override protected void refreshValidState() { super.refreshValidState(); } @@ -145,6 +152,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement /** * Clears the error message from the message line if the error message is the error message from this field editor. */ + @Override protected void clearErrorMessage() { if ( getPage() != null ) { String message = getPage().getErrorMessage(); @@ -213,6 +221,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement * * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors() */ + @Override protected void createFieldEditors() { ICBreakpoint breakpoint = getBreakpoint(); createMainLabel(breakpoint); @@ -402,6 +411,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement() */ + @Override public IAdaptable getElement() { return fElement; } @@ -409,14 +419,17 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable) */ + @Override public void setElement( IAdaptable element ) { fElement = element; } + @Override public IPreferenceStore getPreferenceStore() { return fCBreakpointPreferenceStore; } + @Override public boolean performOk() { final List changedProperties = new ArrayList( 5 ); getPreferenceStore().addPropertyChangeListener( new IPropertyChangeListener() { @@ -424,6 +437,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement /** * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) */ + @Override public void propertyChange( PropertyChangeEvent event ) { changedProperties.add( event.getProperty() ); } @@ -436,6 +450,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement protected void setBreakpointProperties( final List changedProperties ) { IWorkspaceRunnable wr = new IWorkspaceRunnable() { + @Override public void run( IProgressMonitor monitor ) throws CoreException { ICBreakpoint breakpoint = getBreakpoint(); Iterator changed = changedProperties.iterator(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModuleProperties.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModuleProperties.java index 8d628f745cd..368c2b477c9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModuleProperties.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModuleProperties.java @@ -47,6 +47,7 @@ public class ModuleProperties { return fValue; } + @Override public String toString() { String result = ""; //$NON-NLS-1$ if ( getKey() != null ) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModulePropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModulePropertyPage.java index 858decce6e6..34b86a60d1d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModulePropertyPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ModulePropertyPage.java @@ -54,6 +54,7 @@ public class ModulePropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents( Composite parent ) { noDefaultAndApplyButton(); Composite composite = new Composite( parent, SWT.NONE ); @@ -78,6 +79,7 @@ public class ModulePropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { if ( getModuleProperties() != null && getModuleProperties().isDirty() ) { final IPath path = (IPath)getModuleProperties().getProperty( ModuleProperties.SYMBOLS_FILE ); @@ -86,6 +88,7 @@ public class ModulePropertyPage extends PropertyPage { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { try { module.setSymbolsFileName( path ); @@ -171,6 +174,7 @@ public class ModulePropertyPage extends PropertyPage { fBrowseButton.addSelectionListener( new SelectionListener() { + @Override public void widgetSelected( SelectionEvent e ) { FileDialog dialog = new FileDialog( fBrowseButton.getShell() ); dialog.setFileName( ((IPath)getModuleProperties().getProperty( ModuleProperties.SYMBOLS_FILE )).toOSString() ); @@ -182,6 +186,7 @@ public class ModulePropertyPage extends PropertyPage { } } + @Override public void widgetDefaultSelected( SelectionEvent e ) { } } ); @@ -228,6 +233,7 @@ public class ModulePropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#dispose() */ + @Override public void dispose() { if ( getModuleProperties() != null ) { getModuleProperties().dispose(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java index 544c25d9db8..53d597b9a3a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/SignalPropertyPage.java @@ -42,6 +42,7 @@ public class SignalPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents( Composite parent ) { noDefaultAndApplyButton(); Composite composite = new Composite( parent, SWT.NONE ); @@ -106,11 +107,13 @@ public class SignalPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { boolean result = super.performOk(); if ( result ) { DebugPlugin.getDefault().asyncExec( new Runnable() { + @Override public void run() { if ( !getSignal().canModify() ) return; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ThreadFilterEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ThreadFilterEditor.java index 92e01ec0693..b02390ca10f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ThreadFilterEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/ThreadFilterEditor.java @@ -48,6 +48,7 @@ public class ThreadFilterEditor { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) */ + @Override public void checkStateChanged( CheckStateChangedEvent event ) { Object element = event.getElement(); if ( element instanceof IDebugTarget ) { @@ -134,6 +135,7 @@ public class ThreadFilterEditor { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren( Object parent ) { if ( parent instanceof IDebugTarget ) { ICDebugTarget target = (ICDebugTarget)((IDebugTarget)parent).getAdapter( ICDebugTarget.class ); @@ -168,6 +170,7 @@ public class ThreadFilterEditor { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ + @Override public Object getParent( Object element ) { if ( element instanceof IThread ) { return ((IThread)element).getDebugTarget(); @@ -184,6 +187,7 @@ public class ThreadFilterEditor { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ + @Override public boolean hasChildren( Object element ) { if ( element instanceof IStackFrame ) { return false; @@ -203,6 +207,7 @@ public class ThreadFilterEditor { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements( Object inputElement ) { return getChildren( inputElement ); } @@ -210,12 +215,14 @@ public class ThreadFilterEditor { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) { } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AbsolutePathSourceContainerBrowser.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AbsolutePathSourceContainerBrowser.java index 08452422185..5db70a13182 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AbsolutePathSourceContainerBrowser.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AbsolutePathSourceContainerBrowser.java @@ -21,6 +21,7 @@ import org.eclipse.swt.widgets.Shell; */ public class AbsolutePathSourceContainerBrowser extends AbstractSourceContainerBrowser { + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { return new ISourceContainer[] { new AbsolutePathSourceContainer() }; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddContainerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddContainerAction.java index db143d593a4..5969d49c0a3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddContainerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddContainerAction.java @@ -30,6 +30,7 @@ public class AddContainerAction extends SourceContainerAction { * * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { AddSourceContainerDialog dialog = new AddSourceContainerDialog(getShell(), getViewer(), fDirector); dialog.open(); @@ -42,6 +43,7 @@ public class AddContainerAction extends SourceContainerAction { /* (non-Javadoc) * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { if (selection == null || selection.isEmpty()) { return true; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java index a280b30de49..b0ce1e497b2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java @@ -64,6 +64,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { /** * Creates the dialog area to display source container types that are "browseable" */ + @Override protected Control createDialogArea(Composite ancestor) { getShell().setText(SourceLookupUIMessages.AddSourceContainerDialog_0); setTitle(SourceLookupUIMessages.AddSourceContainerDialog_1); @@ -84,6 +85,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { if (fDoubleClickSelects) { table.addSelectionListener(new SelectionAdapter() { + @Override public void widgetDefaultSelected(SelectionEvent e) { if (table.getSelectionCount() == 1) okPressed(); @@ -95,6 +97,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { fViewer.setContentProvider(new ArrayContentProvider()); fViewer.setSorter(new ViewerSorter()); fViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); String desc = null; @@ -135,6 +138,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { // Single selection dialog, so take first item in array // there will always be a selected item since we set it with viewer.setSelection diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CProjectSourceContainerBrowser.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CProjectSourceContainerBrowser.java index 0109a48e93d..2901c0931f9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CProjectSourceContainerBrowser.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CProjectSourceContainerBrowser.java @@ -34,6 +34,7 @@ public class CProjectSourceContainerBrowser extends AbstractSourceContainerBrows /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { if (director.getLaunchConfiguration() == null) { TargetProjectSourceContainerDialog dialog = new TargetProjectSourceContainerDialog(shell); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java index d7bf6cdf902..3a3441510f8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java @@ -84,11 +84,13 @@ public class CSourceNotFoundEditor extends CommonSourceNotFoundEditor { super(); } + @Override public void createPartControl(Composite parent) { super.createPartControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICDebugHelpContextIds.SOURCE_NOT_FOUND); } + @Override public void setInput(IEditorInput input) { if (input instanceof CSourceNotFoundEditorInput) { isDebugElement = false; @@ -121,6 +123,7 @@ public class CSourceNotFoundEditor extends CommonSourceNotFoundEditor { editLookupButton.setVisible(missingFile.length() > 0); } + @Override protected String getText() { if (missingFile.length() > 0) { return NLS.bind(SourceLookupUIMessages.CSourceNotFoundEditor_0, missingFile); @@ -137,6 +140,7 @@ public class CSourceNotFoundEditor extends CommonSourceNotFoundEditor { } } + @Override protected void createButtons(Composite parent) { if (isDebugElement) { GridData data; @@ -147,6 +151,7 @@ public class CSourceNotFoundEditor extends CommonSourceNotFoundEditor { disassemblyButton.setLayoutData(data); disassemblyButton.setText(SourceLookupUIMessages.CSourceNotFoundEditor_4); disassemblyButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { viewDisassembly(); } @@ -163,6 +168,7 @@ public class CSourceNotFoundEditor extends CommonSourceNotFoundEditor { locateFileButton.setLayoutData(data); locateFileButton.setText(SourceLookupUIMessages.CSourceNotFoundEditor_1); locateFileButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { locateFile(); } @@ -179,6 +185,7 @@ public class CSourceNotFoundEditor extends CommonSourceNotFoundEditor { editLookupButton.setLayoutData(data); editLookupButton.setText(SourceLookupUIMessages.CSourceNotFoundEditor_5); editLookupButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { editSourceLookupPath(); } @@ -332,6 +339,7 @@ public class CSourceNotFoundEditor extends CommonSourceNotFoundEditor { * @Override * @see org.eclipse.debug.ui.sourcelookup.CommonSourceNotFoundEditor#getArtifact() */ + @Override protected Object getArtifact() { Object o = super.getArtifact(); if (o instanceof CSourceNotFoundElement) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerBrowser.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerBrowser.java index 334658bc347..8d069569114 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerBrowser.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerBrowser.java @@ -26,6 +26,7 @@ public class CompilationDirectorySourceContainerBrowser extends AbstractSourceCo /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { ISourceContainer[] containers = new ISourceContainer[1]; CompilationDirectorySourceContainerDialog dialog = new CompilationDirectorySourceContainerDialog(shell); @@ -42,6 +43,7 @@ public class CompilationDirectorySourceContainerBrowser extends AbstractSourceCo /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#canEditSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public boolean canEditSourceContainers(ISourceLookupDirector director, ISourceContainer[] containers) { return containers.length == 1 && CompilationDirectorySourceContainer.TYPE_ID.equals(containers[0].getType().getId()); } @@ -49,6 +51,7 @@ public class CompilationDirectorySourceContainerBrowser extends AbstractSourceCo /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#editSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public ISourceContainer[] editSourceContainers(Shell shell, ISourceLookupDirector director, ISourceContainer[] containers) { if (containers.length == 1 && CompilationDirectorySourceContainer.TYPE_ID.equals(containers[0].getType().getId()) ) { CompilationDirectorySourceContainer c = (CompilationDirectorySourceContainer) containers[0]; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerDialog.java index 050df7b9e67..de48963259f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CompilationDirectorySourceContainerDialog.java @@ -101,6 +101,7 @@ public class CompilationDirectorySourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Image image = fNewContainer ? CDebugImages.get(IInternalCDebugUIConstants.IMG_ADD_COMP_DIR_WIZ) : @@ -139,6 +140,7 @@ public class CompilationDirectorySourceContainerDialog extends TitleAreaDialog { fDirText.setLayoutData(data); fDirText.setFont(font); fDirText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validate(); } @@ -153,7 +155,8 @@ public class CompilationDirectorySourceContainerDialog extends TitleAreaDialog { button.setLayoutData(data); button.setFont(JFaceResources.getDialogFont()); button.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { browse(); } }); @@ -171,6 +174,7 @@ public class CompilationDirectorySourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { String title = null; if (fNewContainer) { @@ -185,6 +189,7 @@ public class CompilationDirectorySourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Control c = super.createContents(parent); fDirText.setText(fDirectory); @@ -197,6 +202,7 @@ public class CompilationDirectorySourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { fDirectory = fDirText.getText().trim(); fCompilationSubfolders = fSubfoldersButton.getSelection(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/DownAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/DownAction.java index 33a344aa1dc..be2d42e367c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/DownAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/DownAction.java @@ -27,6 +27,7 @@ public class DownAction extends SourceContainerAction { /** * @see IAction#run() */ + @Override public void run() { List targets = getOrderedSelection(); if (targets.isEmpty()) { @@ -52,6 +53,7 @@ public class DownAction extends SourceContainerAction { /** * @see SelectionListenerAction#updateSelection(IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { return !selection.isEmpty() && !isIndexSelected(selection, getEntriesAsList().size() - 1) && getViewer().getTree().getSelection()[0].getParentItem() == null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java index 9997214fedf..8b39ce96f24 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java @@ -35,6 +35,7 @@ public class EditContainerAction extends SourceContainerAction { * * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { ISourceContainer[] replacements = fBrowser.editSourceContainers(getShell(), fDirector, fContainers); int j = 0; @@ -57,6 +58,7 @@ public class EditContainerAction extends SourceContainerAction { /* (non-Javadoc) * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { if (selection == null || selection.isEmpty()) { return false; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/MappingSourceContainerBrowser.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/MappingSourceContainerBrowser.java index 26641c938cb..5437ad71cce 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/MappingSourceContainerBrowser.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/MappingSourceContainerBrowser.java @@ -26,6 +26,7 @@ public class MappingSourceContainerBrowser extends AbstractSourceContainerBrowse /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#addSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { return new ISourceContainer[] { new MappingSourceContainer(generateName(director)) }; } @@ -33,6 +34,7 @@ public class MappingSourceContainerBrowser extends AbstractSourceContainerBrowse /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#canAddSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector) */ + @Override public boolean canAddSourceContainers(ISourceLookupDirector director) { return true; } @@ -40,6 +42,7 @@ public class MappingSourceContainerBrowser extends AbstractSourceContainerBrowse /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#canEditSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public boolean canEditSourceContainers(ISourceLookupDirector director, ISourceContainer[] containers) { return (containers.length == 1 && containers[0] instanceof MappingSourceContainer); } @@ -47,6 +50,7 @@ public class MappingSourceContainerBrowser extends AbstractSourceContainerBrowse /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#editSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ + @Override public ISourceContainer[] editSourceContainers(Shell shell, ISourceLookupDirector director, ISourceContainer[] containers) { if (containers.length == 1 && containers[0] instanceof MappingSourceContainer) { PathMappingDialog dialog = new PathMappingDialog(shell, (MappingSourceContainer)containers[0]); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/MappingSourceContainerDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/MappingSourceContainerDialog.java index 568714a2982..efe18f0d74e 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/MappingSourceContainerDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/MappingSourceContainerDialog.java @@ -68,14 +68,16 @@ public class MappingSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String) */ - public boolean canModify(Object element, String property) { + @Override + public boolean canModify(Object element, String property) { return (CP_COMPILATION_PATH.equals(property) || CP_FILE_SYSTEM_PATH.equals(property)); } /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String) */ - public Object getValue(Object element, String property) { + @Override + public Object getValue(Object element, String property) { if (element instanceof MapEntrySourceContainer) { MapEntrySourceContainer entry = (MapEntrySourceContainer)element; if (CP_COMPILATION_PATH.equals(property)) @@ -89,7 +91,8 @@ public class MappingSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object) */ - public void modify(Object element, String property, Object value) { + @Override + public void modify(Object element, String property, Object value) { MapEntrySourceContainer entry = (element instanceof Item) ? (MapEntrySourceContainer)((Item)element).getData() @@ -131,7 +134,8 @@ public class MappingSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) */ - public Image getColumnImage(Object element, int columnIndex) { + @Override + public Image getColumnImage(Object element, int columnIndex) { if (element instanceof MapEntrySourceContainer && columnIndex == 0) { return CDebugImages.get(CDebugImages.IMG_OBJS_PATH_MAP_ENTRY); } @@ -141,7 +145,8 @@ public class MappingSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ - public String getColumnText(Object element, int columnIndex) { + @Override + public String getColumnText(Object element, int columnIndex) { if (element instanceof MapEntrySourceContainer) { MapEntrySourceContainer entry = (MapEntrySourceContainer)element; if (columnIndex == 0) @@ -179,14 +184,16 @@ public class MappingSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.swt.events.ControlListener#controlMoved(org.eclipse.swt.events.ControlEvent) */ - public void controlMoved(ControlEvent e) { + @Override + public void controlMoved(ControlEvent e) { MappingSourceContainerDialog.this.controlMoved(e); } /* (non-Javadoc) * @see org.eclipse.swt.events.ControlListener#controlResized(org.eclipse.swt.events.ControlEvent) */ - public void controlResized(ControlEvent e) { + @Override + public void controlResized(ControlEvent e) { MappingSourceContainerDialog.this.controlResized(e); } }; @@ -294,7 +301,8 @@ public class MappingSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) */ - public void modifyText(ModifyEvent e) { + @Override + public void modifyText(ModifyEvent e) { } }); } @@ -335,7 +343,8 @@ public class MappingSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ - public Object[] getElements(Object inputElement) { + @Override + public Object[] getElements(Object inputElement) { if (inputElement instanceof MappingSourceContainer) { try { return ((MappingSourceContainer)inputElement).getSourceContainers(); @@ -348,13 +357,15 @@ public class MappingSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } }); @@ -371,7 +382,8 @@ public class MappingSourceContainerDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { updateViewerButtons(); } }); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/NewMappingSourceContainerBrowser.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/NewMappingSourceContainerBrowser.java index 63bd7c42be3..4af7a49e53a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/NewMappingSourceContainerBrowser.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/NewMappingSourceContainerBrowser.java @@ -36,14 +36,16 @@ public class NewMappingSourceContainerBrowser extends AbstractSourceContainerBro /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#canEditSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ - public boolean canEditSourceContainers(ISourceLookupDirector director, ISourceContainer[] containers) { + @Override + public boolean canEditSourceContainers(ISourceLookupDirector director, ISourceContainer[] containers) { return (containers.length == 1 && containers[0] instanceof MappingSourceContainer); } /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#editSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[]) */ - public ISourceContainer[] editSourceContainers(Shell shell, ISourceLookupDirector director, ISourceContainer[] containers) { + @Override + public ISourceContainer[] editSourceContainers(Shell shell, ISourceLookupDirector director, ISourceContainer[] containers) { if (containers.length == 1 && containers[0] instanceof MappingSourceContainer) { MappingSourceContainerDialog dialog = new MappingSourceContainerDialog(shell, (MappingSourceContainer)containers[0]); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/PathMappingDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/PathMappingDialog.java index 795ddcf3c4d..9ae652308e8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/PathMappingDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/PathMappingDialog.java @@ -85,6 +85,7 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { setTitle(SourceLookupUIMessages.PathMappingDialog_0); setTitleImage(CDebugImages.get(CDebugImages.IMG_WIZBAN_PATH_MAP_ENTRY)); @@ -120,6 +121,7 @@ public class PathMappingDialog extends TitleAreaDialog { fBackendPathText.setLayoutData(data); fBackendPathText.setFont(font); fBackendPathText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { update(); } @@ -137,6 +139,7 @@ public class PathMappingDialog extends TitleAreaDialog { fLocalPathText.setLayoutData(data); fLocalPathText.setFont(font); fLocalPathText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { update(); } @@ -147,6 +150,7 @@ public class PathMappingDialog extends TitleAreaDialog { button.setText(SourceLookupUIMessages.PathMappingDialog_3); button.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { DirectoryDialog dialog = new DirectoryDialog(MapEntryDialog.this.getShell()); String path = dialog.open(); @@ -155,6 +159,7 @@ public class PathMappingDialog extends TitleAreaDialog { } } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -162,6 +167,7 @@ public class PathMappingDialog extends TitleAreaDialog { return composite; } + @Override protected Control createContents(Composite parent) { Control control = super.createContents(parent); initialize(); @@ -169,6 +175,7 @@ public class PathMappingDialog extends TitleAreaDialog { return control; } + @Override protected void configureShell(Shell newShell) { newShell.setText(SourceLookupUIMessages.PathMappingDialog_4); super.configureShell(newShell); @@ -228,6 +235,7 @@ public class PathMappingDialog extends TitleAreaDialog { return new Path(fLocalPathText.getText().trim()); } + @Override protected void okPressed() { if (fEntry == null) { fEntry = new MapEntrySourceContainer(); @@ -245,6 +253,7 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { Image image = getWorkbenchLabelProvider().getImage(element); if (image != null) { @@ -256,6 +265,7 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { String label = getWorkbenchLabelProvider().getText(element); if (label == null || label.length() == 0) { @@ -278,6 +288,7 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { super.dispose(); if (fLabelProvider != null) { @@ -290,6 +301,7 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object input) { if (input instanceof MappingSourceContainer) { try { @@ -304,12 +316,14 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } @@ -332,6 +346,7 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Control control = super.createContents(parent); updateButtons(); @@ -341,6 +356,7 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { setTitle(SourceLookupUIMessages.PathMappingDialog_11); setTitleImage(CDebugImages.get(CDebugImages.IMG_WIZBAN_PATH_MAPPING)); @@ -381,6 +397,7 @@ public class PathMappingDialog extends TitleAreaDialog { fNameText.setFont(font); fNameText.setText(getMapping().getName()); fNameText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { } }); @@ -390,6 +407,7 @@ public class PathMappingDialog extends TitleAreaDialog { fViewer.getControl().setLayoutData(data); fViewer.getControl().setFont(font); fViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateButtons(); } @@ -411,6 +429,7 @@ public class PathMappingDialog extends TitleAreaDialog { fAddButton = createPushButton(buttonComp, SourceLookupUIMessages.PathMappingDialog_13, fontMetrics); fAddButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { MapEntryDialog dialog = new MapEntryDialog(getShell()); if (dialog.open() == Window.OK) { @@ -421,6 +440,7 @@ public class PathMappingDialog extends TitleAreaDialog { fEditButton = createPushButton(buttonComp, SourceLookupUIMessages.PathMappingDialog_14, fontMetrics); fEditButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { MapEntrySourceContainer[] entries = getSelection(); if (entries.length > 0) { @@ -434,6 +454,7 @@ public class PathMappingDialog extends TitleAreaDialog { fRemoveButton = createPushButton(buttonComp, SourceLookupUIMessages.PathMappingDialog_15, fontMetrics); fRemoveButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { MapEntrySourceContainer[] entries = getSelection(); for (int i = 0; i < entries.length; ++i) { @@ -479,6 +500,7 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { newShell.setText(SourceLookupUIMessages.PathMappingDialog_16); super.configureShell(newShell); @@ -491,6 +513,7 @@ public class PathMappingDialog extends TitleAreaDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { fOriginalMapping.clear(); fOriginalMapping.setName(fNameText.getText().trim()); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/ProgramRelativePathSourceContainerBrowser.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/ProgramRelativePathSourceContainerBrowser.java index 2e2f86715b0..a606a431c60 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/ProgramRelativePathSourceContainerBrowser.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/ProgramRelativePathSourceContainerBrowser.java @@ -21,6 +21,7 @@ import org.eclipse.swt.widgets.Shell; */ public class ProgramRelativePathSourceContainerBrowser extends AbstractSourceContainerBrowser { + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { return new ISourceContainer[] { new ProgramRelativePathSourceContainer() }; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/RemoveAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/RemoveAction.java index c8547744b37..c50355fac9d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/RemoveAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/RemoveAction.java @@ -28,6 +28,7 @@ public class RemoveAction extends SourceContainerAction { * * @see IAction#run() */ + @Override public void run() { List targets = getOrderedSelection(); List list = getEntriesAsList(); @@ -38,6 +39,7 @@ public class RemoveAction extends SourceContainerAction { /** * @see SelectionListenerAction#updateSelection(IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { //check that something is selected and it is a root tree node. return !selection.isEmpty() && getViewer().getTree().getSelection()[0].getParentItem() == null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAction.java index d182b26790b..86ae9771c4d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAction.java @@ -130,6 +130,7 @@ public abstract class SourceContainerAction extends SelectionListenerAction { public void setButton(Button button) { fButton = button; button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { run(); } @@ -139,6 +140,7 @@ public abstract class SourceContainerAction extends SelectionListenerAction { /** * @see IAction#setEnabled(boolean) */ + @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); if (fButton != null) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java index 1a80ed2550d..755345c161b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java @@ -21,6 +21,7 @@ public class SourceContainerAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ + @Override public Object getAdapter(Object adaptableObject, @SuppressWarnings("rawtypes") Class adapterType) { if (adapterType.equals(IWorkbenchAdapter.class)) { return new SourceContainerWorkbenchAdapter(); @@ -31,6 +32,7 @@ public class SourceContainerAdapterFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override public Class[] getAdapterList() { return new Class[]{ IWorkbenchAdapter.class }; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java index e639e123f5d..a4872261690 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java @@ -27,6 +27,7 @@ public class SourceContainerLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { Image image = getWorkbenchLabelProvider().getImage(element); if (image == null) { @@ -50,6 +51,7 @@ public class SourceContainerLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { // first, allo workbench adapter to provide label String label = getWorkbenchLabelProvider().getText(element); @@ -75,6 +77,7 @@ public class SourceContainerLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { super.dispose(); if (fLabelProvider != null) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerViewer.java index 387b092d565..89ae1b5c9f9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerViewer.java @@ -39,6 +39,7 @@ public class SourceContainerViewer extends TreeViewer { /** * @see IStructuredContentProvider#getElements(Object) */ + @Override public Object[] getElements(Object inputElement) { return getEntries(); } @@ -46,18 +47,21 @@ public class SourceContainerViewer extends TreeViewer { /** * @see IContentProvider#dispose() */ + @Override public void dispose() { } /** * @see IContentProvider#inputChanged(Viewer, Object, Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } /** * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object parentElement) { try { return ((ISourceContainer)parentElement).getSourceContainers(); @@ -69,6 +73,7 @@ public class SourceContainerViewer extends TreeViewer { /** * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ + @Override public Object getParent(Object element) { return null; } @@ -76,6 +81,7 @@ public class SourceContainerViewer extends TreeViewer { /** * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ + @Override public boolean hasChildren(Object element) { return ((ISourceContainer)element).isComposite(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java index 6f9d983d0d3..df7c5402340 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java @@ -32,6 +32,7 @@ public class SourceContainerWorkbenchAdapter implements IWorkbenchAdapter { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object o) { return null; } @@ -39,6 +40,7 @@ public class SourceContainerWorkbenchAdapter implements IWorkbenchAdapter { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ + @Override public ImageDescriptor getImageDescriptor(Object o) { if (o instanceof MappingSourceContainer) { return CDebugImages.DESC_OBJS_PATH_MAPPING; @@ -73,6 +75,7 @@ public class SourceContainerWorkbenchAdapter implements IWorkbenchAdapter { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ + @Override public String getLabel(Object o) { if (o instanceof MappingSourceContainer) { return SourceLookupUIMessages.SourceContainerWorkbenchAdapter_0 + ((MappingSourceContainer)o).getName(); @@ -86,6 +89,7 @@ public class SourceContainerWorkbenchAdapter implements IWorkbenchAdapter { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object o) { return null; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceDisplayAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceDisplayAdapter.java index 24bca53a970..c28129cb349 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceDisplayAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceDisplayAdapter.java @@ -43,91 +43,104 @@ public class SourceDisplayAdapter implements ISourceDisplay { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd() */ - public int getCharEnd() throws DebugException { + @Override + public int getCharEnd() throws DebugException { return fDelegate.getCharEnd(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getCharStart() */ - public int getCharStart() throws DebugException { + @Override + public int getCharStart() throws DebugException { return fDelegate.getCharStart(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber() */ - public int getLineNumber() throws DebugException { + @Override + public int getLineNumber() throws DebugException { return fDelegate.getLineNumber(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getName() */ - public String getName() throws DebugException { + @Override + public String getName() throws DebugException { return fDelegate.getName(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups() */ - public IRegisterGroup[] getRegisterGroups() throws DebugException { + @Override + public IRegisterGroup[] getRegisterGroups() throws DebugException { return fDelegate.getRegisterGroups(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getThread() */ - public IThread getThread() { + @Override + public IThread getThread() { return fDelegate.getThread(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#getVariables() */ - public IVariable[] getVariables() throws DebugException { + @Override + public IVariable[] getVariables() throws DebugException { return fDelegate.getVariables(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups() */ - public boolean hasRegisterGroups() throws DebugException { + @Override + public boolean hasRegisterGroups() throws DebugException { return fDelegate.hasRegisterGroups(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStackFrame#hasVariables() */ - public boolean hasVariables() throws DebugException { + @Override + public boolean hasVariables() throws DebugException { return fDelegate.hasVariables(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget() */ - public IDebugTarget getDebugTarget() { + @Override + public IDebugTarget getDebugTarget() { return fDelegate.getDebugTarget(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugElement#getLaunch() */ - public ILaunch getLaunch() { + @Override + public ILaunch getLaunch() { return fDelegate.getLaunch(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier() */ - public String getModelIdentifier() { + @Override + public String getModelIdentifier() { return fDelegate.getModelIdentifier(); } /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { + @Override + public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (ICStackFrame.class.equals(adapter)) return fDelegate; return fDelegate.getAdapter(adapter); @@ -136,105 +149,120 @@ public class SourceDisplayAdapter implements ISourceDisplay { /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#canStepInto() */ - public boolean canStepInto() { + @Override + public boolean canStepInto() { return fDelegate.canStepInto(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#canStepOver() */ - public boolean canStepOver() { + @Override + public boolean canStepOver() { return fDelegate.canStepOver(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#canStepReturn() */ - public boolean canStepReturn() { + @Override + public boolean canStepReturn() { return fDelegate.canStepReturn(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#isStepping() */ - public boolean isStepping() { + @Override + public boolean isStepping() { return fDelegate.isStepping(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#stepInto() */ - public void stepInto() throws DebugException { + @Override + public void stepInto() throws DebugException { fDelegate.stepInto(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#stepOver() */ - public void stepOver() throws DebugException { + @Override + public void stepOver() throws DebugException { fDelegate.stepOver(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IStep#stepReturn() */ - public void stepReturn() throws DebugException { + @Override + public void stepReturn() throws DebugException { fDelegate.stepReturn(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#canResume() */ - public boolean canResume() { + @Override + public boolean canResume() { return fDelegate.canResume(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() */ - public boolean canSuspend() { + @Override + public boolean canSuspend() { return fDelegate.canSuspend(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() */ - public boolean isSuspended() { + @Override + public boolean isSuspended() { return fDelegate.isSuspended(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ - public void resume() throws DebugException { + @Override + public void resume() throws DebugException { fDelegate.resume(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISuspendResume#suspend() */ - public void suspend() throws DebugException { + @Override + public void suspend() throws DebugException { fDelegate.suspend(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#canTerminate() */ - public boolean canTerminate() { + @Override + public boolean canTerminate() { return fDelegate.canTerminate(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#isTerminated() */ - public boolean isTerminated() { + @Override + public boolean isTerminated() { return fDelegate.isTerminated(); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.ITerminate#terminate() */ - public void terminate() throws DebugException { + @Override + public void terminate() throws DebugException { fDelegate.terminate(); } } @@ -242,7 +270,8 @@ public class SourceDisplayAdapter implements ISourceDisplay { /* (non-Javadoc) * @see org.eclipse.debug.ui.sourcelookup.ISourceDisplay#displaySource(java.lang.Object, org.eclipse.ui.IWorkbenchPage, boolean) */ - public void displaySource(Object element, IWorkbenchPage page, boolean forceSourceLookup) { + @Override + public void displaySource(Object element, IWorkbenchPage page, boolean forceSourceLookup) { if (element instanceof ICStackFrame) { ICStackFrame frame = (ICStackFrame)element; if (isDisplayDisassembly(frame, page)) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceFoldersRelativePathSourceContainerBrowser.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceFoldersRelativePathSourceContainerBrowser.java index d8f64d4f924..1641ee9116e 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceFoldersRelativePathSourceContainerBrowser.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceFoldersRelativePathSourceContainerBrowser.java @@ -34,6 +34,7 @@ public class SourceFoldersRelativePathSourceContainerBrowser extends AbstractSou /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#createSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { if (director.getLaunchConfiguration() == null) { TargetProjectSourceContainerDialog dialog = new TargetProjectSourceContainerDialog(shell); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/TargetProjectSourceContainerDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/TargetProjectSourceContainerDialog.java index 0478374af20..aee7752cbf8 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/TargetProjectSourceContainerDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/TargetProjectSourceContainerDialog.java @@ -37,6 +37,7 @@ public class TargetProjectSourceContainerDialog extends SelectionDialog { /** * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Font font = parent.getFont(); @@ -49,6 +50,7 @@ public class TargetProjectSourceContainerDialog extends SelectionDialog { final Button addRequired = new Button(composite, SWT.CHECK); addRequired.setText(SourceLookupUIMessages.TargetProjectSourceContainerDialog_referencedLabel); addRequired.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fAddReferencedProjects = addRequired.getSelection(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/UpAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/UpAction.java index cdfc1fec406..f407f034541 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/UpAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/UpAction.java @@ -29,6 +29,7 @@ public class UpAction extends SourceContainerAction { * * @see IAction#run() */ + @Override public void run() { List targets = getOrderedSelection(); if (targets.isEmpty()) { @@ -53,6 +54,7 @@ public class UpAction extends SourceContainerAction { /** * @see SelectionListenerAction#updateSelection(IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { //check that something is selected, it's not first in the list, and it is a root tree node. return !selection.isEmpty() && !isIndexSelected(selection, 0) && getViewer().getTree().getSelection()[0].getParentItem()==null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandler.java index 099d6b78423..0451ea04e42 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandler.java @@ -61,11 +61,13 @@ public abstract class AbstractDebugEventHandler implements IDebugEventSetListene /** * @see IDebugEventSetListener#handleDebugEvents(DebugEvent[]) */ + @Override public void handleDebugEvents(final DebugEvent[] events) { if (!isAvailable()) { return; } Runnable r= new Runnable() { + @Override public void run() { if (isAvailable()) { if (isViewVisible()) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandlerView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandlerView.java index 10e7c175b2c..c4b4a2622b7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandlerView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/AbstractDebugEventHandlerView.java @@ -46,6 +46,7 @@ public abstract class AbstractDebugEventHandlerView extends AbstractDebugView { /** * @see IWorkbenchPart#dispose() */ + @Override public void dispose() { super.dispose(); if (getEventHandler() != null) { @@ -56,6 +57,7 @@ public abstract class AbstractDebugEventHandlerView extends AbstractDebugView { /** * @see org.eclipse.debug.ui.AbstractDebugView#becomesHidden() */ + @Override protected void becomesHidden() { super.becomesHidden(); getEventHandler().viewBecomesHidden(); @@ -64,6 +66,7 @@ public abstract class AbstractDebugEventHandlerView extends AbstractDebugView { /** * @see org.eclipse.debug.ui.AbstractDebugView#becomesVisible() */ + @Override protected void becomesVisible() { super.becomesVisible(); getEventHandler().viewBecomesVisible(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/BaseViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/BaseViewer.java index 6ef1494705c..11b3d6fc5e5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/BaseViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/BaseViewer.java @@ -46,6 +46,7 @@ abstract class BaseViewer extends TreeViewer { this.selector = selector; } + @Override public void widgetSelected(SelectionEvent e) { setComparator(getViewerComparator(selector)); getTree().setSortColumn((TreeColumn) e.getSource()); @@ -83,7 +84,7 @@ abstract class BaseViewer extends TreeViewer { Tree tree = getTree(); // save the column order - StringBuilder columnOrder = new StringBuilder(); //$NON-NLS-1$ + StringBuilder columnOrder = new StringBuilder(); for (int index : tree.getColumnOrder()) { columnOrder.append(","); //$NON-NLS-1$ columnOrder.append(Integer.toString(index)); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java index 132c4a45fba..83d7fdee6a9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesContentProvider.java @@ -40,6 +40,7 @@ class ExecutablesContentProvider extends ColumnLabelProvider implements IStructu ExecutablesManager.getExecutablesManager().addExecutablesChangeListener(this); } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -51,6 +52,7 @@ class ExecutablesContentProvider extends ColumnLabelProvider implements IStructu ExecutablesManager.getExecutablesManager().removeExecutablesChangeListener(this); } + @Override public Object[] getElements(final Object inputElement) { if (inputElement instanceof ExecutablesManager) { ExecutablesManager em = (ExecutablesManager) inputElement; @@ -59,10 +61,12 @@ class ExecutablesContentProvider extends ColumnLabelProvider implements IStructu return new Object[] {}; } + @Override public Object getParent(Object element) { return null; } + @Override public boolean hasChildren(Object element) { return false; } @@ -112,6 +116,7 @@ class ExecutablesContentProvider extends ColumnLabelProvider implements IStructu return super.getText(element); } + @Override public Object[] getChildren(Object parentElement) { return new Object[] {}; } @@ -119,6 +124,7 @@ class ExecutablesContentProvider extends ColumnLabelProvider implements IStructu /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.executables.IExecutablesChangeListener#executablesListChanged() */ + @Override public void executablesListChanged() { new WorkbenchJob("execs list changed") { //$NON-NLS-1$ @Override @@ -135,6 +141,7 @@ class ExecutablesContentProvider extends ColumnLabelProvider implements IStructu /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.executables.IExecutablesChangeListener#executablesChanged(java.util.List) */ + @Override public void executablesChanged(List executables) { // Our concern is only if the list of executables changed. The // content provider for the source files viewer will care about diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesView.java index 83b37d6be72..4a9947c637a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesView.java @@ -151,6 +151,7 @@ public class ExecutablesView extends ViewPart { * * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { return columnNames; } @@ -160,6 +161,7 @@ public class ExecutablesView extends ViewPart { * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } @@ -169,6 +171,7 @@ public class ExecutablesView extends ViewPart { * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -256,8 +259,10 @@ public class ExecutablesView extends ViewPart { executablesViewer.getTree().addFocusListener(new FocusListener() { + @Override public void focusLost(FocusEvent e) {} + @Override public void focusGained(FocusEvent e) { focusedViewer = executablesViewer; } @@ -265,8 +270,10 @@ public class ExecutablesView extends ViewPart { sourceFilesViewer.getTree().addFocusListener(new FocusListener() { + @Override public void focusLost(FocusEvent e) {} + @Override public void focusGained(FocusEvent e) { focusedViewer = sourceFilesViewer; } @@ -274,20 +281,24 @@ public class ExecutablesView extends ViewPart { ExecutablesView.this.getViewSite().setSelectionProvider(new ISelectionProvider() { + @Override public void setSelection(ISelection selection) { getFocusedViewer().setSelection(selection); } + @Override public void removeSelectionChangedListener( ISelectionChangedListener listener) { executablesViewer.removeSelectionChangedListener(listener); sourceFilesViewer.removeSelectionChangedListener(listener); } + @Override public ISelection getSelection() { return getFocusedViewer().getSelection(); } + @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { executablesViewer.addSelectionChangedListener(listener); sourceFilesViewer.addSelectionChangedListener(listener); @@ -319,6 +330,7 @@ public class ExecutablesView extends ViewPart { // update the source files viewer executablesViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection newSelection = event.getSelection(); if (newSelection instanceof IStructuredSelection) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewCopyHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewCopyHandler.java index baa2199f98f..a0b138468ad 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewCopyHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewCopyHandler.java @@ -45,6 +45,7 @@ public class ExecutablesViewCopyHandler extends AbstractHandler { clipboard.dispose(); } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { ISelection selection = HandlerUtil.getCurrentSelection(event); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewer.java index cd225886b70..605205b7b26 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewer.java @@ -91,6 +91,7 @@ public class ExecutablesViewer extends BaseViewer { MenuManager popupMenuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$ IMenuListener listener = new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { manager.add(ExecutablesViewer.this.getExecutablesView().refreshAction); manager.add(ExecutablesViewer.this.getExecutablesView().importAction); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewerComparator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewerComparator.java index f259de38176..3279aec32d0 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewerComparator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewerComparator.java @@ -30,12 +30,14 @@ class ExecutablesViewerComparator extends ViewerComparator { this.columnOrder = columnOrder; } + @Override public int category(Object element) { if (element instanceof ITranslationUnit || element instanceof Executable) return 1; return 0; } + @Override @SuppressWarnings("unchecked") public int compare(Viewer viewer, Object e1, Object e2) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesContentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesContentProvider.java index b515756542a..53d70a1832d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesContentProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesContentProvider.java @@ -217,6 +217,7 @@ public class SourceFilesContentProvider extends CElementContentProvider implemen /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.executables.IExecutablesChangeListener#executablesListChanged() */ + @Override public void executablesListChanged() { // we react via IExecutablesChangeListener2 methods } @@ -225,6 +226,7 @@ public class SourceFilesContentProvider extends CElementContentProvider implemen /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.executables.IExecutablesChangeListener#executablesChanged(java.util.List) */ + @Override public void executablesChanged(final List executables) { if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, executables); @@ -298,6 +300,7 @@ public class SourceFilesContentProvider extends CElementContentProvider implemen /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.executables.IExecutablesChangeListener2#executablesAdded(java.util.List) */ + @Override public void executablesAdded(final List executables) { if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, executables); @@ -345,6 +348,7 @@ public class SourceFilesContentProvider extends CElementContentProvider implemen /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.executables.IExecutablesChangeListener2#executablesRemoved(java.util.List) */ + @Override public void executablesRemoved(final List executables) { if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, executables); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java index b571f5b614e..91b39f6dc48 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesLabelProvider.java @@ -45,6 +45,7 @@ public class SourceFilesLabelProvider extends TreeColumnViewerLabelProvider impl // brute-force clear the cache when executables change ExecutablesManager.getExecutablesManager().addExecutablesChangeListener(this); viewer.getControl().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { ExecutablesManager.getExecutablesManager().removeExecutablesChangeListener(SourceFilesLabelProvider.this); } @@ -127,6 +128,7 @@ public class SourceFilesLabelProvider extends TreeColumnViewerLabelProvider impl /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.executables.IExecutablesChangeListener#executablesListChanged() */ + @Override public void executablesListChanged() { SourceFilesViewer.flushTranslationUnitCache(); } @@ -134,6 +136,7 @@ public class SourceFilesLabelProvider extends TreeColumnViewerLabelProvider impl /* (non-Javadoc) * @see org.eclipse.cdt.debug.core.executables.IExecutablesChangeListener#executablesChanged(java.util.List) */ + @Override public void executablesChanged(List executables) { // no mapping of executable -> TU maintained; just kill all for now SourceFilesViewer.flushTranslationUnitCache(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesViewer.java index 0d7cb4ae76f..648f257087d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/SourceFilesViewer.java @@ -90,16 +90,19 @@ public class SourceFilesViewer extends BaseViewer { this.addOpenListener(new IOpenListener() { + @Override public void open(OpenEvent event) { openSourceFile(event); } }); ExecutablesManager.getExecutablesManager().addExecutablesChangeListener(new IExecutablesChangeListener(){ + @Override public void executablesListChanged() { // this doesn't directly affect us } + @Override public void executablesChanged(List executables) { // TODO: be more selective; we don't know what TUs go with which executables yet flushTranslationUnitCache(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlockDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlockDialog.java index 3456f62f035..13a4aa0f3d4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlockDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlockDialog.java @@ -165,6 +165,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, fAddressInput.addModifyListener(this); fAddressInput.addVerifyListener(new VerifyListener() { // limit entry to hex or decimal + @Override public void verifyText(VerifyEvent e) { e.doit = false; final char c = e.character; @@ -235,6 +236,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, /* (non-Javadoc) * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) */ + @Override public void modifyText(ModifyEvent e) { // if user enters text into either the address field or the expression one, automatically // select its associated radio button (and deselect the other, these are mutually exclusive) @@ -286,6 +288,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, /* (non-Javadoc) * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetDefaultSelected(SelectionEvent e) { // TODO Auto-generated method stub @@ -294,6 +297,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener, /* (non-Javadoc) * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { // if user selects a memory space, select its associated radio button (and deselect the // other, these are mutually exclusive) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java index cb8c9e9a724..57d05bdfdc6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlocks.java @@ -72,9 +72,11 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { /** Request object used to get the memory spaces */ private static class GetMemorySpacesRequest extends CRequest implements IMemorySpaceAwareMemoryBlockRetrieval.GetMemorySpacesRequest { String [] fMemorySpaces = new String[0]; + @Override public String[] getMemorySpaces() { return fMemorySpaces; } + @Override public void setMemorySpaces(String[] memorySpaceIds) { fMemorySpaces = memorySpaceIds; } @@ -83,6 +85,7 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { /* (non-Javadoc) * @see org.eclipse.debug.ui.actions.IAddMemoryBlocksTarget#addMemoryBlocks(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void addMemoryBlocks(final IWorkbenchPart part, final ISelection selection) throws CoreException { if (!(part instanceof IMemoryRenderingSite)) { @@ -116,8 +119,10 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { @Override protected IStatus run(IProgressMonitor monitor) { msRetrieval.getMemorySpaces(context, new GetMemorySpacesRequest(){ + @Override public void done() { runOnUIThread(new Runnable(){ + @Override public void run() { if (isSuccess()) { String[] memorySpaces = getMemorySpaces(); @@ -209,11 +214,13 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { } + @Override public boolean canAddMemoryBlocks(IWorkbenchPart part, ISelection selection) throws CoreException { return true; } + @Override public boolean supportsAddMemoryBlocks(IWorkbenchPart part) { return (IDebugUIConstants.ID_MEMORY_VIEW.equals(part.getSite().getId())); } @@ -387,6 +394,7 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { final ParamHolder params_f = params; final IMemoryRenderingSite memRendSite = memSite; Job job = new Job("Add Memory Block") { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { addMemoryBlocks(debugViewElement_f, retrieval_f, params_f, memRendSite); @@ -463,6 +471,7 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget { } else { UIJob job = new UIJob("Memory Browser UI Job"){ //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { runnable.run(); return Status.OK_STATUS; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentProvider.java index 737309834c6..0263e7e1b24 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleContentProvider.java @@ -30,6 +30,7 @@ public class ModuleContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildCount(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override protected int getChildCount( Object element, IPresentationContext context, IViewerUpdate monitor ) throws CoreException { return getAllChildren( element, context ).length; } @@ -37,6 +38,7 @@ public class ModuleContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#getChildren(java.lang.Object, int, int, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override protected Object[] getChildren( Object parent, int index, int length, IPresentationContext context, IViewerUpdate monitor ) throws CoreException { return getElements( getAllChildren( parent, context ), index, length ); } @@ -44,6 +46,7 @@ public class ModuleContentProvider extends ElementContentProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementContentProvider#supportsContextId(java.lang.String) */ + @Override protected boolean supportsContextId( String id ) { return IDebugUIConstants.ID_MODULE_VIEW.equals( id ); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPane.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPane.java index 631b17c6d3f..dd632e51515 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPane.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPane.java @@ -99,7 +99,8 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ - protected IStatus run(IProgressMonitor monitor) { + @Override + protected IStatus run(IProgressMonitor monitor) { fMonitor = monitor; String detail = ""; //$NON-NLS-1$ @@ -117,7 +118,8 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, private void detailComputed(final String result) { if (!fMonitor.isCanceled()) { WorkbenchJob setDetail = new WorkbenchJob("set details") { //$NON-NLS-1$ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { if (!fMonitor.isCanceled()) { getDetailDocument().set(result); } @@ -203,7 +205,8 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#createControl(org.eclipse.swt.widgets.Composite) */ - public Control createControl(Composite parent) { + @Override + public Control createControl(Composite parent) { createSourceViewer(parent); @@ -243,22 +246,26 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, // Add a document listener so actions get updated when the document changes getDetailDocument().addDocumentListener(new IDocumentListener() { - public void documentAboutToBeChanged(DocumentEvent event) {} - public void documentChanged(DocumentEvent event) { + @Override + public void documentAboutToBeChanged(DocumentEvent event) {} + @Override + public void documentChanged(DocumentEvent event) { updateSelectionDependentActions(); } }); // Add the selection listener so selection dependent actions get updated. fSourceViewer.getSelectionProvider().addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { updateSelectionDependentActions(); } }); // Add a focus listener to update actions when details area gains focus fSourceViewer.getControl().addFocusListener(new FocusAdapter() { - public void focusGained(FocusEvent e) { + @Override + public void focusGained(FocusEvent e) { getViewSite().setSelectionProvider(fSourceViewer.getSelectionProvider()); @@ -268,7 +275,8 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, getViewSite().getActionBars().updateActionBars(); } - public void focusLost(FocusEvent e) { + @Override + public void focusLost(FocusEvent e) { getViewSite().setSelectionProvider(null); @@ -319,7 +327,8 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, MenuManager menuMgr= new MenuManager(); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager mgr) { + @Override + public void menuAboutToShow(IMenuManager mgr) { fillDetailContextMenu(mgr); } }); @@ -350,7 +359,8 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#display(org.eclipse.jface.viewers.IStructuredSelection) */ - public void display(IStructuredSelection selection) { + @Override + public void display(IStructuredSelection selection) { if (selection == null){ clearSourceViewer(); @@ -384,7 +394,8 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#setFocus() */ - public boolean setFocus(){ + @Override + public boolean setFocus(){ if (fSourceViewer != null){ fSourceViewer.getTextWidget().setFocus(); return true; @@ -395,7 +406,8 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.details.AbstractDetailPane#dispose() */ - public void dispose(){ + @Override + public void dispose(){ super.dispose(); if (fDetailJob != null) fDetailJob.cancel(); @@ -410,28 +422,32 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#getDescription() */ - public String getDescription() { + @Override + public String getDescription() { return DESCRIPTION; } /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#getID() */ - public String getID() { + @Override + public String getID() { return ID; } /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPane#getName() */ - public String getName() { + @Override + public String getName() { return NAME; } /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class required) { + @Override + public Object getAdapter(Class required) { if (ITextViewer.class.equals(required)) { return fSourceViewer; } @@ -462,7 +478,8 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { String propertyName= event.getProperty(); if (propertyName.equals(IInternalCDebugUIConstants.DETAIL_PANE_FONT)) { fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(IInternalCDebugUIConstants.DETAIL_PANE_FONT)); @@ -492,14 +509,16 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#canPerformFind() */ - public boolean canPerformFind() { + @Override + public boolean canPerformFind() { return fTarget.canPerformFind(); } /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#findAndSelect(int, java.lang.String, boolean, boolean, boolean) */ - public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) { + @Override + public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) { int position = fTarget.findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord); // Explicitly tell the widget to show the selection because the viewer thinks the text is all on one line, even if wrapping is turned on. if (fSourceViewer != null){ @@ -514,28 +533,32 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#getSelection() */ - public Point getSelection() { + @Override + public Point getSelection() { return fTarget.getSelection(); } /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#getSelectionText() */ - public String getSelectionText() { + @Override + public String getSelectionText() { return fTarget.getSelectionText(); } /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#isEditable() */ - public boolean isEditable() { + @Override + public boolean isEditable() { return fTarget.isEditable(); } /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#replaceSelection(java.lang.String) */ - public void replaceSelection(String text) { + @Override + public void replaceSelection(String text) { fTarget.replaceSelection(text); } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPaneFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPaneFactory.java index 2803b6b5ae7..c1cfef1fcb9 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPaneFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPaneFactory.java @@ -28,6 +28,7 @@ public class ModuleDetailPaneFactory implements IDetailPaneFactory { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#createDetailsArea(java.lang.String) */ + @Override public IDetailPane createDetailPane(String id) { return new ModuleDetailPane(); } @@ -35,6 +36,7 @@ public class ModuleDetailPaneFactory implements IDetailPaneFactory { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDetailsTypes(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public Set getDetailPaneTypes(IStructuredSelection selection) { Set possibleIDs = new HashSet(1); possibleIDs.add(ModuleDetailPane.ID); @@ -44,6 +46,7 @@ public class ModuleDetailPaneFactory implements IDetailPaneFactory { /* (non-Javadoc) * @see org.eclipse.debug.ui.IDetailPaneFactory#getDefaultDetailPane(java.util.Set, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public String getDefaultDetailPane(IStructuredSelection selection) { // Return null so that any contributed detail pane can override the default return null; @@ -52,6 +55,7 @@ public class ModuleDetailPaneFactory implements IDetailPaneFactory { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getName(java.lang.String) */ + @Override public String getDetailPaneName(String id) { if (id.equals(ModuleDetailPane.ID)){ return ModuleDetailPane.NAME; @@ -63,6 +67,7 @@ public class ModuleDetailPaneFactory implements IDetailPaneFactory { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDescription(java.lang.String) */ + @Override public String getDetailPaneDescription(String id) { if (id.equals(ModuleDetailPane.ID)){ return ModuleDetailPane.DESCRIPTION; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleLabelProvider.java index 9c0d0240e56..17c4414c0ac 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleLabelProvider.java @@ -33,6 +33,7 @@ public class ModuleLabelProvider extends ElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementLabelProvider#getLabel(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected String getLabel( TreePath elementPath, IPresentationContext presentationContext, String columnId ) throws CoreException { Object element = elementPath.getLastSegment(); if ( element instanceof ICModule && presentationContext instanceof DebugModelPresentationContext ) { @@ -50,6 +51,7 @@ public class ModuleLabelProvider extends ElementLabelProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementLabelProvider#getImageDescriptor(org.eclipse.jface.viewers.TreePath, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String) */ + @Override protected ImageDescriptor getImageDescriptor( TreePath elementPath, IPresentationContext presentationContext, String columnId ) throws CoreException { Object element = elementPath.getLastSegment(); if ( element instanceof ICModule ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleMementoProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleMementoProvider.java index efb348221ff..ac921a69553 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleMementoProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleMementoProvider.java @@ -37,6 +37,7 @@ public class ModuleMementoProvider extends ElementMementoProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementMementoProvider#encodeElement(java.lang.Object, org.eclipse.ui.IMemento, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override protected boolean encodeElement( Object element, IMemento memento, IPresentationContext context ) throws CoreException { if ( element instanceof ICDebugTarget || element instanceof ICThread || element instanceof ICStackFrame ) { IModuleRetrieval mr = (IModuleRetrieval)((IAdaptable)element).getAdapter( IModuleRetrieval.class ); @@ -63,6 +64,7 @@ public class ModuleMementoProvider extends ElementMementoProvider { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.model.elements.ElementMementoProvider#isEqual(java.lang.Object, org.eclipse.ui.IMemento, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext) */ + @Override protected boolean isEqual( Object element, IMemento memento, IPresentationContext context ) throws CoreException { String mementoName = memento.getString( ELEMENT_NAME ); if ( mementoName != null ) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java index 793c792e9fa..f4312f42056 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewEventHandler.java @@ -37,6 +37,7 @@ public class ModulesViewEventHandler extends DebugEventHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#handlesEvent(org.eclipse.debug.core.DebugEvent) */ + @Override protected boolean handlesEvent( DebugEvent event ) { if ( event.getKind() == DebugEvent.CREATE || event.getKind() == DebugEvent.TERMINATE || @@ -48,6 +49,7 @@ public class ModulesViewEventHandler extends DebugEventHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#handleChange(org.eclipse.debug.core.DebugEvent) */ + @Override protected void handleChange( DebugEvent event ) { if ( event.getSource() instanceof ICModule ) fireDelta( (ICModule)event.getSource(), IModelDelta.STATE ); @@ -56,6 +58,7 @@ public class ModulesViewEventHandler extends DebugEventHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#handleCreate(org.eclipse.debug.core.DebugEvent) */ + @Override protected void handleCreate( DebugEvent event ) { Object source = event.getSource(); if ( source instanceof IDebugTarget ) { @@ -72,6 +75,7 @@ public class ModulesViewEventHandler extends DebugEventHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#handleTerminate(org.eclipse.debug.core.DebugEvent) */ + @Override protected void handleTerminate( DebugEvent event ) { Object source = event.getSource(); if ( source instanceof IDebugTarget ) { @@ -91,6 +95,7 @@ public class ModulesViewEventHandler extends DebugEventHandler { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DebugEventHandler#dispose() */ + @Override public synchronized void dispose() { super.dispose(); fModuleRetrieval = null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewModelProxy.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewModelProxy.java index 550198337a7..0aa87cd34e0 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewModelProxy.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewModelProxy.java @@ -32,6 +32,7 @@ public class ModulesViewModelProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#createEventHandlers() */ + @Override protected DebugEventHandler[] createEventHandlers() { return new DebugEventHandler[] { new ModulesViewEventHandler( this, fModuleRetrieval ) }; } @@ -39,6 +40,7 @@ public class ModulesViewModelProxy extends EventHandlerModelProxy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.EventHandlerModelProxy#dispose() */ + @Override public synchronized void dispose() { super.dispose(); fModuleRetrieval = null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/FlexibleSignalsView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/FlexibleSignalsView.java index 99f65b7a6c3..a9dd50c3632 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/FlexibleSignalsView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/FlexibleSignalsView.java @@ -59,6 +59,7 @@ public class FlexibleSignalsView extends AbstractDebugView implements IViewerUpd * resolved. */ private IViewerInputRequestor fRequester = new IViewerInputRequestor() { + @Override public void viewerInputComplete(IViewerInputUpdate update) { if (!update.isCanceled()) { viewerInputUpdateComplete(update); @@ -96,6 +97,7 @@ public class FlexibleSignalsView extends AbstractDebugView implements IViewerUpd variablesViewer.getPresentationContext().addPropertyChangeListener( new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (IPresentationContext.PROPERTY_COLUMNS.equals(event.getProperty())) { IAction action = getAction("ShowTypeNames"); //$NON-NLS-1$ @@ -173,6 +175,7 @@ public class FlexibleSignalsView extends AbstractDebugView implements IViewerUpd /* * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdateListener#viewerUpdatesBegin() */ + @Override public void viewerUpdatesBegin() { IWorkbenchSiteProgressService progressService = (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class); @@ -184,6 +187,7 @@ public class FlexibleSignalsView extends AbstractDebugView implements IViewerUpd /* * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdateListener#viewerUpdatesComplete() */ + @Override public void viewerUpdatesComplete() { IWorkbenchSiteProgressService progressService = (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class); @@ -195,12 +199,14 @@ public class FlexibleSignalsView extends AbstractDebugView implements IViewerUpd /* * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdateListener#updateStarted(org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override public void updateStarted(IViewerUpdate update) { } /* * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdateListener#updateComplete(org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate) */ + @Override public void updateComplete(IViewerUpdate update) { IStatus status = update.getStatus(); if (!update.isCanceled()) { @@ -215,6 +221,7 @@ public class FlexibleSignalsView extends AbstractDebugView implements IViewerUpd /* * @see org.eclipse.debug.ui.contexts.IDebugContextListener#debugContextChanged(org.eclipse.debug.ui.contexts.DebugContextEvent) */ + @Override public void debugContextChanged(DebugContextEvent event) { if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { contextActivated(event.getContext()); @@ -238,6 +245,7 @@ public class FlexibleSignalsView extends AbstractDebugView implements IViewerUpd /* * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelChangedListener#modelChanged(org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta, org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy) */ + @Override public void modelChanged(IModelDelta delta, IModelProxy proxy) { } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsView.java index b7b9e505633..bc750218b68 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsView.java @@ -58,6 +58,7 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) */ + @Override public Image getColumnImage( Object element, int columnIndex ) { if ( columnIndex == 0 ) return getModelPresentation().getImage( element ); @@ -67,6 +68,7 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ + @Override public String getColumnText( Object element, int columnIndex ) { if ( element instanceof ICSignal ) { try { @@ -94,6 +96,7 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#createViewer(org.eclipse.swt.widgets.Composite) */ + @Override protected Viewer createViewer( Composite parent ) { // add tree viewer @@ -115,12 +118,14 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#createActions() */ + @Override protected void createActions() { } /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId() */ + @Override protected String getHelpContextId() { return ICDebugHelpContextIds.SIGNALS_VIEW; } @@ -128,6 +133,7 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override protected void fillContextMenu( IMenuManager menu ) { menu.add( new Separator( IWorkbenchActionConstants.MB_ADDITIONS ) ); updateObjects(); @@ -136,12 +142,14 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager) */ + @Override protected void configureToolBar( IToolBarManager tbm ) { } /* (non-Javadoc) * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged( IWorkbenchPart part, ISelection selection ) { if ( !isAvailable() || !isVisible() ) return; @@ -154,12 +162,14 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange( PropertyChangeEvent event ) { } /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.views.IDebugExceptionHandler#handleException(org.eclipse.debug.core.DebugException) */ + @Override public void handleException( DebugException e ) { showMessage( e.getMessage() ); } @@ -200,6 +210,7 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#becomesHidden() */ + @Override protected void becomesHidden() { setViewerInput( new StructuredSelection() ); super.becomesHidden(); @@ -208,6 +219,7 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractDebugView#becomesVisible() */ + @Override protected void becomesVisible() { super.becomesVisible(); IViewPart part = getSite().getPage().findView( IDebugUIConstants.ID_DEBUG_VIEW ); @@ -220,6 +232,7 @@ public class SignalsView extends AbstractDebugEventHandlerView /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPart#dispose() */ + @Override public void dispose() { getSite().getPage().removeSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, this ); CDebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener( this ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewColumnPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewColumnPresentation.java index 071e13b2cdb..b384286dd9c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewColumnPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewColumnPresentation.java @@ -50,21 +50,26 @@ public class SignalsViewColumnPresentation implements IColumnPresentation { COLUMN_ID_DESC }; - public void init( IPresentationContext context ) { + @Override + public void init( IPresentationContext context ) { } - public void dispose() { + @Override + public void dispose() { } - public String[] getAvailableColumns() { + @Override + public String[] getAvailableColumns() { return ALL_COLUMNS; } - public String[] getInitialColumns() { + @Override + public String[] getInitialColumns() { return INITIAL_COLUMNS; } - public String getHeader( String id ) { + @Override + public String getHeader( String id ) { if ( COLUMN_ID_NAME.equals( id ) ) { return CL_NAME; } @@ -80,15 +85,18 @@ public class SignalsViewColumnPresentation implements IColumnPresentation { return null; } - public ImageDescriptor getImageDescriptor( String id ) { + @Override + public ImageDescriptor getImageDescriptor( String id ) { return null; } - public String getId() { + @Override + public String getId() { return ID; } - public boolean isOptional() { + @Override + public boolean isOptional() { return true; } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewContentProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewContentProvider.java index 6d9508f9340..333463c23b5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewContentProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewContentProvider.java @@ -37,6 +37,7 @@ public class SignalsViewContentProvider implements IStructuredContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements( Object inputElement ) { if ( inputElement instanceof ICDebugTarget ) { ICDebugTarget target = (ICDebugTarget)inputElement; @@ -58,12 +59,14 @@ public class SignalsViewContentProvider implements IStructuredContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) { } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewEventHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewEventHandler.java index 6f521dbcfbb..dc317614086 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewEventHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/signals/SignalsViewEventHandler.java @@ -37,6 +37,7 @@ public class SignalsViewEventHandler extends AbstractDebugEventHandler { /* (non-Javadoc) * @see org.eclipse.cdt.debug.internal.ui.views.AbstractDebugEventHandler#doHandleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ + @Override protected void doHandleDebugEvents( DebugEvent[] events ) { for( int i = 0; i < events.length; i++ ) { DebugEvent event = events[i]; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/AbstractCDebuggerPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/AbstractCDebuggerPage.java index d038b0ff3f9..02cdbec83d4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/AbstractCDebuggerPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/AbstractCDebuggerPage.java @@ -31,6 +31,7 @@ abstract public class AbstractCDebuggerPage extends AbstractLaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.cdt.debug.ui.ICDebuggerPage#init(java.lang.String) */ + @Override public void init(String debuggerID) { fDebuggerID = debuggerID; } @@ -47,6 +48,7 @@ abstract public class AbstractCDebuggerPage extends AbstractLaunchConfigurationT /* (non-Javadoc) * @see org.eclipse.cdt.debug.ui.ICDebuggerPage#getDebuggerIdentifier() */ + @Override public String getDebuggerIdentifier() { return fDebuggerID; } @@ -55,7 +57,8 @@ abstract public class AbstractCDebuggerPage extends AbstractLaunchConfigurationT * @see org.eclipse.cdt.debug.ui.ICDebuggerPageExtension#addContentChangeListener(org.eclipse.cdt.debug.ui.ICDebuggerPageExtension.IContentChangeListener) */ /** @since 7.0 */ - public void addContentChangeListener(IContentChangeListener listener) { + @Override + public void addContentChangeListener(IContentChangeListener listener) { fContentListeners.add(listener); } @@ -63,7 +66,8 @@ abstract public class AbstractCDebuggerPage extends AbstractLaunchConfigurationT * @see org.eclipse.cdt.debug.ui.ICDebuggerPageExtension#removeContentChangeListener(org.eclipse.cdt.debug.ui.ICDebuggerPageExtension.IContentChangeListener) */ /** @since 7.0 */ - public void removeContentChangeListener(IContentChangeListener listener) { + @Override + public void removeContentChangeListener(IContentChangeListener listener) { fContentListeners.remove(listener); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/PinElementHandle.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/PinElementHandle.java index df13a90df2d..c66b2b04b9b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/PinElementHandle.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/PinElementHandle.java @@ -35,6 +35,7 @@ public class PinElementHandle extends PlatformObject implements IPinElementHandl * (non-Javadoc) * @see org.eclipse.cdt.debug.ui.IPinProvider.IPinElementHandle#getDebugContext() */ + @Override public synchronized Object getDebugContext() { return fDebugContext; } @@ -52,6 +53,7 @@ public class PinElementHandle extends PlatformObject implements IPinElementHandl * (non-Javadoc) * @see org.eclipse.cdt.debug.core.IPinProvider.IHandleLabelProvider#getLabel() */ + @Override public String getLabel() { return fLabel; } @@ -60,6 +62,7 @@ public class PinElementHandle extends PlatformObject implements IPinElementHandl * (non-Javadoc) * @see org.eclipse.cdt.debug.ui.IPinProvider.IPinElementHandle#getPinElementColorDescriptor() */ + @Override public IPinElementColorDescriptor getPinElementColorDescriptor() { return fColorDescriptor; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionDialog.java index c0e7310c854..0c317785ea2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionDialog.java @@ -70,11 +70,13 @@ public class ActionDialog extends Dialog { lastSelectedActionTypeIndex = 0; } + @Override protected void cancelPressed() { actionPage.actionDialogCanceled(); super.cancelPressed(); } + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); if (originalAction == null) @@ -88,6 +90,7 @@ public class ActionDialog extends Dialog { * * @param parent */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); @@ -98,6 +101,7 @@ public class ActionDialog extends Dialog { * * @param parent */ + @Override protected Control createDialogArea(Composite parent) { dialogArea = (Composite) super.createDialogArea(parent); final GridLayout gridLayout = new GridLayout(); @@ -115,6 +119,7 @@ public class ActionDialog extends Dialog { combo = new Combo(dialogArea, SWT.READ_ONLY); combo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(final SelectionEvent e) { try { showActionComposite(); @@ -185,10 +190,12 @@ public class ActionDialog extends Dialog { /** * Return the initial size of the dialog */ + @Override protected Point getInitialSize() { return new Point(500, 375); } + @Override protected void okPressed() { if (originalAction == null) CDebugUIPlugin.getDefault().getPreferenceStore().setValue(ACTION_DIALOG_LAST_SELECTED, breakpointAction.getTypeName()); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsList.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsList.java index 8cbed1eefbb..2309b34c0d7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsList.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsList.java @@ -44,6 +44,7 @@ public class ActionsList extends Composite { table.setLinesVisible(true); table.setHeaderVisible(true); table.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateButtons(); } @@ -65,6 +66,7 @@ public class ActionsList extends Composite { removeButton.setText(Messages.getString("ActionsList.3")); //$NON-NLS-1$ removeButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { HandleRemoveButton(); } @@ -72,6 +74,7 @@ public class ActionsList extends Composite { final Button upButton = new Button(this, SWT.NONE); upButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(final SelectionEvent e) { HandleUpButton(); } @@ -81,6 +84,7 @@ public class ActionsList extends Composite { final Button downButton = new Button(this, SWT.NONE); downButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(final SelectionEvent e) { HandleDownButton(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsPreferencePage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsPreferencePage.java index b5beb797876..3c93a524ca2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsPreferencePage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsPreferencePage.java @@ -34,6 +34,7 @@ public class ActionsPreferencePage extends PreferencePage implements IWorkbenchP setPreferenceStore(CDebugUIPlugin.getDefault().getPreferenceStore()); } + @Override public Control createContents(Composite parent) { Composite container = new Composite(parent, SWT.NONE); final GridLayout gridLayout = new GridLayout(); @@ -45,6 +46,7 @@ public class ActionsPreferencePage extends PreferencePage implements IWorkbenchP actionsList.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true)); actionsList.getDeleteButton().addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { actionsList.HandleDeleteButton(); } @@ -56,14 +58,17 @@ public class ActionsPreferencePage extends PreferencePage implements IWorkbenchP return container; } + @Override public void init(IWorkbench workbench) { } + @Override public boolean performCancel() { CDebugCorePlugin.getDefault().getBreakpointActionManager().revertActionData(); return super.performCancel(); } + @Override public boolean performOk() { CDebugCorePlugin.getDefault().getBreakpointActionManager().saveActionData(); return super.performOk(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsPropertyPage.java index 12755bf0ba1..704c6df3c57 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsPropertyPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ActionsPropertyPage.java @@ -37,6 +37,7 @@ public class ActionsPropertyPage extends PropertyPage { super(); } + @Override public Control createContents(Composite parent) { Composite container = new Composite(parent, SWT.NULL); @@ -80,12 +81,14 @@ public class ActionsPropertyPage extends PropertyPage { actionsList.setNames(actionNames); globalActionsList.getAttachButton().addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { HandleAttachButton(); } }); globalActionsList.getDeleteButton().addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { HandleDeleteButton(); } @@ -118,6 +121,7 @@ public class ActionsPropertyPage extends PropertyPage { globalActionsList.HandleDeleteButton(); } + @Override protected void performDefaults() { try { breakpointMarker.setAttribute(BreakpointActionManager.BREAKPOINT_ACTION_ATTRIBUTE, ""); //$NON-NLS-1$ @@ -127,6 +131,7 @@ public class ActionsPropertyPage extends PropertyPage { super.performDefaults(); } + @Override public boolean performCancel() { try { breakpointMarker.setAttribute(BreakpointActionManager.BREAKPOINT_ACTION_ATTRIBUTE, savedActionNames); @@ -136,6 +141,7 @@ public class ActionsPropertyPage extends PropertyPage { return super.performCancel(); } + @Override public boolean performOk() { try { CDebugCorePlugin.getDefault().getBreakpointActionManager().saveActionData(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java index aa5942fec48..16a683cce03 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolAction.java @@ -45,6 +45,7 @@ public class ExternalToolAction extends AbstractBreakpointAction { private String externalToolName = ""; //$NON-NLS-1$ + @Override public IStatus execute(IBreakpoint breakpoint, IAdaptable context, IProgressMonitor monitor) { IStatus errorStatus = null; ILaunchManager lcm = DebugPlugin.getDefault().getLaunchManager(); @@ -79,6 +80,7 @@ public class ExternalToolAction extends AbstractBreakpointAction { return Status.OK_STATUS; } + @Override public String getDefaultName() { return "Untitled External Tool Action"; //$NON-NLS-1$ } @@ -91,10 +93,12 @@ public class ExternalToolAction extends AbstractBreakpointAction { this.externalToolName = launchConfigName; } + @Override public String getIdentifier() { return "org.eclipse.cdt.debug.ui.breakpointactions.ExternalToolAction"; //$NON-NLS-1$ } + @Override public String getMemento() { String executeData = ""; //$NON-NLS-1$ if (externalToolName != null) { @@ -129,14 +133,17 @@ public class ExternalToolAction extends AbstractBreakpointAction { return executeData; } + @Override public String getSummary() { return MessageFormat.format(Messages.getString("ExternalToolAction.Summary"), new Object[] { externalToolName }); //$NON-NLS-1$ } + @Override public String getTypeName() { return Messages.getString("ExternalToolAction.TypeName"); //$NON-NLS-1$ } + @Override public void initializeFromMemento(String data) { Element root = null; DocumentBuilder parser; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionComposite.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionComposite.java index cbbcd6bb387..8e1c799f8ec 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionComposite.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionComposite.java @@ -63,6 +63,7 @@ public class ExternalToolActionComposite extends Composite { * * @see org.eclipse.ui.IPluginContribution#getLocalId() */ + @Override public String getLocalId() { return type.getIdentifier(); } @@ -72,6 +73,7 @@ public class ExternalToolActionComposite extends Composite { * * @see org.eclipse.ui.IPluginContribution#getPluginId() */ + @Override public String getPluginId() { return type.getPluginIdentifier(); } @@ -90,12 +92,15 @@ public class ExternalToolActionComposite extends Composite { this.setInput(composite); this.setContentProvider(new IStructuredContentProvider() { + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public void dispose() { } + @Override public Object[] getElements(Object parent) { return launchConfigs; } @@ -103,6 +108,7 @@ public class ExternalToolActionComposite extends Composite { this.setLabelProvider(new LabelProvider() { + @Override public String getText(Object element) { return ((ILaunchConfiguration) element).getName(); } @@ -138,6 +144,7 @@ public class ExternalToolActionComposite extends Composite { final Button browseButton = new Button(this, SWT.NONE); browseButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { ILaunchConfiguration[] lcs = getLaunchConfigurations(); @@ -174,6 +181,7 @@ public class ExternalToolActionComposite extends Composite { final Button externalToolsButton = new Button(this, SWT.NONE); externalToolsButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { DebugUITools.openLaunchConfigurationDialogOnGroup(externalToolActionComposite.getShell(), new StructuredSelection(), "org.eclipse.ui.externaltools.launchGroup"); //$NON-NLS-1$ browseButton.setEnabled(getLaunchConfigurations().length > 0); @@ -221,10 +229,12 @@ public class ExternalToolActionComposite extends Composite { return (ILaunchConfiguration[]) onlyExternalTools.toArray(new ILaunchConfiguration[onlyExternalTools.size()]); } + @Override public void dispose() { super.dispose(); } + @Override protected void checkSubclass() { // Disable the check that prevents subclassing of SWT components } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionPage.java index 3e82bc3363d..9004af66410 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionPage.java @@ -19,6 +19,7 @@ public class ExternalToolActionPage extends PlatformObject implements IBreakpoin private ExternalToolAction externalToolAction; private ExternalToolActionComposite runComposite; + @Override public void actionDialogCanceled() { } @@ -26,10 +27,12 @@ public class ExternalToolActionPage extends PlatformObject implements IBreakpoin return externalToolAction; } + @Override public void actionDialogOK() { externalToolAction.setExternalToolName(runComposite.getLaunchConfigName()); } + @Override public Composite createComposite(IBreakpointAction action, Composite composite, int style) { externalToolAction = (ExternalToolAction) action; runComposite = new ExternalToolActionComposite(composite, style, this); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/GlobalActionsList.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/GlobalActionsList.java index d2bf73a3427..71fa80c8387 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/GlobalActionsList.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/GlobalActionsList.java @@ -44,10 +44,12 @@ public class GlobalActionsList extends Composite { table = new Table(this, SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI); table.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateButtons(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { HandleEditButton(); } @@ -92,6 +94,7 @@ public class GlobalActionsList extends Composite { newButton = new Button(this, SWT.NONE); newButton.setLayoutData(new GridData()); newButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { try { @@ -106,6 +109,7 @@ public class GlobalActionsList extends Composite { editButton = new Button(this, SWT.NONE); editButton.setText(Messages.getString("GlobalActionsList.5")); //$NON-NLS-1$ editButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { HandleEditButton(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java index 3dfa3f3fec8..1de08d0c327 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogAction.java @@ -58,6 +58,7 @@ public class LogAction extends AbstractBreakpointAction { * (non-Javadoc) * @see org.eclipse.cdt.debug.core.breakpointactions.IBreakpointAction#execute(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus execute(IBreakpoint breakpoint, IAdaptable context, IProgressMonitor monitor) { IStatus result = Status.OK_STATUS; try { @@ -101,14 +102,17 @@ public class LogAction extends AbstractBreakpointAction { ConsolePlugin.getDefault().getConsoleManager().showConsoleView(console); } + @Override public String getDefaultName() { return Messages.getString("LogAction.UntitledName"); //$NON-NLS-1$ } + @Override public String getIdentifier() { return "org.eclipse.cdt.debug.ui.breakpointactions.LogAction"; //$NON-NLS-1$ } + @Override public String getMemento() { String logData = ""; //$NON-NLS-1$ @@ -151,6 +155,7 @@ public class LogAction extends AbstractBreakpointAction { this.message = message; } + @Override public String getSummary() { String summary = getMessage(); if (summary.length() > 32) @@ -158,10 +163,12 @@ public class LogAction extends AbstractBreakpointAction { return summary; } + @Override public String getTypeName() { return Messages.getString("LogAction.TypeName"); //$NON-NLS-1$ } + @Override public void initializeFromMemento(String data) { Element root = null; DocumentBuilder parser; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogActionComposite.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogActionComposite.java index b2a76f84d9e..d092776e5b6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogActionComposite.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogActionComposite.java @@ -43,6 +43,7 @@ public class LogActionComposite extends Composite { expressionButton = new Button(this, SWT.CHECK); expressionButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(final SelectionEvent e) { } }); @@ -53,10 +54,12 @@ public class LogActionComposite extends Composite { expressionButton.setSelection(this.logActionPage.getLogAction().isEvaluateExpression()); } + @Override protected void checkSubclass() { // Disable the check that prevents subclassing of SWT components } + @Override public void dispose() { super.dispose(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogActionPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogActionPage.java index d6ed1b1eeae..fdb7c983b67 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogActionPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/LogActionPage.java @@ -23,14 +23,17 @@ public class LogActionPage extends PlatformObject implements IBreakpointActionPa return logAction; } + @Override public void actionDialogCanceled() { } + @Override public void actionDialogOK() { logAction.setMessage(editor.getMessage()); logAction.setEvaluateExpression(editor.getIsExpression()); } + @Override public Composite createComposite(IBreakpointAction action, Composite composite, int style) { logAction = (LogAction) action; editor = new LogActionComposite(composite, style, this); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/PreferenceInitializer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/PreferenceInitializer.java index dd03f3a9c04..53f1172b4de 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/PreferenceInitializer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/PreferenceInitializer.java @@ -24,6 +24,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { * * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { IPreferenceStore store = CDebugUIPlugin.getDefault().getPreferenceStore(); store.setDefault(PreferenceConstants.P_BOOLEAN, true); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java index cfac0f8160d..1dde0b7f618 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeAction.java @@ -49,6 +49,7 @@ public class ResumeAction extends AbstractBreakpointAction { * (non-Javadoc) * @see org.eclipse.cdt.debug.core.breakpointactions.IBreakpointAction#execute(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus execute(IBreakpoint breakpoint, IAdaptable context, IProgressMonitor monitor) { IStatus errorStatus = null; long endTime = System.currentTimeMillis() + getPauseTime()*1000; @@ -87,6 +88,7 @@ public class ResumeAction extends AbstractBreakpointAction { return errorStatus; } + @Override public String getDefaultName() { return Messages.getString("ResumeAction.UntitledName"); //$NON-NLS-1$ } @@ -99,10 +101,12 @@ public class ResumeAction extends AbstractBreakpointAction { this.pauseTime = pauseTime; } + @Override public String getIdentifier() { return "org.eclipse.cdt.debug.ui.breakpointactions.ResumeAction"; //$NON-NLS-1$ } + @Override public String getMemento() { String resumeData = ""; //$NON-NLS-1$ @@ -136,16 +140,19 @@ public class ResumeAction extends AbstractBreakpointAction { return resumeData; } + @Override public String getSummary() { if (pauseTime == 0) return Messages.getString("ResumeAction.SummaryImmediately"); //$NON-NLS-1$ return MessageFormat.format(Messages.getString("ResumeAction.SummaryResumeTime"), new Object[] { Integer.valueOf(pauseTime) }); //$NON-NLS-1$ } + @Override public String getTypeName() { return Messages.getString("ResumeAction.TypeName"); //$NON-NLS-1$ } + @Override public void initializeFromMemento(String data) { Element root = null; DocumentBuilder parser; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeActionComposite.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeActionComposite.java index 9a1a9a9913b..2c986c6950b 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeActionComposite.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeActionComposite.java @@ -50,10 +50,12 @@ public class ResumeActionComposite extends Composite { // } + @Override public void dispose() { super.dispose(); } + @Override protected void checkSubclass() { // Disable the check that prevents subclassing of SWT components } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeActionPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeActionPage.java index ebb8f578a92..03fcafe9abe 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeActionPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ResumeActionPage.java @@ -23,13 +23,16 @@ public class ResumeActionPage extends PlatformObject implements IBreakpointActio return resumeAction; } + @Override public void actionDialogCanceled() { } + @Override public void actionDialogOK() { resumeAction.setPauseTime(resumeComposite.getPauseTime()); } + @Override public Composite createComposite(IBreakpointAction action, Composite composite, int style) { resumeAction = (ResumeAction) action; resumeComposite = new ResumeActionComposite(composite, style, this); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java index 234ff3bec78..86773f1c595 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundAction.java @@ -50,6 +50,7 @@ public class SoundAction extends AbstractBreakpointAction { class SoundPlayer extends Thread { + @Override public void run() { AudioInputStream soundStream; try { @@ -95,6 +96,7 @@ public class SoundAction extends AbstractBreakpointAction { public SoundAction() { } + @Override public IStatus execute(IBreakpoint breakpoint, IAdaptable context, IProgressMonitor monitor) { if (soundFile == null || !soundFile.exists()) { String errorMsg = MessageFormat.format(Messages.getString("SoundAction.error.0"), new Object[] {getSummary()}); //$NON-NLS-1$ @@ -105,6 +107,7 @@ public class SoundAction extends AbstractBreakpointAction { return Status.OK_STATUS; } + @Override public String getDefaultName() { return Messages.getString("SoundAction.UntitledName"); //$NON-NLS-1$ } @@ -113,16 +116,19 @@ public class SoundAction extends AbstractBreakpointAction { return soundFile; } + @Override public String getSummary() { if (soundFile == null) return ""; //$NON-NLS-1$ return soundFile.getAbsolutePath(); } + @Override public String getTypeName() { return Messages.getString("SoundAction.ActionTypeName"); //$NON-NLS-1$ } + @Override public String getMemento() { String soundData = ""; //$NON-NLS-1$ if (soundFile != null) { @@ -157,6 +163,7 @@ public class SoundAction extends AbstractBreakpointAction { return soundData; } + @Override public void initializeFromMemento(String data) { Element root = null; DocumentBuilder parser; @@ -173,6 +180,7 @@ public class SoundAction extends AbstractBreakpointAction { } } + @Override public String getIdentifier() { return "org.eclipse.cdt.debug.ui.breakpointactions.SoundAction"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundActionComposite.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundActionComposite.java index 56f8faed244..7282abcccb1 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundActionComposite.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundActionComposite.java @@ -63,6 +63,7 @@ public class SoundActionComposite extends Composite { combo_1.setLayoutData(gridData); comboModifyListener = new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { if (combo_1.getText().length() > 0) { String filePath = combo_1.getText(); @@ -85,6 +86,7 @@ public class SoundActionComposite extends Composite { final Button browseButton = new Button(this, SWT.NONE); browseButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); dialog.setText(Messages.getString("SoundActionComposite.5")); //$NON-NLS-1$ @@ -104,6 +106,7 @@ public class SoundActionComposite extends Composite { tryItButton.setLayoutData(new GridData()); tryItButton.setText(Messages.getString("SoundActionComposite.7")); //$NON-NLS-1$ tryItButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { File soundFile = new File(soundFilePathLabel.getText()); playSoundFile(soundFile); @@ -126,10 +129,12 @@ public class SoundActionComposite extends Composite { rebuildRecentSoundsCombo(); } + @Override protected void checkSubclass() { // Disable the check that prevents subclassing of SWT components } + @Override public void dispose() { super.dispose(); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundActionPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundActionPage.java index 7ca9e1734b7..4c6aa92afdf 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundActionPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/SoundActionPage.java @@ -66,9 +66,11 @@ public class SoundActionPage extends PlatformObject implements IBreakpointAction loadRecentSounds(); } + @Override public void actionDialogCanceled() { } + @Override public void actionDialogOK() { saveRecentSounds(); soundAction.setSoundFile(editor.getSoundFile()); @@ -92,6 +94,7 @@ public class SoundActionPage extends PlatformObject implements IBreakpointAction } + @Override public Composite createComposite(IBreakpointAction action, Composite composite, int style) { this.soundAction = (SoundAction) action; loadRecentSounds(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java index f3f58b10c41..53c76328c19 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java @@ -115,6 +115,7 @@ public class CEventBreakpointsLabelProviderFactory 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 (adapterType.equals(IElementLabelProvider.class)) { @@ -133,6 +134,7 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ + @Override @SuppressWarnings("rawtypes") public Class[] getAdapterList() { return new Class[] { IElementLabelProvider.class, ILabelProvider.class }; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java index 177329d5a24..65c2bc81394 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java @@ -33,14 +33,17 @@ class DefaultCBreakpointUIContribution implements ICBreakpointsUIContribution { private Map valueLabels = new LinkedHashMap(); private Map conditions = new HashMap(); + @Override public String getId() { return attId; } + @Override public String getLabel() { return attLabel; } + @Override public String getDebugModelId() { return modelId; } @@ -48,6 +51,7 @@ class DefaultCBreakpointUIContribution implements ICBreakpointsUIContribution { static private Class[] fieldSignature = new Class[] { String.class, String.class, Composite.class }; + @Override public FieldEditor getFieldEditor(String name, String labelText, Composite parent) { String className = fieldEditorClassName; if (fieldEditorClassName == null) { @@ -68,25 +72,30 @@ class DefaultCBreakpointUIContribution implements ICBreakpointsUIContribution { } } + @Override public String getLabelForValue(String value) { if (valueLabels.containsKey(value)) return valueLabels.get(value); return value; } + @Override public String getMarkerType() { return markerType; } + @Override public String[] getPossibleValues() { Set set = valueLabels.keySet(); return set.toArray(new String[set.size()]); } + @Override public String getType() { return attType; } + @Override public boolean isApplicable(Map properties) { for (Object key : properties.keySet()) { String value = conditions.get(key); @@ -150,6 +159,7 @@ class DefaultCBreakpointUIContribution implements ICBreakpointsUIContribution { return attId + " " + attLabel; //$NON-NLS-1$ } + @Override public String getFieldEditorClassName() { return fieldEditorClassName; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/editors/AbstractDebugTextHover.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/editors/AbstractDebugTextHover.java index 32044430116..e3e51d90555 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/editors/AbstractDebugTextHover.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/editors/AbstractDebugTextHover.java @@ -152,6 +152,7 @@ public abstract class AbstractDebugTextHover implements ICEditorTextHover, IText */ protected abstract String evaluateExpression(String expression); + @Override public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { if (canEvaluate()) { String expression = getExpressionText(textViewer, hoverRegion); @@ -173,18 +174,21 @@ public abstract class AbstractDebugTextHover implements ICEditorTextHover, IText return null; } + @Override public IRegion getHoverRegion(ITextViewer viewer, int offset) { if (viewer != null) return CDebugUIUtils.findWord(viewer.getDocument(), offset); return null; } + @Override public final void setEditor(IEditorPart editor) { if (editor != null) { fEditor = editor; } } + @Override public IInformationControlCreator getHoverControlCreator() { return null; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/AbstractImportExecutableWizard.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/AbstractImportExecutableWizard.java index 9e90b285943..05d28348613 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/AbstractImportExecutableWizard.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/AbstractImportExecutableWizard.java @@ -94,6 +94,7 @@ public abstract class AbstractImportExecutableWizard extends Wizard implements I } } + @Override public void addPages() { super.addPages(); pageOne = new ImportExecutablePageOne(this); @@ -128,6 +129,7 @@ public abstract class AbstractImportExecutableWizard extends Wizard implements I UIJob openLaunchConfigJob = new UIJob(Messages.AbstractImportExecutableWizard_CreateLaunchConfiguration) { + @Override public IStatus runInUIThread(IProgressMonitor monitor) { DebugUITools.openLaunchConfigurationDialogOnGroup(CUIPlugin.getActiveWorkbenchShell(), selection, identifier); return Status.OK_STATUS; @@ -146,6 +148,7 @@ public abstract class AbstractImportExecutableWizard extends Wizard implements I return pageTwo; } + @Override public IWizardPage getNextPage(IWizardPage page) { if (page == pageOne) { pageTwo.checkExecutableSettings(); @@ -165,11 +168,13 @@ public abstract class AbstractImportExecutableWizard extends Wizard implements I return Messages.AbstractImportExecutableWizard_windowTitle; } + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { setWindowTitle(getDefaultWindowTitle()); setNeedsProgressMonitor(true); } + @Override public boolean performFinish() { ICProject targetProject = null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageOne.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageOne.java index 290974f22d3..cdbb2841e61 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageOne.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageOne.java @@ -171,6 +171,7 @@ public class ImportExecutablePageOne extends WizardPage { return true; } + @Override public void createControl(Composite parent) { initializeDialogUnits(parent); @@ -233,26 +234,32 @@ public class ImportExecutablePageOne extends WizardPage { executablesViewer.setContentProvider(new ITreeContentProvider() { + @Override public void dispose() { } + @Override public Object[] getChildren(Object parentElement) { return null; } + @Override public Object[] getElements(Object inputElement) { return executables; } + @Override public Object getParent(Object element) { return null; } + @Override public boolean hasChildren(Object element) { return false; } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } @@ -260,6 +267,7 @@ public class ImportExecutablePageOne extends WizardPage { }); executablesViewer.setLabelProvider(new LabelProvider() { + @Override public String getText(Object element) { return ((File) element).getName(); } @@ -267,6 +275,7 @@ public class ImportExecutablePageOne extends WizardPage { executablesViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { setPageComplete(executablesViewer.getCheckedElements().length > 0); } @@ -275,7 +284,8 @@ public class ImportExecutablePageOne extends WizardPage { executablesViewer.setInput(this); executablesViewer.getTree().getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = wizard.getExecutableListLabel(); } } @@ -290,6 +300,7 @@ public class ImportExecutablePageOne extends WizardPage { selectMultipleButton.setText(Messages.ImportExecutablePageOne_SearchDirectory); selectMultipleButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { checkControlState(); String selectedDirectory = multipleExecutablePathField @@ -308,7 +319,8 @@ public class ImportExecutablePageOne extends WizardPage { this.multipleExecutablePathField = new Text(workArea, SWT.BORDER); multipleExecutablePathField.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = Messages.ImportExecutablePageOne_SearchDirectory; } } @@ -320,6 +332,7 @@ public class ImportExecutablePageOne extends WizardPage { setButtonLayoutData(selectMultipleBrowseButton); selectMultipleBrowseButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleLocationBrowseButtonPressed(); } @@ -327,6 +340,7 @@ public class ImportExecutablePageOne extends WizardPage { }); multipleExecutablePathField.addFocusListener(new FocusAdapter() { + @Override public void focusLost(FocusEvent e) { updateExecutablesList(multipleExecutablePathField.getText() .trim()); @@ -353,8 +367,10 @@ public class ImportExecutablePageOne extends WizardPage { binaryParserCombo.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { supportedBinaryParsers[0] = instantiateBinaryParser(exts[binaryParserCombo.getSelectionIndex()]); supportedBinaryParserIds[0] = exts[binaryParserCombo.getSelectionIndex()].getUniqueIdentifier(); @@ -413,6 +429,7 @@ public class ImportExecutablePageOne extends WizardPage { selectSingleButton = new Button(workArea, SWT.RADIO); selectSingleButton.setText(Messages.ImportExecutablePageOne_SelectExecutable); selectSingleButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { checkControlState(); if (selectSingleFile) { @@ -428,7 +445,8 @@ public class ImportExecutablePageOne extends WizardPage { this.singleExecutablePathField = new Text(workArea, SWT.BORDER); singleExecutablePathField.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = Messages.ImportExecutablePageOne_SelectExecutable; } } @@ -437,6 +455,7 @@ public class ImportExecutablePageOne extends WizardPage { singleExecutablePathField.setData("name", "singleExecutablePathField"); //$NON-NLS-1$ //$NON-NLS-2$ singleExecutablePathField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validateExe(singleExecutablePathField.getText()); } @@ -450,6 +469,7 @@ public class ImportExecutablePageOne extends WizardPage { setButtonLayoutData(selectSingleBrowseButton); selectSingleBrowseButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); wizard.setupFileDialog(dialog); @@ -483,6 +503,7 @@ public class ImportExecutablePageOne extends WizardPage { selectAll = new Button(buttonsComposite, SWT.PUSH); selectAll.setText(Messages.ImportExecutablePageOne_SelectAll); selectAll.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { executablesViewer.setAllChecked(true); setPageComplete(executables.length > 0); @@ -494,6 +515,7 @@ public class ImportExecutablePageOne extends WizardPage { deselectAll = new Button(buttonsComposite, SWT.PUSH); deselectAll.setText(Messages.ImportExecutablePageOne_DeselectAll); deselectAll.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { executablesViewer.setAllChecked(false); @@ -570,6 +592,7 @@ public class ImportExecutablePageOne extends WizardPage { previouslySearchedDirectory = path; try { getContainer().run(true, true, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) { monitor.beginTask(Messages.ImportExecutablePageOne_Searching, IProgressMonitor.UNKNOWN); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java index c2187a2c216..6ed5b53e1da 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java @@ -150,6 +150,7 @@ public class ImportExecutablePageTwo extends WizardPage { return null; } + @Override public void createControl(Composite parent) { Composite container = new Composite(parent, SWT.NULL); @@ -166,6 +167,7 @@ public class ImportExecutablePageTwo extends WizardPage { newProjectButton = new Button(composite, SWT.RADIO); newProjectButton.setText(Messages.ImportExecutablePageTwo_NewProjectName); newProjectButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { isCreateNewProjectSelected = newProjectButton.getSelection(); updateControls(); @@ -178,6 +180,7 @@ public class ImportExecutablePageTwo extends WizardPage { newProjectName.setLayoutData(gridData); newProjectName.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateControls(); } @@ -201,6 +204,7 @@ public class ImportExecutablePageTwo extends WizardPage { existingProjectButton = new Button(composite, SWT.RADIO); existingProjectButton.setText(Messages.ImportExecutablePageTwo_ExistingProject); existingProjectButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { isCreateNewProjectSelected = !newProjectButton.getSelection(); updateControls(); @@ -213,6 +217,7 @@ public class ImportExecutablePageTwo extends WizardPage { existingProjectName.setLayoutData(gridData_3); existingProjectName.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateControls(); } @@ -223,6 +228,7 @@ public class ImportExecutablePageTwo extends WizardPage { searchButton.setLayoutData(new GridData()); searchButton.setText(Messages.ImportExecutablePageTwo_Search); searchButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { ICProject project = chooseCProject(); if (project == null) { @@ -253,6 +259,7 @@ public class ImportExecutablePageTwo extends WizardPage { createLaunch.setText(Messages.ImportExecutablePageTwo_CreateLaunch); createLaunch.setSelection(true); createLaunch.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { isCreateLaunchConfigurationSelected = createLaunch .getSelection(); @@ -267,6 +274,7 @@ public class ImportExecutablePageTwo extends WizardPage { configTypes.setLayoutData(gridData_6); configTypes.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { setLaunchConfigurationName(configurationName.getText().trim()); } @@ -284,6 +292,7 @@ public class ImportExecutablePageTwo extends WizardPage { configurationName.setLayoutData(gridData_7); configurationName.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateControls(); } @@ -388,7 +397,8 @@ public class ImportExecutablePageTwo extends WizardPage { getContainer().updateButtons(); } - public boolean isPageComplete() { + @Override + public boolean isPageComplete() { setErrorMessage(null); if (isCreateNewProjectSelected()) { if (getNewProjectName().length() == 0) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutableWizard.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutableWizard.java index 00435f704e4..602a44651ab 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutableWizard.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutableWizard.java @@ -22,22 +22,27 @@ import org.eclipse.swt.widgets.FileDialog; */ public class ImportExecutableWizard extends AbstractImportExecutableWizard { + @Override public String getPageOneTitle() { return Messages.ImportExecutableWizard_pageOneTitle; } + @Override public String getPageOneDescription() { return Messages.ImportExecutableWizard_pageOneDescription; } + @Override public String getExecutableListLabel() { return Messages.ImportExecutableWizard_executableListLabel; } + @Override public void setupFileDialog(FileDialog dialog) { dialog.setText(Messages.ImportExecutableWizard_fileDialogTitle); } + @Override public boolean supportsConfigurationType(ILaunchConfigurationType type) { return true; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/preferences/ReadOnlyFieldEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/preferences/ReadOnlyFieldEditor.java index b410f8dd54b..5b6f2615ec3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/preferences/ReadOnlyFieldEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/preferences/ReadOnlyFieldEditor.java @@ -35,6 +35,7 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC /* (non-Javadoc) * Method declared on FieldEditor. */ + @Override protected void adjustForNumColumns(int numColumns) { GridData gd = (GridData) textField.getLayoutData(); gd.horizontalSpan = numColumns - 1; @@ -52,6 +53,7 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC * but must call super.doFillIntoGrid. *

*/ + @Override protected void doFillIntoGrid(Composite parent, int numColumns) { getLabelControl(parent); @@ -68,6 +70,7 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC /* (non-Javadoc) * Method declared on FieldEditor. */ + @Override protected void doLoad() { if (textField != null) { String value = getPreferenceStore().getString(getPreferenceName()); @@ -83,6 +86,7 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC /* (non-Javadoc) * Method declared on FieldEditor. */ + @Override protected void doLoadDefault() { if (textField != null) { String value = getPreferenceStore().getDefaultString(getPreferenceName()); @@ -93,6 +97,7 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC /* (non-Javadoc) * Method declared on FieldEditor. */ + @Override public int getNumberOfControls() { return 2; } @@ -134,6 +139,7 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC textField = new Label(parent, SWT.WRAP); textField.setFont(parent.getFont()); textField.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent event) { textField = null; } @@ -147,6 +153,7 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC /* (non-Javadoc) * Method declared on FieldEditor. */ + @Override public boolean isValid() { return true; } @@ -154,6 +161,7 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC /* (non-Javadoc) * Method declared on FieldEditor. */ + @Override public void setFocus() { if (textField != null) { textField.setFocus(); @@ -163,6 +171,7 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC /* * @see FieldEditor.setEnabled(boolean,Composite). */ + @Override public void setEnabled(boolean enabled, Composite parent) { super.setEnabled(enabled, parent); getTextControl(parent).setEnabled(enabled); @@ -174,10 +183,12 @@ public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIC // nothing } + @Override public ICBreakpointsUIContribution getContribution() { return contribution; } + @Override public void setContribution(ICBreakpointsUIContribution contribution) { this.contribution = contribution; } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/DefaultSourceLocator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/DefaultSourceLocator.java index cbef6f18ebc..81ad415c89d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/DefaultSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/DefaultSourceLocator.java @@ -36,6 +36,7 @@ public class DefaultSourceLocator extends CSourceLookupDirector { /* (non-Javadoc) * @see org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector#initializeFromMemento(java.lang.String, org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFromMemento(String memento, ILaunchConfiguration configuration) throws CoreException { Element rootElement = DebugPlugin.parseDocument(memento); if (rootElement.getNodeName().equalsIgnoreCase(OldDefaultSourceLocator.ELEMENT_NAME)) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java index 5e4fd03b1e3..ef48577bea3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/OldDefaultSourceLocator.java @@ -68,6 +68,7 @@ public class OldDefaultSourceLocator implements IPersistableSourceLocator, IAdap /* (non-Javadoc) * @see org.eclipse.debug.core.model.IPersistableSourceLocator#getMemento() */ + @Override public String getMemento() throws CoreException { if ( getCSourceLocator() != null ) { Document document = null; @@ -100,6 +101,7 @@ public class OldDefaultSourceLocator implements IPersistableSourceLocator, IAdap /* (non-Javadoc) * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeFromMemento(java.lang.String) */ + @Override public void initializeFromMemento( String memento ) throws CoreException { Exception ex = null; try { @@ -145,6 +147,7 @@ public class OldDefaultSourceLocator implements IPersistableSourceLocator, IAdap /* (non-Javadoc) * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeDefaults(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeDefaults( ILaunchConfiguration configuration ) throws CoreException { setCSourceLocator( SourceLookupFactory.createSourceLocator( getProject( configuration ) ) ); String memento = configuration.getAttribute( ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, "" ); //$NON-NLS-1$ @@ -155,6 +158,7 @@ public class OldDefaultSourceLocator implements IPersistableSourceLocator, IAdap /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter( Class adapter ) { if ( getCSourceLocator() instanceof IAdaptable ) { if ( adapter.equals( ICSourceLocator.class ) ) { @@ -170,6 +174,7 @@ public class OldDefaultSourceLocator implements IPersistableSourceLocator, IAdap /* (non-Javadoc) * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(org.eclipse.debug.core.model.IStackFrame) */ + @Override public Object getSourceElement( IStackFrame stackFrame ) { return null; } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMIBreakInsertCommand.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMIBreakInsertCommand.java index 395b24b10a2..f4c416fa94f 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMIBreakInsertCommand.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMIBreakInsertCommand.java @@ -47,14 +47,17 @@ public class TestMIBreakInsertCommand { private class TestContext implements IBreakpointsTargetDMContext { + @Override public IDMContext[] getParents() { return null; } + @Override public String getSessionId() { return null; } + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { return null; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java index 06aa5f1b0cd..e3559fee57e 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java @@ -48,14 +48,17 @@ public class TestMICommandConstructCommand { private class TestContext implements IDMContext { + @Override public IDMContext[] getParents() { return null; } + @Override public String getSessionId() { return null; } + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { return null; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BackgroundRunner.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BackgroundRunner.java index f3e75948128..3ba58c112b1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BackgroundRunner.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BackgroundRunner.java @@ -84,11 +84,13 @@ public class BackgroundRunner extends BlockJUnit4ClassRunner { this.job = job; } + @Override public boolean isTrue() { // Interrupt the wait method if the job signaled that it has finished. return ((Boolean)job.getProperty(BACKGROUND_TEST_EXECUTION_FINISHED)).booleanValue(); } + @Override public void dispose() { // nothing to do } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java index 0baded31f22..dc0dd55aeb0 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java @@ -191,6 +191,7 @@ public class BaseTestCase { // register ourselves with that particular session before any events // occur. We want to find out when the break on main() occurs. SessionStartedListener sessionStartedListener = new SessionStartedListener() { + @Override public void sessionStarted(DsfSession session) { session.addServiceEventListener(new SessionEventListener(session), null); } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java index 755e82a568a..379679aadba 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java @@ -61,7 +61,8 @@ public class ServiceEventWaitor { fEventTypeClass = eventClass; fEvent = null; Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fSession.addServiceEventListener(ServiceEventWaitor.this, null); } }; @@ -79,6 +80,7 @@ public class ServiceEventWaitor { super.finalize(); if (fEventTypeClass != null) { Runnable runnable = new Runnable() { + @Override public void run() { fSession.removeServiceEventListener(ServiceEventWaitor.this); } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java index 85aad2d9988..2c870308a31 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java @@ -80,7 +80,8 @@ public class SyncUtil { fSession = session; Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { DsfServicesTracker tracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); @@ -135,6 +136,7 @@ public class SyncUtil { MIStoppedEvent.class); fRunControl.getExecutor().submit(new Runnable() { + @Override public void run() { // No need for a RequestMonitor since we will wait for the // ServiceEvent telling us the program has been suspended again @@ -172,6 +174,7 @@ public class SyncUtil { MIStoppedEvent.class); fRunControl.getExecutor().submit(new Runnable() { + @Override public void run() { // No need for a RequestMonitor since we will wait for the // ServiceEvent telling us the program has been suspended again @@ -289,6 +292,7 @@ public class SyncUtil { MIStoppedEvent.class); fRunControl.getExecutor().submit(new Runnable() { + @Override public void run() { // No need for a RequestMonitor since we will wait for the // ServiceEvent telling us the program has been suspended again @@ -318,6 +322,7 @@ public class SyncUtil { MIRunningEvent.class); fRunControl.getExecutor().submit(new Runnable() { + @Override public void run() { // No need for a RequestMonitor since we will wait for the // ServiceEvent telling us the program has been resumed @@ -419,7 +424,8 @@ public class SyncUtil { public static IExpressionDMContext createExpression(final IDMContext parentCtx, final String expression) throws Throwable { Callable callable = new Callable() { - public IExpressionDMContext call() throws Exception { + @Override + public IExpressionDMContext call() throws Exception { return fExpressions.createExpression(parentCtx, expression); } }; @@ -430,7 +436,8 @@ public class SyncUtil { final IFormattedValues service, final IFormattedDataDMContext dmc, final String formatId) throws Throwable { Callable callable = new Callable() { - public FormattedValueDMContext call() throws Exception { + @Override + public FormattedValueDMContext call() throws Exception { return service.getFormattedValueContext(dmc, formatId); } }; @@ -439,7 +446,8 @@ public class SyncUtil { public static IMIExecutionDMContext createExecutionContext(final IContainerDMContext parentCtx, final int threadId) throws Throwable { Callable callable = new Callable() { - public IMIExecutionDMContext call() throws Exception { + @Override + public IMIExecutionDMContext call() throws Exception { String threadIdStr = Integer.toString(threadId); IProcessDMContext processDmc = DMContexts.getAncestorOfType(parentCtx, IProcessDMContext.class); IThreadDMContext threadDmc = fProcessesService.createThreadContext(processDmc, threadIdStr); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java index 77f46fc07f6..8c8fb00d626 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBProcessesTest.java @@ -66,7 +66,8 @@ public class GDBProcessesTest extends BaseTestCase { public void init() throws Exception { fSession = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); fProcService = fServicesTracker.getService(IMIProcesses.class); } @@ -112,7 +113,8 @@ public class GDBProcessesTest extends BaseTestCase { */ final IProcessDMContext processContext = DMContexts.getAncestorOfType(SyncUtil.getContainerContext(), IProcessDMContext.class); fSession.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fProcService.getExecutionData(processContext, rm); } }); @@ -152,7 +154,8 @@ public class GDBProcessesTest extends BaseTestCase { final IProcessDMContext processContext = DMContexts.getAncestorOfType(SyncUtil.getContainerContext(), IProcessDMContext.class); fProcService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { IThreadDMContext threadDmc = fProcService.createThreadContext(processContext, THREAD_ID); fProcService.getExecutionData(threadDmc, rm); } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java index d15243629bf..a96c18f0a83 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java @@ -97,7 +97,8 @@ public class LaunchConfigurationAndRestartTest extends BaseTestCase { fSession = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); fExpService = fServicesTracker.getService(IExpressions.class); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java index ebd91a9412b..73d8363f861 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java @@ -183,7 +183,8 @@ public class MIBreakpointsTest extends BaseTestCase { // Get a reference to the breakpoint service fSession = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); assert(fServicesTracker != null); @@ -214,7 +215,8 @@ public class MIBreakpointsTest extends BaseTestCase { // Clear the references (not strictly necessary) Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fRunControl.getSession().removeServiceEventListener(MIBreakpointsTest.this); } }; @@ -396,6 +398,7 @@ public class MIBreakpointsTest extends BaseTestCase { // Evaluate the expression (asynchronously) fWait.waitReset(); fSession.getExecutor().submit(new Runnable() { + @Override public void run() { fExpressionService.getFormattedExpressionValue(formattedValueDMC, drm); } @@ -441,7 +444,8 @@ public class MIBreakpointsTest extends BaseTestCase { // Issue the breakpoint request fWait.waitReset(); fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.getBreakpoints(context, drm); } }); @@ -483,7 +487,8 @@ public class MIBreakpointsTest extends BaseTestCase { // Issue the breakpoint request fWait.waitReset(); fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.getBreakpointDMData(breakpoint, drm); } }); @@ -562,7 +567,8 @@ public class MIBreakpointsTest extends BaseTestCase { // Issue the remove insertion request fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.insertBreakpoint(context, attributes, drm); } }); @@ -601,7 +607,8 @@ public class MIBreakpointsTest extends BaseTestCase { // Issue the add breakpoint request fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.removeBreakpoint(breakpoint, rm); } }); @@ -640,7 +647,8 @@ public class MIBreakpointsTest extends BaseTestCase { // Issue the update breakpoint request fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.updateBreakpoint(breakpoint, delta, rm); } }); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java index 5cea8052955..6bde4a324f8 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java @@ -164,7 +164,8 @@ public class MICatchpointsTest extends BaseTestCase { // Get a reference to the breakpoint service fSession = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); assertNotNull(fServicesTracker); @@ -195,7 +196,8 @@ public class MICatchpointsTest extends BaseTestCase { @After public void testCaseCleanup() throws Exception { Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fRunControl.getSession().removeServiceEventListener(MICatchpointsTest.this); } }; @@ -353,6 +355,7 @@ public class MICatchpointsTest extends BaseTestCase { // Evaluate the expression (asynchronously) fWait.waitReset(); fSession.getExecutor().submit(new Runnable() { + @Override public void run() { fExpressionService.getFormattedExpressionValue(formattedValueDMC, drm); } @@ -398,7 +401,8 @@ public class MICatchpointsTest extends BaseTestCase { // Issue the breakpoint request fWait.waitReset(); fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.getBreakpoints(context, drm); } }); @@ -440,7 +444,8 @@ public class MICatchpointsTest extends BaseTestCase { // Issue the breakpoint request fWait.waitReset(); fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.getBreakpointDMData(breakpoint, drm); } }); @@ -483,7 +488,8 @@ public class MICatchpointsTest extends BaseTestCase { // Issue the remove breakpoint request fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.insertBreakpoint(context, attributes, drm); } }); @@ -522,7 +528,8 @@ public class MICatchpointsTest extends BaseTestCase { // Issue the add breakpoint request fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.removeBreakpoint(breakpoint, rm); } }); @@ -561,7 +568,8 @@ public class MICatchpointsTest extends BaseTestCase { // Issue the update breakpoint request fBreakpointService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fBreakpointService.updateBreakpoint(breakpoint, delta, rm); } }); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIDisassemblyTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIDisassemblyTest.java index 0ed2d588db7..64066f25ba1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIDisassemblyTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIDisassemblyTest.java @@ -92,7 +92,8 @@ public class MIDisassemblyTest extends BaseTestCase { public void testCaseInitialization() throws Exception { fSession = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { // Get a reference to the memory service fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); assert(fServicesTracker != null); @@ -160,7 +161,8 @@ public class MIDisassemblyTest extends BaseTestCase { // Evaluate the expression (asynchronously) fSession.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpressionService.getFormattedExpressionValue(formattedValueDMC, drm); } }); @@ -211,7 +213,8 @@ public class MIDisassemblyTest extends BaseTestCase { // Issue the get memory request fSession.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fDisassembly.getInstructions(dmc, startAddress, endAddress, drm); } }); @@ -252,7 +255,8 @@ public class MIDisassemblyTest extends BaseTestCase { // Issue the get memory request fSession.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fDisassembly.getInstructions(dmc, function, linenum, count, drm); } }); @@ -292,7 +296,8 @@ public class MIDisassemblyTest extends BaseTestCase { // Issue the get memory request fSession.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fDisassembly.getMixedInstructions(dmc, startAddress, endAddress, drm); } }); @@ -333,7 +338,8 @@ public class MIDisassemblyTest extends BaseTestCase { // Issue the get memory request fSession.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fDisassembly.getMixedInstructions(dmc, function, linenum, count, drm); } }); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java index 6686606254e..61934dbb880 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java @@ -80,7 +80,8 @@ public class MIExpressionsTest extends BaseTestCase { public void init() throws Exception { fSession = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); fExpService = fServicesTracker.getService(IExpressions.class); @@ -94,7 +95,8 @@ public class MIExpressionsTest extends BaseTestCase { @After public void shutdown() throws Exception { Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fSession.removeServiceEventListener(MIExpressionsTest.this); } }; @@ -324,7 +326,8 @@ public class MIExpressionsTest extends BaseTestCase { final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, "f"); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getSubExpressionCount( exprDmc, new DataRequestMonitor(fExpService.getExecutor(), null) { @@ -367,7 +370,8 @@ public class MIExpressionsTest extends BaseTestCase { final IExpressionDMContext exprDmc = SyncUtil.createExpression(frameDmc, "f"); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getExpressionData( exprDmc, new DataRequestMonitor(fExpService.getExecutor(), null) { @@ -437,7 +441,8 @@ public class MIExpressionsTest extends BaseTestCase { final IExpressionDMContext[] children = getChildren(exprDmc, new String[] {"Base", "Base"}); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(children[0], MIExpressions.DETAILS_FORMAT), new DataRequestMonitor(fExpService.getExecutor(), null) { @@ -457,7 +462,8 @@ public class MIExpressionsTest extends BaseTestCase { // This second child is testing the fact that we could have the child named // the same as its type and we still want to be able to get the details without error. fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(children[1], MIExpressions.DETAILS_FORMAT), new DataRequestMonitor(fExpService.getExecutor(), null) { @@ -495,7 +501,8 @@ public class MIExpressionsTest extends BaseTestCase { final IExpressionDMContext[] childOfPointer = getChildren(children[1], new String[] {"*pNested"}); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(children[0], MIExpressions.DETAILS_FORMAT), new DataRequestMonitor(fExpService.getExecutor(), null) { @@ -513,7 +520,8 @@ public class MIExpressionsTest extends BaseTestCase { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(children[1], MIExpressions.DETAILS_FORMAT), new DataRequestMonitor(fExpService.getExecutor(), null) { @@ -531,7 +539,8 @@ public class MIExpressionsTest extends BaseTestCase { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(childOfPointer[0], MIExpressions.DETAILS_FORMAT), new DataRequestMonitor(fExpService.getExecutor(), null) { @@ -580,7 +589,8 @@ public class MIExpressionsTest extends BaseTestCase { // Write the new value using its formatted value fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.writeExpression( exprDmc, newValueFormatted, @@ -605,7 +615,8 @@ public class MIExpressionsTest extends BaseTestCase { // Read the new value in decimal and check that it is what we expected fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getFormattedExpressionValue(fExpService.getFormattedValueContext(exprDmc, IFormattedValues.DECIMAL_FORMAT), new DataRequestMonitor(fExpService .getExecutor(), null) { @@ -666,7 +677,8 @@ public class MIExpressionsTest extends BaseTestCase { // Write the new value using its formatted value fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.writeExpression(exprDmc, invalidValueFormatted, format, new RequestMonitor(fExpService .getExecutor(), null) { @Override @@ -703,7 +715,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { IExpressionDMContext exprDmc = fExpService.createExpression(frameDmc, "a[0]"); wait.increment(); @@ -774,7 +787,8 @@ public class MIExpressionsTest extends BaseTestCase { final IExpressionDMContext addrDmc = SyncUtil.createExpression(frameDmc, "&a"); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(addrDmc, IFormattedValues.NATURAL_FORMAT), new DataRequestMonitor(fExpService.getExecutor(), null) { @@ -799,7 +813,8 @@ public class MIExpressionsTest extends BaseTestCase { // Now perform the test fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { IExpressionDMContext exprDmc = fExpService.createExpression(frameDmc, "a"); wait.increment(); @@ -896,7 +911,8 @@ public class MIExpressionsTest extends BaseTestCase { final IExpressionDMContext addrDmc = SyncUtil.createExpression(frameDmc, "&a"); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(addrDmc, IFormattedValues.NATURAL_FORMAT), new DataRequestMonitor(fExpService.getExecutor(), null) { @@ -920,7 +936,8 @@ public class MIExpressionsTest extends BaseTestCase { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.increment(); IExpressionDMContext exprDmc = fExpService.createExpression(frameDmc, "a"); @@ -1010,7 +1027,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.increment(); fExpService.getFormattedExpressionValue(fExpService.getFormattedValueContext(exprDmc, @@ -1099,7 +1117,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.increment(); fExpService.getFormattedExpressionValue(fExpService.getFormattedValueContext(exprDmc, @@ -1235,7 +1254,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.increment(); fExpService.getFormattedExpressionValue(fExpService.getFormattedValueContext(exprDmc, @@ -1329,7 +1349,8 @@ public class MIExpressionsTest extends BaseTestCase { // request as above to see that the cache has indeed been reset wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.increment(); fExpService.getFormattedExpressionValue(fExpService.getFormattedValueContext(exprDmc, @@ -1382,7 +1403,8 @@ public class MIExpressionsTest extends BaseTestCase { // First get the address of 'a' through 'a_ptr' fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getFormattedExpressionValue(fExpService.getFormattedValueContext(exprDmc2, IFormattedValues.NATURAL_FORMAT), new DataRequestMonitor(fExpService .getExecutor(), null) { @@ -1554,7 +1576,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc, "z"); @@ -1606,7 +1629,8 @@ public class MIExpressionsTest extends BaseTestCase { stoppedEvent = SyncUtil.step(4, StepType.STEP_INTO); final IFrameDMContext frameDmc2 = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc2, "z"); @@ -1658,7 +1682,8 @@ public class MIExpressionsTest extends BaseTestCase { stoppedEvent = SyncUtil.step(4, StepType.STEP_INTO); final IFrameDMContext frameDmc3 = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc3, "z"); @@ -1738,7 +1763,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc, "a"); @@ -1814,7 +1840,8 @@ public class MIExpressionsTest extends BaseTestCase { final IFrameDMContext frameDmc2 = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc2, "a"); @@ -1899,7 +1926,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc, "f"); @@ -1961,7 +1989,8 @@ public class MIExpressionsTest extends BaseTestCase { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // Now create more than 1000 expressions to trigger the deletion of the children // that were created above @@ -1990,7 +2019,8 @@ public class MIExpressionsTest extends BaseTestCase { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // Evaluate the expression of a child that we know is deleted to make sure // the expression service can handle that @@ -2036,7 +2066,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext exprDmc = fExpService.createExpression(frameDmc, "a"); @@ -2072,7 +2103,8 @@ public class MIExpressionsTest extends BaseTestCase { final IFrameDMContext frameDmc2 = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext exprDmc = fExpService.createExpression(frameDmc2, "a"); @@ -2135,7 +2167,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext exprDmc = fExpService.createExpression(frameDmc, "a"); @@ -2192,7 +2225,8 @@ public class MIExpressionsTest extends BaseTestCase { final IFrameDMContext frameDmc2 = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext exprDmc = fExpService.createExpression(frameDmc2, "a"); @@ -2254,7 +2288,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc, "z"); @@ -2327,7 +2362,8 @@ public class MIExpressionsTest extends BaseTestCase { SyncUtil.step(1, StepType.STEP_OVER); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // trigger the var-update in the last format (decimal) // then request the actual value in natural which should not be taken from the cache @@ -2373,7 +2409,8 @@ public class MIExpressionsTest extends BaseTestCase { // Ask for one value to create the var object fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc, "z"); @@ -2422,7 +2459,8 @@ public class MIExpressionsTest extends BaseTestCase { // We need to make sure that the locking properly works although we are calling // the internal update method, which does affect the state of the object fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.increment(); fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(globalExpressionCtx1, IFormattedValues.BINARY_FORMAT), @@ -2488,7 +2526,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and its child globalExpressionCtx1 = fExpService.createExpression(frameDmc, "z"); @@ -2539,7 +2578,8 @@ public class MIExpressionsTest extends BaseTestCase { // Now step to another method to make the previous variable objects out-of-scope // then first request the child and then the parent. We want to test this order fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.increment(); fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(globalExpressionCtx2, IFormattedValues.NATURAL_FORMAT), @@ -2566,7 +2606,8 @@ public class MIExpressionsTest extends BaseTestCase { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.increment(); fExpService.getFormattedExpressionValue( fExpService.getFormattedValueContext(globalExpressionCtx1, IFormattedValues.NATURAL_FORMAT), @@ -2634,7 +2675,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc, "z"); @@ -2699,7 +2741,8 @@ public class MIExpressionsTest extends BaseTestCase { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // also get the child of the pointer fExpService.getSubExpressions( @@ -2746,7 +2789,8 @@ public class MIExpressionsTest extends BaseTestCase { final IFrameDMContext frameDmc2 = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc2, "z"); @@ -2814,7 +2858,8 @@ public class MIExpressionsTest extends BaseTestCase { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // also get the child of the pointer fExpService.getSubExpressions( @@ -2868,7 +2913,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { final int exprCount = 5; final IExpressionDMContext dmcs[] = new IExpressionDMContext[exprCount]; @@ -2933,7 +2979,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { final int exprCount = 2; final IExpressionDMContext dmcs[] = new IExpressionDMContext[exprCount]; @@ -3016,7 +3063,8 @@ public class MIExpressionsTest extends BaseTestCase { // each one, // get the value of the expression fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getAvailableFormats(exprDMC, new DataRequestMonitor( fExpService.getExecutor(), null) { @Override @@ -3128,7 +3176,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getExpressionAddressData(dmc, new DataRequestMonitor(fExpService .getExecutor(), null) { @Override @@ -3221,7 +3270,8 @@ public class MIExpressionsTest extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getSubExpressions(parentDmc, new DataRequestMonitor(fExpService.getExecutor(), null) { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java index d3f9bedd98b..b19499a435e 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java @@ -98,7 +98,8 @@ public class MIMemoryTest extends BaseTestCase { assert(fMemoryDmc != null); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { // Get a reference to the memory service fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); assert(fServicesTracker != null); @@ -124,7 +125,8 @@ public class MIMemoryTest extends BaseTestCase { public void testCaseCleanup() throws Exception { // Clear the references (not strictly necessary) Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fSession.removeServiceEventListener(MIMemoryTest.this); } }; @@ -232,6 +234,7 @@ public class MIMemoryTest extends BaseTestCase { // Evaluate the expression (asynchronously) fSession.getExecutor().submit(new Runnable() { + @Override public void run() { fExpressionService.getFormattedExpressionValue(formattedValueDMC, drm); } @@ -284,6 +287,7 @@ public class MIMemoryTest extends BaseTestCase { // Issue the get memory request fSession.getExecutor().submit(new Runnable() { + @Override public void run() { fMemoryService.getMemory(dmc, address, offset, word_size, count, drm); } @@ -326,6 +330,7 @@ public class MIMemoryTest extends BaseTestCase { // Issue the get memory request fSession.getExecutor().submit(new Runnable() { + @Override public void run() { fMemoryService.getMemory(dmc, address, offset, word_size, count, drm); } @@ -365,6 +370,7 @@ public class MIMemoryTest extends BaseTestCase { // Issue the get memory request fSession.getExecutor().submit(new Runnable() { + @Override public void run() { fMemoryService.setMemory(dmc, address, offset, word_size, count, buffer, rm); } @@ -404,6 +410,7 @@ public class MIMemoryTest extends BaseTestCase { // Issue the fill memory request fSession.getExecutor().submit(new Runnable() { + @Override public void run() { fMemoryService.fillMemory(dmc, address, offset, word_size, count, pattern, rm); } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java index e3221e88f71..6c5949ca61b 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java @@ -103,7 +103,8 @@ public class MIRegistersTest extends BaseTestCase { fSession = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { // We obtain the services we need after the new // launch has been performed fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); @@ -153,7 +154,8 @@ public class MIRegistersTest extends BaseTestCase { }; fRegService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRegService.getRegisterGroups(fContainerDmc, regGroupDone); } }); @@ -178,7 +180,8 @@ public class MIRegistersTest extends BaseTestCase { final IRegisterGroupDMContext regGroupsDMC = getRegisterGroup(); fRegService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRegService.getRegisters( new CompositeDMContext(new IDMContext[] { regGroupsDMC, frameDmc} ), new DataRequestMonitor(fRegService.getExecutor(), null) { @@ -298,7 +301,8 @@ public class MIRegistersTest extends BaseTestCase { }; fRegService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRegService.getFormattedExpressionValue(valueDmc, regRm); } }); @@ -364,7 +368,8 @@ public class MIRegistersTest extends BaseTestCase { }; fRegService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunControl.getExecutionContexts(containerDmc, drm); } }); @@ -420,6 +425,7 @@ public class MIRegistersTest extends BaseTestCase { final IRegisterDMContext[] regDMCs = getRegisters(frameDmc); fRegService.getExecutor().submit(new Runnable() { + @Override public void run() { fRegService.writeRegister( regDMCs[regIndex], diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java index 2807c0972b1..24d77348e29 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java @@ -75,7 +75,8 @@ public class MIRunControlTargetAvailableTest extends BaseTestCase { final DsfSession session = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), session.getId()); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java index fbe7c93cbc7..582794cfd06 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java @@ -103,7 +103,8 @@ public class MIRunControlTest extends BaseTestCase { final DsfSession session = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), session.getId()); @@ -205,7 +206,8 @@ public class MIRunControlTest extends BaseTestCase { * Test getExecutionContexts() when only one thread exist. */ fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.getExecutionContexts(containerDmc, rm); } }); @@ -285,7 +287,8 @@ public class MIRunControlTest extends BaseTestCase { * Test getExecutionContexts for a valid container DMC */ fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.getExecutionContexts(containerDmc, rmExecutionCtxts); } }); @@ -342,7 +345,8 @@ public class MIRunControlTest extends BaseTestCase { * Call getModelData for Execution DMC */ fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.getExecutionData(((MIRunControl)fRunCtrl).createMIExecutionContext(containerDmc, 1), rm); } }); @@ -390,7 +394,8 @@ public class MIRunControlTest extends BaseTestCase { * getModelData for Execution DMC */ fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.getExecutionData(stoppedEvent.getDMContext(), rm); } }); @@ -436,7 +441,8 @@ public class MIRunControlTest extends BaseTestCase { } }; fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.getExecutionData(stoppedEvent.getDMContext(), rm); } }); @@ -482,7 +488,8 @@ public class MIRunControlTest extends BaseTestCase { }; fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.getExecutionData(fContainerDmc, rm); } }); @@ -518,7 +525,8 @@ public class MIRunControlTest extends BaseTestCase { }; // final IContainerDMContext ctxt = new GDBControlDMContext("-1", getClass().getName() + ":" + 1); fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // Pass an invalid dmc fRunCtrl.getExecutionContexts(fContainerDmc, rm); } @@ -572,7 +580,8 @@ public class MIRunControlTest extends BaseTestCase { final IContainerDMContext containerDmc = SyncUtil.getContainerContext(); fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.resume(containerDmc, rm); } }); @@ -590,6 +599,7 @@ public class MIRunControlTest extends BaseTestCase { wait.waitReset(); fRunCtrl.getExecutor().submit(new Runnable() { + @Override public void run() { wait.setReturnInfo(fRunCtrl.isSuspended(containerDmc)); wait.waitFinished(); @@ -620,7 +630,8 @@ public class MIRunControlTest extends BaseTestCase { IResumedDMEvent.class); fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.resume(fContainerDmc, rm); } }); @@ -641,7 +652,8 @@ public class MIRunControlTest extends BaseTestCase { final IContainerDMContext containerDmc = SyncUtil.getContainerContext(); fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.setReturnInfo(fRunCtrl.isSuspended(containerDmc)); wait.waitFinished(); } @@ -663,7 +675,8 @@ public class MIRunControlTest extends BaseTestCase { fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.runToLine(fThreadExecDmc, SOURCE_NAME, LINE_MAIN_RETURN, true, new RequestMonitor(fRunCtrl.getExecutor(), null) { @Override @@ -685,7 +698,8 @@ public class MIRunControlTest extends BaseTestCase { final IContainerDMContext containerDmc = SyncUtil.getContainerContext(); fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.setReturnInfo(fRunCtrl.isSuspended(containerDmc)); wait.waitFinished(); } @@ -711,7 +725,8 @@ public class MIRunControlTest extends BaseTestCase { // Resume the target fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.resume(fThreadExecDmc, new RequestMonitor(fRunCtrl.getExecutor(), null) { @Override @@ -730,7 +745,8 @@ public class MIRunControlTest extends BaseTestCase { // interrupt the target Thread.sleep(1000); fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fRunCtrl.suspend(fThreadExecDmc, new RequestMonitor(fRunCtrl.getExecutor(), null) { @Override @@ -750,7 +766,8 @@ public class MIRunControlTest extends BaseTestCase { // Double check that the target is in the suspended state final IContainerDMContext containerDmc = SyncUtil.getContainerContext(); fRunCtrl.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { wait.setReturnInfo(fRunCtrl.isSuspended(containerDmc)); wait.waitFinished(); } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java index 4d0e23c05f5..3cd6585df6c 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java @@ -75,7 +75,8 @@ public class OperationsWhileTargetIsRunningTest extends BaseTestCase { final DsfSession session = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), session.getId()); @@ -169,7 +170,8 @@ public class OperationsWhileTargetIsRunningTest extends BaseTestCase { // Don't use a query here. The terminate, because it kills GDB, may not return right away // But that is ok because we wait for a shutdown event right after Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { IProcessDMContext processDmc = DMContexts.getAncestorOfType(fContainerDmc, IProcessDMContext.class); fProcesses.terminate(processDmc, new ImmediateRequestMonitor()); } @@ -258,7 +260,8 @@ public class OperationsWhileTargetIsRunningTest extends BaseTestCase { // Don't use a query here. Because GDB will be killed, the call to detach may not return right away // But that is ok because we wait for a shutdown event right after Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fProcesses.detachDebuggerFromProcess(fContainerDmc, new ImmediateRequestMonitor()); } }; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java index df927f820f6..9d7732ae838 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java @@ -84,7 +84,8 @@ public class PostMortemCoreTest extends BaseTestCase { assert(fMemoryDmc != null); Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); fExpService = fServicesTracker.getService(IExpressions.class); fMemoryService = fServicesTracker.getService(IMemory.class); @@ -96,7 +97,8 @@ public class PostMortemCoreTest extends BaseTestCase { @After public void shutdown() throws Exception { Runnable runnable = new Runnable() { - public void run() { + @Override + public void run() { fSession.removeServiceEventListener(PostMortemCoreTest.this); } }; @@ -283,7 +285,8 @@ public class PostMortemCoreTest extends BaseTestCase { // each one, // get the value of the expression fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { fExpService.getAvailableFormats(exprDMC, new DataRequestMonitor( fExpService.getExecutor(), null) { @Override diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/GDBRemoteTracepointsTest_7_0.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/GDBRemoteTracepointsTest_7_0.java index e4934649e8e..9a236ec8030 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/GDBRemoteTracepointsTest_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_0/GDBRemoteTracepointsTest_7_0.java @@ -164,6 +164,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { public void initialTest() throws Exception { fSession = getGDBLaunch().getSession(); Runnable runnable = new Runnable() { + @Override public void run() { fServicesTracker = new DsfServicesTracker(TestsPlugin.getBundleContext(), fSession.getId()); @@ -191,6 +192,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { @After public void shutdown() throws Exception { Runnable runnable = new Runnable() { + @Override public void run() { fSession.removeServiceEventListener(GDBRemoteTracepointsTest_7_0.this); } @@ -288,6 +290,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fBreakpointService.getExecutor().submit(new Runnable() { + @Override public void run() { fBreakpointService.insertBreakpoint(context, attributes, new DataRequestMonitor(fBreakpointService.getExecutor(), null) { @@ -312,6 +315,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fBreakpointService.getExecutor().submit(new Runnable() { + @Override public void run() { fBreakpointService.removeBreakpoint(breakpoint, new RequestMonitor(fBreakpointService.getExecutor(), null) { @@ -333,6 +337,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fBreakpointService.getExecutor().submit(new Runnable() { + @Override public void run() { fBreakpointService.updateBreakpoint(breakpoint, delta, new RequestMonitor(fBreakpointService.getExecutor(), null) { @@ -353,6 +358,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fBreakpointService.getExecutor().submit(new Runnable() { + @Override public void run() { fBreakpointService.getBreakpointDMData(breakpoint, new DataRequestMonitor(fBreakpointService.getExecutor(), null) { @@ -376,6 +382,7 @@ public class GDBRemoteTracepointsTest_7_0 extends BaseTestCase { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fBreakpointService.getExecutor().submit(new Runnable() { + @Override public void run() { fBreakpointService.getBreakpoints(context, new DataRequestMonitor(fBreakpointService.getExecutor(), null) { @Override diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MIExpressionsTest_7_3.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MIExpressionsTest_7_3.java index 2b39678630a..b568108ded2 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MIExpressionsTest_7_3.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_3/MIExpressionsTest_7_3.java @@ -51,7 +51,8 @@ public class MIExpressionsTest_7_3 extends MIExpressionsTest { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // First create the var object and all its children IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc, "f"); @@ -113,7 +114,8 @@ public class MIExpressionsTest_7_3 extends MIExpressionsTest { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // Now create more than 1000 expressions to trigger the deletion of the children // that were created above @@ -142,7 +144,8 @@ public class MIExpressionsTest_7_3 extends MIExpressionsTest { wait.waitReset(); fExpService.getExecutor().submit(new Runnable() { - public void run() { + @Override + public void run() { // Evaluate the expression of a child that we know is deleted to make sure // the expression service can handle that diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/DisassemblyDocument.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/DisassemblyDocument.java index a23a5ac80e4..34a2390f0b6 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/DisassemblyDocument.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/DisassemblyDocument.java @@ -462,6 +462,7 @@ public class DisassemblyDocument extends REDDocument implements IDisassemblyDocu * @return the address of the given document line number, -1 if no valid * address can be computed */ + @Override public BigInteger getAddressOfLine(int line) { try { int offset = getLineOffset(line); @@ -511,6 +512,7 @@ public class DisassemblyDocument extends REDDocument implements IDisassemblyDocu * @param address * @return */ + @Override public AddressRangePosition getDisassemblyPosition(BigInteger address) { return getPositionOfAddress(CATEGORY_DISASSEMBLY, address); } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java index 187ffff3ff1..18f79bd6881 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java @@ -97,7 +97,8 @@ public class FormattedValueVMUtil { * @deprecated Replaced by {@link #getPropertyForFormatId(String, String)} */ - public static String getPropertyForFormatId(String formatId) { + @Deprecated + public static String getPropertyForFormatId(String formatId) { return getPropertyForFormatId(formatId, ""); //$NON-NLS-1$ } @@ -147,7 +148,8 @@ public class FormattedValueVMUtil { * * @deprecated Replaced by {@link #getFormatFromProperty(String, String)} */ - public static String getFormatFromProperty(String property) { + @Deprecated + public static String getFormatFromProperty(String property) { return getFormatFromProperty(property, ""); //$NON-NLS-1$ } @@ -225,7 +227,8 @@ public class FormattedValueVMUtil { * @deprecated This method has been replaced by the {@link FormattedValueRetriever} * utility. */ - @ConfinedToDsfExecutor("service.getExecutor()") + @Deprecated + @ConfinedToDsfExecutor("service.getExecutor()") public static void updateFormattedValues( final IPropertiesUpdate updates[], final IFormattedValues service, diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Activator.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Activator.java index 378a70c2459..b0179f79c0f 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Activator.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Activator.java @@ -39,6 +39,7 @@ public class Activator extends Plugin { * (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java index 71ee49e2e83..fefbbb15019 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java @@ -292,7 +292,8 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence { * Tell GDB to automatically load or not the shared library symbols */ new Step() { - public void execute(RequestMonitor requestMonitor) { + @Override + public void execute(RequestMonitor requestMonitor) { try { boolean autolib = fLaunch.getLaunchConfiguration().getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB, IGDBLaunchConfigurationConstants.DEBUGGER_AUTO_SOLIB_DEFAULT); @@ -575,7 +576,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence { } } else { - imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME); //$NON-NLS-1$ + imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME); if (imageFileName.length() > 0) { imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName); } else { @@ -594,7 +595,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence { String imageOffset = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET); if (imageOffset.length() > 0) { - imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET); //$NON-NLS-2$ //$NON-NLS-4$ + imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET); //$NON-NLS-2$ } List commands = new ArrayList(); fGdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands); @@ -633,7 +634,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence { ILaunchConfiguration config = fLaunch.getLaunchConfiguration(); try { if (config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER)) { - String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); //$NON-NLS-1$ + String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); List commands = new ArrayList(); fGdbJtagDevice.doSetPC(pcRegister, commands); queueCommands(commands, rm); @@ -654,7 +655,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence { ILaunchConfiguration config = fLaunch.getLaunchConfiguration(); try { if (config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT)) { - String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); //$NON-NLS-1$ + String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); List commands = new ArrayList(); fGdbJtagDevice.doStopAt(stopAt, commands); queueCommands(commands, rm); @@ -695,7 +696,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence { public void execute(RequestMonitor rm) { ILaunchConfiguration config = fLaunch.getLaunchConfiguration(); try { - String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS); //$NON-NLS-1$ + String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS); if (userCmd.length() > 0) { userCmd = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(userCmd); String[] commands = userCmd.split("\\r?\\n"); //$NON-NLS-1$ @@ -778,7 +779,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence { private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config) throws CoreException, NullPointerException { IGDBJtagDevice gdbJtagDevice = null; - String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); //$NON-NLS-1$ + String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.getInstance().getGDBJtagDeviceContribution(); for (GDBJtagDeviceContribution availableDevice : availableDevices) { if (jtagDeviceName.equals(availableDevice.getDeviceName())) { diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java index 9e9cc09b0ad..17072032b19 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java @@ -44,6 +44,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; @ThreadSafe public class GDBJtagDSFLaunchConfigurationDelegate extends GdbLaunchDelegate { + @Override protected IDsfDebugServicesFactory newServiceFactory(ILaunchConfiguration config, String version) { if (version.contains(LaunchUtils.MACOS_GDB_MARKER)) { // The version string at this point should look like diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java index 6eb35202b68..f355051c80a 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java @@ -63,22 +63,26 @@ public class GDBJtagDebugger extends AbstractGDBCDIDebugger { private String miVersion; + @Override public ICDISession createSession(ILaunch launch, File executable, IProgressMonitor monitor) throws CoreException { return super.createSession(launch, executable, monitor); } + @Override public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { return super.createDebuggerSession(launch, exe, monitor); } + @Override protected CommandFactory getCommandFactory(ILaunchConfiguration config) throws CoreException { miVersion = MIPlugin.getMIVersion(config); return new GDBJtagCommandFactory(miVersion); } + @Override @SuppressWarnings("deprecation") protected void doStartSession(ILaunch launch, Session session, IProgressMonitor monitor) throws CoreException { SubMonitor submonitor = SubMonitor.convert(monitor, 100); @@ -292,7 +296,7 @@ public class GDBJtagDebugger extends AbstractGDBCDIDebugger { // Set program counter boolean setPc = config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER); if (setPc) { - String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); //$NON-NLS-1$ + String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); gdbJtagDevice.doSetPC(pcRegister, commands); executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20)); } @@ -302,7 +306,7 @@ public class GDBJtagDebugger extends AbstractGDBCDIDebugger { monitor.beginTask(Messages.getString("GDBJtagDebugger.18"), 1); //$NON-NLS-1$ boolean setStopAt = config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT); if (setStopAt) { - String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); //$NON-NLS-1$ + String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); commands.clear(); gdbJtagDevice.doStopAt(stopAt, commands); executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20)); @@ -377,7 +381,7 @@ public class GDBJtagDebugger extends AbstractGDBCDIDebugger { private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config) throws CoreException, NullPointerException { IGDBJtagDevice gdbJtagDevice = null; - String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); //$NON-NLS-1$ + String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory. getInstance().getGDBJtagDeviceContribution(); for (int i = 0; i < availableDevices.length; i++) { diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java index dd2dedfeef1..6ce1c894213 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java @@ -35,10 +35,12 @@ import org.eclipse.debug.core.model.IProcess; */ public class GDBJtagLaunchConfigurationDelegate extends AbstractCLaunchDelegate { + @Override protected String getPluginID() { return Activator.PLUGIN_ID; }; + @Override public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { SubMonitor submonitor = SubMonitor.convert(monitor, 2); diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl.java index 36b4cc0fea6..e5d24f2f06f 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl.java @@ -34,6 +34,7 @@ public class GDBJtagControl extends GDBControl { super(session, config, factory); } + @Override protected Sequence getCompleteInitializationSequence(Map attributes, RequestMonitorWithProgress rm) { GdbLaunch launch = (GdbLaunch)getSession().getModelAdapter(ILaunch.class); IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class); diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_0.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_0.java index de79e4a35c0..b94ea194155 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_0.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_0.java @@ -34,6 +34,7 @@ public class GDBJtagControl_7_0 extends GDBControl_7_0 { super(session, config, factory); } + @Override protected Sequence getCompleteInitializationSequence(Map attributes, RequestMonitorWithProgress rm) { GdbLaunch launch = (GdbLaunch)getSession().getModelAdapter(ILaunch.class); IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class); diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_2.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_2.java index 64aef84436c..6bf25811c09 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_2.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_2.java @@ -34,6 +34,7 @@ public class GDBJtagControl_7_2 extends GDBControl_7_2 { super(session, config, factory); } + @Override protected Sequence getCompleteInitializationSequence(Map attributes, RequestMonitorWithProgress rm) { GdbLaunch launch = (GdbLaunch)getSession().getModelAdapter(ILaunch.class); IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class); diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java index 47f71444311..f4e335e2e1b 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java @@ -27,6 +27,7 @@ public class GdbJtagDebugServicesFactory extends GdbDebugServicesFactory { super(version); } + @Override protected ICommandControl createCommandControl(DsfSession session, ILaunchConfiguration config) { if (GDB_7_2_VERSION.compareTo(getVersion()) <= 0) { return new GDBJtagControl_7_2(session, config, new CommandFactory_6_8()); diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/AbatronBDI2000.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/AbatronBDI2000.java index 0e0d091dfa7..b677e9315fd 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/AbatronBDI2000.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/AbatronBDI2000.java @@ -16,6 +16,7 @@ public class AbatronBDI2000 extends DefaultGDBJtagDeviceImpl { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#getDefaultIpAddress() */ + @Override public String getDefaultIpAddress() { return "bdi2000"; } @@ -23,6 +24,7 @@ public class AbatronBDI2000 extends DefaultGDBJtagDeviceImpl { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#getDefaultPortNumber() */ + @Override public String getDefaultPortNumber() { return "2001"; } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java index 4f2ad44a066..48d8b91cff9 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java @@ -27,6 +27,7 @@ public class DefaultGDBJtagConnectionImpl extends DefaultGDBJtagDeviceImpl imple /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doDelay(int, java.util.Collection) */ + @Override public final void setDefaultDeviceConnection(String connection) { this.connection = connection; } @@ -34,6 +35,7 @@ public class DefaultGDBJtagConnectionImpl extends DefaultGDBJtagDeviceImpl imple /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doRemote(java.lang.String, java.util.Collection) */ + @Override public void doRemote(String connection, Collection commands) { String cmd = ""; //$NON-NLS-1$ if (connection != null) { @@ -50,14 +52,17 @@ public class DefaultGDBJtagConnectionImpl extends DefaultGDBJtagDeviceImpl imple /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultDeviceConnection() */ + @Override public String getDefaultDeviceConnection() { return connection; } + @Override public String getDefaultIpAddress() { throw new UnsupportedOperationException(); } + @Override public String getDefaultPortNumber() { throw new UnsupportedOperationException(); } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java index 37407a6f69b..9cb844a5227 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java @@ -28,6 +28,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doDelay(int, java.util.Collection) */ + @Override public void doDelay(int delay, Collection commands) { String cmd = "monitor delay " + String.valueOf(delay * 1000); //$NON-NLS-1$ addCmd(commands, cmd); @@ -36,6 +37,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doReset(java.util.Collection) */ + @Override public void doReset(Collection commands) { String cmd = "monitor reset run"; //$NON-NLS-1$ addCmd(commands, cmd); @@ -44,6 +46,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultDelay() */ + @Override public int getDefaultDelay() { return 0; } @@ -51,6 +54,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doRemote(java.lang.String, int, java.util.Collection) */ + @Override public void doRemote(String ip, int port, Collection commands) { // The CLI version (target remote) does not let us know // that we have properly connected. For older GDBs (<= 6.8) @@ -64,6 +68,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doHalt(java.util.Collection) */ + @Override public void doHalt(Collection commands) { String cmd = "monitor halt"; //$NON-NLS-1$ addCmd(commands, cmd); @@ -72,6 +77,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doContinue(java.util.Collection) */ + @Override public void doContinue(Collection commands) { String cmd = "continue"; //$NON-NLS-1$ addCmd(commands, cmd); @@ -80,6 +86,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doLoadImage(java.lang.String, java.lang.String, java.util.Collection) */ + @Override public void doLoadImage(String imageFileName, String imageOffset, Collection commands) { addCmd(commands, "load " + escapeScpaces(imageFileName) + ' ' + imageOffset); } @@ -87,6 +94,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doLoadSymbol(java.lang.String, java.lang.String, java.util.Collection) */ + @Override public void doLoadSymbol(String symbolFileName, String symbolOffset, Collection commands) { String file = escapeScpaces(symbolFileName); if (symbolOffset == null || (symbolOffset.length() == 0)) { @@ -105,6 +113,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doSetPC(java.lang.String, java.util.Collection) */ + @Override public void doSetPC(String pc, Collection commands) { String cmd = "set $pc=0x" + pc; //$NON-NLS-1$ addCmd(commands, cmd); @@ -113,6 +122,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doStopAt(java.lang.String, java.util.Collection) */ + @Override public void doStopAt(String stopAt, Collection commands) { String cmd = "tbreak " + stopAt; //$NON-NLS-1$ addCmd(commands, cmd); @@ -128,6 +138,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultIpAddress() */ + @Override public String getDefaultIpAddress() { return "localhost"; //$NON-NLS-1$ } @@ -135,6 +146,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultPortNumber() */ + @Override public String getDefaultPortNumber() { return "10000"; //$NON-NLS-1$ } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java index 618d04abe1f..8fe52fce32d 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java @@ -18,18 +18,21 @@ public class GenericDevice extends DefaultGDBJtagDeviceImpl { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doDelay(int, java.util.Collection) */ + @Override public void doDelay(int delay, Collection commands) { } /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doHalt(java.util.Collection) */ + @Override public void doHalt(Collection commands) { } /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doReset(java.util.Collection) */ + @Override public void doReset(Collection commands) { } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/IGDBJtagDevice.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/IGDBJtagDevice.java index 3431f86d1a5..7623b7d41b9 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/IGDBJtagDevice.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/IGDBJtagDevice.java @@ -81,6 +81,7 @@ public interface IGDBJtagDevice { * implementing this method (implementation should throw * UnsupportedOperationException) */ + @Deprecated public void doRemote(String ip, int port, Collection commands); /** @@ -158,6 +159,7 @@ public interface IGDBJtagDevice { * implementing this method (implementation should throw * UnsupportedOperationException) */ + @Deprecated public String getDefaultIpAddress(); /** @@ -168,5 +170,6 @@ public interface IGDBJtagDevice { * implementing this method (implementation should throw * UnsupportedOperationException) */ + @Deprecated public String getDefaultPortNumber(); } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/MacraigorUsb2Demon.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/MacraigorUsb2Demon.java index a543fe4dbe4..d0136537d2d 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/MacraigorUsb2Demon.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/MacraigorUsb2Demon.java @@ -23,6 +23,7 @@ public class MacraigorUsb2Demon extends DefaultGDBJtagDeviceImpl { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#getDefaultPortNumber() */ + @Override public String getDefaultPortNumber() { return "8888"; } @@ -30,6 +31,7 @@ public class MacraigorUsb2Demon extends DefaultGDBJtagDeviceImpl { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doDelay(int, java.util.Collection) */ + @Override public void doDelay(int delay, Collection commands) { super.addCmd(commands, "monitor sleep " + String.valueOf(delay)); } @@ -37,6 +39,7 @@ public class MacraigorUsb2Demon extends DefaultGDBJtagDeviceImpl { /* (non-Javadoc) * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doReset(java.util.Collection) */ + @Override public void doReset(Collection commands) { super.addCmd(commands, "monitor resetrun"); } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/Activator.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/Activator.java index d169ad8cfd7..59b13599153 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/Activator.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/Activator.java @@ -49,6 +49,7 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); setDefaultLaunchDelegates(); @@ -58,6 +59,7 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java index d9dcb48a28a..de1caeffb7d 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java @@ -84,14 +84,17 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { private String savedJtagDevice; protected Button fUpdateThreadlistOnSuspend; + @Override public String getName() { return TAB_NAME; } + @Override public Image getImage() { return GDBJtagImages.getDebuggerTabImage(); } + @Override public void createControl(Composite parent) { ScrolledComposite sc = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL); sc.setExpandHorizontal(true); @@ -161,6 +164,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { gd = new GridData(GridData.FILL_HORIZONTAL); gdbCommand.setLayoutData(gd); gdbCommand.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); // provides much better performance for Text listeners } @@ -169,6 +173,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { Button button = new Button(comp, SWT.NONE); button.setText(Messages.getString("GDBJtagDebuggerTab.gdbCommandBrowse")); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { browseButtonSelected(Messages.getString("GDBJtagDebuggerTab.gdbCommandBrowse_Title"), gdbCommand); } @@ -177,6 +182,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { button = new Button(comp, SWT.NONE); button.setText(Messages.getString("GDBJtagDebuggerTab.gdbCommandVariable")); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { variablesButtonSelected(gdbCommand); } @@ -194,6 +200,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { useRemote = new Button(group, SWT.CHECK); useRemote.setText(Messages.getString("GDBJtagDebuggerTab.useRemote_Text")); useRemote.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { useRemoteChanged(); updateLaunchConfigurationDialog(); @@ -217,6 +224,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { } jtagDevice.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateDeviceIpPort(jtagDevice.getText()); scheduleUpdateJob(); // provides much better performance for Text listeners @@ -277,22 +285,26 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { // ipAddress.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); // provides much better performance for Text listeners } }); portNumber.addVerifyListener(new VerifyListener() { + @Override public void verifyText(VerifyEvent e) { e.doit = Character.isDigit(e.character) || Character.isISOControl(e.character); } }); portNumber.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); // provides much better performance for Text listeners } }); connection.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); // provides much better performance for Text listeners } @@ -361,6 +373,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { return null; } + @Override public void initializeFrom(ILaunchConfiguration configuration) { try { String defaultGdbCommand = Platform.getPreferencesService().getString(GdbPlugin.PLUGIN_ID, @@ -424,6 +437,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { return TAB_ID; } + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, gdbCommand.getText().trim()); configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME, gdbCommand.getText().trim()); // DSF @@ -453,6 +467,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { fUpdateThreadlistOnSuspend.getSelection()); } + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { String defaultGdbCommand = Platform.getPreferencesService().getString(GdbPlugin.PLUGIN_ID, IGdbDebugPreferenceConstants.PREF_DEFAULT_GDB_COMMAND, "", null); //$NON-NLS-1$ diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java index 6fc9143b264..3e2820d58ce 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java @@ -86,14 +86,17 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { private String savedJtagDevice; + @Override public String getName() { return TAB_NAME; } + @Override public Image getImage() { return GDBJtagImages.getDebuggerTabImage(); } + @Override public void createControl(Composite parent) { ScrolledComposite sc = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL); sc.setExpandHorizontal(true); @@ -159,6 +162,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { gd = new GridData(GridData.FILL_HORIZONTAL); gdbCommand.setLayoutData(gd); gdbCommand.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); // provides much better performance for Text listeners } @@ -167,6 +171,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { Button button = new Button(comp, SWT.NONE); button.setText(Messages.getString("GDBJtagDebuggerTab.gdbCommandBrowse")); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { browseButtonSelected(Messages.getString("GDBJtagDebuggerTab.gdbCommandBrowse_Title"), gdbCommand); } @@ -175,6 +180,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { button = new Button(comp, SWT.NONE); button.setText(Messages.getString("GDBJtagDebuggerTab.gdbCommandVariable")); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { variablesButtonSelected(gdbCommand); } @@ -198,6 +204,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { } commandFactory.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { commandFactoryChanged(); scheduleUpdateJob(); // provides much better performance for Text listeners @@ -214,6 +221,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { miProtocol = new Combo(comp, SWT.READ_ONLY | SWT.DROP_DOWN); miProtocol.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); // provides much better performance for Text listeners } @@ -243,6 +251,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { verboseMode = new Button(parent, SWT.CHECK); verboseMode.setText(Messages.getString("GDBJtagDebuggerTab.verboseModeLabel")); verboseMode.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } @@ -260,6 +269,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { useRemote = new Button(group, SWT.CHECK); useRemote.setText(Messages.getString("GDBJtagDebuggerTab.useRemote_Text")); useRemote.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { useRemoteChanged(); updateLaunchConfigurationDialog(); @@ -283,6 +293,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { } jtagDevice.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateDeviceIpPort(jtagDevice.getText()); scheduleUpdateJob(); // provides much better performance for Text listeners @@ -343,22 +354,26 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { // ipAddress.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); // provides much better performance for Text listeners } }); portNumber.addVerifyListener(new VerifyListener() { + @Override public void verifyText(VerifyEvent e) { e.doit = Character.isDigit(e.character) || Character.isISOControl(e.character); } }); portNumber.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); // provides much better performance for Text listeners } }); connection.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); // provides much better performance for Text listeners } @@ -429,6 +444,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { return null; } + @Override public void initializeFrom(ILaunchConfiguration configuration) { try { String gdbCommandAttr = configuration.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, IMILaunchConfigurationConstants.DEBUGGER_DEBUG_NAME_DEFAULT); @@ -470,9 +486,9 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { for (int i = 0; i < jtagDevice.getItemCount(); i++) { if (jtagDevice.getItem(i).equals(savedJtagDevice)) { - storedAddress = configuration.getAttribute(IGDBJtagConstants.ATTR_IP_ADDRESS, IGDBJtagConstants.DEFAULT_IP_ADDRESS); //$NON-NLS-1$ + storedAddress = configuration.getAttribute(IGDBJtagConstants.ATTR_IP_ADDRESS, IGDBJtagConstants.DEFAULT_IP_ADDRESS); storedPort = configuration.getAttribute(IGDBJtagConstants.ATTR_PORT_NUMBER, IGDBJtagConstants.DEFAULT_PORT_NUMBER); - storedConnection = configuration.getAttribute(IGDBJtagConstants.ATTR_CONNECTION, IGDBJtagConstants.DEFAULT_CONNECTION); //$NON-NLS-1$ + storedConnection = configuration.getAttribute(IGDBJtagConstants.ATTR_CONNECTION, IGDBJtagConstants.DEFAULT_CONNECTION); jtagDevice.select(i); break; } @@ -504,6 +520,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { return TAB_ID; } + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, gdbCommand.getText().trim()); configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME, gdbCommand.getText().trim()); // DSF @@ -534,6 +551,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { } } + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, IMILaunchConfigurationConstants.DEBUGGER_DEBUG_NAME_DEFAULT); CommandFactoryManager cfManager = MIPlugin.getDefault().getCommandFactoryManager(); diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagLaunchConfigurationTabGroup.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagLaunchConfigurationTabGroup.java index 3982b43168f..6b87d520000 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagLaunchConfigurationTabGroup.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagLaunchConfigurationTabGroup.java @@ -23,6 +23,7 @@ import org.eclipse.debug.ui.ILaunchConfigurationTab; public class GDBJtagLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup { + @Override public void createTabs(ILaunchConfigurationDialog dialog, String mode) { setTabs(new ILaunchConfigurationTab[0]); } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagStartupTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagStartupTab.java index 3e7297920c7..a9eaf58c42d 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagStartupTab.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagStartupTab.java @@ -94,14 +94,17 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { private Label projBinaryLabel1; private Label projBinaryLabel2; + @Override public String getName() { return TAB_NAME; } + @Override public Image getImage() { return GDBJtagImages.getStartupTabImage(); } + @Override public void createControl(Composite parent) { ScrolledComposite sc = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL); sc.setExpandHorizontal(true); @@ -164,6 +167,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { doReset = new Button(comp, SWT.CHECK); doReset.setText(Messages.getString("GDBJtagStartupTab.doReset_Text")); doReset.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { doResetChanged(); updateLaunchConfigurationDialog(); @@ -175,11 +179,13 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.widthHint = 60; delay.setLayoutData(gd); delay.addVerifyListener(new VerifyListener() { + @Override public void verifyText(VerifyEvent e) { e.doit = (Character.isDigit(e.character) || Character.isISOControl(e.character)); } }); delay.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); } @@ -197,6 +203,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 1; doHalt.setLayoutData(gd); doHalt.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } @@ -207,6 +214,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.heightHint = 60; initCommands.setLayoutData(gd); initCommands.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { scheduleUpdateJob(); } @@ -230,6 +238,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 4; loadImage.setLayoutData(gd); loadImage.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { loadImageChanged(); updateLaunchConfigurationDialog(); @@ -243,10 +252,12 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { comp.setLayout(layout); SelectionListener radioButtonListener = new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); updateUseFileEnablement(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }; @@ -276,6 +287,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 1; imageFileName.setLayoutData(gd); imageFileName.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); } @@ -283,13 +295,15 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { imageFileBrowseWs = createPushButton(comp, Messages.getString("GDBJtagStartupTab.FileBrowseWs_Label"), null); imageFileBrowseWs.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { browseWsButtonSelected(Messages.getString("GDBJtagStartupTab.imageFileBrowseWs_Title"), imageFileName); } }); imageFileBrowse = createPushButton(comp, Messages.getString("GDBJtagStartupTab.FileBrowse_Label"), null); imageFileBrowse.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { browseButtonSelected(Messages.getString("GDBJtagStartupTab.imageFileBrowse_Title"), imageFileName); } @@ -303,11 +317,13 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.widthHint = 100; imageOffset.setLayoutData(gd); imageOffset.addVerifyListener(new VerifyListener() { + @Override public void verifyText(VerifyEvent e) { e.doit = (Character.isDigit(e.character) || Character.isISOControl(e.character) || "abcdef".contains(String.valueOf(e.character).toLowerCase())); } }); imageOffset.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); } @@ -320,6 +336,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 4; loadSymbols.setLayoutData(gd); loadSymbols.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { loadSymbolsChanged(); updateLaunchConfigurationDialog(); @@ -357,6 +374,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 1; symbolsFileName.setLayoutData(gd); symbolsFileName.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); } @@ -364,13 +382,15 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { symbolsFileBrowseWs = createPushButton(comp, Messages.getString("GDBJtagStartupTab.FileBrowseWs_Label"), null); symbolsFileBrowseWs.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { browseWsButtonSelected(Messages.getString("GDBJtagStartupTab.symbolsFileBrowseWs_Title"), symbolsFileName); } }); symbolsFileBrowse = createPushButton(comp, Messages.getString("GDBJtagStartupTab.FileBrowse_Label"), null); symbolsFileBrowse.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { browseButtonSelected(Messages.getString("GDBJtagStartupTab.symbolsFileBrowse_Title"), symbolsFileName); } @@ -384,11 +404,13 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.widthHint = 100; symbolsOffset.setLayoutData(gd); symbolsOffset.addVerifyListener(new VerifyListener() { + @Override public void verifyText(VerifyEvent e) { e.doit = (Character.isDigit(e.character) || Character.isISOControl(e.character) || "abcdef".contains(String.valueOf(e.character).toLowerCase())); } }); symbolsOffset.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); } @@ -424,6 +446,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 1; setPcRegister.setLayoutData(gd); setPcRegister.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { pcRegisterChanged(); updateLaunchConfigurationDialog(); @@ -436,11 +459,13 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.widthHint = 100; pcRegister.setLayoutData(gd); pcRegister.addVerifyListener(new VerifyListener() { + @Override public void verifyText(VerifyEvent e) { e.doit = (Character.isDigit(e.character) || Character.isISOControl(e.character) || "abcdef".contains(String.valueOf(e.character).toLowerCase())); } }); pcRegister.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); } @@ -452,6 +477,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 1; setStopAt.setLayoutData(gd); setStopAt.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { stopAtChanged(); updateLaunchConfigurationDialog(); @@ -464,6 +490,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.widthHint = 100; stopAt.setLayoutData(gd); stopAt.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { scheduleUpdateJob(); } @@ -475,6 +502,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.horizontalSpan = 1; setResume.setLayoutData(gd); setResume.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { resumeChanged(); updateLaunchConfigurationDialog(); @@ -529,6 +557,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { gd.heightHint = 60; runCommands.setLayoutData(gd); runCommands.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { scheduleUpdateJob(); } @@ -538,6 +567,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public boolean isValid(ILaunchConfiguration launchConfig) { if (!super.isValid(launchConfig)) return false; @@ -618,6 +648,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { try { // Initialization Commands @@ -680,6 +711,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { // Initialization Commands @@ -716,6 +748,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { // Initialization Commands configuration.setAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java index 6da9cfb5296..5df21eb9b06 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java @@ -159,6 +159,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat /** Flag set to true if build before launch failed, or was cancelled. */ private boolean buildFailed; + @Override abstract public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException; @@ -429,6 +430,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat /** * @deprecated use {@link CDebugUtils#verifyCProject(ILaunchConfiguration)} */ + @Deprecated protected ICProject verifyCProject(ILaunchConfiguration config) throws CoreException { return CDebugUtils.verifyCProject(config); } @@ -436,6 +438,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat /** * @deprecated use {@link CDebugUtils#verifyProgramPath(ILaunchConfiguration) */ + @Deprecated protected IPath verifyProgramPath(ILaunchConfiguration config) throws CoreException { return CDebugUtils.verifyProgramPath(config); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java index 22f5e014f02..ba922b69a58 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java @@ -201,6 +201,7 @@ public abstract class AbstractCLaunchDelegate2 extends LaunchConfigurationDelega throw new CoreException(status); } + @Override public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { // TODO Auto-generated method stub @@ -311,6 +312,7 @@ public abstract class AbstractCLaunchDelegate2 extends LaunchConfigurationDelega // utility. See bug 313927 IWorkspaceRunnable build = new IWorkspaceRunnable(){ + @Override public void run(IProgressMonitor pm) throws CoreException { SubMonitor localmonitor = SubMonitor.convert(pm, "", TOTAL_TICKS); //$NON-NLS-1$ diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java index 9b2c76ce60f..0ee48952e0b 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/LaunchUtils.java @@ -170,6 +170,7 @@ public class LaunchUtils { if (PlatformUI.isWorkbenchRunning()) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + @Override public void run() { IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport(); IActivityManager activityManager = workbenchActivitySupport.getActivityManager(); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java index 6c8ca073f28..1a244cef426 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java @@ -42,6 +42,7 @@ import org.eclipse.debug.core.model.IProcess; public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate { + @Override public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { if (monitor == null) { monitor = new NullProgressMonitor(); @@ -126,6 +127,7 @@ public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate { return null; } + @Override public String getPluginID() { return LaunchUIPlugin.getUniqueIdentifier(); } @@ -136,6 +138,7 @@ public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate { * @see org.eclipse.cdt.launch.AbstractCLaunchConfigurationDelegate#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, * java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) { return true; // no pre launch check for core file } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java index 6b536ff757b..8b8cbc2d25b 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java @@ -49,6 +49,7 @@ public class LocalAttachLaunchDelegate extends AbstractCLaunchDelegate { * java.lang.String, org.eclipse.debug.core.ILaunch, * org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { IBinaryObject exeFile = null; @@ -145,6 +146,7 @@ public class LocalAttachLaunchDelegate extends AbstractCLaunchDelegate { * * @see org.eclipse.cdt.launch.AbstractCLaunchConfigurationDelegate#getPluginID() */ + @Override protected String getPluginID() { return LaunchUIPlugin.getUniqueIdentifier(); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java index e588d7de568..7be45a8ce08 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java @@ -62,6 +62,7 @@ public class LocalCDILaunchDelegate extends AbstractCLaunchDelegate { /* (non-Javadoc) * @see org.eclipse.cdt.launch.AbstractCLaunchDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { if (monitor == null) { monitor = new NullProgressMonitor(); @@ -336,6 +337,7 @@ public class LocalCDILaunchDelegate extends AbstractCLaunchDelegate { /* (non-Javadoc) * @see org.eclipse.cdt.launch.AbstractCLaunchDelegate#getPluginID() */ + @Override protected String getPluginID() { return LaunchUIPlugin.getUniqueIdentifier(); } @@ -423,6 +425,7 @@ public class LocalCDILaunchDelegate extends AbstractCLaunchDelegate { /* (non-Javadoc) * @see org.eclipse.cdt.launch.AbstractCLaunchDelegate#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public boolean preLaunchCheck(ILaunchConfiguration config, String mode, IProgressMonitor monitor) throws CoreException { // no pre launch check for core file if (mode.equals(ILaunchManager.DEBUG_MODE)) { diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java index f2b54b4c8ab..57a608c8d37 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java @@ -46,6 +46,7 @@ import org.eclipse.debug.core.model.IProcess; public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate { + @Override public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { IBinaryObject exeFile = null; if (monitor == null) { @@ -196,6 +197,7 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate { return p; } + @Override protected String getPluginID() { return LaunchUIPlugin.getUniqueIdentifier(); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java index 789d61161ec..a9c43063f33 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java @@ -247,6 +247,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat /* (non-Javadoc) * @see org.eclipse.debug.core.Launch#launchChanged(org.eclipse.debug.core.ILaunch) */ + @Override public void launchChanged(ILaunch launch) { if (this == launch) return; @@ -293,6 +294,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesTerminated(ILaunch[] launches) { for (ILaunch launch : launches) { launchTerminated(launch); @@ -302,6 +304,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesAdded(ILaunch[] launches) { for (ILaunch launch : launches) { launchAdded(launch); @@ -311,6 +314,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesChanged(ILaunch[] launches) { for (ILaunch launch : launches) { launchChanged(launch); @@ -320,6 +324,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ + @Override public void launchesRemoved(ILaunch[] launches) { for (ILaunch launch : launches) { launchRemoved(launch); @@ -339,6 +344,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat /* (non-Javadoc) * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void launch(ILaunchConfiguration configuration, String mode, final ILaunch launch, IProgressMonitor monitor) throws CoreException { @@ -370,6 +376,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat } if (!conf.supportsMode(localMode)) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + @Override public void run() { MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), LaunchMessages.LaunchUIPlugin_Error, @@ -397,6 +404,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat } catch (StackOverflowError e) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + @Override public void run() { MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), LaunchMessages.LaunchUIPlugin_Error, @@ -451,6 +459,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat /* (non-Javadoc) * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#buildProjects(org.eclipse.core.resources.IProject[], org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void buildProjects(IProject[] projects, IProgressMonitor monitor) throws CoreException { // do nothing, project can be rebuild for each launch individually } @@ -458,6 +467,7 @@ public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegat /* (non-Javadoc) * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#buildForLaunch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { // not build for this one diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/refactoring/ResourceRenameParticipant.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/refactoring/ResourceRenameParticipant.java index 343c35e1ef3..75c4dc69959 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/refactoring/ResourceRenameParticipant.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/refactoring/ResourceRenameParticipant.java @@ -137,6 +137,7 @@ public class ResourceRenameParticipant extends RenameParticipant implements return new RefactoringStatus(); } + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java index 8100b35679c..a6a0e785761 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java @@ -54,7 +54,8 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.cdt.debug.ui.ICDebuggerPageExtension.IContentChangeListener#contentChanged() */ - public void contentChanged() { + @Override + public void contentChanged() { contentsChanged(); } }; @@ -110,6 +111,7 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab { * * @see ILaunchConfigurationTab#getErrorMessage() */ + @Override public String getErrorMessage() { ICDebuggerPage tab = getDynamicTab(); if ( (super.getErrorMessage() != null) || (tab == null)) { @@ -203,8 +205,10 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab { protected void contentsChanged() { } + @Override abstract public void createControl(Composite parent); + @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) { ICDebuggerPage dynamicTab = getDynamicTab(); if (dynamicTab != null) { @@ -212,6 +216,7 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab { } } + @Override public void initializeFrom(ILaunchConfiguration config) { setLaunchConfiguration(config); ICDebuggerPage dynamicTab = getDynamicTab(); @@ -220,6 +225,7 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab { } } + @Override public void performApply(ILaunchConfigurationWorkingCopy config) { if (getDebugConfig() != null) { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, getDebugConfig().getID()); @@ -232,6 +238,7 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab { } } + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { setLaunchConfigurationWorkingCopy(config); ICDebuggerPage dynamicTab = getDynamicTab(); @@ -241,6 +248,7 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab { } } + @Override public boolean isValid(ILaunchConfiguration config) { setErrorMessage(null); setMessage(null); @@ -264,10 +272,12 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab { return fInitDefaults; } + @Override public Image getImage() { return LaunchImages.get(LaunchImages.IMG_VIEW_DEBUGGER_TAB); } + @Override public String getName() { return LaunchMessages.AbstractCDebuggerTab_Debugger; } @@ -284,14 +294,16 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab { fDCombo = new Combo(comboComp, SWT.READ_ONLY | SWT.DROP_DOWN); fDCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); fDCombo.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { if (!isInitializing()) { setInitializeDefault(true); updateComboFromSelection(); } } - public void widgetDefaultSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) { } }); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/BuildErrPrompter.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/BuildErrPrompter.java index e9ecf385869..e3bafab75cc 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/BuildErrPrompter.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/BuildErrPrompter.java @@ -64,6 +64,7 @@ public class BuildErrPrompter implements IStatusHandler { * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, * java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { if (!(source instanceof Object[])) { diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFilePrompter.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFilePrompter.java index cdb4d55eef7..fe4fb28bae2 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFilePrompter.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFilePrompter.java @@ -34,6 +34,7 @@ public class CoreFilePrompter implements IStatusHandler { * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, * java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { final Shell shell = LaunchUIPlugin.getShell(); if (shell == null) { diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java index 6d60cb4d7cd..9ae45022c3b 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java @@ -197,25 +197,29 @@ public class LaunchUIPlugin extends AbstractUIPlugin implements ILaunchesListene /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[]) */ - public void launchesAdded(ILaunch[] launches) { + @Override + public void launchesAdded(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[]) */ - public void launchesChanged(ILaunch[] launches) { + @Override + public void launchesChanged(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[]) */ - public void launchesRemoved(ILaunch[] launches) { + @Override + public void launchesRemoved(ILaunch[] launches) { } /* (non-Javadoc) * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[]) */ - public void launchesTerminated(ILaunch[] launches) { + @Override + public void launchesTerminated(ILaunch[] launches) { for (ILaunch l : launches) { if (l instanceof CLaunch) { ((CLaunch)l).refresh(); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java index c21d17a9d6d..b1fb29ee58a 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java @@ -89,6 +89,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp fFilters = null; setShellStyle(getShellStyle() | SWT.RESIZE); emptyTypeFilter = new ViewerFilter() { + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof ILaunchConfigurationType) { try { @@ -109,6 +110,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp return DebugPlugin.getDefault().getLaunchManager(); } + @Override protected Control createContents(Composite parent) { Control x = super.createContents(parent); validate(); @@ -116,6 +118,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp return x; } + @Override protected Control createDialogArea(Composite parent2) { Composite comp = (Composite) super.createDialogArea(parent2); @@ -189,6 +192,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp data.heightHint = Math.max(convertHeightInCharsToPixels(15), bounds.height); data.widthHint = Math.max(convertWidthInCharsToPixels(40), bounds.width); fStackComposite.getCombo().addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { mode = ((Combo) e.widget).getText(); } @@ -200,6 +204,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp Button checkBox = new Button(checkboxComp, SWT.CHECK); checkBox.setText(LaunchMessages.MultiLaunchConfigurationSelectionDialog_5); checkBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { isDefaultMode = ((Button) e.widget).getSelection(); } @@ -221,6 +226,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp combo.add(LaunchElement.actionEnumToStr(EPostLaunchAction.WAIT_FOR_TERMINATION)); combo.add(LaunchElement.actionEnumToStr(EPostLaunchAction.DELAY)); combo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { final String actionStr = ((Combo) e.widget).getText(); action = MultiLaunchConfigurationDelegate.LaunchElement.strToActionEnum(actionStr); @@ -238,6 +244,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp gridData.widthHint = convertWidthInCharsToPixels(8); fDelayAmountWidget.setLayoutData(gridData); fDelayAmountWidget.addModifyListener(new ModifyListener(){ + @Override public void modifyText(ModifyEvent e) { String text = ((Text)e.widget).getText(); try { @@ -294,6 +301,7 @@ public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog imp /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { // This listener gets called for a selection change in the launch diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java index 0ba111db252..37d53d7527a 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java @@ -64,33 +64,40 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio static class ContentProvider implements IStructuredContentProvider, ITreeContentProvider { protected List input; + @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } + @Override public void dispose() { input = null; } + @Override @SuppressWarnings("unchecked") // nothing we can do about this public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput instanceof List) input = (List) newInput; } + @Override public Object[] getChildren(Object parentElement) { return (parentElement == input) ? input.toArray() : null; } + @Override public Object getParent(Object element) { return (element == input) ? null : input; } + @Override public boolean hasChildren(Object element) { return (element == input) ? (input.size() > 0) : false; } } static class LabelProvider extends BaseLabelProvider implements ITableLabelProvider { + @Override public Image getColumnImage(Object element, int columnIndex) { if (!(element instanceof MultiLaunchConfigurationDelegate.LaunchElement)) return null; @@ -112,6 +119,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio return null; } + @Override public String getColumnText(Object element, int columnIndex) { if (!(element instanceof MultiLaunchConfigurationDelegate.LaunchElement)) return null; @@ -156,6 +164,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICheckStateProvider#isChecked(java.lang.Object) */ + @Override public boolean isChecked(Object element) { if (element instanceof LaunchElement) { return ((LaunchElement)element).enabled; @@ -166,6 +175,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio /* (non-Javadoc) * @see org.eclipse.jface.viewers.ICheckStateProvider#isGrayed(java.lang.Object) */ + @Override public boolean isGrayed(Object element) { return false; } @@ -210,10 +220,12 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio return button; } + @Override public void widgetDefaultSelected(SelectionEvent e) { // nothing } + @Override public void widgetSelected(SelectionEvent e) { Widget widget = e.widget; if (widget == upButton) { @@ -248,6 +260,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio this.mode = mode; } + @Override public void createControl(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); @@ -273,6 +286,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio treeViewer.setInput(input); final ButtonComposite buts = new ButtonComposite(comp, SWT.NONE) { + @Override protected void addPressed() { MultiLaunchConfigurationSelectionDialog dialog = MultiLaunchConfigurationSelectionDialog.createDialog( @@ -298,6 +312,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio updateLaunchConfigurationDialog(); } } + @Override protected void updateWidgetEnablement(){ downButton.setEnabled(isDownEnabled()); upButton.setEnabled(isUpEnabled()); @@ -308,6 +323,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio } + @Override protected void editPressed() { int index = getSingleSelectionIndex(); if (index < 0) @@ -334,6 +350,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio updateLaunchConfigurationDialog(); } } + @Override protected void deletePressed() { int[] indices = getMultiSelectionIndices(); if (indices.length < 1) @@ -386,6 +403,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio } + @Override protected void downPressed() { if (!isDownEnabled()) return; int index = getSingleSelectionIndex(); @@ -407,6 +425,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio return getSingleSelectionIndex() > 0; } + @Override protected void upPressed() { if (!isUpEnabled()) return; int index = getSingleSelectionIndex(); @@ -419,6 +438,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio } }; treeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { buts.updateWidgetEnablement(); } @@ -432,6 +452,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio }); treeViewer.addCheckStateListener(new ICheckStateListener(){ + @Override public void checkStateChanged(CheckStateChangedEvent event) { ((LaunchElement)event.getElement()).enabled = event.getChecked(); updateLaunchConfigurationDialog(); @@ -443,10 +464,12 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio buts.setLayoutData(layoutData); } + @Override public String getName() { return LaunchMessages.MultiLaunchConfigurationTabGroup_10; } + @Override public void initializeFrom(ILaunchConfiguration configuration) { // replace the input from previously shown launch configurations input = MultiLaunchConfigurationDelegate.createLaunchElements(configuration, new ArrayList()); @@ -455,10 +478,12 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio } } + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { MultiLaunchConfigurationDelegate.storeLaunchElements(configuration, input); } + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { // defaults is empty list } @@ -501,6 +526,7 @@ public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfiguratio // nothing } + @Override public void createTabs(ILaunchConfigurationDialog dialog, String mode) { ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {// new GroupLaunchTab(mode), // diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/ProcessPrompter.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/ProcessPrompter.java index 479186edf4f..98c8b33cbd1 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/ProcessPrompter.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/ProcessPrompter.java @@ -36,6 +36,7 @@ public class ProcessPrompter implements IStatusHandler { * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, * java.lang.Object) */ + @Override public Object handleStatus(IStatus status, Object source) throws CoreException { Shell shell = LaunchUIPlugin.getShell(); if (shell == null) { @@ -52,6 +53,7 @@ public class ProcessPrompter implements IStatusHandler { * * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { IProcessInfo info = (IProcessInfo)element; IPath path = new Path(info.getName()); @@ -62,12 +64,14 @@ public class ProcessPrompter implements IStatusHandler { * * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { return LaunchImages.get(LaunchImages.IMG_OBJS_EXEC); } }; ILabelProvider qprovider = new LabelProvider() { + @Override public String getText(Object element) { IProcessInfo info = (IProcessInfo)element; return info.getName(); @@ -77,6 +81,7 @@ public class ProcessPrompter implements IStatusHandler { * * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { return LaunchImages.get(LaunchImages.IMG_OBJS_EXEC); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java index 5913b6b5290..0c7072e042c 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java @@ -69,10 +69,12 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { */ private class WidgetListener extends SelectionAdapter implements ModifyListener { + @Override public void modifyText(ModifyEvent e) { updateLaunchConfigurationDialog(); } + @Override public void widgetSelected(SelectionEvent e) { Object source = e.getSource(); if (source == fWorkspaceButton) { @@ -94,6 +96,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Font font = parent.getFont(); @@ -113,7 +116,8 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { fWorkingDirText = new Text(group, SWT.SINGLE | SWT.BORDER); fWorkingDirText.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = LaunchMessages.WorkingDirectoryBlock_Working_directory; } } @@ -153,6 +157,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose() */ + @Override public void dispose() { } @@ -265,6 +270,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public boolean isValid(ILaunchConfiguration config) { setErrorMessage(null); @@ -299,6 +305,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { // config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, // (String)null); @@ -309,6 +316,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { setLaunchConfiguration(configuration); try { @@ -332,6 +340,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { String wd = null; if (!isDefaultWorkingDirectory()) { @@ -358,6 +367,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return LaunchMessages.WorkingDirectoryBlock_Working_Directory_8; } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java index 9189f4ade11..79dc66f0750 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java @@ -151,6 +151,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { gd = new GridData(GridData.FILL_HORIZONTAL); fProjText.setLayoutData(gd); fProjText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { // if project changes, invalidate program name cache fPreviouslyCheckedProgram = null; @@ -314,11 +315,13 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { fBuildConfigCombo = new Combo(comboComp, SWT.READ_ONLY | SWT.DROP_DOWN); fBuildConfigCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); fBuildConfigCombo.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } - public void widgetDefaultSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } }); @@ -329,13 +332,15 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { fBuildConfigAuto.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); fBuildConfigAuto.setText(LaunchMessages.CMainTab_Build_Config_Auto); fBuildConfigAuto.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { fBuildConfigAutoChanged = true; fBuildConfigCombo.setEnabled(false); updateBuildConfigCombo(EMPTY_STRING); updateLaunchConfigurationDialog(); } - public void widgetDefaultSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) { fBuildConfigAutoChanged = true; fBuildConfigCombo.setEnabled(true); updateBuildConfigCombo(EMPTY_STRING); @@ -365,6 +370,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { fEnableBuildButton.setToolTipText(LaunchMessages.CMainTab_Enable_build_button_tooltip); fEnableBuildButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { updateLaunchConfigurationDialog(); } @@ -375,6 +381,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { fDisableBuildButton.setToolTipText(LaunchMessages.CMainTab_Disable_build_button_tooltip); fDisableBuildButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { updateLaunchConfigurationDialog(); } @@ -385,6 +392,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { fWorkspaceSettingsButton.setToolTipText(LaunchMessages.CMainTab_Workspace_settings_button_tooltip); fWorkspaceSettingsButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { updateLaunchConfigurationDialog(); } @@ -393,6 +401,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { fWorkpsaceSettingsLink = new Link(buildGroup, SWT.NONE); fWorkpsaceSettingsLink.setText(LaunchMessages.CMainTab_Workspace_settings_link_label); fWorkpsaceSettingsLink.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn( parent.getShell(), @@ -458,6 +467,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { gd = new GridData(GridData.FILL_HORIZONTAL); fCoreText.setLayoutData(gd); fCoreText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { updateLaunchConfigurationDialog(); } @@ -515,6 +525,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { } final IBinary[][] ret = new IBinary[1][]; BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { try { ret[0] = cproject.getBinaryContainer().getBinaries(); @@ -532,6 +543,7 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy config) { if (fBuildConfigCombo != null) { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, (String)fBuildConfigCombo.getData(Integer.toString(fBuildConfigCombo.getSelectionIndex()))); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java index 677287bde67..9d54a8a9213 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java @@ -70,6 +70,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Font font = parent.getFont(); Composite comp = new Composite(parent, SWT.NONE); @@ -102,6 +103,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { fPrgmArgumentsText = new Text(group, SWT.MULTI | SWT.WRAP | SWT.BORDER | SWT.V_SCROLL); fPrgmArgumentsText.getAccessible().addAccessibleListener( new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = LaunchMessages.CArgumentsTab_C_Program_Arguments; } @@ -113,6 +115,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { fPrgmArgumentsText.setLayoutData(gd); fPrgmArgumentsText.setFont(font); fPrgmArgumentsText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { updateLaunchConfigurationDialog(); } @@ -124,6 +127,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent arg0) { handleVariablesButtonSelected(fPrgmArgumentsText); } @@ -168,6 +172,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { ControlAccessibleListener(String name) { controlName = name; } + @Override public void getName(AccessibleEvent e) { e.result = controlName; } @@ -176,6 +181,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public boolean isValid(ILaunchConfiguration config) { return fWorkingDirectoryBlock.isValid(config); } @@ -183,6 +189,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String) null); config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String) null); @@ -191,6 +198,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { try { fPrgmArgumentsText.setText(configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "")); //$NON-NLS-1$ @@ -205,6 +213,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { configuration.setAttribute( ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, @@ -236,6 +245,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return LaunchMessages.CArgumentsTab_Arguments; } @@ -243,6 +253,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setLaunchConfigurationDialog(org.eclipse.debug.ui.ILaunchConfigurationDialog) */ + @Override public void setLaunchConfigurationDialog(ILaunchConfigurationDialog dialog) { super.setLaunchConfigurationDialog(dialog); fWorkingDirectoryBlock.setLaunchConfigurationDialog(dialog); @@ -251,6 +262,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getErrorMessage() */ + @Override public String getErrorMessage() { String m = super.getErrorMessage(); if (m == null) { @@ -262,6 +274,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getMessage() */ + @Override public String getMessage() { String m = super.getMessage(); if (m == null) { @@ -273,6 +286,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return LaunchImages.get(LaunchImages.IMG_VIEW_ARGUMENTS_TAB); } @@ -280,6 +294,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog() */ + @Override protected void updateLaunchConfigurationDialog() { super.updateLaunchConfigurationDialog(); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java index 7b746e549a3..62390e06418 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java @@ -88,6 +88,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite)super.createDialogArea(parent); Group group = new Group(composite, SWT.NONE); @@ -103,6 +104,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { return composite; } + @Override protected void okPressed() { saveValues(); super.okPressed(); @@ -130,6 +132,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { * * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(LaunchMessages.CDebuggerTab_Advanced_Options_Dialog_Title); @@ -164,6 +167,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { return TAB_ID; } + @Override public void createControl(Composite parent) { fContainer = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL); fContainer.setLayoutData(new GridData(GridData.FILL_BOTH)); @@ -193,6 +197,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { String configPlatform = getPlatform(config); debugConfigs = CDebugCorePlugin.getDefault().getActiveDebugConfigurations(); Arrays.sort(debugConfigs, new Comparator() { + @Override public int compare(ICDebugConfiguration c1, ICDebugConfiguration c2) { return Collator.getInstance().compare(c1.getName(), c2.getName()); } @@ -233,11 +238,13 @@ public class CDebuggerTab extends AbstractCDebuggerTab { loadDebuggerCombo((ICDebugConfiguration[])list.toArray(new ICDebugConfiguration[list.size()]), defaultSelection); } + @Override protected void updateComboFromSelection() { super.updateComboFromSelection(); initializeCommonControls(getLaunchConfiguration()); } + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { super.setDefaults(config); if (fAttachMode) { @@ -288,6 +295,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, defaultDebugger); } + @Override public void initializeFrom(ILaunchConfiguration config) { setInitializing(true); super.initializeFrom(config); @@ -300,6 +308,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { setInitializing(false); } + @Override public void performApply(ILaunchConfigurationWorkingCopy config) { super.performApply(config); if (fAttachMode) { @@ -313,6 +322,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { applyAdvancedAttributes(config); } + @Override public boolean isValid(ILaunchConfiguration config) { if (!validateDebuggerConfig(config)) { return false; @@ -403,6 +413,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { if (fAttachMode == false) { fStopInMain = createCheckButton(optionsComp, LaunchMessages.CDebuggerTab_Stop_at_main_on_startup); fStopInMain.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fStopInMainSymbol.setEnabled(fStopInMain.getSelection()); update(); @@ -413,12 +424,14 @@ public class CDebuggerTab extends AbstractCDebuggerTab { gridData.widthHint = 100; fStopInMainSymbol.setLayoutData(gridData); fStopInMainSymbol.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { update(); } }); fStopInMainSymbol.getAccessible().addAccessibleListener( new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = LaunchMessages.CDebuggerTab_Stop_at_main_on_startup; } @@ -428,6 +441,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { fAdvancedButton = createPushButton(optionsComp, LaunchMessages.CDebuggerTab_Advanced, null); ((GridData)fAdvancedButton.getLayoutData()).horizontalAlignment = GridData.END; fAdvancedButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { Dialog dialog = new AdvancedDebuggerOptionsDialog(getShell()); dialog.open(); @@ -471,6 +485,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { ((Boolean)regBookkeeping).booleanValue()); } + @Override protected Shell getShell() { return super.getShell(); } @@ -480,6 +495,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose() */ + @Override public void dispose() { getAdvancedAttributes().clear(); ICDebuggerPage debuggerPage = getDynamicTab(); @@ -507,10 +523,12 @@ public class CDebuggerTab extends AbstractCDebuggerTab { * * @see org.eclipse.cdt.launch.internal.ui.AbstractCDebuggerTab#setInitializeDefault(boolean) */ + @Override protected void setInitializeDefault(boolean init) { super.setInitializeDefault(init); } + @Override protected void contentsChanged() { fContainer.setMinSize(fContents.computeSize(SWT.DEFAULT, SWT.DEFAULT)); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java index 5be39fda35e..1b88ca9172e 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java @@ -67,6 +67,7 @@ import org.eclipse.swt.widgets.Text; /** * @deprecated */ +@Deprecated public class CEnvironmentTab extends CLaunchConfigurationTab { protected Properties fElements; protected TableViewer fVariableList; @@ -84,12 +85,15 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { class ElementsContentProvider implements IStructuredContentProvider { Object input = null; + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public void dispose() { } + @Override public Object[] getElements(Object parent) { return fElements.entrySet().toArray(); } @@ -97,10 +101,12 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { class ElementsLabelProvider extends LabelProvider implements ITableLabelProvider { + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } + @Override public String getColumnText(Object element, int columnIndex) { if (element != null && element instanceof Map.Entry) { return (columnIndex == 0) ? ((Map.Entry) element).getKey().toString() : ((Map.Entry) element).getValue().toString(); @@ -125,12 +131,14 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { fEdit = edit; } + @Override protected Control createContents(Composite parent) { Control result = super.createContents(parent); updateButtonsState(); return result; } + @Override protected void configureShell(Shell shell) { super.configureShell(shell); String title = (fEdit) ? @@ -138,6 +146,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { shell.setText(title); } + @Override protected Control createDialogArea(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(2, false); @@ -166,11 +175,13 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { gd.widthHint = fieldWidthHint; fTextValue.setLayoutData(gd); fTextName.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateButtonsState(); } }); fTextValue.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateButtonsState(); } @@ -181,6 +192,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { return composite; } + @Override protected void createButtonsForButtonBar(Composite parent) { fBtnOk = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); @@ -199,6 +211,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { return fValue; } + @Override protected void okPressed() { fName = fTextName.getText().trim(); fValue = fTextValue.getText().trim(); @@ -207,6 +220,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { } } + @Override public void createControl(Composite parent) { fElements = new Properties(); Composite control = new Composite(parent, SWT.NONE); @@ -284,11 +298,13 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { tableLayout.addColumnData(new ColumnWeightData(30)); fVariableList.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent e) { elementDoubleClicked((IStructuredSelection) e.getSelection()); } }); fVariableList.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent e) { updateButtons(); } @@ -303,6 +319,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { fBtnNew.setText(LaunchMessages.CEnvironmentTab_New); fBtnNew.setLayoutData(new GridData(GridData.FILL_BOTH)); fBtnNew.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { newEntry(); } @@ -311,6 +328,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { fBtnImport.setText(LaunchMessages.CEnvironmentTab_Import); fBtnImport.setLayoutData(new GridData(GridData.FILL_BOTH)); fBtnImport.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { importEntries(); } @@ -319,6 +337,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { fBtnEdit.setText(LaunchMessages.CEnvironmentTab_Edit); fBtnEdit.setLayoutData(new GridData(GridData.FILL_BOTH)); fBtnEdit.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { edit(); } @@ -327,6 +346,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { fBtnRemove.setText(LaunchMessages.CEnvironmentTab_Remove); fBtnRemove.setLayoutData(new GridData(GridData.FILL_BOTH)); fBtnRemove.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { remove(); } @@ -439,11 +459,13 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { updateLaunchConfigurationDialog(); } + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ENVIROMENT_MAP, (Map) null); config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ENVIROMENT_INHERIT, true); } + @Override public void initializeFrom(ILaunchConfiguration config) { try { Map env = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ENVIROMENT_MAP, (Map) null); @@ -458,6 +480,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { } } + @Override public void performApply(ILaunchConfigurationWorkingCopy config) { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ENVIROMENT_MAP, (Map) fElements.clone()); config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ENVIROMENT_INHERIT, true); @@ -466,6 +489,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return LaunchMessages.CEnvironmentTab_Environment; } @@ -473,6 +497,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return LaunchImages.get(LaunchImages.IMG_VIEW_ENVIRONMENT_TAB); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainAttachTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainAttachTab.java index 3ec550a796a..fb9558f14cd 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainAttachTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainAttachTab.java @@ -19,6 +19,7 @@ public class CMainAttachTab extends CMainTab { super(false); } + @Override public boolean isValid(ILaunchConfiguration config) { if (super.isValid(config) == false) { String name = fProgText.getText().trim(); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java index 7eb1b517feb..14df978f8fc 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java @@ -103,6 +103,7 @@ public class CMainTab extends CAbstractMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); @@ -157,6 +158,7 @@ public class CMainTab extends CAbstractMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration config) { filterPlatform = getPlatform(config); updateProjectFromConfig(config); @@ -196,6 +198,7 @@ public class CMainTab extends CAbstractMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy config) { super.performApply(config); ICProject cProject = this.getCProject(); @@ -221,6 +224,7 @@ public class CMainTab extends CAbstractMainTab { /** * Show a dialog that lists all main types */ + @Override protected void handleSearchButtonSelected() { if (getCProject() == null) { MessageDialog.openInformation(getShell(), LaunchMessages.CMainTab_Project_required, @@ -292,6 +296,7 @@ public class CMainTab extends CAbstractMainTab { /** * @since 6.0 */ + @Override protected void createProjectGroup(Composite parent, int colSpan) { Composite projComp = new Composite(parent, SWT.NONE); GridLayout projLayout = new GridLayout(); @@ -314,6 +319,7 @@ public class CMainTab extends CAbstractMainTab { fProjText.setLayoutData(gd); fProjText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { // if project changes, invalidate program name cache fPreviouslyCheckedProgram = null; @@ -353,6 +359,7 @@ public class CMainTab extends CAbstractMainTab { gd = new GridData(GridData.FILL_HORIZONTAL); fProgText.setLayoutData(gd); fProgText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { updateLaunchConfigurationDialog(); } @@ -504,6 +511,7 @@ public class CMainTab extends CAbstractMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { // We set empty attributes for project & program so that when one config // is @@ -602,6 +610,7 @@ public class CMainTab extends CAbstractMainTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return LaunchMessages.CMainTab_Main; } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CommonTabLite.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CommonTabLite.java index 7a2997f232d..6115ceaf983 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CommonTabLite.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CommonTabLite.java @@ -97,6 +97,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { super(parentShell, initialRoot, allowNewContainerName, message); } + @Override protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(SETTINGS_ID); @@ -130,6 +131,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { * Modify listener that simply updates the owning launch configuration dialog. */ private ModifyListener fBasicModifyListener = new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { updateLaunchConfigurationDialog(); } @@ -138,6 +140,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); @@ -164,6 +167,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { fFavoritesTable.setContentProvider(new FavoritesContentProvider()); fFavoritesTable.setLabelProvider(new FavoritesLabelProvider()); fFavoritesTable.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { updateLaunchConfigurationDialog(); } @@ -184,12 +188,14 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { fLocalRadioButton.setLayoutData(gd); fSharedRadioButton = createRadioButton(comp, LaunchConfigurationsMessages.CommonTab_S_hared_4); fSharedRadioButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleSharedRadioButtonSelected(); } }); fSharedLocationText = SWTFactory.createSingleText(comp, 1); fSharedLocationText.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = LaunchConfigurationsMessages.CommonTab_S_hared_4; } @@ -197,6 +203,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { fSharedLocationText.addModifyListener(fBasicModifyListener); fSharedLocationButton = createPushButton(comp, LaunchConfigurationsMessages.CommonTab__Browse_6, null); fSharedLocationButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleSharedLocationButtonSelected(); } @@ -282,6 +289,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public void initializeFrom(ILaunchConfiguration configuration) { boolean isShared = !configuration.isLocal(); fSharedRadioButton.setSelection(isShared); @@ -429,6 +437,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration) */ + @Override public boolean isValid(ILaunchConfiguration config) { setMessage(null); setErrorMessage(null); @@ -458,6 +467,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { config.setContainer(null); setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, config, true, true); @@ -466,6 +476,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { updateConfigFromLocalShared(configuration); updateConfigFromFavorites(configuration); @@ -474,6 +485,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ + @Override public String getName() { return LaunchConfigurationsMessages.CommonTab__Common_15; } @@ -483,6 +495,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { * * @since 3.3 */ + @Override public String getId() { return "org.eclipse.debug.ui.commonTab"; //$NON-NLS-1$ } @@ -490,6 +503,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#canSave() */ + @Override public boolean canSave() { return validateLocalShared(); } @@ -497,6 +511,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return DebugUITools.getImage(IInternalDebugUIConstants.IMG_OBJS_COMMON_TAB); } @@ -504,11 +519,13 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) {} /* (non-Javadoc) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {} /** @@ -516,6 +533,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { */ class FavoritesContentProvider implements IStructuredContentProvider { + @Override public Object[] getElements(Object inputElement) { ILaunchGroup[] groups = DebugUITools.getLaunchGroups(); List possibleGroups = new ArrayList(); @@ -530,8 +548,10 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { return possibleGroups.toArray(); } + @Override public void dispose() {} + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} } @@ -544,6 +564,7 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { private Map fImages = new HashMap(); + @Override public Image getColumnImage(Object element, int columnIndex) { Image image = (Image)fImages.get(element); if (image == null) { @@ -556,13 +577,16 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { return image; } + @Override public String getColumnText(Object element, int columnIndex) { String label = ((LaunchGroupExtension)element).getLabel(); return DebugUIPlugin.removeAccelerators(label); } + @Override public void addListener(ILabelProviderListener listener) {} + @Override public void dispose() { Iterator images = fImages.values().iterator(); while (images.hasNext()) { @@ -571,8 +595,10 @@ public class CommonTabLite extends AbstractLaunchConfigurationTab { } } + @Override public boolean isLabelProperty(Object element, String property) {return false;} + @Override public void removeListener(ILabelProviderListener listener) {} } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java index 38ab9405e87..7b9886d8d89 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java @@ -49,6 +49,7 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); @@ -66,6 +67,7 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void setDefaults(ILaunchConfigurationWorkingCopy config) { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE); @@ -87,6 +89,7 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void performApply(ILaunchConfigurationWorkingCopy config) { if (getDebugConfig() != null) { config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, getDebugConfig().getID()); @@ -107,7 +110,8 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab { return TAB_ID; } - public void initializeFrom(ILaunchConfiguration config) { + @Override + public void initializeFrom(ILaunchConfiguration config) { setInitializing(true); setLaunchConfiguration(config); try { @@ -122,6 +126,7 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab { /* (non-Javadoc) * @see org.eclipse.cdt.launch.internal.ui.AbstractCDebuggerTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy) */ + @Override public void activated(ILaunchConfigurationWorkingCopy workingCopy) { setInitializing(true); try { @@ -133,6 +138,7 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab { super.activated(workingCopy); } + @Override public boolean isValid(ILaunchConfiguration config) { if (!validateDebuggerConfig(config)) { return false; diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java index 29b2fc88f8a..8a854788544 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java @@ -82,14 +82,11 @@ import org.eclipse.swt.custom.CTabFolderEvent; import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.dnd.DND; -import org.eclipse.swt.dnd.DragSource; import org.eclipse.swt.dnd.DropTarget; import org.eclipse.swt.dnd.DropTargetAdapter; import org.eclipse.swt.dnd.DropTargetEvent; -import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; -import org.eclipse.swt.dnd.TransferData; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.SelectionAdapter; @@ -226,6 +223,7 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM /* * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void drop(final DropTargetEvent event) { if (TextTransfer.getInstance().isSupportedType( event.currentDataType )) { if ( event.data instanceof String ) { @@ -238,6 +236,7 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM /* * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void dragEnter(DropTargetEvent event) { event.detail = DND.DROP_COPY; event.feedback = DND.FEEDBACK_NONE; @@ -289,27 +288,32 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM } fGotoAddressBar.getButton(IDialogConstants.OK_ID).addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { performGo(false); } }); fGotoAddressBar.getButton(GoToAddressBarWidget.ID_GO_NEW_TAB).addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { performGo(true); } }); fGotoAddressBar.getExpressionWidget().addSelectionListener(new SelectionAdapter() { + @Override public void widgetDefaultSelected(SelectionEvent e) { performGo(false); } + @Override public void widgetSelected(SelectionEvent e) { performGo(false); } }); fGotoMemorySpaceControl.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if(fGotoMemorySpaceControl.getItemCount() >= 2) { final CTabFolder activeFolder = (CTabFolder) fStackLayout.topControl; diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowserPlugin.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowserPlugin.java index cfbd5e9a981..0aaa9532c6f 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowserPlugin.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowserPlugin.java @@ -39,6 +39,7 @@ public class MemoryBrowserPlugin extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -48,6 +49,7 @@ public class MemoryBrowserPlugin extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowserPreferenceInitializer.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowserPreferenceInitializer.java index a4651765653..9a6a7bb6694 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowserPreferenceInitializer.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowserPreferenceInitializer.java @@ -23,6 +23,7 @@ public class MemoryBrowserPreferenceInitializer extends AbstractPreferenceInitia * * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { IPreferenceStore store = MemoryBrowserPlugin.getDefault().getPreferenceStore(); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java index 2a768914926..1ffb7a85153 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java @@ -66,7 +66,7 @@ public class FindAction implements IViewActionDelegate { Shell shell = CDebugUIPlugin.getActiveWorkbenchShell(); FindReplaceDialog dialog = new FindReplaceDialog(shell, (IMemoryBlockExtension) memBlock, - fView, (Properties) fSearchDialogProperties, fAction); + fView, fSearchDialogProperties, fAction); if(action.getId().equals(FIND_NEXT_ID)) { if(Boolean.valueOf(fSearchDialogProperties.getProperty(FindReplaceDialog.SEARCH_ENABLE_FIND_NEXT, Boolean.FALSE.toString()))) diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java index 0668fdc056a..59f5b666fac 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java @@ -239,6 +239,7 @@ public class FindReplaceDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { fFindButton = createButton(parent, 10, Messages.getString("FindReplaceDialog.ButtonFind"), true); //$NON-NLS-1$ @@ -306,6 +307,7 @@ public class FindReplaceDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.ui.dialogs.SelectionDialog#getResult() */ + @Override public Object[] getResult() { Object[] results = super.getResult(); @@ -320,6 +322,7 @@ public class FindReplaceDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#cancelPressed() */ + @Override protected void cancelPressed() { fProperties.setProperty(SEARCH_FIND, fFindText.getText()); @@ -355,6 +358,7 @@ public class FindReplaceDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { setSelectionResult(new Object[]{ fProperties }); @@ -436,7 +440,7 @@ public class FindReplaceDialog extends SelectionDialog for(String string : strings) if(string != null) nonNullStrings.addElement(string); - return (String[]) nonNullStrings.toArray(new String[0]); + return nonNullStrings.toArray(new String[0]); } private String getMemoryBlockBaseAddress() @@ -532,6 +536,7 @@ public class FindReplaceDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, MemorySearchPlugin.getUniqueIdentifier() + ".FindReplaceDialog_context"); //$NON-NLS-1$ @@ -1245,6 +1250,7 @@ public class FindReplaceDialog extends SelectionDialog else { Job job = new Job("Searching memory for " + searchPhrase){ //$NON-NLS-1$ + @Override public IStatus run(IProgressMonitor monitor) { return query.run(monitor); } @@ -1277,6 +1283,7 @@ public class FindReplaceDialog extends SelectionDialog return fPhrase.length(); } + @Override public String toString() { return fPhrase; @@ -1320,6 +1327,7 @@ public class FindReplaceDialog extends SelectionDialog } } + @Override public String toString() { if(fBytes == null) @@ -1357,6 +1365,7 @@ public class FindReplaceDialog extends SelectionDialog return removeZeroPrefixByte(fPhrase.toByteArray()).length; } + @Override public String toString() { return fPhrase.toString(fRadix); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResult.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResult.java index 7ef671cfd08..3d3c24ae2ec 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResult.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResult.java @@ -57,7 +57,7 @@ public class MemorySearchResult implements ISearchResult { MemoryMatch matches[] = new MemoryMatch[fMatches.size()]; for(int i = 0; i < matches.length; i++) - matches[i] = (MemoryMatch) fMatches.elementAt(i); + matches[i] = fMatches.elementAt(i); return matches; } @@ -71,7 +71,7 @@ public class MemorySearchResult implements ISearchResult { Enumeration en = listeners.elements(); while(en.hasMoreElements()) { - ((ISearchResultListener) en.nextElement()).searchResultChanged(new SearchResultEvent(this) { + en.nextElement().searchResultChanged(new SearchResultEvent(this) { private static final long serialVersionUID = -1435449002760145835L; } ); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResultsPage.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResultsPage.java index 06f001492a5..033f1bd6f29 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResultsPage.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResultsPage.java @@ -100,6 +100,7 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage, fPart = part; } + @Override public void createControl(Composite parent) { fViewerContainer = new Composite(parent, SWT.NULL); fViewerContainer.setLayoutData(new GridData(GridData.FILL_BOTH)); @@ -227,15 +228,19 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage, }; } + @Override public void dispose() { fTreeViewer.getControl().dispose(); fViewerContainer.dispose(); } + @Override public Control getControl() { return fViewerContainer; } + @Override public void setActionBars(IActionBars actionBars) {} + @Override public void setFocus() {} } diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AbstractPane.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AbstractPane.java index 34274ee39b6..6c6902ae595 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AbstractPane.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AbstractPane.java @@ -786,7 +786,8 @@ public abstract class AbstractPane extends Canvas abstract protected int getCellCharacterCount(); - public void setFont(Font font) + @Override + public void setFont(Font font) { super.setFont(font); fCharacterWidth = -1; diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AddressPane.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AddressPane.java index afb20eaa404..7970bd4e84c 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AddressPane.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AddressPane.java @@ -26,7 +26,8 @@ public class AddressPane extends AbstractPane super(parent); } - protected BigInteger getViewportAddress(int col, int row) + @Override + protected BigInteger getViewportAddress(int col, int row) throws DebugException { BigInteger address = fRendering.getViewportStartAddress(); @@ -37,7 +38,8 @@ public class AddressPane extends AbstractPane return address; } - protected void appendSelection(int x, int y) + @Override + protected void appendSelection(int x, int y) { try { @@ -66,12 +68,14 @@ public class AddressPane extends AbstractPane } } - public Point computeSize(int wHint, int hHint) + @Override + public Point computeSize(int wHint, int hHint) { return new Point(getCellWidth() + fRendering.getRenderSpacing(), 100); } - protected int getCellCharacterCount() + @Override + protected int getCellCharacterCount() { // two characters per byte of hex address @@ -79,7 +83,8 @@ public class AddressPane extends AbstractPane + 2; // 0x } - protected int getCellWidth() + @Override + protected int getCellWidth() { GC gc = new GC(this); StringBuffer buf = new StringBuffer(); @@ -115,7 +120,8 @@ public class AddressPane extends AbstractPane return address; } - protected Point getCellLocation(BigInteger cellAddress) + @Override + protected Point getCellLocation(BigInteger cellAddress) { try { @@ -154,12 +160,14 @@ public class AddressPane extends AbstractPane } } - protected int getNumberOfBytesRepresentedByColumn() + @Override + protected int getNumberOfBytesRepresentedByColumn() { return fRendering.getBytesPerRow(); } - protected void positionCaret(int x, int y) + @Override + protected void positionCaret(int x, int y) { try { @@ -196,7 +204,8 @@ public class AddressPane extends AbstractPane } } - protected void paint(PaintEvent pe) + @Override + protected void paint(PaintEvent pe) { super.paint(pe); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/DataPane.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/DataPane.java index 7a8062d6eb5..8c4c27ddcbd 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/DataPane.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/DataPane.java @@ -26,13 +26,15 @@ public class DataPane extends AbstractPane super(parent); } - protected String getCellText(MemoryByte bytes[]) + @Override + protected String getCellText(MemoryByte bytes[]) { return fRendering.getRadixText(bytes, fRendering.getRadix(), fRendering .isTargetLittleEndian()); } - protected void editCell(BigInteger address, int subCellPosition, + @Override + protected void editCell(BigInteger address, int subCellPosition, char character) { try @@ -119,19 +121,22 @@ public class DataPane extends AbstractPane } } - protected int getCellWidth() + @Override + protected int getCellWidth() { return getCellCharacterCount() * getCellCharacterWidth() + (fRendering.getCellPadding() * 2); } - protected int getCellCharacterCount() + @Override + protected int getCellCharacterCount() { return fRendering.getRadixCharacterCount(fRendering.getRadix(), fRendering.getBytesPerColumn()); } - public Point computeSize(int wHint, int hHint) + @Override + public Point computeSize(int wHint, int hHint) { return new Point(fRendering.getColumnCount() * getCellWidth() + fRendering.getRenderSpacing(), 100); @@ -156,7 +161,8 @@ public class DataPane extends AbstractPane return address; } - protected Point getCellLocation(BigInteger cellAddress) + @Override + protected Point getCellLocation(BigInteger cellAddress) { try { @@ -187,7 +193,8 @@ public class DataPane extends AbstractPane } } - protected void positionCaret(int x, int y) + @Override + protected void positionCaret(int x, int y) { try { @@ -223,7 +230,8 @@ public class DataPane extends AbstractPane } } - protected BigInteger getViewportAddress(int col, int row) + @Override + protected BigInteger getViewportAddress(int col, int row) throws DebugException { BigInteger address = fRendering.getViewportStartAddress(); @@ -234,7 +242,8 @@ public class DataPane extends AbstractPane return address; } - protected void paint(PaintEvent pe) + @Override + protected void paint(PaintEvent pe) { super.paint(pe); @@ -341,7 +350,7 @@ public class DataPane extends AbstractPane boolean anyByteEditing = false; for(int n = 0; n < bytes.length && !anyByteEditing; n++) if(bytes[n] instanceof TraditionalMemoryByte) - if(((TraditionalMemoryByte) bytes[n]).isEdited()) + if(bytes[n].isEdited()) anyByteEditing = true; if(isOdd(col)) diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java index 3dfd908adac..465a58e516b 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java @@ -195,6 +195,7 @@ public class Rendering extends Composite implements IDebugEventSetListener { button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { doGoToAddress(); } @@ -204,6 +205,7 @@ public class Rendering extends Composite implements IDebugEventSetListener if (button != null) { button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setVisibleAddressBar(false); }}); @@ -211,12 +213,14 @@ public class Rendering extends Composite implements IDebugEventSetListener } fAddressBar.getExpressionWidget().addSelectionListener(new SelectionAdapter() { + @Override public void widgetDefaultSelected(SelectionEvent e) { doGoToAddress(); }}); fAddressBar.getExpressionWidget().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.keyCode == SWT.ESC) setVisibleAddressBar(false); @@ -261,7 +265,8 @@ public class Rendering extends Composite implements IDebugEventSetListener { this.setLayout(new Layout() { - public void layout(Composite composite, boolean changed) + @Override + public void layout(Composite composite, boolean changed) { int xOffset = 0; if(Rendering.this.getHorizontalBar().isVisible()) @@ -323,7 +328,8 @@ public class Rendering extends Composite implements IDebugEventSetListener } } - protected Point computeSize(Composite composite, int wHint, + @Override + protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { return new Point(100, 100); // dummy data @@ -729,7 +735,8 @@ public class Rendering extends Composite implements IDebugEventSetListener TraditionalMemoryByte[] bytes; - public MemoryUnit clone() + @Override + public MemoryUnit clone() { MemoryUnit b = new MemoryUnit(); @@ -837,6 +844,7 @@ public class Rendering extends Composite implements IDebugEventSetListener } } + @Override public void run() { while(!fDisposed) @@ -1076,7 +1084,7 @@ public class Rendering extends Composite implements IDebugEventSetListener Display.getDefault().getThread()) : TraditionalRenderingMessages .getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$ - return (TraditionalMemoryByte[]) fEditBuffer.get(address); + return fEditBuffer.get(address); } public void clearEditBuffer() @@ -1100,8 +1108,8 @@ public class Rendering extends Composite implements IDebugEventSetListener while(iterator.hasNext()) { - BigInteger address = (BigInteger) iterator.next(); - TraditionalMemoryByte[] bytes = (TraditionalMemoryByte[]) fEditBuffer + BigInteger address = iterator.next(); + TraditionalMemoryByte[] bytes = fEditBuffer .get(address); byte byteValue[] = new byte[bytes.length]; @@ -1164,7 +1172,8 @@ public class Rendering extends Composite implements IDebugEventSetListener return fCacheDirty; } - public void dispose() + @Override + public void dispose() { DebugPlugin.getDefault().removeDebugEventListener(this); if(fViewportCache != null) diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TextPane.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TextPane.java index 5b4bbe2253b..177b4fd4f07 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TextPane.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TextPane.java @@ -26,19 +26,22 @@ public class TextPane extends AbstractPane super(parent); } - protected int getCellCharacterCount() + @Override + protected int getCellCharacterCount() { return fRendering.getBytesPerColumn() / fRendering.getBytesPerCharacter(); } - protected String getCellText(MemoryByte bytes[]) + @Override + protected String getCellText(MemoryByte bytes[]) { return fRendering.formatText(bytes, fRendering .isTargetLittleEndian(), fRendering.getTextMode()); } - protected void editCell(BigInteger address, int subCellPosition, + @Override + protected void editCell(BigInteger address, int subCellPosition, char character) { try @@ -85,7 +88,8 @@ public class TextPane extends AbstractPane } } - protected int getCellWidth() + @Override + protected int getCellWidth() { GC gc = new GC(this); gc.setFont(fRendering.getFont()); @@ -96,14 +100,16 @@ public class TextPane extends AbstractPane / fRendering.getBytesPerCharacter() * width; } - public Point computeSize(int wHint, int hHint) + @Override + public Point computeSize(int wHint, int hHint) { return new Point(fRendering.getColumnCount() * getCellWidth() + fRendering.getRenderSpacing(), 100); } - protected Point getCellLocation(BigInteger cellAddress) + @Override + protected Point getCellLocation(BigInteger cellAddress) { try { @@ -157,7 +163,8 @@ public class TextPane extends AbstractPane return address; } - protected void positionCaret(int x, int y) + @Override + protected void positionCaret(int x, int y) { try { @@ -195,7 +202,8 @@ public class TextPane extends AbstractPane } } - protected BigInteger getViewportAddress(int col, int row) + @Override + protected BigInteger getViewportAddress(int col, int row) throws DebugException { BigInteger address = fRendering.getViewportStartAddress(); @@ -207,7 +215,8 @@ public class TextPane extends AbstractPane return address; } - protected void paint(PaintEvent pe) + @Override + protected void paint(PaintEvent pe) { super.paint(pe); @@ -288,7 +297,7 @@ public class TextPane extends AbstractPane boolean anyByteEditing = false; for(int n = 0; n < bytes.length && !anyByteEditing; n++) if(bytes[n] instanceof TraditionalMemoryByte) - if(((TraditionalMemoryByte) bytes[n]).isEdited()) + if(bytes[n].isEdited()) anyByteEditing = true; if(isOdd(col)) diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java index 9f09984721e..de93061bdc6 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java @@ -26,8 +26,6 @@ import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.core.model.IMemoryBlockExtension; import org.eclipse.debug.core.model.MemoryByte; -import org.eclipse.debug.internal.ui.DebugPluginImages; -import org.eclipse.debug.internal.ui.DebugUIMessages; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.memory.IMemoryBlockConnection; @@ -190,7 +188,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe private int fAddressableSize; private int fAddressSize; - public void init(IMemoryRenderingContainer container, IMemoryBlock block) + @Override + public void init(IMemoryRenderingContainer container, IMemoryBlock block) { super.init(container, block); @@ -308,7 +307,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe private AbstractHandler fGoToAddressHandler; private IAction fSavedActionHandler; // When we set the global copy action handler we save off the existing so we can restore it. - public void activated() + @Override + public void activated() { super.activated(); @@ -348,6 +348,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe } + @Override public void deactivated() { IWorkbench workbench = PlatformUI.getWorkbench(); @@ -388,6 +389,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe public void updateRenderingLabels() { UIJob job = new UIJob("updateLabels"){ //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { // update tab labels @@ -434,7 +436,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe int green = textColor.getGreen(); int blue = textColor.getBlue(); - float scale = (float) store.getInt( + float scale = store.getInt( TraditionalRenderingPreferenceConstants.MEM_LIGHTEN_DARKEN_ALTERNATE_CELLS); red = (int) Math.min(red + ((255 - red) / 10) * scale, 255); @@ -594,7 +596,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe TraditionalRenderingMessages .getString("TraditionalRendering.RESET_TO_BASE_ADDRESS")) //$NON-NLS-1$ { - public void run() + @Override + public void run() { Display.getDefault().asyncExec(new Runnable() { @@ -614,7 +617,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe TraditionalRenderingMessages .getString("TraditionalRendering.REFRESH")) //$NON-NLS-1$ { - public void run() + @Override + public void run() { Display.getDefault().asyncExec(new Runnable() { @@ -644,7 +648,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.ADDRESS"), //$NON-NLS-1$ IAction.AS_CHECK_BOX) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering.setPaneVisible( Rendering.PANE_ADDRESS, isChecked()); @@ -660,7 +665,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.BINARY"), //$NON-NLS-1$ IAction.AS_CHECK_BOX) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering.setPaneVisible( Rendering.PANE_BINARY, isChecked()); @@ -676,7 +682,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.TEXT"), //$NON-NLS-1$ IAction.AS_CHECK_BOX) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering.setPaneVisible( Rendering.PANE_TEXT, isChecked()); @@ -692,7 +699,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.1_BYTE"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering.setBytesPerColumn(1); } @@ -704,7 +712,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe TraditionalRenderingMessages .getString("TraditionalRendering.2_BYTES"), IAction.AS_RADIO_BUTTON) //$NON-NLS-1$ { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering.setBytesPerColumn(2); } @@ -716,7 +725,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe TraditionalRenderingMessages .getString("TraditionalRendering.4_BYTES"), IAction.AS_RADIO_BUTTON) //$NON-NLS-1$ { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering.setBytesPerColumn(4); } @@ -728,7 +738,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe TraditionalRenderingMessages .getString("TraditionalRendering.8_BYTES"), IAction.AS_RADIO_BUTTON) //$NON-NLS-1$ { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering.setBytesPerColumn(8); } @@ -743,7 +754,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.ISO-8859-1"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setTextMode(Rendering.TEXT_ISO_8859_1); @@ -757,7 +769,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.USASCII"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setTextMode(Rendering.TEXT_USASCII); @@ -770,7 +783,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe TraditionalRenderingMessages .getString("TraditionalRendering.UTF8"), IAction.AS_RADIO_BUTTON) //$NON-NLS-1$ { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setTextMode(Rendering.TEXT_UTF8); @@ -800,7 +814,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.BIG"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setDisplayLittleEndian(false); @@ -813,7 +828,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.LITTLE"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setDisplayLittleEndian(true); @@ -828,7 +844,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.HEX"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setRadix(Rendering.RADIX_HEX); @@ -841,7 +858,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe TraditionalRenderingMessages .getString("TraditionalRendering.DECIMAL_SIGNED"), IAction.AS_RADIO_BUTTON) //$NON-NLS-1$ { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setRadix(Rendering.RADIX_DECIMAL_SIGNED); @@ -854,7 +872,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe TraditionalRenderingMessages .getString("TraditionalRendering.DECIMAL_UNSIGNED"), IAction.AS_RADIO_BUTTON) //$NON-NLS-1$ { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setRadix(Rendering.RADIX_DECIMAL_UNSIGNED); @@ -868,7 +887,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.OCTAL"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setRadix(Rendering.RADIX_OCTAL); @@ -882,7 +902,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.BINARY"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering .setRadix(Rendering.RADIX_BINARY); @@ -896,7 +917,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.COLUMN_COUNT_AUTO"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering.setColumnsSetting(Rendering.COLUMNS_AUTO_SIZE_TO_FIT); } @@ -912,7 +934,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.COLUMN_COUNT_" + finali), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { TraditionalRendering.this.fRendering.setColumnsSetting(finali); } @@ -922,7 +945,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe final Action displayColumnCountCustomValue = new Action("", IAction.AS_RADIO_BUTTON) //$NON-NLS-1$ { - public void run() + @Override + public void run() { } }; @@ -932,7 +956,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.COLUMN_COUNT_CUSTOM"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { InputDialog inputDialog = new InputDialog( fRendering.getShell(), @@ -1072,7 +1097,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.UPDATE_ALWAYS"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { fRendering.setUpdateMode(Rendering.UPDATE_ALWAYS); } @@ -1084,7 +1110,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.UPDATE_ON_BREAKPOINT"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { fRendering.setUpdateMode(Rendering.UPDATE_ON_BREAKPOINT); } @@ -1096,7 +1123,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe .getString("TraditionalRendering.UPDATE_MANUAL"), //$NON-NLS-1$ IAction.AS_RADIO_BUTTON) { - public void run() + @Override + public void run() { fRendering.setUpdateMode(Rendering.UPDATE_MANUAL); } @@ -1208,7 +1236,8 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe fRendering.setDisplayLittleEndian(littleEndian); } - public void dispose() + @Override + public void dispose() { if(this.fRendering != null) this.fRendering.dispose(); @@ -1219,6 +1248,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe /* (non-Javadoc) * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) */ + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { @@ -1390,7 +1420,8 @@ abstract class CopyAction extends Action setChecked(fDefaultCopyType == fCopyType); } - public void run() + @Override + public void run() { final String PANE_SPACING = " "; //$NON-NLS-1$ diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java index 1b8b90c3ed1..3306de1716e 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java @@ -29,6 +29,7 @@ public class TraditionalRenderingPreferenceAction extends ActionDelegate impleme /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { IPreferencePage page = new TraditionalRenderingPreferencePage(); showPreferencePage("org.eclipse.cdt.debug.ui.memory.traditional.TraditionalRenderingPreferencePage", page); //$NON-NLS-1$ diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceInitializer.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceInitializer.java index 3e097300be9..e2b080d63aa 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceInitializer.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceInitializer.java @@ -28,6 +28,7 @@ public class TraditionalRenderingPreferenceInitializer extends AbstractPreferenc * * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { IPreferenceStore store = TraditionalRenderingPlugin.getDefault() .getPreferenceStore(); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferencePage.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferencePage.java index ae6915849c6..a4fa7c3182b 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferencePage.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferencePage.java @@ -60,6 +60,7 @@ public class TraditionalRenderingPreferencePage * of preferences. Each field editor knows how to save and * restore itself. */ + @Override public void createFieldEditors() { addField(new BooleanFieldEditor(TraditionalRenderingPreferenceConstants.MEM_USE_GLOBAL_TEXT, TraditionalRenderingMessages.getString("TraditionalRenderingPreferencePage_UseGlobalTextColor"), getFieldEditorParent())); //$NON-NLS-1$ diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/ExportMemoryDialog.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/ExportMemoryDialog.java index 9571150afb0..f279b04e2de 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/ExportMemoryDialog.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/ExportMemoryDialog.java @@ -98,6 +98,7 @@ public class ExportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); } @@ -105,6 +106,7 @@ public class ExportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.ui.dialogs.SelectionDialog#getResult() */ + @Override public Object[] getResult() { Object[] results = super.getResult(); @@ -119,6 +121,7 @@ public class ExportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#cancelPressed() */ + @Override protected void cancelPressed() { setResult(null); @@ -129,6 +132,7 @@ public class ExportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { if(fCurrentControl != null) fCurrentControl.dispose(); @@ -144,6 +148,7 @@ public class ExportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, MemoryTransportPlugin.getUniqueIdentifier() + ".ExportMemoryDialog_context"); //$NON-NLS-1$ @@ -196,8 +201,8 @@ public class ExportMemoryDialog extends SelectionDialog fFormatNames = new String[exporters.size()]; for(int i = 0; i < fFormatExporters.length; i++) { - fFormatExporters[i] = (IMemoryExporter) exporters.elementAt(i); - fFormatNames[i] = ((IMemoryExporter) exporters.elementAt(i)).getName(); + fFormatExporters[i] = exporters.elementAt(i); + fFormatNames[i] = exporters.elementAt(i).getName(); } final Composite container = new Composite(composite, SWT.NONE); @@ -209,6 +214,7 @@ public class ExportMemoryDialog extends SelectionDialog fFormatCombo.setItems(fFormatNames); fFormatCombo.addSelectionListener(new SelectionAdapter(){ + @Override public void widgetSelected(SelectionEvent e) { if(fCurrentControl != null) { fCurrentControl.dispose(); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/ImportMemoryDialog.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/ImportMemoryDialog.java index 42623825214..32d12aec9ce 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/ImportMemoryDialog.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/ImportMemoryDialog.java @@ -106,6 +106,7 @@ public class ImportMemoryDialog extends SelectionDialog public void scrollRenderings(final BigInteger address) { UIJob job = new UIJob("repositionRenderings"){ //$NON-NLS-1$ + @Override public IStatus runInUIThread(IProgressMonitor monitor) { for (IMemoryRenderingContainer container : fMemoryView.getMemoryRenderingContainers()) { IMemoryRendering rendering = container.getActiveRendering(); @@ -132,6 +133,7 @@ public class ImportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); } @@ -139,6 +141,7 @@ public class ImportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.ui.dialogs.SelectionDialog#getResult() */ + @Override public Object[] getResult() { Object[] results = super.getResult(); @@ -153,6 +156,7 @@ public class ImportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#cancelPressed() */ + @Override protected void cancelPressed() { setResult(null); @@ -163,6 +167,7 @@ public class ImportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { if(fCurrentControl != null) fCurrentControl.dispose(); @@ -176,6 +181,7 @@ public class ImportMemoryDialog extends SelectionDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, MemoryTransportPlugin.getUniqueIdentifier() + ".ImportMemoryDialog_context"); //$NON-NLS-1$ @@ -241,6 +247,7 @@ public class ImportMemoryDialog extends SelectionDialog fFormatCombo.setItems(fFormatNames); fFormatCombo.addSelectionListener(new SelectionAdapter(){ + @Override public void widgetSelected(SelectionEvent e) { if(fCurrentControl != null) { fCurrentControl.dispose(); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java index 7a06b212087..2ad02b2260c 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java @@ -66,6 +66,7 @@ public class PlainTextExporter implements IMemoryExporter { Composite composite = new Composite(parent, SWT.NONE) { + @Override public void dispose() { fProperties.put(TRANSFER_FILE, fFileText.getText()); @@ -166,6 +167,7 @@ public class PlainTextExporter implements IMemoryExporter { fileButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(parent.getShell(), SWT.SAVE); dialog.setText(Messages.getString("PlainTextExporter.ChooseFile")); //$NON-NLS-1$ @@ -355,6 +357,7 @@ public class PlainTextExporter implements IMemoryExporter { public void exportMemory() { Job job = new Job("Memory Export to Plain Text File"){ //$NON-NLS-1$ + @Override public IStatus run(IProgressMonitor monitor) { try { diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java index 3a6b4dc1dfc..85de142c2d6 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java @@ -73,6 +73,7 @@ public class PlainTextImporter implements IMemoryImporter { Composite composite = new Composite(parent, SWT.NONE) { + @Override public void dispose() { fProperties.put(TRANSFER_FILE, fFileText.getText()); @@ -269,6 +270,7 @@ public class PlainTextImporter implements IMemoryImporter { public void importMemory() { Job job = new Job("Memory Import from Plain Text File"){ //$NON-NLS-1$ + @Override public IStatus run(IProgressMonitor monitor) { try { diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java index 4c32bedb4f6..cfa505cdc05 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java @@ -66,6 +66,7 @@ public class RAWBinaryExporter implements IMemoryExporter Composite composite = new Composite(parent, SWT.NONE) { + @Override public void dispose() { fProperties.put(TRANSFER_FILE, fFileText.getText()); @@ -374,6 +375,7 @@ public class RAWBinaryExporter implements IMemoryExporter public void exportMemory() { Job job = new Job("Memory Export to RAW Binary File"){ //$NON-NLS-1$ + @Override public IStatus run(IProgressMonitor monitor) { try { diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java index 7aa1bd8686a..e6337fe2230 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java @@ -68,6 +68,7 @@ public class RAWBinaryImporter implements IMemoryImporter { Composite composite = new Composite(parent, SWT.NONE) { + @Override public void dispose() { fProperties.put(TRANSFER_FILE, fFileText.getText()); @@ -249,6 +250,7 @@ public class RAWBinaryImporter implements IMemoryImporter { public void importMemory() { Job job = new Job("Memory Import from RAW Binary File"){ //$NON-NLS-1$ + @Override public IStatus run(IProgressMonitor monitor) { try { diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java index 879becfa2ed..4c080a96218 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java @@ -66,6 +66,7 @@ public class SRecordExporter implements IMemoryExporter Composite composite = new Composite(parent, SWT.NONE) { + @Override public void dispose() { fProperties.put(TRANSFER_FILE, fFileText.getText()); @@ -376,6 +377,7 @@ public class SRecordExporter implements IMemoryExporter public void exportMemory() { Job job = new Job("Memory Export to S-Record File"){ //$NON-NLS-1$ + @Override public IStatus run(IProgressMonitor monitor) { try { diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java index c9388a6640d..f1ddd61e29e 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java @@ -73,6 +73,7 @@ public class SRecordImporter implements IMemoryImporter { Composite composite = new Composite(parent, SWT.NONE) { + @Override public void dispose() { fProperties.put(TRANSFER_FILE, fFileText.getText()); @@ -296,6 +297,7 @@ public class SRecordImporter implements IMemoryImporter { public void importMemory() { Job job = new Job("Memory Import from S-Record File"){ //$NON-NLS-1$ + @Override public IStatus run(IProgressMonitor monitor) { try