Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jtag
diff options
context:
space:
mode:
authorMarc Khouzam2012-01-17 09:42:18 -0500
committerMarc Khouzam2012-01-17 09:42:18 -0500
commit2bafef2e42a8fc04637fef5bd468e0cd893894a0 (patch)
tree8e1a3e813bd22dd84d7ee3af613b65fe32d3e218 /jtag
parentd184e414d04125c66d85cf0c55e6b921d4d7c420 (diff)
downloadorg.eclipse.cdt-2bafef2e42a8fc04637fef5bd468e0cd893894a0.tar.gz
org.eclipse.cdt-2bafef2e42a8fc04637fef5bd468e0cd893894a0.tar.xz
org.eclipse.cdt-2bafef2e42a8fc04637fef5bd468e0cd893894a0.zip
Code cleanup, mostly about missing @Override
Diffstat (limited to 'jtag')
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Activator.java1
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java15
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java1
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java10
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java2
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl.java1
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_0.java1
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_2.java1
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java1
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/AbatronBDI2000.java2
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java5
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java12
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java3
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/IGDBJtagDevice.java3
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/MacraigorUsb2Demon.java3
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/Activator.java2
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java15
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java22
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagLaunchConfigurationTabGroup.java1
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagStartupTab.java37
20 files changed, 124 insertions, 14 deletions
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Activator.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Activator.java
index 378a70c245..b0179f79c0 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Activator.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Activator.java
@@ -39,6 +39,7 @@ public class Activator extends Plugin {
* (non-Javadoc)
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
index 71ee49e2e8..fefbbb1501 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
@@ -292,7 +292,8 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence {
* Tell GDB to automatically load or not the shared library symbols
*/
new Step() {
- public void execute(RequestMonitor requestMonitor) {
+ @Override
+ public void execute(RequestMonitor requestMonitor) {
try {
boolean autolib = fLaunch.getLaunchConfiguration().getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB,
IGDBLaunchConfigurationConstants.DEBUGGER_AUTO_SOLIB_DEFAULT);
@@ -575,7 +576,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence {
}
}
else {
- imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME); //$NON-NLS-1$
+ imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME);
if (imageFileName.length() > 0) {
imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName);
} else {
@@ -594,7 +595,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence {
String imageOffset = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET);
if (imageOffset.length() > 0) {
- imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET); //$NON-NLS-2$ //$NON-NLS-4$
+ imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET); //$NON-NLS-2$
}
List<String> commands = new ArrayList<String>();
fGdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);
@@ -633,7 +634,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence {
ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
try {
if (config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER)) {
- String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); //$NON-NLS-1$
+ String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER));
List<String> commands = new ArrayList<String>();
fGdbJtagDevice.doSetPC(pcRegister, commands);
queueCommands(commands, rm);
@@ -654,7 +655,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence {
ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
try {
if (config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT)) {
- String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); //$NON-NLS-1$
+ String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT);
List<String> commands = new ArrayList<String>();
fGdbJtagDevice.doStopAt(stopAt, commands);
queueCommands(commands, rm);
@@ -695,7 +696,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence {
public void execute(RequestMonitor rm) {
ILaunchConfiguration config = fLaunch.getLaunchConfiguration();
try {
- String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS); //$NON-NLS-1$
+ String userCmd = config.getAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS);
if (userCmd.length() > 0) {
userCmd = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(userCmd);
String[] commands = userCmd.split("\\r?\\n"); //$NON-NLS-1$
@@ -778,7 +779,7 @@ public class GDBJtagDSFFinalLaunchSequence extends Sequence {
private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config)
throws CoreException, NullPointerException {
IGDBJtagDevice gdbJtagDevice = null;
- String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); //$NON-NLS-1$
+ String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE);
GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.getInstance().getGDBJtagDeviceContribution();
for (GDBJtagDeviceContribution availableDevice : availableDevices) {
if (jtagDeviceName.equals(availableDevice.getDeviceName())) {
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java
index 9e9cc09b0a..17072032b1 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFLaunchConfigurationDelegate.java
@@ -44,6 +44,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@ThreadSafe
public class GDBJtagDSFLaunchConfigurationDelegate extends GdbLaunchDelegate {
+ @Override
protected IDsfDebugServicesFactory newServiceFactory(ILaunchConfiguration config, String version) {
if (version.contains(LaunchUtils.MACOS_GDB_MARKER)) {
// The version string at this point should look like
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java
index 6eb35202b6..f355051c80 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java
@@ -63,22 +63,26 @@ public class GDBJtagDebugger extends AbstractGDBCDIDebugger {
private String miVersion;
+ @Override
public ICDISession createSession(ILaunch launch, File executable,
IProgressMonitor monitor) throws CoreException {
return super.createSession(launch, executable, monitor);
}
+ @Override
public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe,
IProgressMonitor monitor) throws CoreException {
return super.createDebuggerSession(launch, exe, monitor);
}
+ @Override
protected CommandFactory getCommandFactory(ILaunchConfiguration config)
throws CoreException {
miVersion = MIPlugin.getMIVersion(config);
return new GDBJtagCommandFactory(miVersion);
}
+ @Override
@SuppressWarnings("deprecation")
protected void doStartSession(ILaunch launch, Session session, IProgressMonitor monitor) throws CoreException {
SubMonitor submonitor = SubMonitor.convert(monitor, 100);
@@ -292,7 +296,7 @@ public class GDBJtagDebugger extends AbstractGDBCDIDebugger {
// Set program counter
boolean setPc = config.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER);
if (setPc) {
- String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER)); //$NON-NLS-1$
+ String pcRegister = config.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_PC_REGISTER));
gdbJtagDevice.doSetPC(pcRegister, commands);
executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
}
@@ -302,7 +306,7 @@ public class GDBJtagDebugger extends AbstractGDBCDIDebugger {
monitor.beginTask(Messages.getString("GDBJtagDebugger.18"), 1); //$NON-NLS-1$
boolean setStopAt = config.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT);
if (setStopAt) {
- String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT); //$NON-NLS-1$
+ String stopAt = config.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT);
commands.clear();
gdbJtagDevice.doStopAt(stopAt, commands);
executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
@@ -377,7 +381,7 @@ public class GDBJtagDebugger extends AbstractGDBCDIDebugger {
private IGDBJtagDevice getGDBJtagDevice (ILaunchConfiguration config)
throws CoreException, NullPointerException {
IGDBJtagDevice gdbJtagDevice = null;
- String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE); //$NON-NLS-1$
+ String jtagDeviceName = config.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, IGDBJtagConstants.DEFAULT_JTAG_DEVICE);
GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.
getInstance().getGDBJtagDeviceContribution();
for (int i = 0; i < availableDevices.length; i++) {
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java
index dd2dedfeef..6ce1c89421 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java
@@ -35,10 +35,12 @@ import org.eclipse.debug.core.model.IProcess;
*/
public class GDBJtagLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
+ @Override
protected String getPluginID() {
return Activator.PLUGIN_ID;
};
+ @Override
public void launch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
SubMonitor submonitor = SubMonitor.convert(monitor, 2);
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl.java
index 36b4cc0fea..e5d24f2f06 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl.java
@@ -34,6 +34,7 @@ public class GDBJtagControl extends GDBControl {
super(session, config, factory);
}
+ @Override
protected Sequence getCompleteInitializationSequence(Map<String,Object> attributes, RequestMonitorWithProgress rm) {
GdbLaunch launch = (GdbLaunch)getSession().getModelAdapter(ILaunch.class);
IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class);
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_0.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_0.java
index de79e4a35c..b94ea19415 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_0.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_0.java
@@ -34,6 +34,7 @@ public class GDBJtagControl_7_0 extends GDBControl_7_0 {
super(session, config, factory);
}
+ @Override
protected Sequence getCompleteInitializationSequence(Map<String,Object> attributes, RequestMonitorWithProgress rm) {
GdbLaunch launch = (GdbLaunch)getSession().getModelAdapter(ILaunch.class);
IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class);
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_2.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_2.java
index 64aef84436..6bf25811c0 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_2.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GDBJtagControl_7_2.java
@@ -34,6 +34,7 @@ public class GDBJtagControl_7_2 extends GDBControl_7_2 {
super(session, config, factory);
}
+ @Override
protected Sequence getCompleteInitializationSequence(Map<String,Object> attributes, RequestMonitorWithProgress rm) {
GdbLaunch launch = (GdbLaunch)getSession().getModelAdapter(ILaunch.class);
IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class);
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java
index 47f7144431..f4e335e2e1 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/dsf/gdb/service/GdbJtagDebugServicesFactory.java
@@ -27,6 +27,7 @@ public class GdbJtagDebugServicesFactory extends GdbDebugServicesFactory {
super(version);
}
+ @Override
protected ICommandControl createCommandControl(DsfSession session, ILaunchConfiguration config) {
if (GDB_7_2_VERSION.compareTo(getVersion()) <= 0) {
return new GDBJtagControl_7_2(session, config, new CommandFactory_6_8());
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/AbatronBDI2000.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/AbatronBDI2000.java
index 0e0d091dfa..b677e9315f 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/AbatronBDI2000.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/AbatronBDI2000.java
@@ -16,6 +16,7 @@ public class AbatronBDI2000 extends DefaultGDBJtagDeviceImpl {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#getDefaultIpAddress()
*/
+ @Override
public String getDefaultIpAddress() {
return "bdi2000";
}
@@ -23,6 +24,7 @@ public class AbatronBDI2000 extends DefaultGDBJtagDeviceImpl {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#getDefaultPortNumber()
*/
+ @Override
public String getDefaultPortNumber() {
return "2001";
}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java
index 4f2ad44a06..48d8b91cff 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java
@@ -27,6 +27,7 @@ public class DefaultGDBJtagConnectionImpl extends DefaultGDBJtagDeviceImpl imple
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doDelay(int, java.util.Collection)
*/
+ @Override
public final void setDefaultDeviceConnection(String connection) {
this.connection = connection;
}
@@ -34,6 +35,7 @@ public class DefaultGDBJtagConnectionImpl extends DefaultGDBJtagDeviceImpl imple
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doRemote(java.lang.String, java.util.Collection)
*/
+ @Override
public void doRemote(String connection, Collection<String> commands) {
String cmd = ""; //$NON-NLS-1$
if (connection != null) {
@@ -50,14 +52,17 @@ public class DefaultGDBJtagConnectionImpl extends DefaultGDBJtagDeviceImpl imple
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultDeviceConnection()
*/
+ @Override
public String getDefaultDeviceConnection() {
return connection;
}
+ @Override
public String getDefaultIpAddress() {
throw new UnsupportedOperationException();
}
+ @Override
public String getDefaultPortNumber() {
throw new UnsupportedOperationException();
}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java
index 37407a6f69..9cb844a522 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java
@@ -28,6 +28,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doDelay(int, java.util.Collection)
*/
+ @Override
public void doDelay(int delay, Collection<String> commands) {
String cmd = "monitor delay " + String.valueOf(delay * 1000); //$NON-NLS-1$
addCmd(commands, cmd);
@@ -36,6 +37,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doReset(java.util.Collection)
*/
+ @Override
public void doReset(Collection<String> commands) {
String cmd = "monitor reset run"; //$NON-NLS-1$
addCmd(commands, cmd);
@@ -44,6 +46,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultDelay()
*/
+ @Override
public int getDefaultDelay() {
return 0;
}
@@ -51,6 +54,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doRemote(java.lang.String, int, java.util.Collection)
*/
+ @Override
public void doRemote(String ip, int port, Collection<String> commands) {
// The CLI version (target remote) does not let us know
// that we have properly connected. For older GDBs (<= 6.8)
@@ -64,6 +68,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doHalt(java.util.Collection)
*/
+ @Override
public void doHalt(Collection<String> commands) {
String cmd = "monitor halt"; //$NON-NLS-1$
addCmd(commands, cmd);
@@ -72,6 +77,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doContinue(java.util.Collection)
*/
+ @Override
public void doContinue(Collection<String> commands) {
String cmd = "continue"; //$NON-NLS-1$
addCmd(commands, cmd);
@@ -80,6 +86,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doLoadImage(java.lang.String, java.lang.String, java.util.Collection)
*/
+ @Override
public void doLoadImage(String imageFileName, String imageOffset, Collection<String> commands) {
addCmd(commands, "load " + escapeScpaces(imageFileName) + ' ' + imageOffset);
}
@@ -87,6 +94,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doLoadSymbol(java.lang.String, java.lang.String, java.util.Collection)
*/
+ @Override
public void doLoadSymbol(String symbolFileName, String symbolOffset, Collection<String> commands) {
String file = escapeScpaces(symbolFileName);
if (symbolOffset == null || (symbolOffset.length() == 0)) {
@@ -105,6 +113,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doSetPC(java.lang.String, java.util.Collection)
*/
+ @Override
public void doSetPC(String pc, Collection<String> commands) {
String cmd = "set $pc=0x" + pc; //$NON-NLS-1$
addCmd(commands, cmd);
@@ -113,6 +122,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doStopAt(java.lang.String, java.util.Collection)
*/
+ @Override
public void doStopAt(String stopAt, Collection<String> commands) {
String cmd = "tbreak " + stopAt; //$NON-NLS-1$
addCmd(commands, cmd);
@@ -128,6 +138,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultIpAddress()
*/
+ @Override
public String getDefaultIpAddress() {
return "localhost"; //$NON-NLS-1$
}
@@ -135,6 +146,7 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultPortNumber()
*/
+ @Override
public String getDefaultPortNumber() {
return "10000"; //$NON-NLS-1$
}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java
index 618d04abe1..8fe52fce32 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java
@@ -18,18 +18,21 @@ public class GenericDevice extends DefaultGDBJtagDeviceImpl {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doDelay(int, java.util.Collection)
*/
+ @Override
public void doDelay(int delay, Collection <String>commands) {
}
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doHalt(java.util.Collection)
*/
+ @Override
public void doHalt(Collection<String> commands) {
}
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doReset(java.util.Collection)
*/
+ @Override
public void doReset(Collection<String> commands) {
}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/IGDBJtagDevice.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/IGDBJtagDevice.java
index 3431f86d1a..7623b7d41b 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/IGDBJtagDevice.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/IGDBJtagDevice.java
@@ -81,6 +81,7 @@ public interface IGDBJtagDevice {
* implementing this method (implementation should throw
* UnsupportedOperationException)
*/
+ @Deprecated
public void doRemote(String ip, int port, Collection<String> commands);
/**
@@ -158,6 +159,7 @@ public interface IGDBJtagDevice {
* implementing this method (implementation should throw
* UnsupportedOperationException)
*/
+ @Deprecated
public String getDefaultIpAddress();
/**
@@ -168,5 +170,6 @@ public interface IGDBJtagDevice {
* implementing this method (implementation should throw
* UnsupportedOperationException)
*/
+ @Deprecated
public String getDefaultPortNumber();
}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/MacraigorUsb2Demon.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/MacraigorUsb2Demon.java
index a543fe4dbe..d0136537d2 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/MacraigorUsb2Demon.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/MacraigorUsb2Demon.java
@@ -23,6 +23,7 @@ public class MacraigorUsb2Demon extends DefaultGDBJtagDeviceImpl {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#getDefaultPortNumber()
*/
+ @Override
public String getDefaultPortNumber() {
return "8888";
}
@@ -30,6 +31,7 @@ public class MacraigorUsb2Demon extends DefaultGDBJtagDeviceImpl {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doDelay(int, java.util.Collection)
*/
+ @Override
public void doDelay(int delay, Collection<String> commands) {
super.addCmd(commands, "monitor sleep " + String.valueOf(delay));
}
@@ -37,6 +39,7 @@ public class MacraigorUsb2Demon extends DefaultGDBJtagDeviceImpl {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doReset(java.util.Collection)
*/
+ @Override
public void doReset(Collection<String> commands) {
super.addCmd(commands, "monitor resetrun");
}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/Activator.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/Activator.java
index d169ad8cfd..59b1359915 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/Activator.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/Activator.java
@@ -49,6 +49,7 @@ public class Activator extends AbstractUIPlugin {
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
setDefaultLaunchDelegates();
@@ -58,6 +59,7 @@ public class Activator extends AbstractUIPlugin {
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java
index d9dcb48a28..de1caeffb7 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java
@@ -84,14 +84,17 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
private String savedJtagDevice;
protected Button fUpdateThreadlistOnSuspend;
+ @Override
public String getName() {
return TAB_NAME;
}
+ @Override
public Image getImage() {
return GDBJtagImages.getDebuggerTabImage();
}
+ @Override
public void createControl(Composite parent) {
ScrolledComposite sc = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
sc.setExpandHorizontal(true);
@@ -161,6 +164,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
gd = new GridData(GridData.FILL_HORIZONTAL);
gdbCommand.setLayoutData(gd);
gdbCommand.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob(); // provides much better performance for Text listeners
}
@@ -169,6 +173,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
Button button = new Button(comp, SWT.NONE);
button.setText(Messages.getString("GDBJtagDebuggerTab.gdbCommandBrowse"));
button.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
browseButtonSelected(Messages.getString("GDBJtagDebuggerTab.gdbCommandBrowse_Title"), gdbCommand);
}
@@ -177,6 +182,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
button = new Button(comp, SWT.NONE);
button.setText(Messages.getString("GDBJtagDebuggerTab.gdbCommandVariable"));
button.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
variablesButtonSelected(gdbCommand);
}
@@ -194,6 +200,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
useRemote = new Button(group, SWT.CHECK);
useRemote.setText(Messages.getString("GDBJtagDebuggerTab.useRemote_Text"));
useRemote.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
useRemoteChanged();
updateLaunchConfigurationDialog();
@@ -217,6 +224,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
}
jtagDevice.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
updateDeviceIpPort(jtagDevice.getText());
scheduleUpdateJob(); // provides much better performance for Text listeners
@@ -277,22 +285,26 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
//
ipAddress.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob(); // provides much better performance for Text listeners
}
});
portNumber.addVerifyListener(new VerifyListener() {
+ @Override
public void verifyText(VerifyEvent e) {
e.doit = Character.isDigit(e.character) || Character.isISOControl(e.character);
}
});
portNumber.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob(); // provides much better performance for Text listeners
}
});
connection.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob(); // provides much better performance for Text listeners
}
@@ -361,6 +373,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
return null;
}
+ @Override
public void initializeFrom(ILaunchConfiguration configuration) {
try {
String defaultGdbCommand = Platform.getPreferencesService().getString(GdbPlugin.PLUGIN_ID,
@@ -424,6 +437,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
return TAB_ID;
}
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, gdbCommand.getText().trim());
configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME, gdbCommand.getText().trim()); // DSF
@@ -453,6 +467,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab {
fUpdateThreadlistOnSuspend.getSelection());
}
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
String defaultGdbCommand = Platform.getPreferencesService().getString(GdbPlugin.PLUGIN_ID,
IGdbDebugPreferenceConstants.PREF_DEFAULT_GDB_COMMAND, "", null); //$NON-NLS-1$
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java
index 6fc9143b26..3e2820d58c 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java
@@ -86,14 +86,17 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
private String savedJtagDevice;
+ @Override
public String getName() {
return TAB_NAME;
}
+ @Override
public Image getImage() {
return GDBJtagImages.getDebuggerTabImage();
}
+ @Override
public void createControl(Composite parent) {
ScrolledComposite sc = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
sc.setExpandHorizontal(true);
@@ -159,6 +162,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
gd = new GridData(GridData.FILL_HORIZONTAL);
gdbCommand.setLayoutData(gd);
gdbCommand.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob(); // provides much better performance for Text listeners
}
@@ -167,6 +171,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
Button button = new Button(comp, SWT.NONE);
button.setText(Messages.getString("GDBJtagDebuggerTab.gdbCommandBrowse"));
button.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
browseButtonSelected(Messages.getString("GDBJtagDebuggerTab.gdbCommandBrowse_Title"), gdbCommand);
}
@@ -175,6 +180,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
button = new Button(comp, SWT.NONE);
button.setText(Messages.getString("GDBJtagDebuggerTab.gdbCommandVariable"));
button.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
variablesButtonSelected(gdbCommand);
}
@@ -198,6 +204,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
}
commandFactory.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
commandFactoryChanged();
scheduleUpdateJob(); // provides much better performance for Text listeners
@@ -214,6 +221,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
miProtocol = new Combo(comp, SWT.READ_ONLY | SWT.DROP_DOWN);
miProtocol.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob(); // provides much better performance for Text listeners
}
@@ -243,6 +251,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
verboseMode = new Button(parent, SWT.CHECK);
verboseMode.setText(Messages.getString("GDBJtagDebuggerTab.verboseModeLabel"));
verboseMode.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
}
@@ -260,6 +269,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
useRemote = new Button(group, SWT.CHECK);
useRemote.setText(Messages.getString("GDBJtagDebuggerTab.useRemote_Text"));
useRemote.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
useRemoteChanged();
updateLaunchConfigurationDialog();
@@ -283,6 +293,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
}
jtagDevice.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
updateDeviceIpPort(jtagDevice.getText());
scheduleUpdateJob(); // provides much better performance for Text listeners
@@ -343,22 +354,26 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
//
ipAddress.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob(); // provides much better performance for Text listeners
}
});
portNumber.addVerifyListener(new VerifyListener() {
+ @Override
public void verifyText(VerifyEvent e) {
e.doit = Character.isDigit(e.character) || Character.isISOControl(e.character);
}
});
portNumber.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob(); // provides much better performance for Text listeners
}
});
connection.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob(); // provides much better performance for Text listeners
}
@@ -429,6 +444,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
return null;
}
+ @Override
public void initializeFrom(ILaunchConfiguration configuration) {
try {
String gdbCommandAttr = configuration.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, IMILaunchConfigurationConstants.DEBUGGER_DEBUG_NAME_DEFAULT);
@@ -470,9 +486,9 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
for (int i = 0; i < jtagDevice.getItemCount(); i++) {
if (jtagDevice.getItem(i).equals(savedJtagDevice)) {
- storedAddress = configuration.getAttribute(IGDBJtagConstants.ATTR_IP_ADDRESS, IGDBJtagConstants.DEFAULT_IP_ADDRESS); //$NON-NLS-1$
+ storedAddress = configuration.getAttribute(IGDBJtagConstants.ATTR_IP_ADDRESS, IGDBJtagConstants.DEFAULT_IP_ADDRESS);
storedPort = configuration.getAttribute(IGDBJtagConstants.ATTR_PORT_NUMBER, IGDBJtagConstants.DEFAULT_PORT_NUMBER);
- storedConnection = configuration.getAttribute(IGDBJtagConstants.ATTR_CONNECTION, IGDBJtagConstants.DEFAULT_CONNECTION); //$NON-NLS-1$
+ storedConnection = configuration.getAttribute(IGDBJtagConstants.ATTR_CONNECTION, IGDBJtagConstants.DEFAULT_CONNECTION);
jtagDevice.select(i);
break;
}
@@ -504,6 +520,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
return TAB_ID;
}
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, gdbCommand.getText().trim());
configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME, gdbCommand.getText().trim()); // DSF
@@ -534,6 +551,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab {
}
}
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, IMILaunchConfigurationConstants.DEBUGGER_DEBUG_NAME_DEFAULT);
CommandFactoryManager cfManager = MIPlugin.getDefault().getCommandFactoryManager();
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagLaunchConfigurationTabGroup.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagLaunchConfigurationTabGroup.java
index 3982b43168..6b87d52000 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagLaunchConfigurationTabGroup.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagLaunchConfigurationTabGroup.java
@@ -23,6 +23,7 @@ import org.eclipse.debug.ui.ILaunchConfigurationTab;
public class GDBJtagLaunchConfigurationTabGroup extends
AbstractLaunchConfigurationTabGroup {
+ @Override
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
setTabs(new ILaunchConfigurationTab[0]);
}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagStartupTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagStartupTab.java
index 3e7297920c..a9eaf58c42 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagStartupTab.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagStartupTab.java
@@ -94,14 +94,17 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
private Label projBinaryLabel1;
private Label projBinaryLabel2;
+ @Override
public String getName() {
return TAB_NAME;
}
+ @Override
public Image getImage() {
return GDBJtagImages.getStartupTabImage();
}
+ @Override
public void createControl(Composite parent) {
ScrolledComposite sc = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
sc.setExpandHorizontal(true);
@@ -164,6 +167,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
doReset = new Button(comp, SWT.CHECK);
doReset.setText(Messages.getString("GDBJtagStartupTab.doReset_Text"));
doReset.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
doResetChanged();
updateLaunchConfigurationDialog();
@@ -175,11 +179,13 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.widthHint = 60;
delay.setLayoutData(gd);
delay.addVerifyListener(new VerifyListener() {
+ @Override
public void verifyText(VerifyEvent e) {
e.doit = (Character.isDigit(e.character) || Character.isISOControl(e.character));
}
});
delay.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob();
}
@@ -197,6 +203,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.horizontalSpan = 1;
doHalt.setLayoutData(gd);
doHalt.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
}
@@ -207,6 +214,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.heightHint = 60;
initCommands.setLayoutData(gd);
initCommands.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent evt) {
scheduleUpdateJob();
}
@@ -230,6 +238,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.horizontalSpan = 4;
loadImage.setLayoutData(gd);
loadImage.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
loadImageChanged();
updateLaunchConfigurationDialog();
@@ -243,10 +252,12 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
comp.setLayout(layout);
SelectionListener radioButtonListener = new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
updateUseFileEnablement();
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
};
@@ -276,6 +287,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.horizontalSpan = 1;
imageFileName.setLayoutData(gd);
imageFileName.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob();
}
@@ -283,13 +295,15 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
imageFileBrowseWs = createPushButton(comp, Messages.getString("GDBJtagStartupTab.FileBrowseWs_Label"), null);
imageFileBrowseWs.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
browseWsButtonSelected(Messages.getString("GDBJtagStartupTab.imageFileBrowseWs_Title"), imageFileName);
}
});
imageFileBrowse = createPushButton(comp, Messages.getString("GDBJtagStartupTab.FileBrowse_Label"), null);
imageFileBrowse.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
browseButtonSelected(Messages.getString("GDBJtagStartupTab.imageFileBrowse_Title"), imageFileName);
}
@@ -303,11 +317,13 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.widthHint = 100;
imageOffset.setLayoutData(gd);
imageOffset.addVerifyListener(new VerifyListener() {
+ @Override
public void verifyText(VerifyEvent e) {
e.doit = (Character.isDigit(e.character) || Character.isISOControl(e.character) || "abcdef".contains(String.valueOf(e.character).toLowerCase()));
}
});
imageOffset.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob();
}
@@ -320,6 +336,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.horizontalSpan = 4;
loadSymbols.setLayoutData(gd);
loadSymbols.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
loadSymbolsChanged();
updateLaunchConfigurationDialog();
@@ -357,6 +374,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.horizontalSpan = 1;
symbolsFileName.setLayoutData(gd);
symbolsFileName.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob();
}
@@ -364,13 +382,15 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
symbolsFileBrowseWs = createPushButton(comp, Messages.getString("GDBJtagStartupTab.FileBrowseWs_Label"), null);
symbolsFileBrowseWs.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
browseWsButtonSelected(Messages.getString("GDBJtagStartupTab.symbolsFileBrowseWs_Title"), symbolsFileName);
}
});
symbolsFileBrowse = createPushButton(comp, Messages.getString("GDBJtagStartupTab.FileBrowse_Label"), null);
symbolsFileBrowse.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
browseButtonSelected(Messages.getString("GDBJtagStartupTab.symbolsFileBrowse_Title"), symbolsFileName);
}
@@ -384,11 +404,13 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.widthHint = 100;
symbolsOffset.setLayoutData(gd);
symbolsOffset.addVerifyListener(new VerifyListener() {
+ @Override
public void verifyText(VerifyEvent e) {
e.doit = (Character.isDigit(e.character) || Character.isISOControl(e.character) || "abcdef".contains(String.valueOf(e.character).toLowerCase()));
}
});
symbolsOffset.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob();
}
@@ -424,6 +446,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.horizontalSpan = 1;
setPcRegister.setLayoutData(gd);
setPcRegister.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
pcRegisterChanged();
updateLaunchConfigurationDialog();
@@ -436,11 +459,13 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.widthHint = 100;
pcRegister.setLayoutData(gd);
pcRegister.addVerifyListener(new VerifyListener() {
+ @Override
public void verifyText(VerifyEvent e) {
e.doit = (Character.isDigit(e.character) || Character.isISOControl(e.character) || "abcdef".contains(String.valueOf(e.character).toLowerCase()));
}
});
pcRegister.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob();
}
@@ -452,6 +477,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.horizontalSpan = 1;
setStopAt.setLayoutData(gd);
setStopAt.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
stopAtChanged();
updateLaunchConfigurationDialog();
@@ -464,6 +490,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.widthHint = 100;
stopAt.setLayoutData(gd);
stopAt.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
scheduleUpdateJob();
}
@@ -475,6 +502,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.horizontalSpan = 1;
setResume.setLayoutData(gd);
setResume.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
resumeChanged();
updateLaunchConfigurationDialog();
@@ -529,6 +557,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
gd.heightHint = 60;
runCommands.setLayoutData(gd);
runCommands.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent evt) {
scheduleUpdateJob();
}
@@ -538,6 +567,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
/* (non-Javadoc)
* @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public boolean isValid(ILaunchConfiguration launchConfig) {
if (!super.isValid(launchConfig))
return false;
@@ -618,6 +648,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
*/
+ @Override
public void initializeFrom(ILaunchConfiguration configuration) {
try {
// Initialization Commands
@@ -680,6 +711,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
// Initialization Commands
@@ -716,6 +748,7 @@ public class GDBJtagStartupTab extends AbstractLaunchConfigurationTab {
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
// Initialization Commands
configuration.setAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET);

Back to the top