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

Code cleanup, mostly about missing @Override

Browse source
This commit is contained in:
Marc Khouzam 2012-01-17 09:42:18 -05:00
parent d184e414d0
commit 2bafef2e42
657 changed files with 3775 additions and 492 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java
View file

@ -37,6 +37,7 @@ public class Activator extends Plugin {
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext) * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
*/ */
@Override
public void start(BundleContext context) throws Exception { public void start(BundleContext context) throws Exception {
super.start(context); super.start(context);
} }
@ -45,6 +46,7 @@ public class Activator extends Plugin {
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/ */
@Override
public void stop(BundleContext context) throws Exception { public void stop(BundleContext context) throws Exception {
super.stop(context); super.stop(context);
plugin = null; plugin = null;

1
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java
View file

@ -61,6 +61,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate {
* *
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch
*/ */
@Override
public void launch(ILaunchConfiguration config, String mode, public void launch(ILaunchConfiguration config, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException { ILaunch launch, IProgressMonitor monitor) throws CoreException {

4
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java
View file

@ -14,9 +14,6 @@ package org.eclipse.cdt.launch.remote.tabs;
import org.eclipse.cdt.debug.ui.ICDebuggerPage; 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.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.cdt.dsf.gdb.service.SessionType;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfiguration;
@ -62,6 +59,7 @@ public class RemoteCDSFDebuggerTab extends CDebuggerTab {
super.initializeFrom(config); super.initializeFrom(config);
} }
@Override
protected void loadDynamicDebugArea() { protected void loadDynamicDebugArea() {
Composite dynamicTabHolder = getDynamicTabHolder(); Composite dynamicTabHolder = getDynamicTabHolder();
// Dispose of any current child widgets in the tab holder area // Dispose of any current child widgets in the tab holder area

9
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
View file

@ -22,7 +22,6 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.launch.remote.tabs; 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.dsf.gdb.internal.ui.launching.CMainTab;
import org.eclipse.cdt.internal.launch.remote.Messages; import org.eclipse.cdt.internal.launch.remote.Messages;
import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants; import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
@ -127,6 +126,7 @@ public class RemoteCDSFMainTab extends CMainTab {
* *
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid
*/ */
@Override
public boolean isValid(ILaunchConfiguration config) { public boolean isValid(ILaunchConfiguration config) {
boolean retVal = super.isValid(config); boolean retVal = super.isValid(config);
if (retVal == true) { if (retVal == true) {
@ -184,6 +184,7 @@ public class RemoteCDSFMainTab extends CMainTab {
Messages.RemoteCMainTab_New, null); Messages.RemoteCMainTab_New, null);
newRemoteConnectionButton.addSelectionListener(new SelectionAdapter() { newRemoteConnectionButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleNewRemoteConnectionSelected(); handleNewRemoteConnectionSelected();
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
@ -196,6 +197,7 @@ public class RemoteCDSFMainTab extends CMainTab {
remoteConnectionPropertiesButton remoteConnectionPropertiesButton
.addSelectionListener(new SelectionAdapter() { .addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleRemoteConnectionPropertiesSelected(); handleRemoteConnectionPropertiesSelected();
} }
@ -239,6 +241,7 @@ public class RemoteCDSFMainTab extends CMainTab {
Messages.RemoteCMainTab_Remote_Path_Browse_Button, null); Messages.RemoteCMainTab_Remote_Path_Browse_Button, null);
remoteBrowseButton.addSelectionListener(new SelectionAdapter() { remoteBrowseButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleRemoteBrowseSelected(); handleRemoteBrowseSelected();
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
@ -281,6 +284,7 @@ public class RemoteCDSFMainTab extends CMainTab {
SKIP_DOWNLOAD_BUTTON_TEXT); SKIP_DOWNLOAD_BUTTON_TEXT);
skipDownloadButton.addSelectionListener(new SelectionAdapter() { skipDownloadButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
} }
@ -340,6 +344,7 @@ public class RemoteCDSFMainTab extends CMainTab {
fbLocalHost = fHost.getSystemType().isLocal(); fbLocalHost = fHost.getSystemType().isLocal();
} }
@Override
protected Control createDialogArea(Composite parent) { protected Control createDialogArea(Composite parent) {
// create composite // create composite
Composite composite = (Composite) super Composite composite = (Composite) super
@ -385,6 +390,7 @@ public class RemoteCDSFMainTab extends CMainTab {
return composite; return composite;
} }
@Override
protected void buttonPressed(int buttonId) { protected void buttonPressed(int buttonId) {
if (!fbLocalHost && (buttonId == IDialogConstants.OK_ID)) { if (!fbLocalHost && (buttonId == IDialogConstants.OK_ID)) {
IPropertySet propertySet = fHost IPropertySet propertySet = fHost
@ -646,6 +652,7 @@ public class RemoteCDSFMainTab extends CMainTab {
* *
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply
*/ */
@Override
public void performApply(ILaunchConfigurationWorkingCopy config) { public void performApply(ILaunchConfigurationWorkingCopy config) {
int currentSelection = connectionCombo.getSelectionIndex(); int currentSelection = connectionCombo.getSelectionIndex();

2
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java
View file

@ -33,6 +33,7 @@ public class RemoteCDebuggerTab extends CDebuggerTab {
super(false); super(false);
} }
@Override
public void createControl(Composite parent) { public void createControl(Composite parent) {
super.createControl(parent); super.createControl(parent);
PlatformUI PlatformUI
@ -48,6 +49,7 @@ public class RemoteCDebuggerTab extends CDebuggerTab {
super(attachMode); super(attachMode);
} }
@Override
protected void loadDebuggerComboBox(ILaunchConfiguration config, protected void loadDebuggerComboBox(ILaunchConfiguration config,
String selection) { String selection) {
ICDebugConfiguration[] debugConfigs = CDebugCorePlugin.getDefault() ICDebugConfiguration[] debugConfigs = CDebugCorePlugin.getDefault()

10
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java
View file

@ -103,6 +103,7 @@ public class RemoteCMainTab extends CMainTab {
* *
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl
*/ */
@Override
public void createControl(Composite parent) { public void createControl(Composite parent) {
Composite comp = new Composite(parent, SWT.NONE); Composite comp = new Composite(parent, SWT.NONE);
GridLayout topLayout = new GridLayout(); GridLayout topLayout = new GridLayout();
@ -145,6 +146,7 @@ public class RemoteCMainTab extends CMainTab {
* *
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid
*/ */
@Override
public boolean isValid(ILaunchConfiguration config) { public boolean isValid(ILaunchConfiguration config) {
boolean retVal = super.isValid(config); boolean retVal = super.isValid(config);
if (retVal == true) { if (retVal == true) {
@ -202,6 +204,7 @@ public class RemoteCMainTab extends CMainTab {
Messages.RemoteCMainTab_New, null); Messages.RemoteCMainTab_New, null);
newRemoteConnectionButton.addSelectionListener(new SelectionAdapter() { newRemoteConnectionButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleNewRemoteConnectionSelected(); handleNewRemoteConnectionSelected();
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
@ -214,6 +217,7 @@ public class RemoteCMainTab extends CMainTab {
remoteConnectionPropertiesButton remoteConnectionPropertiesButton
.addSelectionListener(new SelectionAdapter() { .addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleRemoteConnectionPropertiesSelected(); handleRemoteConnectionPropertiesSelected();
} }
@ -257,6 +261,7 @@ public class RemoteCMainTab extends CMainTab {
Messages.RemoteCMainTab_Remote_Path_Browse_Button, null); Messages.RemoteCMainTab_Remote_Path_Browse_Button, null);
remoteBrowseButton.addSelectionListener(new SelectionAdapter() { remoteBrowseButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleRemoteBrowseSelected(); handleRemoteBrowseSelected();
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
@ -299,6 +304,7 @@ public class RemoteCMainTab extends CMainTab {
SKIP_DOWNLOAD_BUTTON_TEXT); SKIP_DOWNLOAD_BUTTON_TEXT);
skipDownloadButton.addSelectionListener(new SelectionAdapter() { skipDownloadButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
} }
@ -311,6 +317,7 @@ public class RemoteCMainTab extends CMainTab {
* *
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply
*/ */
@Override
public void performApply(ILaunchConfigurationWorkingCopy config) { public void performApply(ILaunchConfigurationWorkingCopy config) {
int currentSelection = connectionCombo.getSelectionIndex(); int currentSelection = connectionCombo.getSelectionIndex();
@ -334,6 +341,7 @@ public class RemoteCMainTab extends CMainTab {
/* /*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom
*/ */
@Override
public void initializeFrom(ILaunchConfiguration config) { public void initializeFrom(ILaunchConfiguration config) {
isInitializing = true; isInitializing = true;
@ -421,6 +429,7 @@ public class RemoteCMainTab extends CMainTab {
fbLocalHost = fHost.getSystemType().isLocal(); fbLocalHost = fHost.getSystemType().isLocal();
} }
@Override
protected Control createDialogArea(Composite parent) { protected Control createDialogArea(Composite parent) {
// create composite // create composite
Composite composite = (Composite) super Composite composite = (Composite) super
@ -466,6 +475,7 @@ public class RemoteCMainTab extends CMainTab {
return composite; return composite;
} }
@Override
protected void buttonPressed(int buttonId) { protected void buttonPressed(int buttonId) {
if (!fbLocalHost && (buttonId == IDialogConstants.OK_ID)) { if (!fbLocalHost && (buttonId == IDialogConstants.OK_ID)) {
IPropertySet propertySet = fHost IPropertySet propertySet = fHost

7
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java
View file

@ -15,8 +15,6 @@
package org.eclipse.cdt.launch.remote.tabs; 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.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.internal.launch.remote.Messages;
import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants; import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -47,10 +45,12 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{
} }
@Override
public String getName() { public String getName() {
return Messages.Remote_GDB_Debugger_Options; return Messages.Remote_GDB_Debugger_Options;
} }
@Override
public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) {
super.setDefaults(configuration); super.setDefaults(configuration);
configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND, configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND,
@ -59,6 +59,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{
IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT ); IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT );
} }
@Override
public void initializeFrom( ILaunchConfiguration configuration ) { public void initializeFrom( ILaunchConfiguration configuration ) {
setInitializing(true); setInitializing(true);
super.initializeFrom(configuration); super.initializeFrom(configuration);
@ -82,6 +83,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{
setInitializing(false); setInitializing(false);
} }
@Override
public void performApply( ILaunchConfigurationWorkingCopy configuration ) { public void performApply( ILaunchConfigurationWorkingCopy configuration ) {
super.performApply(configuration); super.performApply(configuration);
String str = fGDBServerCommandText.getText(); String str = fGDBServerCommandText.getText();
@ -143,6 +145,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder) * @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder)
*/ */
@Override
public void createTabs( TabFolder tabFolder ) { public void createTabs( TabFolder tabFolder ) {
super.createTabs( tabFolder ); super.createTabs( tabFolder );
createGdbserverSettingsTab( tabFolder ); createGdbserverSettingsTab( tabFolder );

5
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java
View file

@ -43,10 +43,12 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage {
protected Text fGDBServerPortNumberText; protected Text fGDBServerPortNumberText;
@Override
public String getName() { public String getName() {
return Messages.Remote_GDB_Debugger_Options; return Messages.Remote_GDB_Debugger_Options;
} }
@Override
public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) { public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) {
super.setDefaults(configuration); super.setDefaults(configuration);
configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND, configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND,
@ -55,6 +57,7 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage {
IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT ); IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT );
} }
@Override
public void initializeFrom( ILaunchConfiguration configuration ) { public void initializeFrom( ILaunchConfiguration configuration ) {
super.initializeFrom(configuration); super.initializeFrom(configuration);
String gdbserverCommand = null; String gdbserverCommand = null;
@ -75,6 +78,7 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage {
fGDBServerPortNumberText.setText( gdbserverPortNumber ); fGDBServerPortNumberText.setText( gdbserverPortNumber );
} }
@Override
public void performApply( ILaunchConfigurationWorkingCopy configuration ) { public void performApply( ILaunchConfigurationWorkingCopy configuration ) {
super.performApply(configuration); super.performApply(configuration);
String str = fGDBServerCommandText.getText(); String str = fGDBServerCommandText.getText();
@ -136,6 +140,7 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder) * @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder)
*/ */
@Override
public void createTabs( TabFolder tabFolder ) { public void createTabs( TabFolder tabFolder ) {
super.createTabs( tabFolder ); super.createTabs( tabFolder );
createGdbserverSettingsTab( tabFolder ); createGdbserverSettingsTab( tabFolder );

1
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/CDIException.java
View file

@ -49,6 +49,7 @@ public class CDIException extends Exception {
/* (non-Javadoc) /* (non-Javadoc)
* @see java.lang.Object#toString() * @see java.lang.Object#toString()
*/ */
@Override
public String toString() { public String toString() {
return super.toString() + '['+ getDetailMessage() + ']'; return super.toString() + '['+ getDetailMessage() + ']';
} }

5
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java
View file

@ -32,22 +32,27 @@ import org.eclipse.cdt.debug.core.model.ICBreakpointType;
*/ */
public interface ICDIBreakpoint extends ICDIObject { public interface ICDIBreakpoint extends ICDIObject {
/** @deprecated use ICBreakpointTyped.REGULAR */ /** @deprecated use ICBreakpointTyped.REGULAR */
@Deprecated
final static public int REGULAR = ICBreakpointType.REGULAR; final static public int REGULAR = ICBreakpointType.REGULAR;
/** @deprecated use ICBreakpointTyped.TEMPORARY */ /** @deprecated use ICBreakpointTyped.TEMPORARY */
@Deprecated
final static public int TEMPORARY = ICBreakpointType.TEMPORARY; final static public int TEMPORARY = ICBreakpointType.TEMPORARY;
/** @deprecated use ICBreakpointTyped.HARDWARE */ /** @deprecated use ICBreakpointTyped.HARDWARE */
@Deprecated
final static public int HARDWARE = ICBreakpointType.HARDWARE; final static public int HARDWARE = ICBreakpointType.HARDWARE;
/** /**
* @return whether this breakpoint is temporary * @return whether this breakpoint is temporary
* @deprecated by {@link ICDIBreakpoint2#getType()} * @deprecated by {@link ICDIBreakpoint2#getType()}
*/ */
@Deprecated
boolean isTemporary(); boolean isTemporary();
/** /**
* @return whether this breakpoint is hardware-assisted * @return whether this breakpoint is hardware-assisted
* @deprecated by {@link ICDIBreakpoint2#getType()} * @deprecated by {@link ICDIBreakpoint2#getType()}
*/ */
@Deprecated
boolean isHardware(); boolean isHardware();
/** /**

2
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemorySpaceManagement.java
View file

@ -34,6 +34,7 @@ public interface ICDIMemorySpaceManagement extends ICDIObject {
* @return the encoded string representation of the address or null * @return the encoded string representation of the address or null
* @deprecated CDI clients should implement ICDIMemorySpaceEncoder * @deprecated CDI clients should implement ICDIMemorySpaceEncoder
*/ */
@Deprecated
String addressToString(BigInteger address, String memorySpaceID); String addressToString(BigInteger address, String memorySpaceID);
/** /**
@ -54,6 +55,7 @@ public interface ICDIMemorySpaceManagement extends ICDIObject {
* if string is not in the expected format * if string is not in the expected format
* @deprecated CDI clients should implement ICDIMemorySpaceEncoder * @deprecated CDI clients should implement ICDIMemorySpaceEncoder
*/ */
@Deprecated
BigInteger stringToAddress(String str, StringBuffer memorySpaceID_out) throws CDIException; BigInteger stringToAddress(String str, StringBuffer memorySpaceID_out) throws CDIException;
/** /**

9
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
View file

@ -155,6 +155,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
* @deprecated * @deprecated
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void resume() throws CDIException; void resume() throws CDIException;
/** /**
@ -164,6 +165,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
* @see #stepOver(int) * @see #stepOver(int)
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void stepOver() throws CDIException; void stepOver() throws CDIException;
/** /**
@ -173,6 +175,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
* @see #stepInto(int) * @see #stepInto(int)
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void stepInto() throws CDIException; void stepInto() throws CDIException;
/** /**
@ -182,6 +185,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
* @see stepOverInstruction(int) * @see stepOverInstruction(int)
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void stepOverInstruction() throws CDIException; void stepOverInstruction() throws CDIException;
/** /**
@ -191,6 +195,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
* @see #stepIntoInstruction(int) * @see #stepIntoInstruction(int)
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void stepIntoInstruction() throws CDIException; void stepIntoInstruction() throws CDIException;
/** /**
@ -200,6 +205,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
* @see #stepUntil(ICDILocation) * @see #stepUntil(ICDILocation)
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void runUntil(ICDILocation location) throws CDIException; void runUntil(ICDILocation location) throws CDIException;
/** /**
@ -209,6 +215,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
* @see #resume(ICDLocation) * @see #resume(ICDLocation)
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void jump(ICDILocation location) throws CDIException; void jump(ICDILocation location) throws CDIException;
/** /**
@ -217,6 +224,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
* @deprecated * @deprecated
* @throws CDIException * @throws CDIException
*/ */
@Deprecated
void signal() throws CDIException; void signal() throws CDIException;
/** /**
@ -227,6 +235,7 @@ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
* @param signal * @param signal
* @throws CDIException * @throws CDIException
*/ */
@Deprecated
void signal(ICDISignal signal) throws CDIException; void signal(ICDISignal signal) throws CDIException;
/** /**

10
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java
View file

@ -80,6 +80,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @deprecated * @deprecated
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void resume() throws CDIException; void resume() throws CDIException;
/** /**
@ -88,6 +89,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @deprecated * @deprecated
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void stepOver() throws CDIException; void stepOver() throws CDIException;
/** /**
@ -96,6 +98,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @deprecated * @deprecated
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void stepInto() throws CDIException; void stepInto() throws CDIException;
/** /**
@ -104,6 +107,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @deprecated * @deprecated
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void stepOverInstruction() throws CDIException; void stepOverInstruction() throws CDIException;
/** /**
@ -112,6 +116,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @deprecated * @deprecated
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void stepIntoInstruction() throws CDIException; void stepIntoInstruction() throws CDIException;
/** /**
@ -122,6 +127,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @see ICDIStackFrame.stepReturn() * @see ICDIStackFrame.stepReturn()
* @throws CDIException * @throws CDIException
*/ */
@Deprecated
void stepReturn() throws CDIException; void stepReturn() throws CDIException;
/** /**
@ -131,6 +137,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @see #stepUntil(ICDILocation) * @see #stepUntil(ICDILocation)
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void runUntil(ICDILocation location) throws CDIException; void runUntil(ICDILocation location) throws CDIException;
/** /**
@ -140,6 +147,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @see #resume(ICDILocation) * @see #resume(ICDILocation)
* @throws CDIException if this method fails. Reasons include: * @throws CDIException if this method fails. Reasons include:
*/ */
@Deprecated
void jump(ICDILocation location) throws CDIException; void jump(ICDILocation location) throws CDIException;
/** /**
@ -149,6 +157,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @see #resume(boolean) * @see #resume(boolean)
* @throws CDIException * @throws CDIException
*/ */
@Deprecated
void signal() throws CDIException; void signal() throws CDIException;
/** /**
@ -159,6 +168,7 @@ public interface ICDIThread extends ICDIExecuteStep, ICDIExecuteResume, ICDISusp
* @param signal * @param signal
* @throws CDIException * @throws CDIException
*/ */
@Deprecated
void signal(ICDISignal signal) throws CDIException; void signal(ICDISignal signal) throws CDIException;
/** /**

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java
View file

@ -101,6 +101,7 @@ public class CDIDebugModel {
final IDebugTarget[] target = new IDebugTarget[1]; final IDebugTarget[] target = new IDebugTarget[1];
IWorkspaceRunnable r = new IWorkspaceRunnable() { IWorkspaceRunnable r = new IWorkspaceRunnable() {
@Override
public void run( IProgressMonitor m ) throws CoreException { public void run( IProgressMonitor m ) throws CoreException {
target[0] = new CDebugTarget( launch, project, cdiTarget, name, debuggeeProcess, file, allowTerminate, allowDisconnect ); target[0] = new CDebugTarget( launch, project, cdiTarget, name, debuggeeProcess, file, allowTerminate, allowDisconnect );
((CDebugTarget)target[0]).start( stopSymbol, resumeTarget ); ((CDebugTarget)target[0]).start( stopSymbol, resumeTarget );
@ -139,6 +140,7 @@ public class CDIDebugModel {
final IDebugTarget[] target = new IDebugTarget[1]; final IDebugTarget[] target = new IDebugTarget[1];
IWorkspaceRunnable r = new IWorkspaceRunnable() { IWorkspaceRunnable r = new IWorkspaceRunnable() {
@Override
public void run( IProgressMonitor m ) throws CoreException { public void run( IProgressMonitor m ) throws CoreException {
String stopSymbol = null; String stopSymbol = null;
if ( stopInMain ) if ( stopInMain )

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger.java
View file

@ -19,11 +19,13 @@ import org.eclipse.debug.core.ILaunch;
/** /**
* @deprecated use <code>ICDIDebugger2</code>. * @deprecated use <code>ICDIDebugger2</code>.
*/ */
@Deprecated
public interface ICDIDebugger { public interface ICDIDebugger {
/** /**
* @deprecated use <code>createSession</code> of <code>ICDIDebugger2</code> * @deprecated use <code>createSession</code> of <code>ICDIDebugger2</code>
*/ */
@Deprecated
public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException; public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException;
} }

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java
View file

@ -157,6 +157,7 @@ public interface ICDTLaunchConfigurationConstants {
* is launched. * is launched.
* @deprecated - see ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES * @deprecated - see ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES
*/ */
@Deprecated
public static final String ATTR_PROGRAM_ENVIROMENT_INHERIT = CDT_LAUNCH_ID + ".ENVIRONMENT_INHERIT"; //$NON-NLS-1$ 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 - see ILaunchManager.ATTR_ENVIRONMENT_VARIABLES
*/ */
@Deprecated
public static final String ATTR_PROGRAM_ENVIROMENT_MAP = CDT_LAUNCH_ID + ".ENVIRONMENT_MAP"; //$NON-NLS-1$ 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. * use. For now only "mi", "mi1", "m2", "mi3" are supported.
* @deprecated * @deprecated
*/ */
@Deprecated
public static final String ATTR_DEBUGGER_PROTOCOL = CDT_LAUNCH_ID + ".protocol"; //$NON-NLS-1$ public static final String ATTR_DEBUGGER_PROTOCOL = CDT_LAUNCH_ID + ".protocol"; //$NON-NLS-1$
/** /**

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConfiguration.java
View file

@ -20,6 +20,7 @@ public interface ICDebugConfiguration {
* @throws CoreException * @throws CoreException
* @deprecated * @deprecated
*/ */
@Deprecated
ICDebugger getDebugger() throws CoreException; ICDebugger getDebugger() throws CoreException;
ICDIDebugger createDebugger() throws CoreException; ICDIDebugger createDebugger() throws CoreException;

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugger.java
View file

@ -20,6 +20,7 @@ import org.eclipse.debug.core.ILaunchConfiguration;
* *
* @deprecated - see ICDIDebugger * @deprecated - see ICDIDebugger
*/ */
@Deprecated
public interface ICDebugger { public interface ICDebugger {
public ICDISession createLaunchSession(ILaunchConfiguration config, IFile exe) throws CDIException ; public ICDISession createLaunchSession(ILaunchConfiguration config, IFile exe) throws CDIException ;
public ICDISession createAttachSession(ILaunchConfiguration config, IFile exe, int pid) throws CDIException; public ICDISession createAttachSession(ILaunchConfiguration config, IFile exe, int pid) throws CDIException;

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/AbstractBreakpointAction.java
View file

@ -16,10 +16,12 @@ public abstract class AbstractBreakpointAction extends PlatformObject implements
private String actionName; private String actionName;
@Override
public String getName() { public String getName() {
return actionName; return actionName;
} }
@Override
public void setName(String name) { public void setName(String name) {
actionName = name; actionName = name;
} }

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionAdapterFactory.java
View file

@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IAdapterFactory;
public class BreakpointActionAdapterFactory implements IAdapterFactory { public class BreakpointActionAdapterFactory implements IAdapterFactory {
@Override
public Object getAdapter(Object adaptableObject, Class adapterType) { public Object getAdapter(Object adaptableObject, Class adapterType) {
if (adapterType.equals(ILogActionEnabler.class)) { if (adapterType.equals(ILogActionEnabler.class)) {
if (adaptableObject instanceof CThread) { if (adaptableObject instanceof CThread) {
@ -29,6 +30,7 @@ public class BreakpointActionAdapterFactory implements IAdapterFactory {
return null; return null;
} }
@Override
public Class[] getAdapterList() { public Class[] getAdapterList() {
return new Class[] { ILogActionEnabler.class, IResumeActionEnabler.class, }; return new Class[] { ILogActionEnabler.class, IResumeActionEnabler.class, };
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java
View file

@ -106,6 +106,7 @@ public class BreakpointActionManager {
final String[] actions = actionNames.split(","); //$NON-NLS-1$ final String[] actions = actionNames.split(","); //$NON-NLS-1$
if (actions.length > 0){ if (actions.length > 0){
Job job = new Job("Execute breakpoint actions") { Job job = new Job("Execute breakpoint actions") {
@Override
public IStatus run(final IProgressMonitor monitor) { public IStatus run(final IProgressMonitor monitor) {
return doExecuteActions(breakpoint, context, actions, monitor); return doExecuteActions(breakpoint, context, actions, monitor);
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/LogActionEnabler.java
View file

@ -23,6 +23,7 @@ public class LogActionEnabler implements ILogActionEnabler {
this.thread = thread; this.thread = thread;
} }
@Override
public String evaluateExpression(String expression) throws Exception { public String evaluateExpression(String expression) throws Exception {
List frames = thread.computeStackFrames(); List frames = thread.computeStackFrames();
CStackFrame frame = (CStackFrame) frames.get(0); CStackFrame frame = (CStackFrame) frames.get(0);

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ResumeActionEnabler.java
View file

@ -20,6 +20,7 @@ public class ResumeActionEnabler implements IResumeActionEnabler {
thread = adaptableObject; thread = adaptableObject;
} }
@Override
public void resume() throws Exception { public void resume() throws Exception {
thread.resume(); thread.resume();
} }

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CCommandAdapterFactory.java
View file

@ -29,6 +29,7 @@ public class CCommandAdapterFactory implements IAdapterFactory {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
*/ */
@Override
public Object getAdapter(Object adaptableObject, Class adapterType) { public Object getAdapter(Object adaptableObject, Class adapterType) {
if (IRestartHandler.class.equals(adapterType)) { if (IRestartHandler.class.equals(adapterType)) {
if (adaptableObject instanceof IRestart) { if (adaptableObject instanceof IRestart) {
@ -41,6 +42,7 @@ public class CCommandAdapterFactory implements IAdapterFactory {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/ */
@Override
public Class[] getAdapterList() { public Class[] getAdapterList() {
return new Class[] { return new Class[] {
IRestartHandler.class IRestartHandler.class

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CForEachCommand.java
View file

@ -29,6 +29,7 @@ public abstract class CForEachCommand extends AbstractDebugCommand {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.core.commands.DebugCommand#doExecute(java.lang.Object[], org.eclipse.core.runtime.IProgressMonitor, org.eclipse.debug.core.IRequest) * @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 { protected void doExecute(Object[] targets, IProgressMonitor monitor, IRequest request) throws CoreException {
for (int i = 0; i < targets.length; i++) { for (int i = 0; i < targets.length; i++) {
execute(targets[i]); execute(targets[i]);
@ -41,6 +42,7 @@ public abstract class CForEachCommand extends AbstractDebugCommand {
/* (non-Javadoc) /* (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) * @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 { protected boolean isExecutable(Object[] targets, IProgressMonitor monitor, IEnabledStateRequest request) throws CoreException {
for (int i = 0; i < targets.length; i++) { for (int i = 0; i < targets.length; i++) {
if (!isExecutable(targets[i])) { if (!isExecutable(targets[i])) {

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/RestartCommand.java
View file

@ -23,14 +23,17 @@ import org.eclipse.debug.core.commands.IRestartHandler;
*/ */
public class RestartCommand extends CForEachCommand implements IRestartHandler { public class RestartCommand extends CForEachCommand implements IRestartHandler {
@Override
protected Object getTarget(Object element) { protected Object getTarget(Object element) {
return getAdapter(element, IRestart.class); return getAdapter(element, IRestart.class);
} }
@Override
protected void execute(Object target) throws CoreException { protected void execute(Object target) throws CoreException {
((IRestart)target).restart(); ((IRestart)target).restart();
} }
@Override
protected boolean isExecutable(Object target) { protected boolean isExecutable(Object target) {
return ((IRestart)target).canRestart(); return ((IRestart)target).canRestart();
} }
@ -38,6 +41,7 @@ public class RestartCommand extends CForEachCommand implements IRestartHandler {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest) * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
*/ */
@Override
protected Object getEnabledStateJobFamily(IDebugCommandRequest request) { protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
return IRestart.class; return IRestart.class;
} }

13
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java
View file

@ -295,10 +295,15 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr
// flush those caches when applicable locators change. // flush those caches when applicable locators change.
CDebugCorePlugin.getDefault().getCommonSourceLookupDirector().addParticipants(new ISourceLookupParticipant[] { new ISourceLookupParticipant(){ CDebugCorePlugin.getDefault().getCommonSourceLookupDirector().addParticipants(new ISourceLookupParticipant[] { new ISourceLookupParticipant(){
@Override
public void init(ISourceLookupDirector director) {} public void init(ISourceLookupDirector director) {}
@Override
public Object[] findSourceElements(Object object) { return new Object[0]; } public Object[] findSourceElements(Object object) { return new Object[0]; }
@Override
public String getSourceName(Object object) throws CoreException { return ""; } //$NON-NLS-1$ public String getSourceName(Object object) throws CoreException { return ""; } //$NON-NLS-1$
@Override
public void dispose() {} public void dispose() {}
@Override
public void sourceContainersChanged(ISourceLookupDirector director) { public void sourceContainersChanged(ISourceLookupDirector director) {
// Unfortunately, it would be extremely difficult/costly to // Unfortunately, it would be extremely difficult/costly to
// determine which binaries are effected by the source locator // 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, // into play when an Executable looks for a source file locally. So,
// listen for changes in those locators, too. // listen for changes in those locators, too.
DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(new ILaunchConfigurationListener() { DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(new ILaunchConfigurationListener() {
@Override
public void launchConfigurationChanged(ILaunchConfiguration configuration) { public void launchConfigurationChanged(ILaunchConfiguration configuration) {
// Expect lots of noise for working copies. We only care about // Expect lots of noise for working copies. We only care about
// changes to actual configs // changes to actual configs
@ -336,7 +342,9 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr
// with so we can flush only that Executable // with so we can flush only that Executable
flushExecutablesSourceMappings(); flushExecutablesSourceMappings();
} }
@Override
public void launchConfigurationRemoved(ILaunchConfiguration configuration) { configAddedOrRemoved(configuration); } public void launchConfigurationRemoved(ILaunchConfiguration configuration) { configAddedOrRemoved(configuration); }
@Override
public void launchConfigurationAdded(ILaunchConfiguration configuration) { configAddedOrRemoved(configuration); } public void launchConfigurationAdded(ILaunchConfiguration configuration) { configAddedOrRemoved(configuration); }
private void configAddedOrRemoved(ILaunchConfiguration configuration) { private void configAddedOrRemoved(ILaunchConfiguration configuration) {
// Expect lots of noise for working copies. We only care about // Expect lots of noise for working copies. We only care about
@ -478,6 +486,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr
synchronized (executableImporters) { synchronized (executableImporters) {
Collections.sort(executableImporters, new Comparator<IExecutableImporter>() { Collections.sort(executableImporters, new Comparator<IExecutableImporter>() {
@Override
public int compare(IExecutableImporter arg0, IExecutableImporter arg1) { public int compare(IExecutableImporter arg0, IExecutableImporter arg1) {
int p0 = arg0.getPriority(fileNames); int p0 = arg0.getPriority(fileNames);
int p1 = arg1.getPriority(fileNames); int p1 = arg1.getPriority(fileNames);
@ -533,6 +542,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr
synchronized (sourceFileProviders) { synchronized (sourceFileProviders) {
Collections.sort(sourceFileProviders, new Comparator<ISourceFilesProvider>() { Collections.sort(sourceFileProviders, new Comparator<ISourceFilesProvider>() {
@Override
public int compare(ISourceFilesProvider arg0, ISourceFilesProvider arg1) { public int compare(ISourceFilesProvider arg0, ISourceFilesProvider arg1) {
int p0 = arg0.getPriority(executable); int p0 = arg0.getPriority(executable);
int p1 = arg1.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 * @deprecated we no longer listen directly for platform resource changes
* but rather C model changes * but rather C model changes
*/ */
@Override
@Deprecated @Deprecated
public void resourceChanged(IResourceChangeEvent event) {} public void resourceChanged(IResourceChangeEvent event) {}
/** /**
* @since 7.0 * @since 7.0
*/ */
@Override
public void handleEvent(CProjectDescriptionEvent event) { public void handleEvent(CProjectDescriptionEvent event) {
if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, event); if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, event);
@ -862,6 +874,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr
* *
* @since 7.1 * @since 7.1
*/ */
@Override
public void elementChanged(ElementChangedEvent event) { public void elementChanged(ElementChangedEvent event) {
if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null); 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$ if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "event = \n" + event); // must be done separately because of traceEntry() limitation //$NON-NLS-1$

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java
View file

@ -47,10 +47,12 @@ public class StandardExecutableProvider implements IProjectExecutablesProvider {
supportedNatureIds.add(CCProjectNature.CC_NATURE_ID); supportedNatureIds.add(CCProjectNature.CC_NATURE_ID);
} }
@Override
public List<String> getProjectNatures() { public List<String> getProjectNatures() {
return supportedNatureIds; return supportedNatureIds;
} }
@Override
public List<Executable> getExecutables(IProject project, IProgressMonitor monitor) { public List<Executable> getExecutables(IProject project, IProgressMonitor monitor) {
List<Executable> executables = new ArrayList<Executable>(); List<Executable> executables = new ArrayList<Executable>();
@ -122,6 +124,7 @@ public class StandardExecutableProvider implements IProjectExecutablesProvider {
return executables; return executables;
} }
@Override
public IStatus removeExecutable(Executable executable, IProgressMonitor monitor) { public IStatus removeExecutable(Executable executable, IProgressMonitor monitor) {
IResource exeResource = executable.getResource(); IResource exeResource = executable.getResource();
if (exeResource != null) { if (exeResource != null) {

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CDebugElementState.java
View file

@ -21,6 +21,7 @@ public class CDebugElementState {
this.fName = name; this.fName = name;
} }
@Override
public String toString() { public String toString() {
return this.fName; return this.fName;
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CVariableFormat.java
View file

@ -23,6 +23,7 @@ public class CVariableFormat {
this.fNum= num; this.fNum= num;
} }
@Override
public String toString() { public String toString() {
return this.fName; return this.fName;
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugTarget.java
View file

@ -32,6 +32,7 @@ public interface ICDebugTarget extends IDebugTarget,
* *
* @return whether this target is little endian * @return whether this target is little endian
*/ */
@Override
public boolean isLittleEndian(); public boolean isLittleEndian();
/** /**

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/AbsolutePathSourceContainer.java
View file

@ -35,6 +35,7 @@ public class AbsolutePathSourceContainer extends AbstractSourceContainer {
return file.isAbsolute() && file.exists() && file.isFile(); return file.isAbsolute() && file.exists() && file.isFile();
} }
@Override
public Object[] findSourceElements(String name) throws CoreException { public Object[] findSourceElements(String name) throws CoreException {
if (name != null) { if (name != null) {
File file = new File(name); File file = new File(name);
@ -45,6 +46,7 @@ public class AbsolutePathSourceContainer extends AbstractSourceContainer {
return new Object[0]; return new Object[0];
} }
@Override
public String getName() { public String getName() {
return SourceLookupMessages.AbsolutePathSourceContainer_0; return SourceLookupMessages.AbsolutePathSourceContainer_0;
} }
@ -52,6 +54,7 @@ public class AbsolutePathSourceContainer extends AbstractSourceContainer {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType()
*/ */
@Override
public ISourceContainerType getType() { public ISourceContainerType getType() {
return getSourceContainerType(TYPE_ID); return getSourceContainerType(TYPE_ID);
} }

7
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/CProjectSourceContainer.java
View file

@ -111,6 +111,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
*/ */
@Override
public Object[] findSourceElements(String name) throws CoreException { public Object[] findSourceElements(String name) throws CoreException {
if (fProject == null) if (fProject == null)
return EMPTY; return EMPTY;
@ -174,6 +175,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName() * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
*/ */
@Override
public String getName() { public String getName() {
return fProject != null ? fProject.getName() : InternalSourceLookupMessages.CProjectSourceContainer_0; return fProject != null ? fProject.getName() : InternalSourceLookupMessages.CProjectSourceContainer_0;
} }
@ -181,6 +183,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer {
/* (non-Javadoc) /* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object) * @see java.lang.Object#equals(java.lang.Object)
*/ */
@Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj != null && obj instanceof CProjectSourceContainer) { if (obj != null && obj instanceof CProjectSourceContainer) {
CProjectSourceContainer loc = (CProjectSourceContainer) obj; CProjectSourceContainer loc = (CProjectSourceContainer) obj;
@ -192,10 +195,12 @@ public class CProjectSourceContainer extends CompositeSourceContainer {
/* (non-Javadoc) /* (non-Javadoc)
* @see java.lang.Object#hashCode() * @see java.lang.Object#hashCode()
*/ */
@Override
public int hashCode() { public int hashCode() {
return TYPE_ID.hashCode() * 31 + (fProject == null ? 0 : fProject.hashCode()); return TYPE_ID.hashCode() * 31 + (fProject == null ? 0 : fProject.hashCode());
} }
@Override
public boolean isComposite() { public boolean isComposite() {
return true; return true;
} }
@ -203,6 +208,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers() * @see org.eclipse.debug.internal.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers()
*/ */
@Override
protected ISourceContainer[] createSourceContainers() throws CoreException { protected ISourceContainer[] createSourceContainers() throws CoreException {
if (fProject != null && fProject.isOpen()) { if (fProject != null && fProject.isOpen()) {
if (isSearchReferencedProjects()) { if (isSearchReferencedProjects()) {
@ -263,6 +269,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer {
return fSearchReferencedProjects; return fSearchReferencedProjects;
} }
@Override
public ISourceContainerType getType() { public ISourceContainerType getType() {
return getSourceContainerType(TYPE_ID); return getSourceContainerType(TYPE_ID);
} }

7
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java
View file

@ -52,6 +52,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName()
*/ */
@Override
public String getName() { public String getName() {
return fName; return fName;
} }
@ -59,6 +60,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType()
*/ */
@Override
public ISourceContainerType getType() { public ISourceContainerType getType() {
return getSourceContainerType(TYPE_ID); return getSourceContainerType(TYPE_ID);
} }
@ -66,6 +68,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#isComposite() * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#isComposite()
*/ */
@Override
public boolean isComposite() { public boolean isComposite() {
return !fContainers.isEmpty(); return !fContainers.isEmpty();
} }
@ -73,6 +76,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
*/ */
@Override
public Object[] findSourceElements(String name) throws CoreException { public Object[] findSourceElements(String name) throws CoreException {
return findSourceElements(name, getSourceContainers()); return findSourceElements(name, getSourceContainers());
} }
@ -128,6 +132,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer#getSourceContainers() * @see org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer#getSourceContainers()
*/ */
@Override
public ISourceContainer[] getSourceContainers() throws CoreException { public ISourceContainer[] getSourceContainers() throws CoreException {
return fContainers.toArray(new MapEntrySourceContainer[fContainers.size()]); return fContainers.toArray(new MapEntrySourceContainer[fContainers.size()]);
} }
@ -159,6 +164,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#dispose() * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#dispose()
*/ */
@Override
public void dispose() { public void dispose() {
super.dispose(); super.dispose();
Iterator<MapEntrySourceContainer> it = fContainers.iterator(); Iterator<MapEntrySourceContainer> it = fContainers.iterator();
@ -184,6 +190,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I
/* (non-Javadoc) /* (non-Javadoc)
* @see IMappingSourceContainer#getCompilationPath(String) * @see IMappingSourceContainer#getCompilationPath(String)
*/ */
@Override
public IPath getCompilationPath(String sourceName) { public IPath getCompilationPath(String sourceName) {
IPath path = new Path(sourceName); IPath path = new Path(sourceName);
IPath result = null; IPath result = null;

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java
View file

@ -81,6 +81,7 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{
* *
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
*/ */
@Override
public Object[] findSourceElements(String sourceName) throws CoreException { public Object[] findSourceElements(String sourceName) throws CoreException {
if (sourceName == null) { if (sourceName == null) {
return new Object[0]; return new Object[0];
@ -115,6 +116,7 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName()
*/ */
@Override
public String getName() { public String getName() {
return SourceLookupMessages.ProgramRelativePathSourceContainer_0; return SourceLookupMessages.ProgramRelativePathSourceContainer_0;
} }
@ -122,6 +124,7 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType() * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType()
*/ */
@Override
public ISourceContainerType getType() { public ISourceContainerType getType() {
return getSourceContainerType(TYPE_ID); return getSourceContainerType(TYPE_ID);
} }

10
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
View file

@ -289,6 +289,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[]) * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[])
*/ */
@Override
public void breakpointsAdded( IBreakpoint[] breakpoints ) { public void breakpointsAdded( IBreakpoint[] breakpoints ) {
if ( !isTargetAvailable() ) if ( !isTargetAvailable() )
return; return;
@ -298,6 +299,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) * @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 ) { public void breakpointsRemoved( IBreakpoint[] breakpoints, IMarkerDelta[] deltas ) {
if ( !isTargetAvailable() ) if ( !isTargetAvailable() )
return; return;
@ -327,6 +329,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
final ICDIBreakpoint[] cdiBreakpoints = (ICDIBreakpoint[])list.toArray( new ICDIBreakpoint[list.size()] ); final ICDIBreakpoint[] cdiBreakpoints = (ICDIBreakpoint[])list.toArray( new ICDIBreakpoint[list.size()] );
final ICDITarget cdiTarget = getCDITarget(); final ICDITarget cdiTarget = getCDITarget();
DebugPlugin.getDefault().asyncExec( new Runnable() { DebugPlugin.getDefault().asyncExec( new Runnable() {
@Override
public void run() { public void run() {
try { try {
cdiTarget.deleteBreakpoints( cdiBreakpoints ); cdiTarget.deleteBreakpoints( cdiBreakpoints );
@ -340,6 +343,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[]) * @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 ) { public void breakpointsChanged( IBreakpoint[] breakpoints, IMarkerDelta[] deltas ) {
ArrayList removeList = new ArrayList( breakpoints.length ); ArrayList removeList = new ArrayList( breakpoints.length );
ArrayList installList = 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 ) { public void breakpointManagerEnablementChanged( boolean enabled ) {
doSkipBreakpoints( !enabled ); doSkipBreakpoints( !enabled );
} }
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
for( int i = 0; i < events.length; i++ ) { for( int i = 0; i < events.length; i++ ) {
ICDIEvent event = events[i]; ICDIEvent event = events[i];
@ -410,6 +416,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
} }
} }
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( CBreakpointManager.class.equals( adapter ) ) if ( CBreakpointManager.class.equals( adapter ) )
return this; return this;
@ -816,6 +823,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
} }
DebugPlugin.getDefault().asyncExec( new Runnable() { DebugPlugin.getDefault().asyncExec( new Runnable() {
@Override
public void run() { public void run() {
try { try {
cdiTarget.deleteBreakpoints( cdiBreakpoints ); cdiTarget.deleteBreakpoints( cdiBreakpoints );
@ -845,6 +853,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
final ICBreakpoint[] bkpts = register( breakpoints ); final ICBreakpoint[] bkpts = register( breakpoints );
if ( bkpts.length > 0 ) { if ( bkpts.length > 0 ) {
DebugPlugin.getDefault().asyncExec( new Runnable() { DebugPlugin.getDefault().asyncExec( new Runnable() {
@Override
public void run() { public void run() {
setBreakpointsOnTarget0( bkpts ); setBreakpointsOnTarget0( bkpts );
} }
@ -1230,6 +1239,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
private void changeBreakpointPropertiesOnTarget( final ICDIBreakpoint breakpoint, final Boolean enabled, final ICDICondition condition ) { private void changeBreakpointPropertiesOnTarget( final ICDIBreakpoint breakpoint, final Boolean enabled, final ICDICondition condition ) {
DebugPlugin.getDefault().asyncExec( new Runnable() { DebugPlugin.getDefault().asyncExec( new Runnable() {
@Override
public void run() { public void run() {
if ( enabled != null ) { if ( enabled != null ) {
try { try {

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointNotifier.java
View file

@ -33,6 +33,7 @@ public class CBreakpointNotifier implements ICBreakpointListener {
* @see org.eclipse.cdt.debug.core.ICBreakpointListener#installingBreakpoint(org.eclipse.debug.core.model.IDebugTarget, * @see org.eclipse.cdt.debug.core.ICBreakpointListener#installingBreakpoint(org.eclipse.debug.core.model.IDebugTarget,
* org.eclipse.debug.core.model.IBreakpoint) * org.eclipse.debug.core.model.IBreakpoint)
*/ */
@Override
public boolean installingBreakpoint( IDebugTarget target, IBreakpoint breakpoint ) { public boolean installingBreakpoint( IDebugTarget target, IBreakpoint breakpoint ) {
boolean result = true; boolean result = true;
Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners(); 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, * @see org.eclipse.cdt.debug.core.ICBreakpointListener#breakpointInstalled(org.eclipse.debug.core.model.IDebugTarget,
* org.eclipse.debug.core.model.IBreakpoint) * org.eclipse.debug.core.model.IBreakpoint)
*/ */
@Override
public void breakpointInstalled( IDebugTarget target, IBreakpoint breakpoint ) { public void breakpointInstalled( IDebugTarget target, IBreakpoint breakpoint ) {
Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners(); Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners();
for( int i = 0; i < listeners.length; ++i ) 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, * @see org.eclipse.cdt.debug.core.ICBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IDebugTarget,
* org.eclipse.debug.core.model.IBreakpoint) * org.eclipse.debug.core.model.IBreakpoint)
*/ */
@Override
public void breakpointChanged( IDebugTarget target, IBreakpoint breakpoint, Map attributes ) { public void breakpointChanged( IDebugTarget target, IBreakpoint breakpoint, Map attributes ) {
Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners(); Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners();
for( int i = 0; i < listeners.length; ++i ) 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, * @see org.eclipse.cdt.debug.core.ICBreakpointListener#breakpointsRemoved(org.eclipse.debug.core.model.IDebugTarget,
* org.eclipse.debug.core.model.IBreakpoint[]) * org.eclipse.debug.core.model.IBreakpoint[])
*/ */
@Override
public void breakpointsRemoved( IDebugTarget target, IBreakpoint[] breakpoints ) { public void breakpointsRemoved( IDebugTarget target, IBreakpoint[] breakpoints ) {
Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners(); Object[] listeners = CDebugCorePlugin.getDefault().getCBreakpointListeners();
for( int i = 0; i < listeners.length; ++i ) for( int i = 0; i < listeners.length; ++i )

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java
View file

@ -55,6 +55,7 @@ public class CDebugAdapter implements ICDIDebugger {
* org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, * org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable,
* org.eclipse.core.runtime.IProgressMonitor) * org.eclipse.core.runtime.IProgressMonitor)
*/ */
@Override
public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException { public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException {
ILaunchConfiguration config = launch.getLaunchConfiguration(); ILaunchConfiguration config = launch.getLaunchConfiguration();
if (exe == null) { if (exe == null) {

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugCorePreferenceInitializer.java
View file

@ -31,6 +31,7 @@ public class CDebugCorePreferenceInitializer extends AbstractPreferenceInitializ
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
*/ */
@Override
public void initializeDefaultPreferences() { public void initializeDefaultPreferences() {
CDebugCorePlugin.getDefault().getPluginPreferences().setDefault( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS, ICDebugConstants.DEF_NUMBER_OF_INSTRUCTIONS ); 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 ); CDebugCorePlugin.getDefault().getPluginPreferences().setDefault( ICDebugConstants.PREF_DEFAULT_VARIABLE_FORMAT, ICDIFormat.NATURAL );

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDisassemblyContextProvider.java
View file

@ -25,6 +25,7 @@ public class CDisassemblyContextProvider implements IDisassemblyContextProvider
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextProvider#getDisassemblyContext(java.lang.Object) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextProvider#getDisassemblyContext(java.lang.Object)
*/ */
@Override
public Object getDisassemblyContext( Object element ) { public Object getDisassemblyContext( Object element ) {
if ( element instanceof ICDebugElement ) { if ( element instanceof ICDebugElement ) {
IDebugTarget target = ((ICDebugElement)element).getDebugTarget(); IDebugTarget target = ((ICDebugElement)element).getDebugTarget();

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CGlobalVariableManager.java
View file

@ -98,6 +98,7 @@ public class CGlobalVariableManager implements ICGlobalVariableManager {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#addGlobals(IGlobalVariableDescriptor[]) * @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#addGlobals(IGlobalVariableDescriptor[])
*/ */
@Override
public void addGlobals( IGlobalVariableDescriptor[] descriptors ) throws DebugException { public void addGlobals( IGlobalVariableDescriptor[] descriptors ) throws DebugException {
fGlobals = new ArrayList<ICGlobalVariable>( 10 ); fGlobals = new ArrayList<ICGlobalVariable>( 10 );
MultiStatus ms = new MultiStatus( CDebugCorePlugin.getUniqueIdentifier(), 0, "", null ); //$NON-NLS-1$ MultiStatus ms = new MultiStatus( CDebugCorePlugin.getUniqueIdentifier(), 0, "", null ); //$NON-NLS-1$
@ -124,6 +125,7 @@ public class CGlobalVariableManager implements ICGlobalVariableManager {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#removeGlobals(ICGlobalVariable[]) * @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#removeGlobals(ICGlobalVariable[])
*/ */
@Override
public void removeGlobals( ICGlobalVariable[] globals ) { public void removeGlobals( ICGlobalVariable[] globals ) {
synchronized( fGlobals ) { synchronized( fGlobals ) {
fGlobals.removeAll( Arrays.asList( globals ) ); fGlobals.removeAll( Arrays.asList( globals ) );
@ -138,6 +140,7 @@ public class CGlobalVariableManager implements ICGlobalVariableManager {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#removeAllGlobals() * @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#removeAllGlobals()
*/ */
@Override
public void removeAllGlobals() { public void removeAllGlobals() {
if (fGlobals == null ) { if (fGlobals == null ) {
return; return;
@ -278,6 +281,7 @@ public class CGlobalVariableManager implements ICGlobalVariableManager {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#getDescriptors() * @see org.eclipse.cdt.debug.core.ICGlobalVariableManager#getDescriptors()
*/ */
@Override
public IGlobalVariableDescriptor[] getDescriptors() { public IGlobalVariableDescriptor[] getDescriptors() {
if ( fGlobals == null ) if ( fGlobals == null )
return getInitialDescriptors(); return getInitialDescriptors();

12
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryBlockRetrievalExtension.java
View file

@ -221,6 +221,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtensionRetrieval#getExtendedMemoryBlock(java.lang.String, org.eclipse.debug.core.model.IDebugElement) * @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 { public IMemoryBlockExtension getExtendedMemoryBlock( String expression, Object selected ) throws DebugException {
return getMemoryBlock(expression, selected, null); return getMemoryBlock(expression, selected, null);
} }
@ -228,6 +229,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#getExtendedMemoryBlock(java.lang.String, java.lang.Object, java.lang.String) * @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 { public IMemorySpaceAwareMemoryBlock getMemoryBlock( String expression, Object selected, String memorySpaceID ) throws DebugException {
String address = null; String address = null;
CExpression exp = null; CExpression exp = null;
@ -305,6 +307,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval() * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval()
*/ */
@Override
public boolean supportsStorageRetrieval() { public boolean supportsStorageRetrieval() {
return true; return true;
} }
@ -312,6 +315,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long) * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long)
*/ */
@Override
public IMemoryBlock getMemoryBlock( long startAddress, long length ) throws DebugException { public IMemoryBlock getMemoryBlock( long startAddress, long length ) throws DebugException {
String expression = Long.toHexString(startAddress); String expression = Long.toHexString(startAddress);
BigInteger address = new BigInteger(expression, 16); 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) * @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) { public void getMemorySpaces(final Object context, GetMemorySpacesRequest request) {
// We're not very asynchronous in CDI. DSF is another story. Also, note // 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 // 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) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#encodeAddress(java.math.BigInteger, java.lang.String) * @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) { public String encodeAddress(final String expression, final String memorySpaceID) {
// See if the CDI client provides customized encoding/decoding // See if the CDI client provides customized encoding/decoding
if (fDebugTarget != null) { if (fDebugTarget != null) {
@ -441,7 +447,9 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM
final String expression = str.substring(index+1); final String expression = str.substring(index+1);
return new DecodeResult() { return new DecodeResult() {
@Override
public String getMemorySpaceId() { return memorySpaceID; } public String getMemorySpaceId() { return memorySpaceID; }
@Override
public String getExpression() { return expression; } public String getExpression() { return expression; }
}; };
} }
@ -449,6 +457,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#decodeAddress(java.lang.String, java.lang.StringBuffer) * @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 { public DecodeResult decodeAddress(final String str) throws CoreException {
// See if the CDI client provides customized encoding/decoding // See if the CDI client provides customized encoding/decoding
@ -458,7 +467,9 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM
try { try {
final ICDIMemorySpaceEncoder.DecodeResult result = ((ICDIMemorySpaceEncoder)cdiTarget).decodeAddress(str); final ICDIMemorySpaceEncoder.DecodeResult result = ((ICDIMemorySpaceEncoder)cdiTarget).decodeAddress(str);
return new DecodeResult() { return new DecodeResult() {
@Override
public String getMemorySpaceId() { return result.getMemorySpaceId(); } public String getMemorySpaceId() { return result.getMemorySpaceId(); }
@Override
public String getExpression() { return result.getExpression(); } public String getExpression() { return result.getExpression(); }
}; };
} }
@ -477,6 +488,7 @@ public class CMemoryBlockRetrievalExtension extends PlatformObject implements IM
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#creatingBlockRequiresMemorySpaceID() * @see org.eclipse.cdt.debug.core.model.provisional.IMemorySpaceAwareMemoryBlockRetrieval#creatingBlockRequiresMemorySpaceID()
*/ */
@Override
public boolean creatingBlockRequiresMemorySpaceID() { public boolean creatingBlockRequiresMemorySpaceID() {
// A behavioral control we're not extending to CDI clients, but is being // A behavioral control we're not extending to CDI clients, but is being
// extended to DSF ones. // extended to DSF ones.

6
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
View file

@ -93,6 +93,7 @@ public class CRegisterManager {
public void dispose() { public void dispose() {
DebugPlugin.getDefault().asyncExec( DebugPlugin.getDefault().asyncExec(
new Runnable() { new Runnable() {
@Override
public void run() { public void run() {
synchronized( fRegisterGroups ) { synchronized( fRegisterGroups ) {
Iterator it = fRegisterGroups.iterator(); Iterator it = fRegisterGroups.iterator();
@ -167,6 +168,7 @@ public class CRegisterManager {
public void addRegisterGroup( final String name, final IRegisterDescriptor[] descriptors ) { public void addRegisterGroup( final String name, final IRegisterDescriptor[] descriptors ) {
DebugPlugin.getDefault().asyncExec( DebugPlugin.getDefault().asyncExec(
new Runnable() { new Runnable() {
@Override
public void run() { public void run() {
fRegisterGroups.add( new CRegisterGroup( getDebugTarget(), name, descriptors ) ); fRegisterGroups.add( new CRegisterGroup( getDebugTarget(), name, descriptors ) );
setUseDefaultRegisterGroups( false ); setUseDefaultRegisterGroups( false );
@ -178,6 +180,7 @@ public class CRegisterManager {
public void removeAllRegisterGroups() { public void removeAllRegisterGroups() {
DebugPlugin.getDefault().asyncExec( DebugPlugin.getDefault().asyncExec(
new Runnable() { new Runnable() {
@Override
public void run() { public void run() {
synchronized( fRegisterGroups ) { synchronized( fRegisterGroups ) {
Iterator it = fRegisterGroups.iterator(); Iterator it = fRegisterGroups.iterator();
@ -195,6 +198,7 @@ public class CRegisterManager {
public void removeRegisterGroups( final IRegisterGroup[] groups ) { public void removeRegisterGroups( final IRegisterGroup[] groups ) {
DebugPlugin.getDefault().asyncExec( DebugPlugin.getDefault().asyncExec(
new Runnable() { new Runnable() {
@Override
public void run() { public void run() {
for ( int i = 0; i < groups.length; ++i ) { for ( int i = 0; i < groups.length; ++i ) {
((CRegisterGroup)groups[i]).dispose(); ((CRegisterGroup)groups[i]).dispose();
@ -209,6 +213,7 @@ public class CRegisterManager {
public void restoreDefaults() { public void restoreDefaults() {
DebugPlugin.getDefault().asyncExec( DebugPlugin.getDefault().asyncExec(
new Runnable() { new Runnable() {
@Override
public void run() { public void run() {
synchronized( fRegisterGroups ) { synchronized( fRegisterGroups ) {
Iterator it = fRegisterGroups.iterator(); Iterator it = fRegisterGroups.iterator();
@ -349,6 +354,7 @@ public class CRegisterManager {
public void modifyRegisterGroup( final IPersistableRegisterGroup group, final IRegisterDescriptor[] descriptors ) { public void modifyRegisterGroup( final IPersistableRegisterGroup group, final IRegisterDescriptor[] descriptors ) {
DebugPlugin.getDefault().asyncExec( DebugPlugin.getDefault().asyncExec(
new Runnable() { new Runnable() {
@Override
public void run() { public void run() {
group.setRegisterDescriptors( descriptors ); group.setRegisterDescriptors( descriptors );
((CRegisterGroup)group).fireChangeEvent( DebugEvent.CONTENT ); ((CRegisterGroup)group).fireChangeEvent( DebugEvent.CONTENT );

5
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRequest.java
View file

@ -26,6 +26,7 @@ public class CRequest implements IRequest {
/* /*
* @see org.eclipse.debug.core.IRequest#cancel() * @see org.eclipse.debug.core.IRequest#cancel()
*/ */
@Override
public void cancel() { public void cancel() {
fCanceled= true; fCanceled= true;
} }
@ -33,12 +34,14 @@ public class CRequest implements IRequest {
/* /*
* @see org.eclipse.debug.core.IRequest#done() * @see org.eclipse.debug.core.IRequest#done()
*/ */
@Override
public void done() { public void done() {
} }
/* /*
* @see org.eclipse.debug.core.IRequest#getStatus() * @see org.eclipse.debug.core.IRequest#getStatus()
*/ */
@Override
public IStatus getStatus() { public IStatus getStatus() {
return fStatus; return fStatus;
} }
@ -46,6 +49,7 @@ public class CRequest implements IRequest {
/* /*
* @see org.eclipse.debug.core.IRequest#isCanceled() * @see org.eclipse.debug.core.IRequest#isCanceled()
*/ */
@Override
public boolean isCanceled() { public boolean isCanceled() {
return fCanceled; return fCanceled;
} }
@ -53,6 +57,7 @@ public class CRequest implements IRequest {
/* /*
* @see org.eclipse.debug.core.IRequest#setStatus(org.eclipse.core.runtime.IStatus) * @see org.eclipse.debug.core.IRequest#setStatus(org.eclipse.core.runtime.IStatus)
*/ */
@Override
public void setStatus(IStatus status) { public void setStatus(IStatus status) {
fStatus= status; fStatus= status;
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSettingsManager.java
View file

@ -105,6 +105,7 @@ public class CSettingsManager {
*/ */
private Map fContentMap = new LinkedHashMap(MAX_ELEMENT_COUNT, 0.75f, true) { private Map fContentMap = new LinkedHashMap(MAX_ELEMENT_COUNT, 0.75f, true) {
private static final long serialVersionUID = 1; private static final long serialVersionUID = 1;
@Override
protected boolean removeEldestEntry(Map.Entry eldest) { protected boolean removeEldestEntry(Map.Entry eldest) {
return size() > MAX_ELEMENT_COUNT; return size() > MAX_ELEMENT_COUNT;
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java
View file

@ -85,6 +85,7 @@ public class CSignalManager implements IAdaptable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( adapter.equals( CSignalManager.class ) ) { if ( adapter.equals( CSignalManager.class ) ) {
return this; return this;

11
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java
View file

@ -45,6 +45,7 @@ public class DebugConfiguration implements ICDebugConfiguration {
return fElement; return fElement;
} }
@Override
public ICDebugger getDebugger() throws CoreException { public ICDebugger getDebugger() throws CoreException {
Object debugger = getConfigurationElement().createExecutableExtension("class"); //$NON-NLS-1$ Object debugger = getConfigurationElement().createExecutableExtension("class"); //$NON-NLS-1$
if (debugger instanceof ICDebugger) { 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$ throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), -1, InternalDebugCoreMessages.getString("DebugConfiguration.0"), null)); //$NON-NLS-1$
} }
@Override
public ICDIDebugger createDebugger() throws CoreException { public ICDIDebugger createDebugger() throws CoreException {
Object debugger = getConfigurationElement().createExecutableExtension("class"); //$NON-NLS-1$ Object debugger = getConfigurationElement().createExecutableExtension("class"); //$NON-NLS-1$
if (debugger instanceof ICDIDebugger) { if (debugger instanceof ICDIDebugger) {
@ -61,15 +63,18 @@ public class DebugConfiguration implements ICDebugConfiguration {
return new CDebugAdapter((ICDebugger)debugger); return new CDebugAdapter((ICDebugger)debugger);
} }
@Override
public String getName() { public String getName() {
String name = getConfigurationElement().getAttribute("name"); //$NON-NLS-1$ String name = getConfigurationElement().getAttribute("name"); //$NON-NLS-1$
return name != null ? name : ""; //$NON-NLS-1$ return name != null ? name : ""; //$NON-NLS-1$
} }
@Override
public String getID() { public String getID() {
return getConfigurationElement().getAttribute("id"); //$NON-NLS-1$ return getConfigurationElement().getAttribute("id"); //$NON-NLS-1$
} }
@Override
public String getPlatform() { public String getPlatform() {
String platform = getConfigurationElement().getAttribute("platform"); //$NON-NLS-1$ String platform = getConfigurationElement().getAttribute("platform"); //$NON-NLS-1$
if (platform == null) { if (platform == null) {
@ -78,18 +83,22 @@ public class DebugConfiguration implements ICDebugConfiguration {
return platform; return platform;
} }
@Override
public String[] getCPUList() { public String[] getCPUList() {
return (String[]) getCPUs().toArray(new String[0]); return (String[]) getCPUs().toArray(new String[0]);
} }
@Override
public String[] getModeList() { public String[] getModeList() {
return (String[]) getModes().toArray(new String[0]); return (String[]) getModes().toArray(new String[0]);
} }
@Override
public boolean supportsMode(String mode) { public boolean supportsMode(String mode) {
return getModes().contains(mode); return getModes().contains(mode);
} }
@Override
public boolean supportsCPU(String cpu) { public boolean supportsCPU(String cpu) {
String nativeCPU = Platform.getOSArch(); String nativeCPU = Platform.getOSArch();
boolean ret = false; boolean ret = false;
@ -149,6 +158,7 @@ public class DebugConfiguration implements ICDebugConfiguration {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.ICDebugConfiguration#getCoreFileExtensions() * @see org.eclipse.cdt.debug.core.ICDebugConfiguration#getCoreFileExtensions()
*/ */
@Override
public String[] getCoreFileExtensions() { public String[] getCoreFileExtensions() {
if (fCoreExt == null) { if (fCoreExt == null) {
List exts = new ArrayList(); List exts = new ArrayList();
@ -166,6 +176,7 @@ public class DebugConfiguration implements ICDebugConfiguration {
return fCoreExt; return fCoreExt;
} }
@Override
public String[] getSupportedBuildConfigPatterns() { public String[] getSupportedBuildConfigPatterns() {
IConfigurationElement[] patternElems = fElement.getChildren("buildIdPattern"); //$NON-NLS-1$ IConfigurationElement[] patternElems = fElement.getChildren("buildIdPattern"); //$NON-NLS-1$
String[] patterns = new String[patternElems.length]; String[] patterns = new String[patternElems.length];

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/SessionManager.java
View file

@ -49,6 +49,7 @@ public class SessionManager implements IDebugEventSetListener {
* *
* @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
*/ */
@Override
public void handleDebugEvents( DebugEvent[] events ) { public void handleDebugEvents( DebugEvent[] events ) {
for( int i = 0; i < events.length; i++ ) { for( int i = 0; i < events.length; i++ ) {
DebugEvent event = events[i]; DebugEvent event = events[i];

8
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/Trace.java
View file

@ -66,13 +66,21 @@ public class Trace {
* clients; no need to check for null. * clients; no need to check for null.
*/ */
private static final DebugTrace NULL_TRACE = new DebugTrace() { private static final DebugTrace NULL_TRACE = new DebugTrace() {
@Override
public void trace(String option, String message) {} public void trace(String option, String message) {}
@Override
public void trace(String option, String message, Throwable error) {} public void trace(String option, String message, Throwable error) {}
@Override
public void traceDumpStack(String option) {} public void traceDumpStack(String option) {}
@Override
public void traceEntry(String option) {} public void traceEntry(String option) {}
@Override
public void traceEntry(String option, Object methodArgument) {} public void traceEntry(String option, Object methodArgument) {}
@Override
public void traceEntry(String option, Object[] methodArguments) {} public void traceEntry(String option, Object[] methodArguments) {}
@Override
public void traceExit(String option) {} public void traceExit(String option) {}
@Override
public void traceExit(String option, Object result) {} public void traceExit(String option, Object result) {}
}; };

8
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractLineBreakpoint.java
View file

@ -48,6 +48,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber() * @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber()
*/ */
@Override
public int getLineNumber() throws CoreException { public int getLineNumber() throws CoreException {
return ensureMarker().getAttribute( IMarker.LINE_NUMBER, -1 ); return ensureMarker().getAttribute( IMarker.LINE_NUMBER, -1 );
} }
@ -55,6 +56,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart() * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart()
*/ */
@Override
public int getCharStart() throws CoreException { public int getCharStart() throws CoreException {
return ensureMarker().getAttribute( IMarker.CHAR_START, -1 ); return ensureMarker().getAttribute( IMarker.CHAR_START, -1 );
} }
@ -62,6 +64,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd() * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd()
*/ */
@Override
public int getCharEnd() throws CoreException { public int getCharEnd() throws CoreException {
return ensureMarker().getAttribute( IMarker.CHAR_END, -1 ); return ensureMarker().getAttribute( IMarker.CHAR_END, -1 );
} }
@ -69,6 +72,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getAddress() * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getAddress()
*/ */
@Override
public String getAddress() throws CoreException { public String getAddress() throws CoreException {
return ensureMarker().getAttribute( ICLineBreakpoint.ADDRESS, "" ); //$NON-NLS-1$ return ensureMarker().getAttribute( ICLineBreakpoint.ADDRESS, "" ); //$NON-NLS-1$
} }
@ -76,6 +80,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFileName() * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFileName()
*/ */
@Override
public String getFileName() throws CoreException { public String getFileName() throws CoreException {
String fileName = ensureMarker().getAttribute( ICBreakpoint.SOURCE_HANDLE, "" ); //$NON-NLS-1$ String fileName = ensureMarker().getAttribute( ICBreakpoint.SOURCE_HANDLE, "" ); //$NON-NLS-1$
IPath path = new Path( fileName ); IPath path = new Path( fileName );
@ -85,6 +90,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFunction() * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFunction()
*/ */
@Override
public String getFunction() throws CoreException { public String getFunction() throws CoreException {
return ensureMarker().getAttribute( ICLineBreakpoint.FUNCTION, "" ); //$NON-NLS-1$ return ensureMarker().getAttribute( ICLineBreakpoint.FUNCTION, "" ); //$NON-NLS-1$
} }
@ -92,6 +98,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setAddress(java.lang.String) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setAddress(java.lang.String)
*/ */
@Override
public void setAddress( String address ) throws CoreException { public void setAddress( String address ) throws CoreException {
setAttribute( ICLineBreakpoint.ADDRESS, address ); setAttribute( ICLineBreakpoint.ADDRESS, address );
} }
@ -99,6 +106,7 @@ public abstract class AbstractLineBreakpoint extends CBreakpoint implements ICLi
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setFunction(java.lang.String) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setFunction(java.lang.String)
*/ */
@Override
public void setFunction( String function ) throws CoreException { public void setFunction( String function ) throws CoreException {
setAttribute( ICLineBreakpoint.FUNCTION, function ); setAttribute( ICLineBreakpoint.FUNCTION, function );
} }

10
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractTracepoint.java
View file

@ -49,6 +49,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber() * @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber()
*/ */
@Override
public int getLineNumber() throws CoreException { public int getLineNumber() throws CoreException {
return ensureMarker().getAttribute( IMarker.LINE_NUMBER, -1 ); return ensureMarker().getAttribute( IMarker.LINE_NUMBER, -1 );
} }
@ -56,6 +57,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart() * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart()
*/ */
@Override
public int getCharStart() throws CoreException { public int getCharStart() throws CoreException {
return ensureMarker().getAttribute( IMarker.CHAR_START, -1 ); return ensureMarker().getAttribute( IMarker.CHAR_START, -1 );
} }
@ -63,6 +65,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd() * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd()
*/ */
@Override
public int getCharEnd() throws CoreException { public int getCharEnd() throws CoreException {
return ensureMarker().getAttribute( IMarker.CHAR_END, -1 ); return ensureMarker().getAttribute( IMarker.CHAR_END, -1 );
} }
@ -70,6 +73,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getAddress() * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getAddress()
*/ */
@Override
public String getAddress() throws CoreException { public String getAddress() throws CoreException {
return ensureMarker().getAttribute( ICLineBreakpoint.ADDRESS, "" ); //$NON-NLS-1$ return ensureMarker().getAttribute( ICLineBreakpoint.ADDRESS, "" ); //$NON-NLS-1$
} }
@ -77,6 +81,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFileName() * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFileName()
*/ */
@Override
public String getFileName() throws CoreException { public String getFileName() throws CoreException {
String fileName = ensureMarker().getAttribute( ICBreakpoint.SOURCE_HANDLE, "" ); //$NON-NLS-1$ String fileName = ensureMarker().getAttribute( ICBreakpoint.SOURCE_HANDLE, "" ); //$NON-NLS-1$
IPath path = new Path( fileName ); IPath path = new Path( fileName );
@ -86,6 +91,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFunction() * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#getFunction()
*/ */
@Override
public String getFunction() throws CoreException { public String getFunction() throws CoreException {
return ensureMarker().getAttribute( ICLineBreakpoint.FUNCTION, "" ); //$NON-NLS-1$ return ensureMarker().getAttribute( ICLineBreakpoint.FUNCTION, "" ); //$NON-NLS-1$
} }
@ -102,6 +108,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setAddress(java.lang.String) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setAddress(java.lang.String)
*/ */
@Override
public void setAddress( String address ) throws CoreException { public void setAddress( String address ) throws CoreException {
setAttribute( ICLineBreakpoint.ADDRESS, address ); setAttribute( ICLineBreakpoint.ADDRESS, address );
} }
@ -109,6 +116,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setFunction(java.lang.String) * @see org.eclipse.cdt.debug.core.model.ICLineBreakpoint#setFunction(java.lang.String)
*/ */
@Override
public void setFunction( String function ) throws CoreException { public void setFunction( String function ) throws CoreException {
setAttribute( ICLineBreakpoint.FUNCTION, function ); setAttribute( ICLineBreakpoint.FUNCTION, function );
} }
@ -117,6 +125,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.cdt.debug.core.ICTracepoint#getPassCount() * @see org.eclipse.cdt.debug.core.ICTracepoint#getPassCount()
*/ */
@Override
public int getPassCount() throws CoreException { public int getPassCount() throws CoreException {
return ensureMarker().getAttribute( PASS_COUNT, 0 ); return ensureMarker().getAttribute( PASS_COUNT, 0 );
} }
@ -125,6 +134,7 @@ public abstract class AbstractTracepoint extends CBreakpoint implements ICTracep
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.cdt.debug.core.ICTracepoint#setPassCount(int) * @see org.eclipse.cdt.debug.core.ICTracepoint#setPassCount(int)
*/ */
@Override
public void setPassCount( int passCount ) throws CoreException { public void setPassCount( int passCount ) throws CoreException {
setAttribute( PASS_COUNT, passCount ); setAttribute( PASS_COUNT, passCount );
setAttribute( IMarker.MESSAGE, getMarkerMessage() ); setAttribute( IMarker.MESSAGE, getMarkerMessage() );

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java
View file

@ -50,6 +50,7 @@ public class CAddressBreakpoint extends AbstractLineBreakpoint implements ICAddr
* *
* @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage()
*/ */
@Override
protected String getMarkerMessage() throws CoreException { protected String getMarkerMessage() throws CoreException {
return MessageFormat.format( BreakpointMessages.getString( "CAddressBreakpoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ return MessageFormat.format( BreakpointMessages.getString( "CAddressBreakpoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java
View file

@ -54,6 +54,7 @@ public class CAddressTracepoint extends AbstractTracepoint implements ICAddressB
* *
* @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage()
*/ */
@Override
protected String getMarkerMessage() throws CoreException { protected String getMarkerMessage() throws CoreException {
return MessageFormat.format( BreakpointMessages.getString( "CAddressTracepoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ return MessageFormat.format( BreakpointMessages.getString( "CAddressTracepoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$
} }

24
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java
View file

@ -71,6 +71,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
this(); this();
IWorkspaceRunnable wr = new IWorkspaceRunnable() { IWorkspaceRunnable wr = new IWorkspaceRunnable() {
@Override
public void run( IProgressMonitor monitor ) throws CoreException { public void run( IProgressMonitor monitor ) throws CoreException {
// create the marker // create the marker
setMarker( resource.createMarker( markerType ) ); 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 { public void createMarker( final IResource resource, final String markerType, final Map attributes, final boolean add ) throws DebugException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() { IWorkspaceRunnable wr = new IWorkspaceRunnable() {
@Override
public void run( IProgressMonitor monitor ) throws CoreException { public void run( IProgressMonitor monitor ) throws CoreException {
// create the marker // create the marker
setMarker( resource.createMarker( markerType ) ); 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() * @see org.eclipse.debug.core.model.IBreakpoint#getModelIdentifier()
*/ */
@Override
public String getModelIdentifier() { public String getModelIdentifier() {
return CDIDebugModel.getPluginIdentifier(); return CDIDebugModel.getPluginIdentifier();
} }
@ -115,6 +118,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
* *
* @see org.eclipse.cdt.debug.core.ICBreakpoint#isInstalled() * @see org.eclipse.cdt.debug.core.ICBreakpoint#isInstalled()
*/ */
@Override
public boolean isInstalled() throws CoreException { public boolean isInstalled() throws CoreException {
return fInstallCount > 0; return fInstallCount > 0;
} }
@ -124,6 +128,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
* *
* @see org.eclipse.cdt.debug.core.ICBreakpoint#getCondition() * @see org.eclipse.cdt.debug.core.ICBreakpoint#getCondition()
*/ */
@Override
public String getCondition() throws CoreException { public String getCondition() throws CoreException {
return ensureMarker().getAttribute( CONDITION, "" ); //$NON-NLS-1$ 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) * @see org.eclipse.cdt.debug.core.ICBreakpoint#setCondition(String)
*/ */
@Override
public void setCondition( String condition ) throws CoreException { public void setCondition( String condition ) throws CoreException {
setAttribute( CONDITION, condition ); setAttribute( CONDITION, condition );
setAttribute( IMarker.MESSAGE, getMarkerMessage() ); 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() * @see org.eclipse.cdt.debug.core.ICBreakpoint#getIgnoreCount()
*/ */
@Override
public int getIgnoreCount() throws CoreException { public int getIgnoreCount() throws CoreException {
return ensureMarker().getAttribute( IGNORE_COUNT, 0 ); 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) * @see org.eclipse.cdt.debug.core.ICBreakpoint#setIgnoreCount(int)
*/ */
@Override
public void setIgnoreCount( int ignoreCount ) throws CoreException { public void setIgnoreCount( int ignoreCount ) throws CoreException {
setAttribute( IGNORE_COUNT, ignoreCount ); setAttribute( IGNORE_COUNT, ignoreCount );
setAttribute( IMarker.MESSAGE, getMarkerMessage() ); setAttribute( IMarker.MESSAGE, getMarkerMessage() );
@ -161,6 +169,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getType() * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getType()
*/ */
@Override
public int getType() throws CoreException { public int getType() throws CoreException {
return ensureMarker().getAttribute( TYPE, 0 ); return ensureMarker().getAttribute( TYPE, 0 );
} }
@ -169,6 +178,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setType(int) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setType(int)
*/ */
@Override
public void setType(int type) throws CoreException { public void setType(int type) throws CoreException {
setAttribute( TYPE, type ); setAttribute( TYPE, type );
setAttribute( IMarker.MESSAGE, getMarkerMessage() ); 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() * @see org.eclipse.cdt.debug.core.ICBreakpoint#getThreadId()
*/ */
@Override
public String getThreadId() throws CoreException { public String getThreadId() throws CoreException {
return ensureMarker().getAttribute( THREAD_ID, null ); 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) * @see org.eclipse.cdt.debug.core.ICBreakpoint#setThreadId(String)
*/ */
@Override
public void setThreadId( String threadId ) throws CoreException { public void setThreadId( String threadId ) throws CoreException {
setAttribute( THREAD_ID, threadId ); setAttribute( THREAD_ID, threadId );
} }
@ -196,6 +208,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getSourceHandle() * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getSourceHandle()
*/ */
@Override
public String getSourceHandle() throws CoreException { public String getSourceHandle() throws CoreException {
return ensureMarker().getAttribute( SOURCE_HANDLE, null ); return ensureMarker().getAttribute( SOURCE_HANDLE, null );
} }
@ -203,6 +216,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setSourceHandle(java.lang.String) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setSourceHandle(java.lang.String)
*/ */
@Override
public void setSourceHandle( String sourceHandle ) throws CoreException { public void setSourceHandle( String sourceHandle ) throws CoreException {
setAttribute( SOURCE_HANDLE, sourceHandle ); 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[]) * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(DebugEvent[])
*/ */
@Override
public void handleDebugEvents( DebugEvent[] events ) { public void handleDebugEvents( DebugEvent[] events ) {
} }
@ -245,6 +260,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#incrementInstallCount() * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#incrementInstallCount()
*/ */
@Override
public synchronized int incrementInstallCount() throws CoreException { public synchronized int incrementInstallCount() throws CoreException {
++fInstallCount; ++fInstallCount;
@ -266,6 +282,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#decrementInstallCount() * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#decrementInstallCount()
*/ */
@Override
public synchronized int decrementInstallCount() throws CoreException { public synchronized int decrementInstallCount() throws CoreException {
fInstallCount--; fInstallCount--;
@ -279,6 +296,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#resetInstallCount() * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#resetInstallCount()
*/ */
@Override
public synchronized void resetInstallCount() throws CoreException { public synchronized void resetInstallCount() throws CoreException {
if (fInstallCount != 0) { if (fInstallCount != 0) {
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() * @see org.eclipse.debug.core.model.Breakpoint#ensureMarker()
*/ */
@Override
protected IMarker ensureMarker() throws DebugException { protected IMarker ensureMarker() throws DebugException {
return super.ensureMarker(); 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) * @see org.eclipse.debug.core.model.Breakpoint#setAttribute(String, Object)
*/ */
@Override
protected void setAttribute( String attributeName, Object value ) throws CoreException { protected void setAttribute( String attributeName, Object value ) throws CoreException {
super.setAttribute( attributeName, value ); 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() * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#isConditional()
*/ */
@Override
public boolean isConditional() throws CoreException { public boolean isConditional() throws CoreException {
return ((getCondition() != null && getCondition().trim().length() > 0) || getIgnoreCount() > 0); return ((getCondition() != null && getCondition().trim().length() > 0) || getIgnoreCount() > 0);
} }
@ -341,6 +362,7 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getModule() * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getModule()
*/ */
@Override
public String getModule() throws CoreException { public String getModule() throws CoreException {
return ensureMarker().getAttribute( MODULE, null ); return ensureMarker().getAttribute( MODULE, null );
} }
@ -348,10 +370,12 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setModule(java.lang.String) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setModule(java.lang.String)
*/ */
@Override
public void setModule( String module ) throws CoreException { public void setModule( String module ) throws CoreException {
setAttribute( MODULE, module ); setAttribute( MODULE, module );
} }
@Override
public ICBreakpointExtension getExtension(String debugModelId, Class extensionType) throws CoreException { public ICBreakpointExtension getExtension(String debugModelId, Class extensionType) throws CoreException {
ICBreakpointExtension[] extensions = getExtensionsForModelId(debugModelId); ICBreakpointExtension[] extensions = getExtensionsForModelId(debugModelId);
for (int i = 0; i < extensions.length; i++) { for (int i = 0; i < extensions.length; i++) {

7
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpointFilterExtension.java
View file

@ -28,6 +28,7 @@ import org.eclipse.debug.core.model.IDebugTarget;
*/ */
public class CBreakpointFilterExtension implements ICBreakpointFilterExtension { public class CBreakpointFilterExtension implements ICBreakpointFilterExtension {
@Override
public void initialize(ICBreakpoint breakpoint) { public void initialize(ICBreakpoint breakpoint) {
} }
@ -37,6 +38,7 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getTargetFilters() * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getTargetFilters()
*/ */
@Override
public ICDebugTarget[] getTargetFilters() throws CoreException { public ICDebugTarget[] getTargetFilters() throws CoreException {
Set set = fFilteredThreadsByTarget.keySet(); Set set = fFilteredThreadsByTarget.keySet();
return (ICDebugTarget[])set.toArray( new ICDebugTarget[set.size()] ); return (ICDebugTarget[])set.toArray( new ICDebugTarget[set.size()] );
@ -45,6 +47,7 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getThreadFilters(org.eclipse.cdt.debug.core.model.ICDebugTarget) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#getThreadFilters(org.eclipse.cdt.debug.core.model.ICDebugTarget)
*/ */
@Override
public ICThread[] getThreadFilters( ICDebugTarget target ) throws CoreException { public ICThread[] getThreadFilters( ICDebugTarget target ) throws CoreException {
Set set = (Set)fFilteredThreadsByTarget.get( target ); Set set = (Set)fFilteredThreadsByTarget.get( target );
return ( set != null ) ? (ICThread[])set.toArray( new ICThread[set.size()] ) : null; return ( set != null ) ? (ICThread[])set.toArray( new ICThread[set.size()] ) : null;
@ -53,6 +56,7 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#removeTargetFilter(org.eclipse.cdt.debug.core.model.ICDebugTarget) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#removeTargetFilter(org.eclipse.cdt.debug.core.model.ICDebugTarget)
*/ */
@Override
public void removeTargetFilter( ICDebugTarget target ) throws CoreException { public void removeTargetFilter( ICDebugTarget target ) throws CoreException {
if ( fFilteredThreadsByTarget.containsKey( target ) ) { if ( fFilteredThreadsByTarget.containsKey( target ) ) {
fFilteredThreadsByTarget.remove( target ); fFilteredThreadsByTarget.remove( target );
@ -62,6 +66,7 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#removeThreadFilters(org.eclipse.cdt.debug.core.model.ICThread[]) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#removeThreadFilters(org.eclipse.cdt.debug.core.model.ICThread[])
*/ */
@Override
public void removeThreadFilters( ICThread[] threads ) throws CoreException { public void removeThreadFilters( ICThread[] threads ) throws CoreException {
if ( threads != null && threads.length > 0 ) { if ( threads != null && threads.length > 0 ) {
IDebugTarget target = threads[0].getDebugTarget(); IDebugTarget target = threads[0].getDebugTarget();
@ -80,6 +85,7 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setTargetFilter(org.eclipse.cdt.debug.core.model.ICDebugTarget) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setTargetFilter(org.eclipse.cdt.debug.core.model.ICDebugTarget)
*/ */
@Override
public void setTargetFilter( ICDebugTarget target ) throws CoreException { public void setTargetFilter( ICDebugTarget target ) throws CoreException {
fFilteredThreadsByTarget.put( target, null ); fFilteredThreadsByTarget.put( target, null );
} }
@ -87,6 +93,7 @@ public class CBreakpointFilterExtension implements ICBreakpointFilterExtension {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setThreadFilters(org.eclipse.cdt.debug.core.model.ICThread[]) * @see org.eclipse.cdt.debug.core.model.ICBreakpoint#setThreadFilters(org.eclipse.cdt.debug.core.model.ICThread[])
*/ */
@Override
public void setThreadFilters( ICThread[] threads ) throws CoreException { public void setThreadFilters( ICThread[] threads ) throws CoreException {
if ( threads != null && threads.length > 0 ) { if ( threads != null && threads.length > 0 ) {
fFilteredThreadsByTarget.put( threads[0].getDebugTarget(), new HashSet( Arrays.asList( threads ) ) ); fFilteredThreadsByTarget.put( threads[0].getDebugTarget(), new HashSet( Arrays.asList( threads ) ) );

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CEventBreakpoint.java
View file

@ -47,6 +47,7 @@ public class CEventBreakpoint extends CBreakpoint implements ICEventBreakpoint {
final Map<String, Object> attributes, final boolean add) throws DebugException { final Map<String, Object> attributes, final boolean add) throws DebugException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() { IWorkspaceRunnable wr = new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException { public void run(IProgressMonitor monitor) throws CoreException {
// create the marker // create the marker
setMarker(resource.createMarker(markerType)); setMarker(resource.createMarker(markerType));
@ -70,6 +71,7 @@ public class CEventBreakpoint extends CBreakpoint implements ICEventBreakpoint {
/** /**
* @see ICEventBreakpoint#getEventType() * @see ICEventBreakpoint#getEventType()
*/ */
@Override
public String getEventType() throws DebugException { public String getEventType() throws DebugException {
return ensureMarker().getAttribute(EVENT_TYPE_ID, ""); //$NON-NLS-1$ return ensureMarker().getAttribute(EVENT_TYPE_ID, ""); //$NON-NLS-1$
} }
@ -77,6 +79,7 @@ public class CEventBreakpoint extends CBreakpoint implements ICEventBreakpoint {
/** /**
* @see ICEventBreakpoint#getEventArgument() * @see ICEventBreakpoint#getEventArgument()
*/ */
@Override
public String getEventArgument() throws CoreException { public String getEventArgument() throws CoreException {
return ensureMarker().getAttribute(EVENT_ARG, ""); //$NON-NLS-1$ return ensureMarker().getAttribute(EVENT_ARG, ""); //$NON-NLS-1$
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java
View file

@ -48,6 +48,7 @@ public class CFunctionBreakpoint extends AbstractLineBreakpoint implements ICFun
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage()
*/ */
@Override
protected String getMarkerMessage() throws CoreException { protected String getMarkerMessage() throws CoreException {
return MessageFormat.format( BreakpointMessages.getString( "CFunctionBreakpoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ return MessageFormat.format( BreakpointMessages.getString( "CFunctionBreakpoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java
View file

@ -52,6 +52,7 @@ public class CFunctionTracepoint extends AbstractTracepoint implements ICFunctio
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage()
*/ */
@Override
protected String getMarkerMessage() throws CoreException { protected String getMarkerMessage() throws CoreException {
return MessageFormat.format( BreakpointMessages.getString( "CFunctionTracepoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ return MessageFormat.format( BreakpointMessages.getString( "CFunctionTracepoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java
View file

@ -48,6 +48,7 @@ public class CLineBreakpoint extends AbstractLineBreakpoint {
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage()
*/ */
@Override
protected String getMarkerMessage() throws CoreException { protected String getMarkerMessage() throws CoreException {
return MessageFormat.format( BreakpointMessages.getString( "CLineBreakpoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ return MessageFormat.format( BreakpointMessages.getString( "CLineBreakpoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineTracepoint.java
View file

@ -51,6 +51,7 @@ public class CLineTracepoint extends AbstractTracepoint implements ICTracepoint
/*(non-Javadoc) /*(non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage()
*/ */
@Override
protected String getMarkerMessage() throws CoreException { protected String getMarkerMessage() throws CoreException {
return MessageFormat.format( BreakpointMessages.getString( "CLineTracepoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$ return MessageFormat.format( BreakpointMessages.getString( "CLineTracepoint.0" ), new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$
} }

9
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java
View file

@ -47,6 +47,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICWatchpoint#isWriteType() * @see org.eclipse.cdt.debug.core.model.ICWatchpoint#isWriteType()
*/ */
@Override
public boolean isWriteType() throws CoreException { public boolean isWriteType() throws CoreException {
return ensureMarker().getAttribute( WRITE, true ); return ensureMarker().getAttribute( WRITE, true );
} }
@ -54,6 +55,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICWatchpoint#isReadType() * @see org.eclipse.cdt.debug.core.model.ICWatchpoint#isReadType()
*/ */
@Override
public boolean isReadType() throws CoreException { public boolean isReadType() throws CoreException {
return ensureMarker().getAttribute( READ, false ); return ensureMarker().getAttribute( READ, false );
} }
@ -61,6 +63,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICWatchpoint#getExpression() * @see org.eclipse.cdt.debug.core.model.ICWatchpoint#getExpression()
*/ */
@Override
public String getExpression() throws CoreException { public String getExpression() throws CoreException {
return ensureMarker().getAttribute( EXPRESSION, "" ); //$NON-NLS-1$ return ensureMarker().getAttribute( EXPRESSION, "" ); //$NON-NLS-1$
} }
@ -75,6 +78,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage() * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage()
*/ */
@Override
protected String getMarkerMessage() throws CoreException { protected String getMarkerMessage() throws CoreException {
String format = BreakpointMessages.getString( "CWatchpoint.3" ); //$NON-NLS-1$ String format = BreakpointMessages.getString( "CWatchpoint.3" ); //$NON-NLS-1$
if ( isWriteType() && !isReadType() ) if ( isWriteType() && !isReadType() )
@ -89,6 +93,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber() * @see org.eclipse.debug.core.model.ILineBreakpoint#getLineNumber()
*/ */
@Override
public int getLineNumber() throws CoreException { public int getLineNumber() throws CoreException {
return ensureMarker().getAttribute( IMarker.LINE_NUMBER, -1 ); return ensureMarker().getAttribute( IMarker.LINE_NUMBER, -1 );
} }
@ -96,6 +101,7 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart() * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharStart()
*/ */
@Override
public int getCharStart() throws CoreException { public int getCharStart() throws CoreException {
return ensureMarker().getAttribute( IMarker.CHAR_START, -1 ); return ensureMarker().getAttribute( IMarker.CHAR_START, -1 );
} }
@ -103,14 +109,17 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd() * @see org.eclipse.debug.core.model.ILineBreakpoint#getCharEnd()
*/ */
@Override
public int getCharEnd() throws CoreException { public int getCharEnd() throws CoreException {
return ensureMarker().getAttribute( IMarker.CHAR_END, -1 ); return ensureMarker().getAttribute( IMarker.CHAR_END, -1 );
} }
@Override
public String getMemorySpace() throws CoreException { public String getMemorySpace() throws CoreException {
return ensureMarker().getAttribute( MEMORYSPACE, "" ); //$NON-NLS-1$ return ensureMarker().getAttribute( MEMORYSPACE, "" ); //$NON-NLS-1$
} }
@Override
public BigInteger getRange() throws CoreException { public BigInteger getRange() throws CoreException {
String attr = ensureMarker().getAttribute( RANGE, "0" ); //$NON-NLS-1$ String attr = ensureMarker().getAttribute( RANGE, "0" ); //$NON-NLS-1$
return new BigInteger( attr.length() > 0 ? attr : "0" ); //$NON-NLS-1$ return new BigInteger( attr.length() > 0 ? attr : "0" ); //$NON-NLS-1$

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/disassembly/DisassemblyContextService.java
View file

@ -31,6 +31,7 @@ public class DisassemblyContextService implements IDisassemblyContextService {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#addDisassemblyContextListener(org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextListener) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#addDisassemblyContextListener(org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextListener)
*/ */
@Override
public void addDisassemblyContextListener( IDisassemblyContextListener listener ) { public void addDisassemblyContextListener( IDisassemblyContextListener listener ) {
fListeners.add( listener ); fListeners.add( listener );
} }
@ -38,6 +39,7 @@ public class DisassemblyContextService implements IDisassemblyContextService {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#removeDisassemblyContextListener(org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextListener) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#removeDisassemblyContextListener(org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextListener)
*/ */
@Override
public void removeDisassemblyContextListener( IDisassemblyContextListener listener ) { public void removeDisassemblyContextListener( IDisassemblyContextListener listener ) {
fListeners.remove( listener ); fListeners.remove( listener );
} }
@ -45,6 +47,7 @@ public class DisassemblyContextService implements IDisassemblyContextService {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#register(java.lang.Object) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#register(java.lang.Object)
*/ */
@Override
public void register( Object context ) { public void register( Object context ) {
fContexts.add( context ); fContexts.add( context );
for( Object listener : fListeners.getListeners() ) { for( Object listener : fListeners.getListeners() ) {
@ -55,6 +58,7 @@ public class DisassemblyContextService implements IDisassemblyContextService {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#unregister(java.lang.Object) * @see org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService#unregister(java.lang.Object)
*/ */
@Override
public void unregister( Object context ) { public void unregister( Object context ) {
fContexts.remove( context ); fContexts.remove( context );
for( Object listener : fListeners.getListeners() ) { for( Object listener : fListeners.getListeners() ) {

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardExecutableImporter.java
View file

@ -59,6 +59,7 @@ public class StandardExecutableImporter implements IExecutableImporter {
* @see org.eclipse.cdt.debug.core.executables.IExecutableImporter#importExecutables(java.lang.String[], * @see org.eclipse.cdt.debug.core.executables.IExecutableImporter#importExecutables(java.lang.String[],
* org.eclipse.core.runtime.IProgressMonitor) * org.eclipse.core.runtime.IProgressMonitor)
*/ */
@Override
public boolean importExecutables(String[] fileNames, IProgressMonitor monitor) { public boolean importExecutables(String[] fileNames, IProgressMonitor monitor) {
monitor.beginTask("Import Executables", fileNames.length); //$NON-NLS-1$ monitor.beginTask("Import Executables", fileNames.length); //$NON-NLS-1$
@ -274,6 +275,7 @@ public class StandardExecutableImporter implements IExecutableImporter {
return false; return false;
} }
@Override
public int getPriority(String[] fileNames) { public int getPriority(String[] fileNames) {
return NORMAL_PRIORITY; return NORMAL_PRIORITY;
} }

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemapping.java
View file

@ -24,6 +24,7 @@ public class StandardSourceFileRemapping implements ISourceFileRemapping {
srcFinder = (ISourceFinder) binary.getAdapter(ISourceFinder.class); srcFinder = (ISourceFinder) binary.getAdapter(ISourceFinder.class);
} }
@Override
public String remapSourceFile(IPath executable, String filePath) { public String remapSourceFile(IPath executable, String filePath) {
if (srcFinder != null) { if (srcFinder != null) {
String mappedPath = srcFinder.toLocalPath(filePath); String mappedPath = srcFinder.toLocalPath(filePath);
@ -37,6 +38,7 @@ public class StandardSourceFileRemapping implements ISourceFileRemapping {
/* (non-Javadoc) /* (non-Javadoc)
* @see java.lang.Object#finalize() * @see java.lang.Object#finalize()
*/ */
@Override
public void finalize(){ public void finalize(){
srcFinder.dispose(); srcFinder.dispose();
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFileRemappingFactory.java
View file

@ -19,6 +19,7 @@ public class StandardSourceFileRemappingFactory implements ISourceFileRemappingF
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.executables.ISourceFileRemappingFactory#createRemapper(org.eclipse.cdt.core.model.IBinary) * @see org.eclipse.cdt.debug.core.executables.ISourceFileRemappingFactory#createRemapper(org.eclipse.cdt.core.model.IBinary)
*/ */
@Override
public ISourceFileRemapping createRemapper(IBinary binary) { public ISourceFileRemapping createRemapper(IBinary binary) {
return new StandardSourceFileRemapping(binary); return new StandardSourceFileRemapping(binary);
} }

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/executables/StandardSourceFilesProvider.java
View file

@ -112,6 +112,7 @@ public class StandardSourceFilesProvider extends PlatformObject implements ISour
return null; return null;
} }
@Override
public String[] getSourceFiles(Executable executable, IProgressMonitor monitor) { public String[] getSourceFiles(Executable executable, IProgressMonitor monitor) {
IBinaryFile bin = createBinaryFile(executable); IBinaryFile bin = createBinaryFile(executable);
@ -125,6 +126,7 @@ public class StandardSourceFilesProvider extends PlatformObject implements ISour
return new String[0]; return new String[0];
} }
@Override
public int getPriority(Executable executable) { public int getPriority(Executable executable) {
return ISourceFilesProvider.NORMAL_PRIORITY; return ISourceFilesProvider.NORMAL_PRIORITY;
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCValue.java
View file

@ -39,6 +39,7 @@ public abstract class AbstractCValue extends CDebugElement implements ICValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICValue#evaluateAsExpression(org.eclipse.cdt.debug.core.model.ICStackFrame) * @see org.eclipse.cdt.debug.core.model.ICValue#evaluateAsExpression(org.eclipse.cdt.debug.core.model.ICStackFrame)
*/ */
@Override
public String evaluateAsExpression( ICStackFrame frame ) { public String evaluateAsExpression( ICStackFrame frame ) {
String valueString = ""; //$NON-NLS-1$ String valueString = ""; //$NON-NLS-1$
AbstractCVariable parent = getParentVariable(); AbstractCVariable parent = getParentVariable();

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AbstractCVariable.java
View file

@ -55,6 +55,7 @@ public abstract class AbstractCVariable extends CDebugElement implements ICVaria
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( IEnableDisableTarget.class.equals( adapter ) ) if ( IEnableDisableTarget.class.equals( adapter ) )
return this; return this;

6
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmInstruction.java
View file

@ -35,6 +35,7 @@ public class AsmInstruction implements IAsmInstruction {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getAdress() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getAdress()
*/ */
@Override
public IAddress getAdress() { public IAddress getAdress() {
return fAddress; return fAddress;
} }
@ -42,6 +43,7 @@ public class AsmInstruction implements IAsmInstruction {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getFunctionName() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getFunctionName()
*/ */
@Override
public String getFunctionName() { public String getFunctionName() {
return fCDIInstruction.getFuntionName(); return fCDIInstruction.getFuntionName();
} }
@ -49,6 +51,7 @@ public class AsmInstruction implements IAsmInstruction {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getInstructionText() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getInstructionText()
*/ */
@Override
public String getInstructionText() { public String getInstructionText() {
return fCDIInstruction.getInstruction(); return fCDIInstruction.getInstruction();
} }
@ -56,6 +59,7 @@ public class AsmInstruction implements IAsmInstruction {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOpcode() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOpcode()
*/ */
@Override
public String getOpcode() { public String getOpcode() {
return fCDIInstruction.getOpcode(); return fCDIInstruction.getOpcode();
} }
@ -63,6 +67,7 @@ public class AsmInstruction implements IAsmInstruction {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getArguments() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getArguments()
*/ */
@Override
public String getArguments() { public String getArguments() {
return fCDIInstruction.getArgs(); return fCDIInstruction.getArgs();
} }
@ -70,6 +75,7 @@ public class AsmInstruction implements IAsmInstruction {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOffset() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOffset()
*/ */
@Override
public long getOffset() { public long getOffset() {
return fCDIInstruction.getOffset(); return fCDIInstruction.getOffset();
} }

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmSourceLine.java
View file

@ -48,6 +48,7 @@ public class AsmSourceLine implements IAsmSourceLine {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getLineNumber() * @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getLineNumber()
*/ */
@Override
public int getLineNumber() { public int getLineNumber() {
return fLineNumber; return fLineNumber;
} }
@ -55,10 +56,12 @@ public class AsmSourceLine implements IAsmSourceLine {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getInstructions() * @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getInstructions()
*/ */
@Override
public IAsmInstruction[] getInstructions() { public IAsmInstruction[] getInstructions() {
return fInstructions; return fInstructions;
} }
@Override
public String toString() { public String toString() {
return fText; return fText;
} }

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CCoreFileDebugTarget.java
View file

@ -21,6 +21,7 @@ import org.eclipse.debug.core.model.IProcess;
* A debug target for the postmortem debugging. * A debug target for the postmortem debugging.
* @deprecated * @deprecated
*/ */
@Deprecated
public class CCoreFileDebugTarget extends CDebugTarget { public class CCoreFileDebugTarget extends CDebugTarget {
@ -42,6 +43,7 @@ public class CCoreFileDebugTarget extends CDebugTarget {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugTarget#isPostMortem() * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#isPostMortem()
*/ */
@Override
public boolean isPostMortem() { public boolean isPostMortem() {
return true; return true;
} }

9
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java
View file

@ -82,6 +82,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle
* *
* @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier() * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
*/ */
@Override
public String getModelIdentifier() { public String getModelIdentifier() {
return CDIDebugModel.getPluginIdentifier(); return CDIDebugModel.getPluginIdentifier();
} }
@ -91,6 +92,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle
* *
* @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget() * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
*/ */
@Override
public IDebugTarget getDebugTarget() { public IDebugTarget getDebugTarget() {
return fDebugTarget; return fDebugTarget;
} }
@ -100,6 +102,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle
* *
* @see org.eclipse.debug.core.model.IDebugElement#getLaunch() * @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
*/ */
@Override
public ILaunch getLaunch() { public ILaunch getLaunch() {
return getDebugTarget().getLaunch(); return getDebugTarget().getLaunch();
} }
@ -302,6 +305,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle
* *
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( adapter.equals( IDebugElement.class ) ) if ( adapter.equals( IDebugElement.class ) )
return this; return this;
@ -342,6 +346,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugElementStatus#isOK() * @see org.eclipse.cdt.debug.core.model.ICDebugElementStatus#isOK()
*/ */
@Override
public boolean isOK() { public boolean isOK() {
return (fSeverity == ICDebugElementStatus.OK); return (fSeverity == ICDebugElementStatus.OK);
} }
@ -349,6 +354,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugElementStatus#getSeverity() * @see org.eclipse.cdt.debug.core.model.ICDebugElementStatus#getSeverity()
*/ */
@Override
public int getSeverity() { public int getSeverity() {
return fSeverity; return fSeverity;
} }
@ -356,6 +362,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugElementStatus#getMessage() * @see org.eclipse.cdt.debug.core.model.ICDebugElementStatus#getMessage()
*/ */
@Override
public String getMessage() { public String getMessage() {
return fMessage; return fMessage;
} }
@ -363,6 +370,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugElement#getState() * @see org.eclipse.cdt.debug.core.model.ICDebugElement#getState()
*/ */
@Override
public CDebugElementState getState() { public CDebugElementState getState() {
return fState; return fState;
} }
@ -379,6 +387,7 @@ abstract public class CDebugElement extends PlatformObject implements ICDebugEle
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugElement#getCurrentStateInfo() * @see org.eclipse.cdt.debug.core.model.ICDebugElement#getCurrentStateInfo()
*/ */
@Override
public Object getCurrentStateInfo() { public Object getCurrentStateInfo() {
return fCurrentStateInfo; return fCurrentStateInfo;
} }

54
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
View file

@ -418,6 +418,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugTarget#getProcess() * @see org.eclipse.debug.core.model.IDebugTarget#getProcess()
*/ */
@Override
public IProcess getProcess() { public IProcess getProcess() {
return fDebuggeeProcess; return fDebuggeeProcess;
} }
@ -438,6 +439,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
* *
* @see org.eclipse.debug.core.model.IDebugTarget#getThreads() * @see org.eclipse.debug.core.model.IDebugTarget#getThreads()
*/ */
@Override
public IThread[] getThreads() { public IThread[] getThreads() {
List<CThread> threads = getThreadList(); List<CThread> threads = getThreadList();
return threads.toArray(new IThread[threads.size()]); 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() * @see org.eclipse.debug.core.model.IDebugTarget#hasThreads()
*/ */
@Override
public boolean hasThreads() throws DebugException { public boolean hasThreads() throws DebugException {
return getThreadList().size() > 0; return getThreadList().size() > 0;
} }
@ -457,6 +460,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
* *
* @see org.eclipse.debug.core.model.IDebugTarget#getName() * @see org.eclipse.debug.core.model.IDebugTarget#getName()
*/ */
@Override
public String getName() throws DebugException { public String getName() throws DebugException {
return fName; return fName;
} }
@ -473,6 +477,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDebugTarget#supportsBreakpoint(org.eclipse.debug.core.model.IBreakpoint) * @see org.eclipse.debug.core.model.IDebugTarget#supportsBreakpoint(org.eclipse.debug.core.model.IBreakpoint)
*/ */
@Override
public boolean supportsBreakpoint(IBreakpoint breakpoint) { public boolean supportsBreakpoint(IBreakpoint breakpoint) {
if (!getConfiguration().supportsBreakpoints()) if (!getConfiguration().supportsBreakpoints())
return false; return false;
@ -482,6 +487,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.ILaunchListener#launchRemoved(org.eclipse.debug.core.ILaunch) * @see org.eclipse.debug.core.ILaunchListener#launchRemoved(org.eclipse.debug.core.ILaunch)
*/ */
@Override
public void launchRemoved(ILaunch launch) { public void launchRemoved(ILaunch launch) {
if (!isAvailable()) { if (!isAvailable()) {
return; return;
@ -496,18 +502,21 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch) * @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch)
*/ */
@Override
public void launchAdded(ILaunch launch) { public void launchAdded(ILaunch launch) {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.ILaunchListener#launchChanged(org.eclipse.debug.core.ILaunch) * @see org.eclipse.debug.core.ILaunchListener#launchChanged(org.eclipse.debug.core.ILaunch)
*/ */
@Override
public void launchChanged(ILaunch launch) { public void launchChanged(ILaunch launch) {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#canTerminate() * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/ */
@Override
public boolean canTerminate() { public boolean canTerminate() {
return supportsTerminate() && isAvailable(); return supportsTerminate() && isAvailable();
} }
@ -515,6 +524,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#isTerminated() * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/ */
@Override
public boolean isTerminated() { public boolean isTerminated() {
return (getState().equals(CDebugElementState.TERMINATED)); return (getState().equals(CDebugElementState.TERMINATED));
} }
@ -522,6 +532,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#terminate() * @see org.eclipse.debug.core.model.ITerminate#terminate()
*/ */
@Override
public void terminate() throws DebugException { public void terminate() throws DebugException {
if (!canTerminate()) { if (!canTerminate()) {
return; return;
@ -544,6 +555,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#canResume() * @see org.eclipse.debug.core.model.ISuspendResume#canResume()
*/ */
@Override
public boolean canResume() { public boolean canResume() {
return getConfiguration().supportsResume() && isSuspended(); return getConfiguration().supportsResume() && isSuspended();
} }
@ -551,6 +563,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
*/ */
@Override
public boolean canSuspend() { public boolean canSuspend() {
if (!getConfiguration().supportsSuspend()) if (!getConfiguration().supportsSuspend())
return false; return false;
@ -570,6 +583,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
*/ */
@Override
public boolean isSuspended() { public boolean isSuspended() {
return (getState().equals(CDebugElementState.SUSPENDED)); return (getState().equals(CDebugElementState.SUSPENDED));
} }
@ -577,6 +591,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#resume() * @see org.eclipse.debug.core.model.ISuspendResume#resume()
*/ */
@Override
public void resume() throws DebugException { public void resume() throws DebugException {
if (!canResume()) if (!canResume())
return; return;
@ -598,6 +613,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#suspend() * @see org.eclipse.debug.core.model.ISuspendResume#suspend()
*/ */
@Override
public void suspend() throws DebugException { public void suspend() throws DebugException {
if (!canSuspend()) if (!canSuspend())
return; return;
@ -699,18 +715,21 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint) * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint)
*/ */
@Override
public void breakpointAdded(IBreakpoint breakpoint) { public void breakpointAdded(IBreakpoint breakpoint) {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta) * @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) { public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta) * @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) { public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
} }
@ -735,6 +754,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDisconnect#canDisconnect() * @see org.eclipse.debug.core.model.IDisconnect#canDisconnect()
*/ */
@Override
public boolean canDisconnect() { public boolean canDisconnect() {
return supportsDisconnect() && isAvailable(); return supportsDisconnect() && isAvailable();
} }
@ -742,6 +762,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDisconnect#disconnect() * @see org.eclipse.debug.core.model.IDisconnect#disconnect()
*/ */
@Override
public void disconnect() throws DebugException { public void disconnect() throws DebugException {
if (isDisconnecting()) { if (isDisconnecting()) {
return; return;
@ -764,6 +785,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IDisconnect#isDisconnected() * @see org.eclipse.debug.core.model.IDisconnect#isDisconnected()
*/ */
@Override
public boolean isDisconnected() { public boolean isDisconnected() {
return (getState().equals(CDebugElementState.DISCONNECTED)); return (getState().equals(CDebugElementState.DISCONNECTED));
} }
@ -771,6 +793,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval() * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval()
*/ */
@Override
public boolean supportsStorageRetrieval() { public boolean supportsStorageRetrieval() {
return false; return false;
} }
@ -778,6 +801,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long) * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long)
*/ */
@Override
public IMemoryBlock getMemoryBlock(long startAddress, long length) throws DebugException { public IMemoryBlock getMemoryBlock(long startAddress, long length) throws DebugException {
return null; return null;
} }
@ -870,6 +894,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents(ICDIEvent[] events) { public void handleDebugEvents(ICDIEvent[] events) {
for (int i = 0; i < events.length; i++) { for (int i = 0; i < events.length; i++) {
ICDIEvent event = events[i]; ICDIEvent event = events[i];
@ -938,6 +963,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRestart#canRestart() * @see org.eclipse.cdt.debug.core.model.IRestart#canRestart()
*/ */
@Override
public boolean canRestart() { public boolean canRestart() {
return getConfiguration().supportsRestart() && isSuspended(); return getConfiguration().supportsRestart() && isSuspended();
} }
@ -945,6 +971,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRestart#restart() * @see org.eclipse.cdt.debug.core.model.IRestart#restart()
*/ */
@Override
public void restart() throws DebugException { public void restart() throws DebugException {
if (!canRestart()) { if (!canRestart()) {
return; return;
@ -1343,18 +1370,21 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.IExpressionListener#expressionAdded(org.eclipse.debug.core.model.IExpression) * @see org.eclipse.debug.core.IExpressionListener#expressionAdded(org.eclipse.debug.core.model.IExpression)
*/ */
@Override
public void expressionAdded(IExpression expression) { public void expressionAdded(IExpression expression) {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.IExpressionListener#expressionChanged(org.eclipse.debug.core.model.IExpression) * @see org.eclipse.debug.core.IExpressionListener#expressionChanged(org.eclipse.debug.core.model.IExpression)
*/ */
@Override
public void expressionChanged(IExpression expression) { public void expressionChanged(IExpression expression) {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.IExpressionListener#expressionRemoved(org.eclipse.debug.core.model.IExpression) * @see org.eclipse.debug.core.IExpressionListener#expressionRemoved(org.eclipse.debug.core.model.IExpression)
*/ */
@Override
public void expressionRemoved(IExpression expression) { public void expressionRemoved(IExpression expression) {
if (expression instanceof CExpression && expression.getDebugTarget().equals(this)) { if (expression instanceof CExpression && expression.getDebugTarget().equals(this)) {
((CExpression)expression).dispose(); ((CExpression)expression).dispose();
@ -1398,6 +1428,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IExecFileInfo#isLittleEndian() * @see org.eclipse.cdt.debug.core.model.IExecFileInfo#isLittleEndian()
*/ */
@Override
public boolean isLittleEndian() { public boolean isLittleEndian() {
if (fIsLittleEndian == null) { if (fIsLittleEndian == null) {
fIsLittleEndian = Boolean.TRUE; fIsLittleEndian = Boolean.TRUE;
@ -1413,6 +1444,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IExecFileInfo#getExecFile() * @see org.eclipse.cdt.debug.core.model.IExecFileInfo#getExecFile()
*/ */
@Override
public IBinaryObject getExecFile() { public IBinaryObject getExecFile() {
return getBinaryFile(); return getBinaryFile();
} }
@ -1436,6 +1468,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IExecFileInfo#getGlobals() * @see org.eclipse.cdt.debug.core.model.IExecFileInfo#getGlobals()
*/ */
@Override
public IGlobalVariableDescriptor[] getGlobals() throws DebugException { public IGlobalVariableDescriptor[] getGlobals() throws DebugException {
ICDITarget cdiTarget = getCDITarget(); ICDITarget cdiTarget = getCDITarget();
// If the backend can give us the globals... // If the backend can give us the globals...
@ -1519,6 +1552,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal() * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal()
*/ */
@Override
public boolean canResumeWithoutSignal() { public boolean canResumeWithoutSignal() {
// Check if the configuration supports this!!! // Check if the configuration supports this!!!
return (canResume() && getCurrentStateInfo() instanceof ICDISignalReceived); return (canResume() && getCurrentStateInfo() instanceof ICDISignalReceived);
@ -1527,6 +1561,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal() * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal()
*/ */
@Override
public void resumeWithoutSignal() throws DebugException { public void resumeWithoutSignal() throws DebugException {
if (!canResume()) if (!canResume())
return; return;
@ -1618,6 +1653,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getDisassembly() * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getDisassembly()
*/ */
@Override
public IDisassembly getDisassembly() throws DebugException { public IDisassembly getDisassembly() throws DebugException {
return fDisassembly; return fDisassembly;
} }
@ -1629,6 +1665,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getSignals() * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getSignals()
*/ */
@Override
public ICSignal[] getSignals() throws DebugException { public ICSignal[] getSignals() throws DebugException {
CSignalManager sm = getSignalManager(); CSignalManager sm = getSignalManager();
if (sm != null) { if (sm != null) {
@ -1640,6 +1677,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugTarget#hasSignals() * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#hasSignals()
*/ */
@Override
public boolean hasSignals() throws DebugException { public boolean hasSignals() throws DebugException {
CSignalManager sm = getSignalManager(); CSignalManager sm = getSignalManager();
if (sm != null) { if (sm != null) {
@ -1665,6 +1703,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IBreakpointTarget#getBreakpointAddress(org.eclipse.cdt.debug.core.model.ICLineBreakpoint) * @see org.eclipse.cdt.debug.core.model.IBreakpointTarget#getBreakpointAddress(org.eclipse.cdt.debug.core.model.ICLineBreakpoint)
*/ */
@Override
public IAddress getBreakpointAddress(ICLineBreakpoint breakpoint) throws DebugException { public IAddress getBreakpointAddress(ICLineBreakpoint breakpoint) throws DebugException {
return (getBreakpointManager() != null) ? getBreakpointManager().getBreakpointAddress(breakpoint) : getAddressFactory().getZero(); return (getBreakpointManager() != null) ? getBreakpointManager().getBreakpointAddress(breakpoint) : getAddressFactory().getZero();
} }
@ -1672,6 +1711,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#enableInstructionStepping(boolean) * @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#enableInstructionStepping(boolean)
*/ */
@Override
public void enableInstructionStepping(boolean enabled) { public void enableInstructionStepping(boolean enabled) {
fPreferences.setValue(PREF_INSTRUCTION_STEPPING_MODE, enabled); fPreferences.setValue(PREF_INSTRUCTION_STEPPING_MODE, enabled);
} }
@ -1679,6 +1719,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#isInstructionSteppingEnabled() * @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#isInstructionSteppingEnabled()
*/ */
@Override
public boolean isInstructionSteppingEnabled() { public boolean isInstructionSteppingEnabled() {
return fPreferences.getBoolean(PREF_INSTRUCTION_STEPPING_MODE); return fPreferences.getBoolean(PREF_INSTRUCTION_STEPPING_MODE);
} }
@ -1686,6 +1727,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#supportsInstructionStepping() * @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#supportsInstructionStepping()
*/ */
@Override
public boolean supportsInstructionStepping() { public boolean supportsInstructionStepping() {
return getConfiguration().supportsInstructionStepping(); return getConfiguration().supportsInstructionStepping();
} }
@ -1707,6 +1749,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ITargetProperties#addPropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener) * @see org.eclipse.cdt.debug.core.model.ITargetProperties#addPropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener)
*/ */
@Override
public void addPropertyChangeListener(IPropertyChangeListener listener) { public void addPropertyChangeListener(IPropertyChangeListener listener) {
if (fPreferences != null) if (fPreferences != null)
fPreferences.addPropertyChangeListener(listener); fPreferences.addPropertyChangeListener(listener);
@ -1715,6 +1758,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ITargetProperties#removePropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener) * @see org.eclipse.cdt.debug.core.model.ITargetProperties#removePropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener)
*/ */
@Override
public void removePropertyChangeListener(IPropertyChangeListener listener) { public void removePropertyChangeListener(IPropertyChangeListener listener) {
if (fPreferences != null) if (fPreferences != null)
fPreferences.removePropertyChangeListener(listener); fPreferences.removePropertyChangeListener(listener);
@ -1739,6 +1783,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugTarget#isPostMortem() * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#isPostMortem()
*/ */
@Override
public boolean isPostMortem() { public boolean isPostMortem() {
return false; return false;
} }
@ -1805,6 +1850,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
return CVariableFactory.createGlobalVariable(this, info, vo); return CVariableFactory.createGlobalVariable(this, info, vo);
} }
@Override
public void sourceContainersChanged(ISourceLookupDirector director) { public void sourceContainersChanged(ISourceLookupDirector director) {
setSourceLookupPath(director.getSourceContainers()); setSourceLookupPath(director.getSourceContainers());
} }
@ -1872,6 +1918,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getRegisterDescriptors() * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getRegisterDescriptors()
*/ */
@Override
public IRegisterDescriptor[] getRegisterDescriptors() throws DebugException { public IRegisterDescriptor[] getRegisterDescriptors() throws DebugException {
return getRegisterManager().getAllRegisterDescriptors(); return getRegisterManager().getAllRegisterDescriptors();
} }
@ -1879,6 +1926,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugTarget#addUserDefinedRegisterGroup(java.lang.String, org.eclipse.cdt.debug.core.model.IRegisterDescriptor[]) * @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) { public void addRegisterGroup(String name, IRegisterDescriptor[] descriptors) {
getRegisterManager().addRegisterGroup(name, descriptors); getRegisterManager().addRegisterGroup(name, descriptors);
} }
@ -1886,6 +1934,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugTarget#removeRegisterGroups(org.eclipse.debug.core.model.IRegisterGroup[]) * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#removeRegisterGroups(org.eclipse.debug.core.model.IRegisterGroup[])
*/ */
@Override
public void removeRegisterGroups(IRegisterGroup[] groups) { public void removeRegisterGroups(IRegisterGroup[] groups) {
getRegisterManager().removeRegisterGroups(groups); getRegisterManager().removeRegisterGroups(groups);
} }
@ -1893,6 +1942,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (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[]) * @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) { public void modifyRegisterGroup(IPersistableRegisterGroup group, IRegisterDescriptor[] descriptors) {
getRegisterManager().modifyRegisterGroup(group, descriptors); getRegisterManager().modifyRegisterGroup(group, descriptors);
} }
@ -1900,6 +1950,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICDebugTarget#restoreDefaultRegisterGroups() * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#restoreDefaultRegisterGroups()
*/ */
@Override
public void restoreDefaultRegisterGroups() { public void restoreDefaultRegisterGroups() {
getRegisterManager().restoreDefaults(); getRegisterManager().restoreDefaults();
} }
@ -1968,6 +2019,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
} }
} }
@Override
public boolean hasModules() throws DebugException { public boolean hasModules() throws DebugException {
CModuleManager mm = getModuleManager(); CModuleManager mm = getModuleManager();
if (mm != null) if (mm != null)
@ -1975,6 +2027,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
return false; return false;
} }
@Override
public ICModule[] getModules() throws DebugException { public ICModule[] getModules() throws DebugException {
CModuleManager mm = getModuleManager(); CModuleManager mm = getModuleManager();
if (mm != null) if (mm != null)
@ -1982,6 +2035,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
return new ICModule[0]; return new ICModule[0];
} }
@Override
public void loadSymbolsForAllModules() throws DebugException { public void loadSymbolsForAllModules() throws DebugException {
CModuleManager mm = getModuleManager(); CModuleManager mm = getModuleManager();
if (mm != null) if (mm != null)

25
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java
View file

@ -42,6 +42,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStackFrame#getThread() * @see org.eclipse.debug.core.model.IStackFrame#getThread()
*/ */
@Override
public IThread getThread() { public IThread getThread() {
return fThread; return fThread;
} }
@ -51,6 +52,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStackFrame#getVariables() * @see org.eclipse.debug.core.model.IStackFrame#getVariables()
*/ */
@Override
public IVariable[] getVariables() throws DebugException { public IVariable[] getVariables() throws DebugException {
return new IVariable[0]; return new IVariable[0];
} }
@ -60,6 +62,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStackFrame#hasVariables() * @see org.eclipse.debug.core.model.IStackFrame#hasVariables()
*/ */
@Override
public boolean hasVariables() throws DebugException { public boolean hasVariables() throws DebugException {
return false; return false;
} }
@ -69,6 +72,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStackFrame#getLineNumber() * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber()
*/ */
@Override
public int getLineNumber() throws DebugException { public int getLineNumber() throws DebugException {
return 0; return 0;
} }
@ -78,6 +82,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStackFrame#getCharStart() * @see org.eclipse.debug.core.model.IStackFrame#getCharStart()
*/ */
@Override
public int getCharStart() throws DebugException { public int getCharStart() throws DebugException {
return 0; return 0;
} }
@ -87,6 +92,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStackFrame#getCharEnd() * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd()
*/ */
@Override
public int getCharEnd() throws DebugException { public int getCharEnd() throws DebugException {
return 0; return 0;
} }
@ -96,6 +102,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStackFrame#getName() * @see org.eclipse.debug.core.model.IStackFrame#getName()
*/ */
@Override
public String getName() throws DebugException { public String getName() throws DebugException {
return "..."; //$NON-NLS-1$ return "..."; //$NON-NLS-1$
} }
@ -105,6 +112,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups() * @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups()
*/ */
@Override
public IRegisterGroup[] getRegisterGroups() throws DebugException { public IRegisterGroup[] getRegisterGroups() throws DebugException {
return new IRegisterGroup[0]; return new IRegisterGroup[0];
} }
@ -114,6 +122,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups() * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups()
*/ */
@Override
public boolean hasRegisterGroups() throws DebugException { public boolean hasRegisterGroups() throws DebugException {
return false; return false;
} }
@ -123,6 +132,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStep#canStepInto() * @see org.eclipse.debug.core.model.IStep#canStepInto()
*/ */
@Override
public boolean canStepInto() { public boolean canStepInto() {
return false; return false;
} }
@ -132,6 +142,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStep#canStepOver() * @see org.eclipse.debug.core.model.IStep#canStepOver()
*/ */
@Override
public boolean canStepOver() { public boolean canStepOver() {
return false; return false;
} }
@ -141,6 +152,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStep#canStepReturn() * @see org.eclipse.debug.core.model.IStep#canStepReturn()
*/ */
@Override
public boolean canStepReturn() { public boolean canStepReturn() {
return false; return false;
} }
@ -150,6 +162,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStep#isStepping() * @see org.eclipse.debug.core.model.IStep#isStepping()
*/ */
@Override
public boolean isStepping() { public boolean isStepping() {
return false; return false;
} }
@ -159,6 +172,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.IStep#stepInto() * @see org.eclipse.debug.core.model.IStep#stepInto()
*/ */
@Override
public void stepInto() throws DebugException { 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() * @see org.eclipse.debug.core.model.IStep#stepOver()
*/ */
@Override
public void stepOver() throws DebugException { 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() * @see org.eclipse.debug.core.model.IStep#stepReturn()
*/ */
@Override
public void stepReturn() throws DebugException { 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() * @see org.eclipse.debug.core.model.ISuspendResume#canResume()
*/ */
@Override
public boolean canResume() { public boolean canResume() {
return false; return false;
} }
@ -192,6 +209,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
*/ */
@Override
public boolean canSuspend() { public boolean canSuspend() {
return false; return false;
} }
@ -201,6 +219,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
*/ */
@Override
public boolean isSuspended() { public boolean isSuspended() {
return false; return false;
} }
@ -210,6 +229,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.ISuspendResume#resume() * @see org.eclipse.debug.core.model.ISuspendResume#resume()
*/ */
@Override
public void resume() throws DebugException { 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() * @see org.eclipse.debug.core.model.ISuspendResume#suspend()
*/ */
@Override
public void suspend() throws DebugException { 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() * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/ */
@Override
public boolean canTerminate() { public boolean canTerminate() {
return false; return false;
} }
@ -235,6 +257,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.ITerminate#isTerminated() * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/ */
@Override
public boolean isTerminated() { public boolean isTerminated() {
return false; return false;
} }
@ -244,6 +267,7 @@ public class CDummyStackFrame extends CDebugElement implements IStackFrame, IDum
* *
* @see org.eclipse.debug.core.model.ITerminate#terminate() * @see org.eclipse.debug.core.model.ITerminate#terminate()
*/ */
@Override
public void terminate() throws DebugException { 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) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( adapter.equals( IDummyStackFrame.class ) ) if ( adapter.equals( IDummyStackFrame.class ) )
return this; return this;

12
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java
View file

@ -61,6 +61,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IExpression#getExpressionText() * @see org.eclipse.debug.core.model.IExpression#getExpressionText()
*/ */
@Override
public String getExpressionText() { public String getExpressionText() {
return fText; return fText;
} }
@ -68,6 +69,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
for( int i = 0; i < events.length; i++ ) { for( int i = 0; i < events.length; i++ ) {
ICDIEvent event = events[i]; ICDIEvent event = events[i];
@ -109,6 +111,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICVariable#isEnabled() * @see org.eclipse.cdt.debug.core.model.ICVariable#isEnabled()
*/ */
@Override
public boolean isEnabled() { public boolean isEnabled() {
return true; return true;
} }
@ -116,6 +119,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable() * @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable()
*/ */
@Override
public boolean canEnableDisable() { public boolean canEnableDisable() {
return true; return true;
} }
@ -123,6 +127,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.CVariable#isBookkeepingEnabled() * @see org.eclipse.cdt.debug.internal.core.model.CVariable#isBookkeepingEnabled()
*/ */
@Override
protected boolean isBookkeepingEnabled() { protected boolean isBookkeepingEnabled() {
return false; return false;
} }
@ -130,6 +135,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IExpression#getValue() * @see org.eclipse.debug.core.model.IExpression#getValue()
*/ */
@Override
public IValue getValue() { public IValue getValue() {
CStackFrame frame = (CStackFrame)getStackFrame(); CStackFrame frame = (CStackFrame)getStackFrame();
try { try {
@ -173,10 +179,12 @@ public class CExpression extends CLocalVariable implements IExpression {
return fValue; return fValue;
} }
@Override
protected ICStackFrame getStackFrame() { protected ICStackFrame getStackFrame() {
return fStackFrame; return fStackFrame;
} }
@Override
protected void resetValue() { protected void resetValue() {
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
((AbstractCValue)fValue).reset(); ((AbstractCValue)fValue).reset();
@ -202,6 +210,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#getExpressionString() * @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#getExpressionString()
*/ */
@Override
public String getExpressionString() throws DebugException { public String getExpressionString() throws DebugException {
return getExpressionText(); return getExpressionText();
} }
@ -209,6 +218,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#dispose() * @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#dispose()
*/ */
@Override
public void dispose() { public void dispose() {
if ( fCDIExpression != null ) { if ( fCDIExpression != null ) {
try { try {
@ -229,6 +239,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICVariable#getType() * @see org.eclipse.cdt.debug.core.model.ICVariable#getType()
*/ */
@Override
public ICType getType() throws DebugException { public ICType getType() throws DebugException {
if ( isDisposed() ) if ( isDisposed() )
return null; return null;
@ -245,6 +256,7 @@ public class CExpression extends CLocalVariable implements IExpression {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName() * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName()
*/ */
@Override
public String getReferenceTypeName() throws DebugException { public String getReferenceTypeName() throws DebugException {
ICType type = getType(); ICType type = getType();
return ( type != null ) ? type.getName() : ""; //$NON-NLS-1$ return ( type != null ) ? type.getName() : ""; //$NON-NLS-1$

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalValue.java
View file

@ -31,6 +31,7 @@ public class CGlobalValue extends CValue
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#hasVariables() * @see org.eclipse.debug.core.model.IValue#hasVariables()
*/ */
@Override
public boolean hasVariables() throws DebugException public boolean hasVariables() throws DebugException
{ {
if ( fHasChildren == null ) if ( fHasChildren == null )

24
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CGlobalVariable.java
View file

@ -80,6 +80,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
setCDIVariable( (varObject instanceof ICDIVariable) ? (ICDIVariable)varObject : null ); setCDIVariable( (varObject instanceof ICDIVariable) ? (ICDIVariable)varObject : null );
} }
@Override
public IInternalVariable createShadow( int start, int length ) throws DebugException { public IInternalVariable createShadow( int start, int length ) throws DebugException {
IInternalVariable iv = null; IInternalVariable iv = null;
try { try {
@ -91,6 +92,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
return iv; return iv;
} }
@Override
public IInternalVariable createShadow( String type ) throws DebugException { public IInternalVariable createShadow( String type ) throws DebugException {
IInternalVariable iv = null; IInternalVariable iv = null;
try { try {
@ -129,6 +131,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
fCDIVariableObject = variableObject; fCDIVariableObject = variableObject;
} }
@Override
public String getQualifiedName() throws DebugException { public String getQualifiedName() throws DebugException {
if ( fQualifiedName == null ) { if ( fQualifiedName == null ) {
try { try {
@ -141,6 +144,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
return fQualifiedName; return fQualifiedName;
} }
@Override
public CType getType() throws DebugException { public CType getType() throws DebugException {
if ( fType == null ) { if ( fType == null ) {
ICDIVariableDescriptor varObject = getCDIVariableObject(); ICDIVariableDescriptor varObject = getCDIVariableObject();
@ -175,14 +179,17 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
fType = null; fType = null;
} }
@Override
public void dispose( boolean destroy ) { public void dispose( boolean destroy ) {
invalidate( destroy ); invalidate( destroy );
} }
@Override
public boolean isSameVariable( ICDIVariable cdiVar ) { public boolean isSameVariable( ICDIVariable cdiVar ) {
return ( fCDIVariable != null ) ? fCDIVariable.equals( cdiVar ) : false; return ( fCDIVariable != null ) ? fCDIVariable.equals( cdiVar ) : false;
} }
@Override
public int sizeof() { public int sizeof() {
if ( getCDIVariableObject() != null ) { if ( getCDIVariableObject() != null ) {
try { try {
@ -194,10 +201,12 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
return 0; return 0;
} }
@Override
public boolean isArgument() { public boolean isArgument() {
return ( getCDIVariableObject() instanceof ICDIArgumentDescriptor ); return ( getCDIVariableObject() instanceof ICDIArgumentDescriptor );
} }
@Override
public void setValue( String expression ) throws DebugException { public void setValue( String expression ) throws DebugException {
ICDIVariable cdiVariable = null; ICDIVariable cdiVariable = null;
try { try {
@ -212,6 +221,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
} }
} }
@Override
public synchronized ICValue getValue() throws DebugException { public synchronized ICValue getValue() throws DebugException {
if ( fValue.equals( CValueFactory.NULL_VALUE ) ) { if ( fValue.equals( CValueFactory.NULL_VALUE ) ) {
ICDIVariable var = getCDIVariable(); ICDIVariable var = getCDIVariable();
@ -244,6 +254,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
return fValue; return fValue;
} }
@Override
public void invalidateValue() { public void invalidateValue() {
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
((AbstractCValue)fValue).dispose(); ((AbstractCValue)fValue).dispose();
@ -251,10 +262,12 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
} }
} }
@Override
public boolean isChanged() { public boolean isChanged() {
return fChanged; return fChanged;
} }
@Override
public synchronized void setChanged( boolean changed ) { public synchronized void setChanged( boolean changed ) {
if ( changed ) { if ( changed ) {
invalidateValue(); invalidateValue();
@ -265,6 +278,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
fChanged = changed; fChanged = changed;
} }
@Override
public synchronized void preserve() { public synchronized void preserve() {
setChanged( false ); setChanged( false );
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
@ -280,12 +294,14 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
fVariable = variable; fVariable = variable;
} }
@Override
public void resetValue() { public void resetValue() {
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
((AbstractCValue)fValue).reset(); ((AbstractCValue)fValue).reset();
} }
} }
@Override
public boolean isEditable() throws DebugException { public boolean isEditable() throws DebugException {
ICDIVariable var = getCDIVariable(); ICDIVariable var = getCDIVariable();
if ( var != null ) { if ( var != null ) {
@ -302,6 +318,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
* Compares the underlying variable objects. * Compares the underlying variable objects.
* @see java.lang.Object#equals(java.lang.Object) * @see java.lang.Object#equals(java.lang.Object)
*/ */
@Override
public boolean equals( Object obj ) { public boolean equals( Object obj ) {
if ( obj instanceof InternalVariable ) { if ( obj instanceof InternalVariable ) {
return getCDIVariableObject().equals( ((InternalVariable)obj).getCDIVariableObject() ); return getCDIVariableObject().equals( ((InternalVariable)obj).getCDIVariableObject() );
@ -309,10 +326,12 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
return false; return false;
} }
@Override
public boolean isSameDescriptor( ICDIVariableDescriptor desc ) { public boolean isSameDescriptor( ICDIVariableDescriptor desc ) {
return getCDIVariableObject().equals( desc ); return getCDIVariableObject().equals( desc );
} }
@Override
public ICDIObject getCdiObject() { public ICDIObject getCdiObject() {
return fCDIVariable; return fCDIVariable;
} }
@ -342,6 +361,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable() * @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable()
*/ */
@Override
public boolean canEnableDisable() { public boolean canEnableDisable() {
return true; return true;
} }
@ -349,6 +369,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
for( int i = 0; i < events.length; i++ ) { for( int i = 0; i < events.length; i++ ) {
ICDIEvent event = events[i]; ICDIEvent event = events[i];
@ -368,6 +389,7 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICGlobalVariable#getDescriptor() * @see org.eclipse.cdt.debug.core.model.ICGlobalVariable#getDescriptor()
*/ */
@Override
public IGlobalVariableDescriptor getDescriptor() { public IGlobalVariableDescriptor getDescriptor() {
return fDescriptor; return fDescriptor;
} }
@ -375,11 +397,13 @@ public class CGlobalVariable extends CVariable implements ICGlobalVariable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#dispose() * @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#dispose()
*/ */
@Override
public void dispose() { public void dispose() {
internalDispose( true ); internalDispose( true );
setDisposed( true ); setDisposed( true );
} }
@Override
protected void createOriginal( ICDIVariableDescriptor vo ) { protected void createOriginal( ICDIVariableDescriptor vo ) {
if ( vo != null ) { if ( vo != null ) {
setName( vo.getName() ); setName( vo.getName() );

14
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CIndexedValue.java
View file

@ -72,6 +72,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#setChanged(boolean) * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#setChanged(boolean)
*/ */
@Override
protected void setChanged( boolean changed ) { protected void setChanged( boolean changed ) {
for (IVariable var : fVariables.values()) { for (IVariable var : fVariables.values()) {
((AbstractCVariable)var).setChanged( changed ); ((AbstractCVariable)var).setChanged( changed );
@ -81,6 +82,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#dispose() * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#dispose()
*/ */
@Override
public void dispose() { public void dispose() {
for (IVariable var : fVariables.values()) { for (IVariable var : fVariables.values()) {
((AbstractCVariable)var).dispose(); ((AbstractCVariable)var).dispose();
@ -90,6 +92,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#reset() * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#reset()
*/ */
@Override
protected void reset() { protected void reset() {
for (IVariable var : fVariables.values()) { for (IVariable var : fVariables.values()) {
((AbstractCVariable)var).resetValue(); ((AbstractCVariable)var).resetValue();
@ -99,6 +102,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#preserve() * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#preserve()
*/ */
@Override
protected void preserve() { protected void preserve() {
resetStatus(); resetStatus();
for (IVariable var : fVariables.values()) { for (IVariable var : fVariables.values()) {
@ -109,6 +113,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICValue#getType() * @see org.eclipse.cdt.debug.core.model.ICValue#getType()
*/ */
@Override
public ICType getType() throws DebugException { public ICType getType() throws DebugException {
if ( fType == null ) { if ( fType == null ) {
synchronized( this ) { synchronized( this ) {
@ -130,6 +135,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getReferenceTypeName() * @see org.eclipse.debug.core.model.IValue#getReferenceTypeName()
*/ */
@Override
public String getReferenceTypeName() throws DebugException { public String getReferenceTypeName() throws DebugException {
ICType type = getType(); ICType type = getType();
return ( type != null ) ? type.getName() : ""; //$NON-NLS-1$ 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() * @see org.eclipse.debug.core.model.IValue#getValueString()
*/ */
@Override
public String getValueString() throws DebugException { public String getValueString() throws DebugException {
if ( fCDIValue instanceof ICDIPointerValue ) { if ( fCDIValue instanceof ICDIPointerValue ) {
try { try {
@ -170,6 +177,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#isAllocated() * @see org.eclipse.debug.core.model.IValue#isAllocated()
*/ */
@Override
public boolean isAllocated() throws DebugException { public boolean isAllocated() throws DebugException {
return true; return true;
} }
@ -177,6 +185,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getVariables() * @see org.eclipse.debug.core.model.IValue#getVariables()
*/ */
@Override
public IVariable[] getVariables() throws DebugException { public IVariable[] getVariables() throws DebugException {
return getVariables0( getInitialOffset(), getSize() ); return getVariables0( getInitialOffset(), getSize() );
} }
@ -184,6 +193,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#hasVariables() * @see org.eclipse.debug.core.model.IValue#hasVariables()
*/ */
@Override
public boolean hasVariables() throws DebugException { public boolean hasVariables() throws DebugException {
return getSize() > 0; return getSize() > 0;
} }
@ -191,6 +201,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IIndexedValue#getVariable(int) * @see org.eclipse.debug.core.model.IIndexedValue#getVariable(int)
*/ */
@Override
public IVariable getVariable( int offset ) throws DebugException { public IVariable getVariable( int offset ) throws DebugException {
if ( offset >= getSize() ) { if ( offset >= getSize() ) {
requestFailed( CoreModelMessages.getString( "CIndexedValue.0" ), null ); //$NON-NLS-1$ requestFailed( CoreModelMessages.getString( "CIndexedValue.0" ), null ); //$NON-NLS-1$
@ -201,6 +212,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IIndexedValue#getVariables(int, int) * @see org.eclipse.debug.core.model.IIndexedValue#getVariables(int, int)
*/ */
@Override
public IVariable[] getVariables( int offset, int length ) throws DebugException { public IVariable[] getVariables( int offset, int length ) throws DebugException {
if ( offset >= getSize() ) { if ( offset >= getSize() ) {
requestFailed( CoreModelMessages.getString( "CIndexedValue.1" ), null ); //$NON-NLS-1$ requestFailed( CoreModelMessages.getString( "CIndexedValue.1" ), null ); //$NON-NLS-1$
@ -214,6 +226,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IIndexedValue#getSize() * @see org.eclipse.debug.core.model.IIndexedValue#getSize()
*/ */
@Override
public int getSize() throws DebugException { public int getSize() throws DebugException {
return getSize0(); return getSize0();
} }
@ -221,6 +234,7 @@ public class CIndexedValue extends AbstractCValue implements IIndexedValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IIndexedValue#getInitialOffset() * @see org.eclipse.debug.core.model.IIndexedValue#getInitialOffset()
*/ */
@Override
public int getInitialOffset() { public int getInitialOffset() {
return fOffset; return fOffset;
} }

20
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CLocalVariable.java
View file

@ -73,6 +73,7 @@ public class CLocalVariable extends CVariable {
setCDIVariable( (varObject instanceof ICDIVariable) ? (ICDIVariable)varObject : null ); setCDIVariable( (varObject instanceof ICDIVariable) ? (ICDIVariable)varObject : null );
} }
@Override
public IInternalVariable createShadow( int start, int length ) throws DebugException { public IInternalVariable createShadow( int start, int length ) throws DebugException {
IInternalVariable iv = null; IInternalVariable iv = null;
try { try {
@ -84,6 +85,7 @@ public class CLocalVariable extends CVariable {
return iv; return iv;
} }
@Override
public IInternalVariable createShadow( String type ) throws DebugException { public IInternalVariable createShadow( String type ) throws DebugException {
IInternalVariable iv = null; IInternalVariable iv = null;
try { try {
@ -122,6 +124,7 @@ public class CLocalVariable extends CVariable {
fCDIVariableObject = variableObject; fCDIVariableObject = variableObject;
} }
@Override
public String getQualifiedName() throws DebugException { public String getQualifiedName() throws DebugException {
if ( fQualifiedName == null ) { if ( fQualifiedName == null ) {
try { try {
@ -134,6 +137,7 @@ public class CLocalVariable extends CVariable {
return fQualifiedName; return fQualifiedName;
} }
@Override
public CType getType() throws DebugException { public CType getType() throws DebugException {
if ( fType == null ) { if ( fType == null ) {
ICDIVariableDescriptor varObject = getCDIVariableObject(); ICDIVariableDescriptor varObject = getCDIVariableObject();
@ -168,14 +172,17 @@ public class CLocalVariable extends CVariable {
fType = null; fType = null;
} }
@Override
public void dispose( boolean destroy ) { public void dispose( boolean destroy ) {
invalidate( destroy ); invalidate( destroy );
} }
@Override
public boolean isSameVariable( ICDIVariable cdiVar ) { public boolean isSameVariable( ICDIVariable cdiVar ) {
return ( fCDIVariable != null ) ? fCDIVariable.equals( cdiVar ) : false; return ( fCDIVariable != null ) ? fCDIVariable.equals( cdiVar ) : false;
} }
@Override
public int sizeof() { public int sizeof() {
if ( getCDIVariableObject() != null ) { if ( getCDIVariableObject() != null ) {
try { try {
@ -187,10 +194,12 @@ public class CLocalVariable extends CVariable {
return 0; return 0;
} }
@Override
public boolean isArgument() { public boolean isArgument() {
return ( getCDIVariableObject() instanceof ICDIArgumentDescriptor ); return ( getCDIVariableObject() instanceof ICDIArgumentDescriptor );
} }
@Override
public void setValue( String expression ) throws DebugException { public void setValue( String expression ) throws DebugException {
ICDIVariable cdiVariable = null; ICDIVariable cdiVariable = null;
try { try {
@ -205,6 +214,7 @@ public class CLocalVariable extends CVariable {
} }
} }
@Override
public synchronized ICValue getValue() throws DebugException { public synchronized ICValue getValue() throws DebugException {
if ( fValue.equals( CValueFactory.NULL_VALUE ) ) { if ( fValue.equals( CValueFactory.NULL_VALUE ) ) {
ICDIVariable var = getCDIVariable(); ICDIVariable var = getCDIVariable();
@ -237,6 +247,7 @@ public class CLocalVariable extends CVariable {
return fValue; return fValue;
} }
@Override
public void invalidateValue() { public void invalidateValue() {
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
((AbstractCValue)fValue).dispose(); ((AbstractCValue)fValue).dispose();
@ -244,10 +255,12 @@ public class CLocalVariable extends CVariable {
} }
} }
@Override
public boolean isChanged() { public boolean isChanged() {
return fChanged; return fChanged;
} }
@Override
public synchronized void setChanged( boolean changed ) { public synchronized void setChanged( boolean changed ) {
if ( changed ) { if ( changed ) {
invalidateValue(); invalidateValue();
@ -258,6 +271,7 @@ public class CLocalVariable extends CVariable {
fChanged = changed; fChanged = changed;
} }
@Override
public synchronized void preserve() { public synchronized void preserve() {
setChanged( false ); setChanged( false );
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
@ -273,12 +287,14 @@ public class CLocalVariable extends CVariable {
fVariable = variable; fVariable = variable;
} }
@Override
public void resetValue() { public void resetValue() {
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
((AbstractCValue)fValue).reset(); ((AbstractCValue)fValue).reset();
} }
} }
@Override
public boolean isEditable() throws DebugException { public boolean isEditable() throws DebugException {
ICDIVariable var = getCDIVariable(); ICDIVariable var = getCDIVariable();
if ( var != null ) { if ( var != null ) {
@ -295,6 +311,7 @@ public class CLocalVariable extends CVariable {
* Compares the underlying variable objects. * Compares the underlying variable objects.
* @see java.lang.Object#equals(java.lang.Object) * @see java.lang.Object#equals(java.lang.Object)
*/ */
@Override
public boolean equals( Object obj ) { public boolean equals( Object obj ) {
if ( obj instanceof InternalVariable ) { if ( obj instanceof InternalVariable ) {
return getCDIVariableObject().equals( ((InternalVariable)obj).getCDIVariableObject() ); return getCDIVariableObject().equals( ((InternalVariable)obj).getCDIVariableObject() );
@ -302,9 +319,11 @@ public class CLocalVariable extends CVariable {
return false; return false;
} }
@Override
public boolean isSameDescriptor( ICDIVariableDescriptor desc ) { public boolean isSameDescriptor( ICDIVariableDescriptor desc ) {
return getCDIVariableObject().equals( desc ); return getCDIVariableObject().equals( desc );
} }
@Override
public ICDIObject getCdiObject() { public ICDIObject getCdiObject() {
return fCDIVariable; return fCDIVariable;
} }
@ -324,6 +343,7 @@ public class CLocalVariable extends CVariable {
super( parent, cdiVariableObject ); super( parent, cdiVariableObject );
} }
@Override
protected void createOriginal( ICDIVariableDescriptor vo ) { protected void createOriginal( ICDIVariableDescriptor vo ) {
if ( vo != null ) { if ( vo != null ) {
setName( vo.getName() ); setName( vo.getName() );

26
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java
View file

@ -145,6 +145,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getExpression() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getExpression()
*/ */
@Override
public String getExpression() { public String getExpression() {
return fExpression; return fExpression;
} }
@ -152,6 +153,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigBaseAddress() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigBaseAddress()
*/ */
@Override
public BigInteger getBigBaseAddress() { public BigInteger getBigBaseAddress() {
return fBaseAddress; return fBaseAddress;
} }
@ -159,6 +161,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressSize() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressSize()
*/ */
@Override
public int getAddressSize() { public int getAddressSize() {
return ((CDebugTarget)getDebugTarget()).getAddressFactory().createAddress( getBigBaseAddress() ).getSize(); return ((CDebugTarget)getDebugTarget()).getAddressFactory().createAddress( getBigBaseAddress() ).getSize();
} }
@ -166,6 +169,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressableSize() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressableSize()
*/ */
@Override
public int getAddressableSize() throws DebugException { public int getAddressableSize() throws DebugException {
if (!fHaveWordSize) { if (!fHaveWordSize) {
synchronized (this) { synchronized (this) {
@ -194,6 +198,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportBaseAddressModification() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportBaseAddressModification()
*/ */
@Override
public boolean supportBaseAddressModification() { public boolean supportBaseAddressModification() {
return true; return true;
} }
@ -201,6 +206,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#setBaseAddress(java.math.BigInteger) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#setBaseAddress(java.math.BigInteger)
*/ */
@Override
public void setBaseAddress( BigInteger address ) throws DebugException { public void setBaseAddress( BigInteger address ) throws DebugException {
BigInteger current = fBaseAddress; BigInteger current = fBaseAddress;
if (current == address || (current != null && current.equals(address))) { if (current == address || (current != null && current.equals(address))) {
@ -213,6 +219,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromOffset(java.math.BigInteger, long) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromOffset(java.math.BigInteger, long)
*/ */
@Override
public MemoryByte[] getBytesFromOffset( BigInteger unitOffset, long addressableUnits ) throws DebugException { public MemoryByte[] getBytesFromOffset( BigInteger unitOffset, long addressableUnits ) throws DebugException {
return getBytesFromAddress(unitOffset.add(getBigBaseAddress()) , addressableUnits); return getBytesFromAddress(unitOffset.add(getBigBaseAddress()) , addressableUnits);
} }
@ -220,6 +227,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromAddress(java.math.BigInteger, long) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromAddress(java.math.BigInteger, long)
*/ */
@Override
public MemoryByte[] getBytesFromAddress( BigInteger address, long length ) throws DebugException { public MemoryByte[] getBytesFromAddress( BigInteger address, long length ) throws DebugException {
ICDIMemoryBlock cdiBlock = getCDIBlock(); ICDIMemoryBlock cdiBlock = getCDIBlock();
if ( fBytes == null || cdiBlock == null || if ( fBytes == null || cdiBlock == null ||
@ -278,6 +286,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockRetrieval() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockRetrieval()
*/ */
@Override
public IMemoryBlockRetrieval getMemoryBlockRetrieval() { public IMemoryBlockRetrieval getMemoryBlockRetrieval() {
return (IMemoryBlockRetrieval)getDebugTarget().getAdapter( IMemoryBlockRetrieval.class ); return (IMemoryBlockRetrieval)getDebugTarget().getAdapter( IMemoryBlockRetrieval.class );
} }
@ -285,6 +294,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
for( int i = 0; i < events.length; i++ ) { for( int i = 0; i < events.length; i++ ) {
ICDIEvent event = events[i]; ICDIEvent event = events[i];
@ -307,6 +317,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlock#getStartAddress() * @see org.eclipse.debug.core.model.IMemoryBlock#getStartAddress()
*/ */
@Override
public long getStartAddress() { public long getStartAddress() {
return 0; return 0;
} }
@ -314,6 +325,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlock#getLength() * @see org.eclipse.debug.core.model.IMemoryBlock#getLength()
*/ */
@Override
public long getLength() { public long getLength() {
return 0; return 0;
} }
@ -321,6 +333,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlock#getBytes() * @see org.eclipse.debug.core.model.IMemoryBlock#getBytes()
*/ */
@Override
public byte[] getBytes() throws DebugException { public byte[] getBytes() throws DebugException {
return null; return null;
} }
@ -328,6 +341,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlock#supportsValueModification() * @see org.eclipse.debug.core.model.IMemoryBlock#supportsValueModification()
*/ */
@Override
public boolean supportsValueModification() { public boolean supportsValueModification() {
return true; return true;
} }
@ -335,6 +349,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlock#setValue(long, byte[]) * @see org.eclipse.debug.core.model.IMemoryBlock#setValue(long, byte[])
*/ */
@Override
public void setValue( long offset, byte[] bytes ) throws DebugException { public void setValue( long offset, byte[] bytes ) throws DebugException {
setValue( BigInteger.valueOf( offset ), bytes ); setValue( BigInteger.valueOf( offset ), bytes );
} }
@ -342,6 +357,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#setValue(java.math.BigInteger, byte[]) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#setValue(java.math.BigInteger, byte[])
*/ */
@Override
public void setValue( BigInteger offset, byte[] bytes ) throws DebugException { public void setValue( BigInteger offset, byte[] bytes ) throws DebugException {
ICDIMemoryBlock block = getCDIBlock(); ICDIMemoryBlock block = getCDIBlock();
if ( block != null ) { if ( block != null ) {
@ -466,6 +482,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportsChangeManagement() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportsChangeManagement()
*/ */
@Override
public boolean supportsChangeManagement() { public boolean supportsChangeManagement() {
return true; return true;
} }
@ -473,6 +490,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#connect(java.lang.Object) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#connect(java.lang.Object)
*/ */
@Override
public void connect( Object object ) { public void connect( Object object ) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@ -480,6 +498,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#disconnect(java.lang.Object) * @see org.eclipse.debug.core.model.IMemoryBlockExtension#disconnect(java.lang.Object)
*/ */
@Override
public void disconnect( Object object ) { public void disconnect( Object object ) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@ -487,6 +506,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getConnections() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getConnections()
*/ */
@Override
public Object[] getConnections() { public Object[] getConnections() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return new Object[0]; return new Object[0];
@ -495,6 +515,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#dispose() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#dispose()
*/ */
@Override
public void dispose() { public void dispose() {
fChanges.clear(); fChanges.clear();
ICDIMemoryBlock cdiBlock = getCDIBlock(); ICDIMemoryBlock cdiBlock = getCDIBlock();
@ -516,6 +537,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/ */
@Override
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( IMemoryBlockRetrieval.class.equals( adapter ) ) if ( IMemoryBlockRetrieval.class.equals( adapter ) )
@ -526,6 +548,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockStartAddress() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockStartAddress()
*/ */
@Override
public BigInteger getMemoryBlockStartAddress() throws DebugException { public BigInteger getMemoryBlockStartAddress() throws DebugException {
return null; // return null to mean not bounded ... according to the spec 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) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockEndAddress() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockEndAddress()
*/ */
@Override
public BigInteger getMemoryBlockEndAddress() throws DebugException { public BigInteger getMemoryBlockEndAddress() throws DebugException {
return null;// return null to mean not bounded ... according to the spec 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) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigLength() * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigLength()
*/ */
@Override
public BigInteger getBigLength() throws DebugException { public BigInteger getBigLength() throws DebugException {
ICDIMemoryBlock block = getCDIBlock(); ICDIMemoryBlock block = getCDIBlock();
if ( block != null ) { if ( block != null ) {
@ -572,6 +597,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemorySpace
/** /**
* @see org.eclipse.cdt.debug.core.model.provisional.IMemorySpaceAwareMemoryBlock#getMemorySpaceID() * @see org.eclipse.cdt.debug.core.model.provisional.IMemorySpaceAwareMemoryBlock#getMemorySpaceID()
*/ */
@Override
public String getMemorySpaceID() { public String getMemorySpaceID() {
return fMemorySpaceID; return fMemorySpaceID;
} }

15
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java
View file

@ -142,6 +142,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#getType() * @see org.eclipse.cdt.debug.core.model.ICModule#getType()
*/ */
@Override
public int getType() { public int getType() {
return fType; return fType;
} }
@ -149,6 +150,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#getName() * @see org.eclipse.cdt.debug.core.model.ICModule#getName()
*/ */
@Override
public String getName() { public String getName() {
return fImageName.lastSegment().toString(); return fImageName.lastSegment().toString();
} }
@ -156,6 +158,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#getImageName() * @see org.eclipse.cdt.debug.core.model.ICModule#getImageName()
*/ */
@Override
public IPath getImageName() { public IPath getImageName() {
return fImageName; return fImageName;
} }
@ -163,6 +166,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#getSymbolsFileName() * @see org.eclipse.cdt.debug.core.model.ICModule#getSymbolsFileName()
*/ */
@Override
public IPath getSymbolsFileName() { public IPath getSymbolsFileName() {
return fSymbolsFileName; return fSymbolsFileName;
} }
@ -170,6 +174,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#setSymbolsFileName(org.eclipse.core.runtime.IPath) * @see org.eclipse.cdt.debug.core.model.ICModule#setSymbolsFileName(org.eclipse.core.runtime.IPath)
*/ */
@Override
public void setSymbolsFileName( IPath symbolsFile ) throws DebugException { public void setSymbolsFileName( IPath symbolsFile ) throws DebugException {
loadSymbolsFromFile( symbolsFile ); loadSymbolsFromFile( symbolsFile );
fSymbolsFileName = symbolsFile; fSymbolsFileName = symbolsFile;
@ -178,6 +183,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#getBaseAddress() * @see org.eclipse.cdt.debug.core.model.ICModule#getBaseAddress()
*/ */
@Override
public IAddress getBaseAddress() { public IAddress getBaseAddress() {
return ( fCDIObject instanceof ICDISharedLibrary ) ? getAddressFactory().createAddress( ((ICDISharedLibrary)fCDIObject).getStartAddress() ) : getAddressFactory().getZero(); return ( fCDIObject instanceof ICDISharedLibrary ) ? getAddressFactory().createAddress( ((ICDISharedLibrary)fCDIObject).getStartAddress() ) : getAddressFactory().getZero();
} }
@ -185,6 +191,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#getSize() * @see org.eclipse.cdt.debug.core.model.ICModule#getSize()
*/ */
@Override
public long getSize() { public long getSize() {
long result = 0; long result = 0;
if ( fCDIObject instanceof ICDISharedLibrary ) { if ( fCDIObject instanceof ICDISharedLibrary ) {
@ -199,6 +206,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#areSymbolsLoaded() * @see org.eclipse.cdt.debug.core.model.ICModule#areSymbolsLoaded()
*/ */
@Override
public boolean areSymbolsLoaded() { public boolean areSymbolsLoaded() {
if (fCDIObject instanceof ICDISharedLibrary) if (fCDIObject instanceof ICDISharedLibrary)
return ((ICDISharedLibrary)fCDIObject).areSymbolsLoaded(); return ((ICDISharedLibrary)fCDIObject).areSymbolsLoaded();
@ -212,6 +220,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#canLoadSymbols() * @see org.eclipse.cdt.debug.core.model.ICModule#canLoadSymbols()
*/ */
@Override
public boolean canLoadSymbols() { public boolean canLoadSymbols() {
return ( getDebugTarget().isSuspended() && !areSymbolsLoaded() ); return ( getDebugTarget().isSuspended() && !areSymbolsLoaded() );
} }
@ -219,6 +228,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#loadSymbols() * @see org.eclipse.cdt.debug.core.model.ICModule#loadSymbols()
*/ */
@Override
public void loadSymbols() throws DebugException { public void loadSymbols() throws DebugException {
loadSymbolsFromFile( getSymbolsFileName() ); loadSymbolsFromFile( getSymbolsFileName() );
} }
@ -226,6 +236,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#getPlatform() * @see org.eclipse.cdt.debug.core.model.ICModule#getPlatform()
*/ */
@Override
public String getPlatform() { public String getPlatform() {
return ( fBinary != null ) ? fBinary.getCPU() : CoreModelMessages.getString( "CModule.1" ); //$NON-NLS-1$ 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) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#isLittleEndian() * @see org.eclipse.cdt.debug.core.model.ICModule#isLittleEndian()
*/ */
@Override
public boolean isLittleEndian() { public boolean isLittleEndian() {
return ( fBinary != null ) ? fBinary.isLittleEndian() : ((CDebugTarget)getDebugTarget()).isLittleEndian(); return ( fBinary != null ) ? fBinary.isLittleEndian() : ((CDebugTarget)getDebugTarget()).isLittleEndian();
} }
@ -240,6 +252,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#getAddressFactory() * @see org.eclipse.cdt.debug.core.model.ICModule#getAddressFactory()
*/ */
@Override
public IAddressFactory getAddressFactory() { public IAddressFactory getAddressFactory() {
return ((CDebugTarget)getDebugTarget()).getAddressFactory(); return ((CDebugTarget)getDebugTarget()).getAddressFactory();
} }
@ -247,6 +260,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICModule#getCPU() * @see org.eclipse.cdt.debug.core.model.ICModule#getCPU()
*/ */
@Override
public String getCPU() { public String getCPU() {
return ( fBinary != null ) ? fBinary.getCPU() : null; return ( fBinary != null ) ? fBinary.getCPU() : null;
} }
@ -254,6 +268,7 @@ public class CModule extends CDebugElement implements ICModule {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( ICElement.class.equals( adapter ) ) { if ( ICElement.class.equals( adapter ) ) {
return getCElement(); return getCElement();

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModuleManager.java
View file

@ -51,14 +51,17 @@ public class CModuleManager extends PlatformObject implements IModuleRetrieval {
fModules = new ArrayList( 5 ); fModules = new ArrayList( 5 );
} }
@Override
public boolean hasModules() throws DebugException { public boolean hasModules() throws DebugException {
return !fModules.isEmpty(); return !fModules.isEmpty();
} }
@Override
public ICModule[] getModules() throws DebugException { public ICModule[] getModules() throws DebugException {
return (ICModule[])fModules.toArray( new ICModule[fModules.size()] ); return (ICModule[])fModules.toArray( new ICModule[fModules.size()] );
} }
@Override
public void loadSymbolsForAllModules() throws DebugException { public void loadSymbolsForAllModules() throws DebugException {
MultiStatus ms = new MultiStatus( CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, CoreModelMessages.getString( "CModuleManager.0" ), null ); //$NON-NLS-1$ MultiStatus ms = new MultiStatus( CDIDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, CoreModelMessages.getString( "CModuleManager.0" ), null ); //$NON-NLS-1$
Iterator it = fModules.iterator(); Iterator it = fModules.iterator();
@ -157,6 +160,7 @@ public class CModuleManager extends PlatformObject implements IModuleRetrieval {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( adapter.equals( ICDebugTarget.class ) ) if ( adapter.equals( ICDebugTarget.class ) )
return getDebugTarget(); return getDebugTarget();

26
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
View file

@ -90,6 +90,7 @@ public class CRegister extends CVariable implements ICRegister {
setCDIRegister( (varObject instanceof ICDIRegister) ? (ICDIRegister)varObject : null ); setCDIRegister( (varObject instanceof ICDIRegister) ? (ICDIRegister)varObject : null );
} }
@Override
public IInternalVariable createShadow( int start, int length ) throws DebugException { public IInternalVariable createShadow( int start, int length ) throws DebugException {
IInternalVariable iv = null; IInternalVariable iv = null;
try { try {
@ -101,6 +102,7 @@ public class CRegister extends CVariable implements ICRegister {
return iv; return iv;
} }
@Override
public IInternalVariable createShadow( String type ) throws DebugException { public IInternalVariable createShadow( String type ) throws DebugException {
IInternalVariable iv = null; IInternalVariable iv = null;
try { try {
@ -139,6 +141,7 @@ public class CRegister extends CVariable implements ICRegister {
fCDIVariableObject = variableObject; fCDIVariableObject = variableObject;
} }
@Override
public String getQualifiedName() throws DebugException { public String getQualifiedName() throws DebugException {
if ( fQualifiedName == null ) { if ( fQualifiedName == null ) {
try { try {
@ -151,6 +154,7 @@ public class CRegister extends CVariable implements ICRegister {
return fQualifiedName; return fQualifiedName;
} }
@Override
public CType getType() throws DebugException { public CType getType() throws DebugException {
if ( fType == null ) { if ( fType == null ) {
ICDIVariableDescriptor varObject = getCDIVariableObject(); ICDIVariableDescriptor varObject = getCDIVariableObject();
@ -185,14 +189,17 @@ public class CRegister extends CVariable implements ICRegister {
fType = null; fType = null;
} }
@Override
public void dispose( boolean destroy ) { public void dispose( boolean destroy ) {
invalidate( destroy ); invalidate( destroy );
} }
@Override
public boolean isSameVariable( ICDIVariable cdiVar ) { public boolean isSameVariable( ICDIVariable cdiVar ) {
return ( fCDIRegister != null ) ? fCDIRegister.equals( cdiVar ) : false; return ( fCDIRegister != null ) ? fCDIRegister.equals( cdiVar ) : false;
} }
@Override
public int sizeof() { public int sizeof() {
if ( getCDIVariableObject() != null ) { if ( getCDIVariableObject() != null ) {
try { try {
@ -204,10 +211,12 @@ public class CRegister extends CVariable implements ICRegister {
return 0; return 0;
} }
@Override
public boolean isArgument() { public boolean isArgument() {
return ( getCDIVariableObject() instanceof ICDIArgumentDescriptor ); return ( getCDIVariableObject() instanceof ICDIArgumentDescriptor );
} }
@Override
public void setValue( String expression ) throws DebugException { public void setValue( String expression ) throws DebugException {
ICDIRegister cdiRegister = null; ICDIRegister cdiRegister = null;
try { try {
@ -222,6 +231,7 @@ public class CRegister extends CVariable implements ICRegister {
} }
} }
@Override
public synchronized ICValue getValue() throws DebugException { public synchronized ICValue getValue() throws DebugException {
CStackFrame frame = getCurrentStackFrame(); CStackFrame frame = getCurrentStackFrame();
if ( frame == null || frame.isDisposed() ) if ( frame == null || frame.isDisposed() )
@ -254,6 +264,7 @@ public class CRegister extends CVariable implements ICRegister {
return fValue; return fValue;
} }
@Override
public void invalidateValue() { public void invalidateValue() {
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
((AbstractCValue)fValue).dispose(); ((AbstractCValue)fValue).dispose();
@ -261,10 +272,12 @@ public class CRegister extends CVariable implements ICRegister {
} }
} }
@Override
public boolean isChanged() { public boolean isChanged() {
return fChanged; return fChanged;
} }
@Override
public synchronized void setChanged( boolean changed ) { public synchronized void setChanged( boolean changed ) {
if ( changed ) { if ( changed ) {
invalidateValue(); invalidateValue();
@ -275,6 +288,7 @@ public class CRegister extends CVariable implements ICRegister {
fChanged = changed; fChanged = changed;
} }
@Override
public synchronized void preserve() { public synchronized void preserve() {
setChanged( false ); setChanged( false );
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
@ -290,12 +304,14 @@ public class CRegister extends CVariable implements ICRegister {
fVariable = variable; fVariable = variable;
} }
@Override
public void resetValue() { public void resetValue() {
if ( fValue instanceof AbstractCValue ) { if ( fValue instanceof AbstractCValue ) {
((AbstractCValue)fValue).reset(); ((AbstractCValue)fValue).reset();
} }
} }
@Override
public boolean isEditable() throws DebugException { public boolean isEditable() throws DebugException {
ICDIRegister reg = getCDIRegister(); ICDIRegister reg = getCDIRegister();
if ( reg != null && reg.getTarget().getConfiguration().supportsRegisterModification() ) { if ( reg != null && reg.getTarget().getConfiguration().supportsRegisterModification() ) {
@ -311,6 +327,7 @@ public class CRegister extends CVariable implements ICRegister {
* Compares the underlying variable objects. * Compares the underlying variable objects.
* @see java.lang.Object#equals(java.lang.Object) * @see java.lang.Object#equals(java.lang.Object)
*/ */
@Override
public boolean equals( Object obj ) { public boolean equals( Object obj ) {
if ( obj instanceof InternalVariable ) { if ( obj instanceof InternalVariable ) {
return getCDIVariableObject().equals( ((InternalVariable)obj).getCDIVariableObject() ); return getCDIVariableObject().equals( ((InternalVariable)obj).getCDIVariableObject() );
@ -318,10 +335,12 @@ public class CRegister extends CVariable implements ICRegister {
return false; return false;
} }
@Override
public boolean isSameDescriptor( ICDIVariableDescriptor desc ) { public boolean isSameDescriptor( ICDIVariableDescriptor desc ) {
return getCDIVariableObject().equals( desc ); return getCDIVariableObject().equals( desc );
} }
@Override
public ICDIObject getCdiObject() { public ICDIObject getCdiObject() {
return fCDIRegister; return fCDIRegister;
} }
@ -348,6 +367,7 @@ public class CRegister extends CVariable implements ICRegister {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IRegister#getRegisterGroup() * @see org.eclipse.debug.core.model.IRegister#getRegisterGroup()
*/ */
@Override
public IRegisterGroup getRegisterGroup() throws DebugException { public IRegisterGroup getRegisterGroup() throws DebugException {
return (IRegisterGroup)getParent(); return (IRegisterGroup)getParent();
} }
@ -355,6 +375,7 @@ public class CRegister extends CVariable implements ICRegister {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.CVariable#isBookkeepingEnabled() * @see org.eclipse.cdt.debug.internal.core.model.CVariable#isBookkeepingEnabled()
*/ */
@Override
protected boolean isBookkeepingEnabled() { protected boolean isBookkeepingEnabled() {
boolean result = false; boolean result = false;
try { try {
@ -368,6 +389,7 @@ public class CRegister extends CVariable implements ICRegister {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable() * @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable()
*/ */
@Override
public boolean canEnableDisable() { public boolean canEnableDisable() {
return true; return true;
} }
@ -375,6 +397,7 @@ public class CRegister extends CVariable implements ICRegister {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
for( int i = 0; i < events.length; i++ ) { for( int i = 0; i < events.length; i++ ) {
ICDIEvent event = events[i]; ICDIEvent event = events[i];
@ -400,11 +423,13 @@ public class CRegister extends CVariable implements ICRegister {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#dispose() * @see org.eclipse.cdt.debug.internal.core.model.AbstractCVariable#dispose()
*/ */
@Override
public void dispose() { public void dispose() {
internalDispose( true ); internalDispose( true );
setDisposed( true ); setDisposed( true );
} }
@Override
protected ICStackFrame getStackFrame() { protected ICStackFrame getStackFrame() {
ICStackFrame frame = super.getStackFrame(); ICStackFrame frame = super.getStackFrame();
if (frame == null) if (frame == null)
@ -416,6 +441,7 @@ public class CRegister extends CVariable implements ICRegister {
return ((CDebugTarget)getDebugTarget()).getRegisterManager().getCurrentFrame(); return ((CDebugTarget)getDebugTarget()).getRegisterManager().getCurrentFrame();
} }
@Override
protected void createOriginal( ICDIVariableDescriptor vo ) { protected void createOriginal( ICDIVariableDescriptor vo ) {
if ( vo != null ) { if ( vo != null ) {
setName( vo.getName() ); setName( vo.getName() );

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterDescriptor.java
View file

@ -43,6 +43,7 @@ public class CRegisterDescriptor implements IRegisterDescriptor {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRegisterDescriptor#getName() * @see org.eclipse.cdt.debug.core.model.IRegisterDescriptor#getName()
*/ */
@Override
public String getName() { public String getName() {
return fName; return fName;
} }
@ -50,6 +51,7 @@ public class CRegisterDescriptor implements IRegisterDescriptor {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRegisterDescriptor#getGroupName() * @see org.eclipse.cdt.debug.core.model.IRegisterDescriptor#getGroupName()
*/ */
@Override
public String getGroupName() { public String getGroupName() {
return fGroupName; return fGroupName;
} }

11
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterGroup.java
View file

@ -69,6 +69,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IRegisterGroup#getName() * @see org.eclipse.debug.core.model.IRegisterGroup#getName()
*/ */
@Override
public String getName() throws DebugException { public String getName() throws DebugException {
return fName; return fName;
} }
@ -76,6 +77,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IRegisterGroup#getRegisters() * @see org.eclipse.debug.core.model.IRegisterGroup#getRegisters()
*/ */
@Override
public IRegister[] getRegisters() throws DebugException { public IRegister[] getRegisters() throws DebugException {
if ( fDisposed ) if ( fDisposed )
return new IRegister[0]; return new IRegister[0];
@ -95,6 +97,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IRegisterGroup#hasRegisters() * @see org.eclipse.debug.core.model.IRegisterGroup#hasRegisters()
*/ */
@Override
public boolean hasRegisters() throws DebugException { public boolean hasRegisters() throws DebugException {
return ( fRegisterDescriptors.length > 0 ); return ( fRegisterDescriptors.length > 0 );
} }
@ -118,6 +121,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( IEnableDisableTarget.class.equals( adapter ) ) if ( IEnableDisableTarget.class.equals( adapter ) )
return this; return this;
@ -127,6 +131,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IEnableDisableTarget#canEnableDisable() * @see org.eclipse.cdt.debug.core.model.IEnableDisableTarget#canEnableDisable()
*/ */
@Override
public boolean canEnableDisable() { public boolean canEnableDisable() {
return true; return true;
} }
@ -134,6 +139,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IEnableDisableTarget#isEnabled() * @see org.eclipse.cdt.debug.core.model.IEnableDisableTarget#isEnabled()
*/ */
@Override
public boolean isEnabled() { public boolean isEnabled() {
return fIsEnabled; return fIsEnabled;
} }
@ -141,6 +147,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IEnableDisableTarget#setEnabled(boolean) * @see org.eclipse.cdt.debug.core.model.IEnableDisableTarget#setEnabled(boolean)
*/ */
@Override
public void setEnabled( boolean enabled ) throws DebugException { public void setEnabled( boolean enabled ) throws DebugException {
if ( fRegisters != null ) { if ( fRegisters != null ) {
synchronized( fRegisters ) { synchronized( fRegisters ) {
@ -157,6 +164,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
fireChangeEvent( DebugEvent.CONTENT ); fireChangeEvent( DebugEvent.CONTENT );
} }
@Override
public String getMemento() throws CoreException { public String getMemento() throws CoreException {
Document document = DebugPlugin.newDocument(); Document document = DebugPlugin.newDocument();
Element element = document.createElement( ELEMENT_REGISTER_GROUP ); Element element = document.createElement( ELEMENT_REGISTER_GROUP );
@ -172,6 +180,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
return DebugPlugin.serializeDocument( document ); return DebugPlugin.serializeDocument( document );
} }
@Override
public void initializeFromMemento( String memento ) throws CoreException { public void initializeFromMemento( String memento ) throws CoreException {
Node node = DebugPlugin.parseDocument( memento ); Node node = DebugPlugin.parseDocument( memento );
if ( node.getNodeType() != Node.ELEMENT_NODE ) { if ( node.getNodeType() != Node.ELEMENT_NODE ) {
@ -227,6 +236,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IPersistableRegisterGroup#setRegisterDescriptors(org.eclipse.cdt.debug.core.model.IRegisterDescriptor[]) * @see org.eclipse.cdt.debug.core.model.IPersistableRegisterGroup#setRegisterDescriptors(org.eclipse.cdt.debug.core.model.IRegisterDescriptor[])
*/ */
@Override
public void setRegisterDescriptors( IRegisterDescriptor[] registerDescriptors ) { public void setRegisterDescriptors( IRegisterDescriptor[] registerDescriptors ) {
invalidate(); invalidate();
fRegisterDescriptors = registerDescriptors; fRegisterDescriptors = registerDescriptors;
@ -235,6 +245,7 @@ public class CRegisterGroup extends CDebugElement implements IPersistableRegiste
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IPersistableRegisterGroup#getRegisterDescriptors() * @see org.eclipse.cdt.debug.core.model.IPersistableRegisterGroup#getRegisterDescriptors()
*/ */
@Override
public IRegisterDescriptor[] getRegisterDescriptors() { public IRegisterDescriptor[] getRegisterDescriptors() {
return fRegisterDescriptors; return fRegisterDescriptors;
} }

9
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CSignal.java
View file

@ -40,6 +40,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICSignal#getDescription() * @see org.eclipse.cdt.debug.core.model.ICSignal#getDescription()
*/ */
@Override
public String getDescription() throws DebugException public String getDescription() throws DebugException
{ {
return getCDISignal().getDescription(); return getCDISignal().getDescription();
@ -48,6 +49,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICSignal#getName() * @see org.eclipse.cdt.debug.core.model.ICSignal#getName()
*/ */
@Override
public String getName() throws DebugException public String getName() throws DebugException
{ {
return getCDISignal().getName(); return getCDISignal().getName();
@ -56,6 +58,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICSignal#isPassEnabled() * @see org.eclipse.cdt.debug.core.model.ICSignal#isPassEnabled()
*/ */
@Override
public boolean isPassEnabled() throws DebugException public boolean isPassEnabled() throws DebugException
{ {
return !getCDISignal().isIgnore(); return !getCDISignal().isIgnore();
@ -64,6 +67,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICSignal#isStopEnabled() * @see org.eclipse.cdt.debug.core.model.ICSignal#isStopEnabled()
*/ */
@Override
public boolean isStopEnabled() throws DebugException public boolean isStopEnabled() throws DebugException
{ {
return getCDISignal().isStopSet(); return getCDISignal().isStopSet();
@ -72,6 +76,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICSignal#setPassEnabled(boolean) * @see org.eclipse.cdt.debug.core.model.ICSignal#setPassEnabled(boolean)
*/ */
@Override
public void setPassEnabled( boolean enable ) throws DebugException public void setPassEnabled( boolean enable ) throws DebugException
{ {
handle( enable, isStopEnabled() ); handle( enable, isStopEnabled() );
@ -80,6 +85,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICSignal#setStopEnabled(boolean) * @see org.eclipse.cdt.debug.core.model.ICSignal#setStopEnabled(boolean)
*/ */
@Override
public void setStopEnabled( boolean enable ) throws DebugException public void setStopEnabled( boolean enable ) throws DebugException
{ {
handle( isPassEnabled(), enable ); handle( isPassEnabled(), enable );
@ -88,6 +94,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(ICDIEvent) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(ICDIEvent)
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) public void handleDebugEvents( ICDIEvent[] events )
{ {
} }
@ -103,6 +110,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICSignal#signal() * @see org.eclipse.cdt.debug.core.model.ICSignal#signal()
*/ */
@Override
public void signal() throws DebugException public void signal() throws DebugException
{ {
try try
@ -132,6 +140,7 @@ public class CSignal extends CDebugElement implements ICSignal, ICDIEventListene
} }
} }
@Override
public boolean canModify() { public boolean canModify() {
// TODO add canModify method to ICDISignal // TODO add canModify method to ICDISignal
return true; return true;

55
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java
View file

@ -109,6 +109,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#getThread() * @see org.eclipse.debug.core.model.IStackFrame#getThread()
*/ */
@Override
public IThread getThread() { public IThread getThread() {
return fThread; return fThread;
} }
@ -116,6 +117,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#getVariables() * @see org.eclipse.debug.core.model.IStackFrame#getVariables()
*/ */
@Override
public IVariable[] getVariables() throws DebugException { public IVariable[] getVariables() throws DebugException {
if ( isDisposed() ) { if ( isDisposed() ) {
return new IVariable[0]; return new IVariable[0];
@ -186,6 +188,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#hasVariables() * @see org.eclipse.debug.core.model.IStackFrame#hasVariables()
*/ */
@Override
public boolean hasVariables() throws DebugException { public boolean hasVariables() throws DebugException {
return ( isDisposed() ) ? false : (getVariables0().size() > 0 || getGlobals().length > 0); return ( isDisposed() ) ? false : (getVariables0().size() > 0 || getGlobals().length > 0);
} }
@ -193,6 +196,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#getLineNumber() * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber()
*/ */
@Override
public int getLineNumber() throws DebugException { public int getLineNumber() throws DebugException {
if ( isSuspended() ) { if ( isSuspended() ) {
ISourceLocator locator = ((CDebugTarget)getDebugTarget()).getSourceLocator(); ISourceLocator locator = ((CDebugTarget)getDebugTarget()).getSourceLocator();
@ -209,6 +213,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#getCharStart() * @see org.eclipse.debug.core.model.IStackFrame#getCharStart()
*/ */
@Override
public int getCharStart() throws DebugException { public int getCharStart() throws DebugException {
return -1; return -1;
} }
@ -216,6 +221,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#getCharEnd() * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd()
*/ */
@Override
public int getCharEnd() throws DebugException { public int getCharEnd() throws DebugException {
return -1; return -1;
} }
@ -223,6 +229,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#getName() * @see org.eclipse.debug.core.model.IStackFrame#getName()
*/ */
@Override
public String getName() throws DebugException { public String getName() throws DebugException {
final ICDIStackFrame cdiFrame = getCDIStackFrame(); final ICDIStackFrame cdiFrame = getCDIStackFrame();
if (cdiFrame == null) { if (cdiFrame == null) {
@ -250,6 +257,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups() * @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups()
*/ */
@Override
public IRegisterGroup[] getRegisterGroups() throws DebugException { public IRegisterGroup[] getRegisterGroups() throws DebugException {
return ( isDisposed() ) ? new IRegisterGroup[0] : ((CDebugTarget)getDebugTarget()).getRegisterGroups( this ); return ( isDisposed() ) ? new IRegisterGroup[0] : ((CDebugTarget)getDebugTarget()).getRegisterGroups( this );
} }
@ -257,6 +265,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups() * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups()
*/ */
@Override
public boolean hasRegisterGroups() throws DebugException { public boolean hasRegisterGroups() throws DebugException {
return ( isDisposed() ) ? false : ((CDebugTarget)getDebugTarget()).getRegisterGroups( this ).length > 0; return ( isDisposed() ) ? false : ((CDebugTarget)getDebugTarget()).getRegisterGroups( this ).length > 0;
} }
@ -264,12 +273,14 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#canStepInto() * @see org.eclipse.debug.core.model.IStep#canStepInto()
*/ */
@Override
public boolean canStepInto() { public boolean canStepInto() {
try { try {
return exists() /*&& isTopStackFrame()*/ && getThread().canStepInto(); return exists() /*&& isTopStackFrame()*/ && getThread().canStepInto();
@ -283,6 +294,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#canStepOver() * @see org.eclipse.debug.core.model.IStep#canStepOver()
*/ */
@Override
public boolean canStepOver() { public boolean canStepOver() {
try { try {
return exists() && getThread().canStepOver(); return exists() && getThread().canStepOver();
@ -296,6 +308,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#canStepReturn() * @see org.eclipse.debug.core.model.IStep#canStepReturn()
*/ */
@Override
public boolean canStepReturn() { public boolean canStepReturn() {
try { try {
if ( !exists() ) { if ( !exists() ) {
@ -316,6 +329,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#isStepping() * @see org.eclipse.debug.core.model.IStep#isStepping()
*/ */
@Override
public boolean isStepping() { public boolean isStepping() {
return getThread().isStepping(); return getThread().isStepping();
} }
@ -323,6 +337,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#stepInto() * @see org.eclipse.debug.core.model.IStep#stepInto()
*/ */
@Override
public void stepInto() throws DebugException { public void stepInto() throws DebugException {
if ( canStepInto() ) { if ( canStepInto() ) {
getThread().stepInto(); getThread().stepInto();
@ -332,6 +347,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#stepOver() * @see org.eclipse.debug.core.model.IStep#stepOver()
*/ */
@Override
public void stepOver() throws DebugException { public void stepOver() throws DebugException {
if ( canStepOver() ) { if ( canStepOver() ) {
getThread().stepOver(); getThread().stepOver();
@ -341,6 +357,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#stepReturn() * @see org.eclipse.debug.core.model.IStep#stepReturn()
*/ */
@Override
public void stepReturn() throws DebugException { public void stepReturn() throws DebugException {
if ( canStepReturn() ) { if ( canStepReturn() ) {
getThread().stepReturn(); getThread().stepReturn();
@ -350,6 +367,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#canResume() * @see org.eclipse.debug.core.model.ISuspendResume#canResume()
*/ */
@Override
public boolean canResume() { public boolean canResume() {
return getThread().canResume(); return getThread().canResume();
} }
@ -357,6 +375,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
*/ */
@Override
public boolean canSuspend() { public boolean canSuspend() {
return getThread().canSuspend(); return getThread().canSuspend();
} }
@ -364,6 +383,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
*/ */
@Override
public boolean isSuspended() { public boolean isSuspended() {
return getThread().isSuspended(); return getThread().isSuspended();
} }
@ -371,6 +391,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#resume() * @see org.eclipse.debug.core.model.ISuspendResume#resume()
*/ */
@Override
public void resume() throws DebugException { public void resume() throws DebugException {
getThread().resume(); getThread().resume();
} }
@ -378,6 +399,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#suspend() * @see org.eclipse.debug.core.model.ISuspendResume#suspend()
*/ */
@Override
public void suspend() throws DebugException { public void suspend() throws DebugException {
getThread().suspend(); getThread().suspend();
} }
@ -385,6 +407,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#canTerminate() * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/ */
@Override
public boolean canTerminate() { public boolean canTerminate() {
boolean exists = false; boolean exists = false;
try { try {
@ -399,6 +422,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#isTerminated() * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/ */
@Override
public boolean isTerminated() { public boolean isTerminated() {
return getThread().isTerminated(); return getThread().isTerminated();
} }
@ -406,6 +430,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#terminate() * @see org.eclipse.debug.core.model.ITerminate#terminate()
*/ */
@Override
public void terminate() throws DebugException { public void terminate() throws DebugException {
if ( getThread().canTerminate() ) { if ( getThread().canTerminate() ) {
getThread().terminate(); getThread().terminate();
@ -481,6 +506,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/** /**
* @see IAdaptable#getAdapter(Class) * @see IAdaptable#getAdapter(Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( adapter == IRunToLine.class ) { if ( adapter == IRunToLine.class ) {
return this; return this;
@ -604,6 +630,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICStackFrame#getAddress() * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getAddress()
*/ */
@Override
public IAddress getAddress() { public IAddress getAddress() {
IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory(); IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory();
final ICDIStackFrame cdiFrame = getCDIStackFrame(); final ICDIStackFrame cdiFrame = getCDIStackFrame();
@ -613,6 +640,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICStackFrame#getFile() * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getFile()
*/ */
@Override
public String getFile() { public String getFile() {
final ICDIStackFrame cdiFrame = getCDIStackFrame(); final ICDIStackFrame cdiFrame = getCDIStackFrame();
return cdiFrame != null ? cdiFrame.getLocator().getFile() : ""; //$NON-NLS-1$ return cdiFrame != null ? cdiFrame.getLocator().getFile() : ""; //$NON-NLS-1$
@ -621,6 +649,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICStackFrame#getFunction() * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getFunction()
*/ */
@Override
public String getFunction() { public String getFunction() {
final ICDIStackFrame cdiFrame = getCDIStackFrame(); final ICDIStackFrame cdiFrame = getCDIStackFrame();
return cdiFrame != null ? cdiFrame.getLocator().getFunction() : ""; //$NON-NLS-1$ return cdiFrame != null ? cdiFrame.getLocator().getFunction() : ""; //$NON-NLS-1$
@ -629,6 +658,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICStackFrame#getLevel() * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getLevel()
*/ */
@Override
public int getLevel() { public int getLevel() {
final ICDIStackFrame cdiFrame = getCDIStackFrame(); final ICDIStackFrame cdiFrame = getCDIStackFrame();
return cdiFrame != null ? cdiFrame.getLevel() : -1; return cdiFrame != null ? cdiFrame.getLevel() : -1;
@ -637,6 +667,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICStackFrame#getFrameLineNumber() * @see org.eclipse.cdt.debug.core.model.ICStackFrame#getFrameLineNumber()
*/ */
@Override
public int getFrameLineNumber() { public int getFrameLineNumber() {
final ICDIStackFrame cdiFrame = getCDIStackFrame(); final ICDIStackFrame cdiFrame = getCDIStackFrame();
return cdiFrame != null ? cdiFrame.getLocator().getLineNumber() : -1; return cdiFrame != null ? cdiFrame.getLocator().getLineNumber() : -1;
@ -680,6 +711,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRestart#canRestart() * @see org.eclipse.cdt.debug.core.model.IRestart#canRestart()
*/ */
@Override
public boolean canRestart() { public boolean canRestart() {
return getDebugTarget() instanceof IRestart && ((IRestart)getDebugTarget()).canRestart(); return getDebugTarget() instanceof IRestart && ((IRestart)getDebugTarget()).canRestart();
} }
@ -687,6 +719,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRestart#restart() * @see org.eclipse.cdt.debug.core.model.IRestart#restart()
*/ */
@Override
public void restart() throws DebugException { public void restart() throws DebugException {
if ( canRestart() ) { if ( canRestart() ) {
((IRestart)getDebugTarget()).restart(); ((IRestart)getDebugTarget()).restart();
@ -704,6 +737,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal() * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal()
*/ */
@Override
public boolean canResumeWithoutSignal() { public boolean canResumeWithoutSignal() {
return (getDebugTarget() instanceof IResumeWithoutSignal && ((IResumeWithoutSignal)getDebugTarget()).canResumeWithoutSignal()); return (getDebugTarget() instanceof IResumeWithoutSignal && ((IResumeWithoutSignal)getDebugTarget()).canResumeWithoutSignal());
} }
@ -711,6 +745,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal() * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal()
*/ */
@Override
public void resumeWithoutSignal() throws DebugException { public void resumeWithoutSignal() throws DebugException {
if ( canResumeWithoutSignal() ) { if ( canResumeWithoutSignal() ) {
((IResumeWithoutSignal)getDebugTarget()).resumeWithoutSignal(); ((IResumeWithoutSignal)getDebugTarget()).resumeWithoutSignal();
@ -720,6 +755,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICStackFrame#evaluateExpression(java.lang.String) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#evaluateExpression(java.lang.String)
*/ */
@Override
public IValue evaluateExpression( String expressionText ) throws DebugException { public IValue evaluateExpression( String expressionText ) throws DebugException {
if ( !isDisposed() ) { if ( !isDisposed() ) {
CExpression expression = getExpression( expressionText ); CExpression expression = getExpression( expressionText );
@ -741,6 +777,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see java.lang.Object#toString() * @see java.lang.Object#toString()
*/ */
@Override
public String toString() { public String toString() {
try { try {
return getName(); return getName();
@ -753,6 +790,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICStackFrame#evaluateExpressionToString(java.lang.String) * @see org.eclipse.cdt.debug.core.model.ICStackFrame#evaluateExpressionToString(java.lang.String)
*/ */
@Override
public String evaluateExpressionToString( String expression ) throws DebugException { public String evaluateExpressionToString( String expression ) throws DebugException {
try { try {
final ICDIStackFrame cdiFrame = getCDIStackFrame(); final ICDIStackFrame cdiFrame = getCDIStackFrame();
@ -769,6 +807,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICStackFrame#canEvaluate() * @see org.eclipse.cdt.debug.core.model.ICStackFrame#canEvaluate()
*/ */
@Override
public boolean canEvaluate() { public boolean canEvaluate() {
CDebugTarget target = ((CDebugTarget)getDebugTarget()); CDebugTarget target = ((CDebugTarget)getDebugTarget());
return target.supportsExpressionEvaluation() && isSuspended(); return target.supportsExpressionEvaluation() && isSuspended();
@ -823,6 +862,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(org.eclipse.core.resources.IFile, int) * @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(org.eclipse.core.resources.IFile, int)
*/ */
@Override
public boolean canRunToLine( IFile file, int lineNumber ) { public boolean canRunToLine( IFile file, int lineNumber ) {
return ((CThread)getThread()).canRunToLine( file, lineNumber ); return ((CThread)getThread()).canRunToLine( file, lineNumber );
} }
@ -830,6 +870,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToLine#runToLine(org.eclipse.core.resources.IFile, int, boolean) * @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 { public void runToLine( IFile file, int lineNumber, boolean skipBreakpoints ) throws DebugException {
if ( !canRunToLine( file, lineNumber ) ) if ( !canRunToLine( file, lineNumber ) )
return; return;
@ -839,6 +880,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(java.lang.String, int) * @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(java.lang.String, int)
*/ */
@Override
public boolean canRunToLine( String fileName, int lineNumber ) { public boolean canRunToLine( String fileName, int lineNumber ) {
return ((CThread)getThread()).canRunToLine( fileName, lineNumber ); return ((CThread)getThread()).canRunToLine( fileName, lineNumber );
} }
@ -846,6 +888,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToLine#runToLine(java.lang.String, int, boolean) * @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 { public void runToLine( String fileName, int lineNumber, boolean skipBreakpoints ) throws DebugException {
if ( !canRunToLine( fileName, lineNumber ) ) if ( !canRunToLine( fileName, lineNumber ) )
return; return;
@ -855,6 +898,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToAddress#canRunToAddress(org.eclipse.cdt.core.IAddress) * @see org.eclipse.cdt.debug.core.model.IRunToAddress#canRunToAddress(org.eclipse.cdt.core.IAddress)
*/ */
@Override
public boolean canRunToAddress( IAddress address ) { public boolean canRunToAddress( IAddress address ) {
return getThread().canResume(); return getThread().canResume();
} }
@ -862,6 +906,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToAddress#runToAddress(org.eclipse.cdt.core.IAddress, boolean) * @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 { public void runToAddress( IAddress address, boolean skipBreakpoints ) throws DebugException {
if ( !canRunToAddress( address ) ) if ( !canRunToAddress( address ) )
return; return;
@ -883,6 +928,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeAtLine#canResumeAtLine(org.eclipse.core.resources.IFile, int) * @see org.eclipse.cdt.debug.core.model.IResumeAtLine#canResumeAtLine(org.eclipse.core.resources.IFile, int)
*/ */
@Override
public boolean canResumeAtLine( IFile file, int lineNumber ) { public boolean canResumeAtLine( IFile file, int lineNumber ) {
return getThread().canResume(); return getThread().canResume();
} }
@ -890,6 +936,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeAtLine#resumeAtLine(org.eclipse.core.resources.IFile, int) * @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 { public void resumeAtLine( IFile file, int lineNumber ) throws DebugException {
if ( !canResumeAtLine( file, lineNumber ) ) if ( !canResumeAtLine( file, lineNumber ) )
return; return;
@ -899,6 +946,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeAtLine#canResumeAtLine(java.lang.String, int) * @see org.eclipse.cdt.debug.core.model.IResumeAtLine#canResumeAtLine(java.lang.String, int)
*/ */
@Override
public boolean canResumeAtLine( String fileName, int lineNumber ) { public boolean canResumeAtLine( String fileName, int lineNumber ) {
return getThread().canResume(); return getThread().canResume();
} }
@ -906,6 +954,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeAtLine#resumeAtLine(java.lang.String, int) * @see org.eclipse.cdt.debug.core.model.IResumeAtLine#resumeAtLine(java.lang.String, int)
*/ */
@Override
public void resumeAtLine( String fileName, int lineNumber ) throws DebugException { public void resumeAtLine( String fileName, int lineNumber ) throws DebugException {
if ( !canResumeAtLine( fileName, lineNumber ) ) if ( !canResumeAtLine( fileName, lineNumber ) )
return; return;
@ -923,6 +972,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeAtAddress#canResumeAtAddress(org.eclipse.cdt.core.IAddress) * @see org.eclipse.cdt.debug.core.model.IResumeAtAddress#canResumeAtAddress(org.eclipse.cdt.core.IAddress)
*/ */
@Override
public boolean canResumeAtAddress( IAddress address ) { public boolean canResumeAtAddress( IAddress address ) {
return getThread().canResume(); return getThread().canResume();
} }
@ -930,6 +980,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeAtAddress#resumeAtAddress(org.eclipse.cdt.core.IAddress) * @see org.eclipse.cdt.debug.core.model.IResumeAtAddress#resumeAtAddress(org.eclipse.cdt.core.IAddress)
*/ */
@Override
public void resumeAtAddress( IAddress address ) throws DebugException { public void resumeAtAddress( IAddress address ) throws DebugException {
if ( !canResumeAtAddress( address ) ) if ( !canResumeAtAddress( address ) )
return; return;
@ -945,6 +996,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IMoveToAddress#canMoveToAddress(org.eclipse.cdt.core.IAddress) * @see org.eclipse.cdt.debug.core.model.IMoveToAddress#canMoveToAddress(org.eclipse.cdt.core.IAddress)
*/ */
@Override
public boolean canMoveToAddress(IAddress address) { public boolean canMoveToAddress(IAddress address) {
return getThread().isSuspended() && (getCDIThread() instanceof ICDIExecuteMoveInstructionPointer); return getThread().isSuspended() && (getCDIThread() instanceof ICDIExecuteMoveInstructionPointer);
} }
@ -952,6 +1004,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IMoveToAddress#moveToAddress(org.eclipse.cdt.core.IAddress) * @see org.eclipse.cdt.debug.core.model.IMoveToAddress#moveToAddress(org.eclipse.cdt.core.IAddress)
*/ */
@Override
public void moveToAddress(IAddress address) throws DebugException { public void moveToAddress(IAddress address) throws DebugException {
if ( !canMoveToAddress( address ) ) if ( !canMoveToAddress( address ) )
return; return;
@ -968,6 +1021,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IMoveToLine#canMoveToLine(java.lang.String, int) * @see org.eclipse.cdt.debug.core.model.IMoveToLine#canMoveToLine(java.lang.String, int)
*/ */
@Override
public boolean canMoveToLine(String fileName, int lineNumber) { public boolean canMoveToLine(String fileName, int lineNumber) {
return getThread().isSuspended() && (getCDIThread() instanceof ICDIExecuteMoveInstructionPointer); return getThread().isSuspended() && (getCDIThread() instanceof ICDIExecuteMoveInstructionPointer);
} }
@ -975,6 +1029,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IMoveToLine#moveToLine(java.lang.String, int) * @see org.eclipse.cdt.debug.core.model.IMoveToLine#moveToLine(java.lang.String, int)
*/ */
@Override
public void moveToLine(String fileName, int lineNumber) throws DebugException { public void moveToLine(String fileName, int lineNumber) throws DebugException {
if ( !canMoveToLine( fileName, lineNumber ) ) if ( !canMoveToLine( fileName, lineNumber ) )
return; return;

32
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
View file

@ -123,6 +123,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IThread#getStackFrames() * @see org.eclipse.debug.core.model.IThread#getStackFrames()
*/ */
@Override
public IStackFrame[] getStackFrames() throws DebugException { public IStackFrame[] getStackFrames() throws DebugException {
List list = Collections.EMPTY_LIST; List list = Collections.EMPTY_LIST;
try { try {
@ -138,6 +139,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IThread#hasStackFrames() * @see org.eclipse.debug.core.model.IThread#hasStackFrames()
*/ */
@Override
public boolean hasStackFrames() throws DebugException { public boolean hasStackFrames() throws DebugException {
// Always return true to postpone the stack frames request. // Always return true to postpone the stack frames request.
// But not if the thread is already resumed. This fixes flickering in the Debug View. // 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) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IThread#getPriority() * @see org.eclipse.debug.core.model.IThread#getPriority()
*/ */
@Override
public int getPriority() throws DebugException { public int getPriority() throws DebugException {
return 0; return 0;
} }
@ -368,6 +371,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IThread#getTopStackFrame() * @see org.eclipse.debug.core.model.IThread#getTopStackFrame()
*/ */
@Override
public IStackFrame getTopStackFrame() throws DebugException { public IStackFrame getTopStackFrame() throws DebugException {
List c = computeStackFrames(); List c = computeStackFrames();
return (c.isEmpty()) ? null : (IStackFrame)c.get( 0 ); return (c.isEmpty()) ? null : (IStackFrame)c.get( 0 );
@ -376,6 +380,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IThread#getName() * @see org.eclipse.debug.core.model.IThread#getName()
*/ */
@Override
public String getName() throws DebugException { public String getName() throws DebugException {
final ICDIThread cdiThread = getCDIThread(); final ICDIThread cdiThread = getCDIThread();
return cdiThread != null ? cdiThread.toString() : ""; //$NON-NLS-1$ return cdiThread != null ? cdiThread.toString() : ""; //$NON-NLS-1$
@ -384,6 +389,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IThread#getBreakpoints() * @see org.eclipse.debug.core.model.IThread#getBreakpoints()
*/ */
@Override
public IBreakpoint[] getBreakpoints() { public IBreakpoint[] getBreakpoints() {
List list = new ArrayList( 1 ); List list = new ArrayList( 1 );
if ( isSuspended() ) { if ( isSuspended() ) {
@ -401,6 +407,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
if ( isDisposed() ) if ( isDisposed() )
return; return;
@ -431,6 +438,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#canResume() * @see org.eclipse.debug.core.model.ISuspendResume#canResume()
*/ */
@Override
public boolean canResume() { public boolean canResume() {
return ( fConfig.supportsResume() && isSuspended() ); return ( fConfig.supportsResume() && isSuspended() );
} }
@ -438,6 +446,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(org.eclipse.core.resources.IFile, int) * @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(org.eclipse.core.resources.IFile, int)
*/ */
@Override
public boolean canRunToLine( IFile file, int lineNumber ) { public boolean canRunToLine( IFile file, int lineNumber ) {
return canRunToLine( file.getLocation().lastSegment(), lineNumber ); return canRunToLine( file.getLocation().lastSegment(), lineNumber );
} }
@ -445,6 +454,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(java.lang.String, int) * @see org.eclipse.cdt.debug.core.model.IRunToLine#canRunToLine(java.lang.String, int)
*/ */
@Override
public boolean canRunToLine( String fileName, int lineNumber ) { public boolean canRunToLine( String fileName, int lineNumber ) {
return canResume(); return canResume();
} }
@ -452,6 +462,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
*/ */
@Override
public boolean canSuspend() { public boolean canSuspend() {
CDebugElementState state = getState(); CDebugElementState state = getState();
return ( fConfig.supportsSuspend() && (state.equals( CDebugElementState.RESUMED ) || state.equals( CDebugElementState.STEPPED )) ); 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) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
*/ */
@Override
public boolean isSuspended() { public boolean isSuspended() {
return getState().equals( CDebugElementState.SUSPENDED ); return getState().equals( CDebugElementState.SUSPENDED );
} }
@ -467,6 +479,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#resume() * @see org.eclipse.debug.core.model.ISuspendResume#resume()
*/ */
@Override
public void resume() throws DebugException { public void resume() throws DebugException {
if ( !canResume() ) if ( !canResume() )
return; return;
@ -487,6 +500,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToLine#runToLine(org.eclipse.core.resources.IFile, int, boolean) * @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 { public void runToLine( IFile file, int lineNumber, boolean skipBreakpoints ) throws DebugException {
runToLine( file.getLocation().lastSegment(), lineNumber, skipBreakpoints ); runToLine( file.getLocation().lastSegment(), lineNumber, skipBreakpoints );
} }
@ -494,6 +508,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRunToLine#runToLine(java.lang.String, int, boolean) * @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 { public void runToLine( String fileName, int lineNumber, boolean skipBreakpoints ) throws DebugException {
if ( !canRunToLine( fileName, lineNumber ) ) if ( !canRunToLine( fileName, lineNumber ) )
return; return;
@ -522,6 +537,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ISuspendResume#suspend() * @see org.eclipse.debug.core.model.ISuspendResume#suspend()
*/ */
@Override
public void suspend() throws DebugException { public void suspend() throws DebugException {
if ( !canSuspend() ) if ( !canSuspend() )
return; return;
@ -542,6 +558,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#canStepInto() * @see org.eclipse.debug.core.model.IStep#canStepInto()
*/ */
@Override
public boolean canStepInto() { public boolean canStepInto() {
return canStep(); return canStep();
} }
@ -549,6 +566,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#canStepOver() * @see org.eclipse.debug.core.model.IStep#canStepOver()
*/ */
@Override
public boolean canStepOver() { public boolean canStepOver() {
return canStep(); return canStep();
} }
@ -556,6 +574,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#canStepReturn() * @see org.eclipse.debug.core.model.IStep#canStepReturn()
*/ */
@Override
public boolean canStepReturn() { public boolean canStepReturn() {
if ( !fConfig.supportsStepping() || !canResume() ) { if ( !fConfig.supportsStepping() || !canResume() ) {
return false; return false;
@ -578,6 +597,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#isStepping() * @see org.eclipse.debug.core.model.IStep#isStepping()
*/ */
@Override
public boolean isStepping() { public boolean isStepping() {
return ( getState().equals( CDebugElementState.STEPPING ) ) || ( getState().equals( CDebugElementState.STEPPED ) ); return ( getState().equals( CDebugElementState.STEPPING ) ) || ( getState().equals( CDebugElementState.STEPPED ) );
} }
@ -585,6 +605,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#stepInto() * @see org.eclipse.debug.core.model.IStep#stepInto()
*/ */
@Override
public void stepInto() throws DebugException { public void stepInto() throws DebugException {
if ( !canStepInto() ) if ( !canStepInto() )
return; return;
@ -610,6 +631,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#stepOver() * @see org.eclipse.debug.core.model.IStep#stepOver()
*/ */
@Override
public void stepOver() throws DebugException { public void stepOver() throws DebugException {
if ( !canStepOver() ) if ( !canStepOver() )
return; return;
@ -635,6 +657,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IStep#stepReturn() * @see org.eclipse.debug.core.model.IStep#stepReturn()
*/ */
@Override
public void stepReturn() throws DebugException { public void stepReturn() throws DebugException {
if ( !canStepReturn() ) if ( !canStepReturn() )
return; return;
@ -656,6 +679,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#canTerminate() * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
*/ */
@Override
public boolean canTerminate() { public boolean canTerminate() {
return getDebugTarget().canTerminate(); return getDebugTarget().canTerminate();
} }
@ -663,6 +687,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#isTerminated() * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
*/ */
@Override
public boolean isTerminated() { public boolean isTerminated() {
return getDebugTarget().isTerminated(); return getDebugTarget().isTerminated();
} }
@ -670,6 +695,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.ITerminate#terminate() * @see org.eclipse.debug.core.model.ITerminate#terminate()
*/ */
@Override
public void terminate() throws DebugException { public void terminate() throws DebugException {
getDebugTarget().terminate(); getDebugTarget().terminate();
} }
@ -867,6 +893,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRestart#canRestart() * @see org.eclipse.cdt.debug.core.model.IRestart#canRestart()
*/ */
@Override
public boolean canRestart() { public boolean canRestart() {
return getDebugTarget() instanceof IRestart && ((IRestart)getDebugTarget()).canRestart(); return getDebugTarget() instanceof IRestart && ((IRestart)getDebugTarget()).canRestart();
} }
@ -874,6 +901,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IRestart#restart() * @see org.eclipse.cdt.debug.core.model.IRestart#restart()
*/ */
@Override
public void restart() throws DebugException { public void restart() throws DebugException {
if ( canRestart() ) { if ( canRestart() ) {
((IRestart)getDebugTarget()).restart(); ((IRestart)getDebugTarget()).restart();
@ -924,6 +952,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
if ( adapter.equals( IRunToLine.class ) || if ( adapter.equals( IRunToLine.class ) ||
adapter.equals( IRunToAddress.class ) || adapter.equals( IRunToAddress.class ) ||
@ -977,6 +1006,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal() * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal()
*/ */
@Override
public boolean canResumeWithoutSignal() { public boolean canResumeWithoutSignal() {
return (getDebugTarget() instanceof IResumeWithoutSignal && ((IResumeWithoutSignal)getDebugTarget()).canResumeWithoutSignal()); return (getDebugTarget() instanceof IResumeWithoutSignal && ((IResumeWithoutSignal)getDebugTarget()).canResumeWithoutSignal());
} }
@ -984,6 +1014,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal() * @see org.eclipse.cdt.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal()
*/ */
@Override
public void resumeWithoutSignal() throws DebugException { public void resumeWithoutSignal() throws DebugException {
if ( canResumeWithoutSignal() ) { if ( canResumeWithoutSignal() ) {
((IResumeWithoutSignal)getDebugTarget()).resumeWithoutSignal(); ((IResumeWithoutSignal)getDebugTarget()).resumeWithoutSignal();
@ -993,6 +1024,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
/* (non-Javadoc) /* (non-Javadoc)
* @see java.lang.Object#toString() * @see java.lang.Object#toString()
*/ */
@Override
public String toString() { public String toString() {
String result = ""; //$NON-NLS-1$ String result = ""; //$NON-NLS-1$
try { try {

10
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CType.java
View file

@ -41,6 +41,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#getName() * @see org.eclipse.cdt.debug.core.model.ICType#getName()
*/ */
@Override
public String getName() { public String getName() {
return ( fCDIType != null ) ? fCDIType.getTypeName() : null; return ( fCDIType != null ) ? fCDIType.getTypeName() : null;
} }
@ -52,6 +53,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#getArrayDimensions() * @see org.eclipse.cdt.debug.core.model.ICType#getArrayDimensions()
*/ */
@Override
public int[] getArrayDimensions() { public int[] getArrayDimensions() {
int length = 0; int length = 0;
ICDIType type = getCDIType(); ICDIType type = getCDIType();
@ -71,6 +73,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#isArray() * @see org.eclipse.cdt.debug.core.model.ICType#isArray()
*/ */
@Override
public boolean isArray() { public boolean isArray() {
return ( getCDIType() instanceof ICDIArrayType ); return ( getCDIType() instanceof ICDIArrayType );
} }
@ -78,6 +81,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#isCharacter() * @see org.eclipse.cdt.debug.core.model.ICType#isCharacter()
*/ */
@Override
public boolean isCharacter() { public boolean isCharacter() {
return ( getCDIType() instanceof ICDICharType ); return ( getCDIType() instanceof ICDICharType );
} }
@ -85,6 +89,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#isFloatingPointType() * @see org.eclipse.cdt.debug.core.model.ICType#isFloatingPointType()
*/ */
@Override
public boolean isFloatingPointType() { public boolean isFloatingPointType() {
return ( getCDIType() instanceof ICDIFloatingPointType ); return ( getCDIType() instanceof ICDIFloatingPointType );
} }
@ -92,6 +97,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#isPointer() * @see org.eclipse.cdt.debug.core.model.ICType#isPointer()
*/ */
@Override
public boolean isPointer() { public boolean isPointer() {
return ( getCDIType() instanceof ICDIPointerType ); return ( getCDIType() instanceof ICDIPointerType );
} }
@ -99,6 +105,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#isReference() * @see org.eclipse.cdt.debug.core.model.ICType#isReference()
*/ */
@Override
public boolean isReference() { public boolean isReference() {
return ( getCDIType() instanceof ICDIReferenceType ); return ( getCDIType() instanceof ICDIReferenceType );
} }
@ -106,6 +113,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#isStructure() * @see org.eclipse.cdt.debug.core.model.ICType#isStructure()
*/ */
@Override
public boolean isStructure() { public boolean isStructure() {
return ( getCDIType() instanceof ICDIStructType ); return ( getCDIType() instanceof ICDIStructType );
} }
@ -113,6 +121,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#isUnsigned() * @see org.eclipse.cdt.debug.core.model.ICType#isUnsigned()
*/ */
@Override
public boolean isUnsigned() { public boolean isUnsigned() {
return ( isIntegralType() ) ? ((ICDIIntegralType)getCDIType()).isUnsigned() : false; return ( isIntegralType() ) ? ((ICDIIntegralType)getCDIType()).isUnsigned() : false;
} }
@ -120,6 +129,7 @@ public class CType implements ICType {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICType#isIntegralType() * @see org.eclipse.cdt.debug.core.model.ICType#isIntegralType()
*/ */
@Override
public boolean isIntegralType() { public boolean isIntegralType() {
return ( getCDIType() instanceof ICDIIntegralType ); return ( getCDIType() instanceof ICDIIntegralType );
} }

10
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
View file

@ -88,6 +88,7 @@ public class CValue extends AbstractCValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getReferenceTypeName() * @see org.eclipse.debug.core.model.IValue#getReferenceTypeName()
*/ */
@Override
public String getReferenceTypeName() throws DebugException { public String getReferenceTypeName() throws DebugException {
return ( getParentVariable() != null ) ? getParentVariable().getReferenceTypeName() : null; return ( getParentVariable() != null ) ? getParentVariable().getReferenceTypeName() : null;
} }
@ -95,6 +96,7 @@ public class CValue extends AbstractCValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getValueString() * @see org.eclipse.debug.core.model.IValue#getValueString()
*/ */
@Override
public String getValueString() throws DebugException { public String getValueString() throws DebugException {
if ( fValueString == null && getUnderlyingValue() != null ) { if ( fValueString == null && getUnderlyingValue() != null ) {
resetStatus(); resetStatus();
@ -116,6 +118,7 @@ public class CValue extends AbstractCValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#isAllocated() * @see org.eclipse.debug.core.model.IValue#isAllocated()
*/ */
@Override
public boolean isAllocated() throws DebugException { public boolean isAllocated() throws DebugException {
return true; return true;
} }
@ -123,6 +126,7 @@ public class CValue extends AbstractCValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#getVariables() * @see org.eclipse.debug.core.model.IValue#getVariables()
*/ */
@Override
public IVariable[] getVariables() throws DebugException { public IVariable[] getVariables() throws DebugException {
List<AbstractCVariable> list = getVariables0(); List<AbstractCVariable> list = getVariables0();
return list.toArray( new IVariable[list.size()] ); return list.toArray( new IVariable[list.size()] );
@ -157,6 +161,7 @@ public class CValue extends AbstractCValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.model.IValue#hasVariables() * @see org.eclipse.debug.core.model.IValue#hasVariables()
*/ */
@Override
public boolean hasVariables() throws DebugException { public boolean hasVariables() throws DebugException {
try { try {
ICDIValue value = getUnderlyingValue(); ICDIValue value = getUnderlyingValue();
@ -193,6 +198,7 @@ public class CValue extends AbstractCValue {
return Arrays.asList( vars ); return Arrays.asList( vars );
} }
@Override
protected synchronized void setChanged( boolean changed ) { protected synchronized void setChanged( boolean changed ) {
if ( changed ) { if ( changed ) {
fValueString = null; fValueString = null;
@ -212,6 +218,7 @@ public class CValue extends AbstractCValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#dispose() * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#dispose()
*/ */
@Override
public void dispose() { public void dispose() {
for (AbstractCVariable var : fVariables) { for (AbstractCVariable var : fVariables) {
var.dispose(); var.dispose();
@ -671,6 +678,7 @@ public class CValue extends AbstractCValue {
/** /**
* Invalidates the string cache. * Invalidates the string cache.
*/ */
@Override
protected void reset() { protected void reset() {
resetStatus(); resetStatus();
fValueString = null; fValueString = null;
@ -679,6 +687,7 @@ public class CValue extends AbstractCValue {
} }
} }
@Override
public ICType getType() throws DebugException { public ICType getType() throws DebugException {
ICDIValue cdiValue = getUnderlyingValue(); ICDIValue cdiValue = getUnderlyingValue();
if ( fType == null ) { if ( fType == null ) {
@ -703,6 +712,7 @@ public class CValue extends AbstractCValue {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#preserve() * @see org.eclipse.cdt.debug.internal.core.model.AbstractCValue#preserve()
*/ */
@Override
protected void preserve() { protected void preserve() {
setChanged( false ); setChanged( false );
resetStatus(); resetStatus();

13
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java
View file

@ -30,54 +30,67 @@ public class CValueFactory {
static public final ICValue NULL_VALUE = new ICValue() { static public final ICValue NULL_VALUE = new ICValue() {
@Override
public String getReferenceTypeName() throws DebugException { public String getReferenceTypeName() throws DebugException {
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$
} }
@Override
public String getValueString() throws DebugException { public String getValueString() throws DebugException {
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$
} }
@Override
public boolean isAllocated() throws DebugException { public boolean isAllocated() throws DebugException {
return true; return true;
} }
@Override
public IVariable[] getVariables() throws DebugException { public IVariable[] getVariables() throws DebugException {
return new IVariable[0]; return new IVariable[0];
} }
@Override
public boolean hasVariables() throws DebugException { public boolean hasVariables() throws DebugException {
return false; return false;
} }
@Override
public String getModelIdentifier() { public String getModelIdentifier() {
return CDebugCorePlugin.getUniqueIdentifier(); return CDebugCorePlugin.getUniqueIdentifier();
} }
@Override
public IDebugTarget getDebugTarget() { public IDebugTarget getDebugTarget() {
return null; return null;
} }
@Override
public ILaunch getLaunch() { public ILaunch getLaunch() {
return null; return null;
} }
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
return null; return null;
} }
@Override
public ICType getType() throws DebugException { public ICType getType() throws DebugException {
return null; return null;
} }
@Override
public String evaluateAsExpression( ICStackFrame frame ) { public String evaluateAsExpression( ICStackFrame frame ) {
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$
} }
@Override
public CDebugElementState getState() { public CDebugElementState getState() {
return CDebugElementState.UNDEFINED; return CDebugElementState.UNDEFINED;
} }
@Override
public Object getCurrentStateInfo() { public Object getCurrentStateInfo() {
return null; return null;
} }

30
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
View file

@ -65,6 +65,7 @@ class VariableEventListener implements ICDIEventListener {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents(ICDIEvent[] events) { public void handleDebugEvents(ICDIEvent[] events) {
fVar.handleDebugEvents(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() * @see org.eclipse.cdt.debug.core.model.ICVariable#getType()
*/ */
@Override
public ICType getType() throws DebugException { public ICType getType() throws DebugException {
if ( isDisposed() ) if ( isDisposed() )
return null; return null;
@ -186,6 +188,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.cdt.debug.core.model.ICVariable#isEnabled() * @see org.eclipse.cdt.debug.core.model.ICVariable#isEnabled()
*/ */
@Override
public boolean isEnabled() { public boolean isEnabled() {
return fIsEnabled; return fIsEnabled;
} }
@ -195,6 +198,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.cdt.debug.core.model.ICVariable#setEnabled(boolean) * @see org.eclipse.cdt.debug.core.model.ICVariable#setEnabled(boolean)
*/ */
@Override
public void setEnabled( boolean enabled ) throws DebugException { public void setEnabled( boolean enabled ) throws DebugException {
// Debugger engines that use active variable objects will benefit // Debugger engines that use active variable objects will benefit
// performance-wise if we dispose the internal variable when it's // 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() * @see org.eclipse.cdt.debug.core.model.ICVariable#canEnableDisable()
*/ */
@Override
public boolean canEnableDisable() { public boolean canEnableDisable() {
return !( getParent() instanceof IValue ); 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() * @see org.eclipse.cdt.debug.core.model.ICVariable#isArgument()
*/ */
@Override
public boolean isArgument() { public boolean isArgument() {
IInternalVariable iv = getOriginal(); IInternalVariable iv = getOriginal();
return ( iv != null ) ? iv.isArgument() : false; 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() * @see org.eclipse.debug.core.model.IVariable#getValue()
*/ */
@Override
public IValue getValue() throws DebugException { public IValue getValue() throws DebugException {
if ( !isDisposed() && isEnabled() ) { if ( !isDisposed() && isEnabled() ) {
IInternalVariable iv = getCurrentInternalVariable(); IInternalVariable iv = getCurrentInternalVariable();
@ -263,6 +270,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.debug.core.model.IVariable#getName() * @see org.eclipse.debug.core.model.IVariable#getName()
*/ */
@Override
public String getName() throws DebugException { public String getName() throws DebugException {
return fName; return fName;
} }
@ -272,6 +280,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName() * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName()
*/ */
@Override
public String getReferenceTypeName() throws DebugException { public String getReferenceTypeName() throws DebugException {
ICType type = getType(); ICType type = getType();
return ( type != null ) ? type.getName() : ""; //$NON-NLS-1$ 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() * @see org.eclipse.debug.core.model.IVariable#hasValueChanged()
*/ */
@Override
public boolean hasValueChanged() throws DebugException { public boolean hasValueChanged() throws DebugException {
if ( isDisposed() ) if ( isDisposed() )
return false; return false;
@ -294,6 +304,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.cdt.debug.core.model.IFormatSupport#supportsFormatting() * @see org.eclipse.cdt.debug.core.model.IFormatSupport#supportsFormatting()
*/ */
@Override
public boolean supportsFormatting() { public boolean supportsFormatting() {
return true; return true;
} }
@ -303,6 +314,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.cdt.debug.core.model.IFormatSupport#getFormat() * @see org.eclipse.cdt.debug.core.model.IFormatSupport#getFormat()
*/ */
@Override
public CVariableFormat getFormat() { public CVariableFormat getFormat() {
return fFormat; 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) * @see org.eclipse.cdt.debug.core.model.IFormatSupport#changeFormat(org.eclipse.cdt.debug.core.model.CVariableFormat)
*/ */
@Override
public void changeFormat( CVariableFormat format ) throws DebugException { public void changeFormat( CVariableFormat format ) throws DebugException {
setFormat( format ); setFormat( format );
storeFormat( format ); storeFormat( format );
@ -324,6 +337,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.cdt.debug.core.model.ICastToArray#canCastToArray() * @see org.eclipse.cdt.debug.core.model.ICastToArray#canCastToArray()
*/ */
@Override
public boolean canCastToArray() { public boolean canCastToArray() {
ICType type; ICType type;
try { try {
@ -340,6 +354,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.cdt.debug.core.model.ICastToArray#castToArray(int, int) * @see org.eclipse.cdt.debug.core.model.ICastToArray#castToArray(int, int)
*/ */
@Override
public void castToArray( int startIndex, int length ) throws DebugException { public void castToArray( int startIndex, int length ) throws DebugException {
IInternalVariable current = getCurrentInternalVariable(); IInternalVariable current = getCurrentInternalVariable();
if ( current != null ) { 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) * @see org.eclipse.debug.core.model.IValueModification#setValue(java.lang.String)
*/ */
@Override
public void setValue( String expression ) throws DebugException { public void setValue( String expression ) throws DebugException {
IInternalVariable iv = getCurrentInternalVariable(); IInternalVariable iv = getCurrentInternalVariable();
if ( iv != null ) { 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) * @see org.eclipse.debug.core.model.IValueModification#setValue(org.eclipse.debug.core.model.IValue)
*/ */
@Override
public void setValue( IValue value ) throws DebugException { public void setValue( IValue value ) throws DebugException {
notSupported( CoreModelMessages.getString( "CVariable.3" ) ); //$NON-NLS-1$ 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() * @see org.eclipse.debug.core.model.IValueModification#supportsValueModification()
*/ */
@Override
public boolean supportsValueModification() { public boolean supportsValueModification() {
try { try {
return fIsEnabled ? getCurrentInternalVariable().isEditable() : false; 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) * @see org.eclipse.debug.core.model.IValueModification#verifyValue(java.lang.String)
*/ */
@Override
public boolean verifyValue( String expression ) throws DebugException { public boolean verifyValue( String expression ) throws DebugException {
return true; 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) * @see org.eclipse.debug.core.model.IValueModification#verifyValue(org.eclipse.debug.core.model.IValue)
*/ */
@Override
public boolean verifyValue( IValue value ) throws DebugException { public boolean verifyValue( IValue value ) throws DebugException {
return value.getDebugTarget().equals( getDebugTarget() ); 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() * @see org.eclipse.cdt.debug.core.model.ICastToType#canCast()
*/ */
@Override
public boolean canCast() { public boolean canCast() {
return ( getOriginal() != null && isEnabled() ); 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() * @see org.eclipse.cdt.debug.core.model.ICastToType#getCurrentType()
*/ */
@Override
public String getCurrentType() { public String getCurrentType() {
String typeName = ""; //$NON-NLS-1$ String typeName = ""; //$NON-NLS-1$
try { 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) * @see org.eclipse.cdt.debug.core.model.ICastToType#cast(java.lang.String)
*/ */
@Override
public void cast( String type ) throws DebugException { public void cast( String type ) throws DebugException {
IInternalVariable current = getCurrentInternalVariable(); IInternalVariable current = getCurrentInternalVariable();
if ( current != null ) { if ( current != null ) {
@ -456,6 +479,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.cdt.debug.core.model.ICastToType#restoreOriginal() * @see org.eclipse.cdt.debug.core.model.ICastToType#restoreOriginal()
*/ */
@Override
public void restoreOriginal() throws DebugException { public void restoreOriginal() throws DebugException {
IInternalVariable oldVar = getShadow(); IInternalVariable oldVar = getShadow();
setShadow( null ); setShadow( null );
@ -476,6 +500,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
* *
* @see org.eclipse.cdt.debug.core.model.ICastToType#isCasted() * @see org.eclipse.cdt.debug.core.model.ICastToType#isCasted()
*/ */
@Override
public boolean isCasted() { public boolean isCasted() {
return ( getShadow() != null ); 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[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
IInternalVariable iv = getCurrentInternalVariable(); IInternalVariable iv = getCurrentInternalVariable();
if ( iv == null ) if ( iv == null )
@ -650,6 +676,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.ICVariable#getExpressionString() * @see org.eclipse.cdt.debug.core.model.ICVariable#getExpressionString()
*/ */
@Override
public String getExpressionString() throws DebugException { public String getExpressionString() throws DebugException {
IInternalVariable iv = getCurrentInternalVariable(); IInternalVariable iv = getCurrentInternalVariable();
return ( iv != null ) ? iv.getQualifiedName() : null; return ( iv != null ) ? iv.getQualifiedName() : null;
@ -883,6 +910,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#getExpression() * @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#getExpression()
*/ */
@Override
public String getExpression() { public String getExpression() {
try { try {
return getExpressionString(); return getExpressionString();
@ -894,6 +922,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#getSize() * @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#getSize()
*/ */
@Override
public void getSize(ICWatchpointTarget.GetSizeRequest request) { public void getSize(ICWatchpointTarget.GetSizeRequest request) {
// CDI has synchronous APIs, so this is easy... // CDI has synchronous APIs, so this is easy...
request.setSize(sizeof()); request.setSize(sizeof());
@ -903,6 +932,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#canCreateWatchpoint(org.eclipse.cdt.debug.internal.core.IWatchpointTarget.CanCreateWatchpointRequest) * @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#canCreateWatchpoint(org.eclipse.cdt.debug.internal.core.IWatchpointTarget.CanCreateWatchpointRequest)
*/ */
@Override
public void canSetWatchpoint(ICWatchpointTarget.CanCreateWatchpointRequest request) { public void canSetWatchpoint(ICWatchpointTarget.CanCreateWatchpointRequest request) {
// CDI has synchronous APIs, so this is easy... // CDI has synchronous APIs, so this is easy...
request.setCanCreate(sizeof() > 0); request.setCanCreate(sizeof() > 0);

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariableFactory.java
View file

@ -37,18 +37,22 @@ public class CVariableFactory {
return new IGlobalVariableDescriptor() { return new IGlobalVariableDescriptor() {
@Override
public String getName() { public String getName() {
return name; return name;
} }
@Override
public IPath getPath() { public IPath getPath() {
return ( path != null ) ? path : new Path( "" ); //$NON-NLS-1$ return ( path != null ) ? path : new Path( "" ); //$NON-NLS-1$
} }
@Override
public String toString() { public String toString() {
return MessageFormat.format( "{0}::{1}", new String[] { getPath().toOSString(), getName() } ); //$NON-NLS-1$ return MessageFormat.format( "{0}::{1}", new String[] { getPath().toOSString(), getName() } ); //$NON-NLS-1$
} }
@Override
public boolean equals( Object obj ) { public boolean equals( Object obj ) {
if ( !(obj instanceof IGlobalVariableDescriptor) ) if ( !(obj instanceof IGlobalVariableDescriptor) )
return false; return false;

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java
View file

@ -53,6 +53,7 @@ public class Disassembly extends CDebugElement implements IDisassembly, ICDIEven
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IDisassembly#getDisassemblyBlock(org.eclipse.cdt.debug.core.model.ICStackFrame) * @see org.eclipse.cdt.debug.core.model.IDisassembly#getDisassemblyBlock(org.eclipse.cdt.debug.core.model.ICStackFrame)
*/ */
@Override
public IDisassemblyBlock getDisassemblyBlock( ICStackFrame frame ) throws DebugException { public IDisassemblyBlock getDisassemblyBlock( ICStackFrame frame ) throws DebugException {
if ( fBlocks[0] == null || !fBlocks[0].contains( frame ) ) { if ( fBlocks[0] == null || !fBlocks[0].contains( frame ) ) {
fBlocks[0] = createBlock( frame ); fBlocks[0] = createBlock( frame );
@ -98,6 +99,7 @@ public class Disassembly extends CDebugElement implements IDisassembly, ICDIEven
return null; return null;
} }
@Override
public IDisassemblyBlock getDisassemblyBlock( IAddress address ) throws DebugException { public IDisassemblyBlock getDisassemblyBlock( IAddress address ) throws DebugException {
fBlocks[0] = createBlock( address, null); fBlocks[0] = createBlock( address, null);
return fBlocks[0]; return fBlocks[0];
@ -195,6 +197,7 @@ public class Disassembly extends CDebugElement implements IDisassembly, ICDIEven
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IDisassembly#getAddressFactory() * @see org.eclipse.cdt.debug.core.model.IDisassembly#getAddressFactory()
*/ */
@Override
public IAddressFactory getAddressFactory() { public IAddressFactory getAddressFactory() {
return ((CDebugTarget)getDebugTarget()).getAddressFactory(); return ((CDebugTarget)getDebugTarget()).getAddressFactory();
} }
@ -202,6 +205,7 @@ public class Disassembly extends CDebugElement implements IDisassembly, ICDIEven
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
boolean update = false; boolean update = false;
for ( int i = 0; i < events.length; ++i ) { for ( int i = 0; i < events.length; ++i ) {

7
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyBlock.java
View file

@ -89,6 +89,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getDisassembly() * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getDisassembly()
*/ */
@Override
public IDisassembly getDisassembly() { public IDisassembly getDisassembly() {
return fDisassembly; return fDisassembly;
} }
@ -96,6 +97,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getModuleFile() * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getModuleFile()
*/ */
@Override
public String getModuleFile() { public String getModuleFile() {
IDisassembly d = getDisassembly(); IDisassembly d = getDisassembly();
if ( d != null ) { if ( d != null ) {
@ -110,6 +112,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getSourceElement() * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getSourceElement()
*/ */
@Override
public Object getSourceElement() { public Object getSourceElement() {
return fSourceElement; return fSourceElement;
} }
@ -117,6 +120,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#contains(org.eclipse.cdt.debug.core.model.ICStackFrame) * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#contains(org.eclipse.cdt.debug.core.model.ICStackFrame)
*/ */
@Override
public boolean contains( ICStackFrame frame ) { public boolean contains( ICStackFrame frame ) {
if ( !getDisassembly().getDebugTarget().equals( frame.getDebugTarget() ) ) if ( !getDisassembly().getDebugTarget().equals( frame.getDebugTarget() ) )
return false; return false;
@ -131,6 +135,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable {
* *
* @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getSourceLines() * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#getSourceLines()
*/ */
@Override
public IAsmSourceLine[] getSourceLines() { public IAsmSourceLine[] getSourceLines() {
return fSourceLines; return fSourceLines;
} }
@ -138,6 +143,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/ */
@Override
public Object getAdapter( Class adapter ) { public Object getAdapter( Class adapter ) {
return null; return null;
} }
@ -145,6 +151,7 @@ public class DisassemblyBlock implements IDisassemblyBlock, IAdaptable {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#isMixedMode() * @see org.eclipse.cdt.debug.core.model.IDisassemblyBlock#isMixedMode()
*/ */
@Override
public boolean isMixedMode() { public boolean isMixedMode() {
return fMixedMode; return fMixedMode;
} }

6
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyInstruction.java
View file

@ -31,6 +31,7 @@ public class DisassemblyInstruction extends CDebugElement implements IDisassembl
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getAdress() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getAdress()
*/ */
@Override
public IAddress getAdress() { public IAddress getAdress() {
return fAddress; return fAddress;
} }
@ -38,6 +39,7 @@ public class DisassemblyInstruction extends CDebugElement implements IDisassembl
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getArguments() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getArguments()
*/ */
@Override
public String getArguments() { public String getArguments() {
return fCDIInstruction.getArgs(); return fCDIInstruction.getArgs();
} }
@ -45,6 +47,7 @@ public class DisassemblyInstruction extends CDebugElement implements IDisassembl
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getFunctionName() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getFunctionName()
*/ */
@Override
public String getFunctionName() { public String getFunctionName() {
return fCDIInstruction.getFuntionName(); return fCDIInstruction.getFuntionName();
} }
@ -52,6 +55,7 @@ public class DisassemblyInstruction extends CDebugElement implements IDisassembl
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getInstructionText() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getInstructionText()
*/ */
@Override
public String getInstructionText() { public String getInstructionText() {
return fCDIInstruction.getInstruction(); return fCDIInstruction.getInstruction();
} }
@ -59,6 +63,7 @@ public class DisassemblyInstruction extends CDebugElement implements IDisassembl
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOffset() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOffset()
*/ */
@Override
public long getOffset() { public long getOffset() {
return fCDIInstruction.getOffset(); return fCDIInstruction.getOffset();
} }
@ -66,6 +71,7 @@ public class DisassemblyInstruction extends CDebugElement implements IDisassembl
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOpcode() * @see org.eclipse.cdt.debug.core.model.IAsmInstruction#getOpcode()
*/ */
@Override
public String getOpcode() { public String getOpcode() {
return fCDIInstruction.getOpcode(); return fCDIInstruction.getOpcode();
} }

1
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblyRetrieval.java
View file

@ -66,6 +66,7 @@ public class DisassemblyRetrieval extends CDebugElement implements ICDIEventList
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[]) * @see org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener#handleDebugEvents(org.eclipse.cdt.debug.core.cdi.event.ICDIEvent[])
*/ */
@Override
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
for ( ICDIEvent event : events ) { for ( ICDIEvent event : events ) {
Object source = event.getSource(); Object source = event.getSource();

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/DisassemblySourceLine.java
View file

@ -32,6 +32,7 @@ public class DisassemblySourceLine extends CDebugElement implements IDisassembly
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IDisassemblySourceLine#getFile() * @see org.eclipse.cdt.debug.core.model.IDisassemblySourceLine#getFile()
*/ */
@Override
public File getFile() { public File getFile() {
String name = fCDIMixedInstruction.getFileName(); String name = fCDIMixedInstruction.getFileName();
if ( name != null && name.length() > 0 ) { if ( name != null && name.length() > 0 ) {
@ -43,6 +44,7 @@ public class DisassemblySourceLine extends CDebugElement implements IDisassembly
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getInstructions() * @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getInstructions()
*/ */
@Override
public IAsmInstruction[] getInstructions() { public IAsmInstruction[] getInstructions() {
return null; return null;
} }
@ -50,6 +52,7 @@ public class DisassemblySourceLine extends CDebugElement implements IDisassembly
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getLineNumber() * @see org.eclipse.cdt.debug.core.model.IAsmSourceLine#getLineNumber()
*/ */
@Override
public int getLineNumber() { public int getLineNumber() {
return fCDIMixedInstruction.getLineNumber(); return fCDIMixedInstruction.getLineNumber();
} }

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/AbsolutePathSourceContainerType.java
View file

@ -18,10 +18,12 @@ import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTyp
public class AbsolutePathSourceContainerType extends AbstractSourceContainerTypeDelegate { public class AbsolutePathSourceContainerType extends AbstractSourceContainerTypeDelegate {
@Override
public ISourceContainer createSourceContainer(String memento) throws CoreException { public ISourceContainer createSourceContainer(String memento) throws CoreException {
return new AbsolutePathSourceContainer(); return new AbsolutePathSourceContainer();
} }
@Override
public String getMemento(ISourceContainer container) throws CoreException { public String getMemento(ISourceContainer container) throws CoreException {
return "AbsolutePath"; //$NON-NLS-1$ return "AbsolutePath"; //$NON-NLS-1$
} }

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CDirectorySourceContainerType.java
View file

@ -27,6 +27,7 @@ public class CDirectorySourceContainerType extends AbstractSourceContainerTypeDe
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String)
*/ */
@Override
public ISourceContainer createSourceContainer(String memento) throws CoreException { public ISourceContainer createSourceContainer(String memento) throws CoreException {
Node node = parseDocument(memento); Node node = parseDocument(memento);
if (node.getNodeType() == Node.ELEMENT_NODE) { if (node.getNodeType() == Node.ELEMENT_NODE) {
@ -49,6 +50,7 @@ public class CDirectorySourceContainerType extends AbstractSourceContainerTypeDe
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
*/ */
@Override
public String getMemento(ISourceContainer container) throws CoreException { public String getMemento(ISourceContainer container) throws CoreException {
DirectorySourceContainer folder = (DirectorySourceContainer) container; DirectorySourceContainer folder = (DirectorySourceContainer) container;
Document document = newDocument(); Document document = newDocument();

Some files were not shown because too many files have changed in this diff Show more