Skip to main content
summaryrefslogtreecommitdiffstats
path: root/cross
diff options
context:
space:
mode:
Diffstat (limited to 'cross')
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java2
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java1
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java4
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java9
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java2
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java10
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java7
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java5
8 files changed, 34 insertions, 6 deletions
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java
index ef325ebbcf..b1682854bc 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java
@@ -37,6 +37,7 @@ public class Activator extends Plugin {
* (non-Javadoc)
* @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
}
@@ -45,6 +46,7 @@ public class Activator extends Plugin {
* (non-Javadoc)
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
super.stop(context);
plugin = null;
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java
index 1556647599..1128c7cb1d 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java
@@ -61,6 +61,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate {
*
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch
*/
+ @Override
public void launch(ILaunchConfiguration config, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java
index 3717d57101..879514df31 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java
@@ -14,9 +14,6 @@ package org.eclipse.cdt.launch.remote.tabs;
import org.eclipse.cdt.debug.ui.ICDebuggerPage;
import org.eclipse.cdt.dsf.gdb.internal.ui.launching.CDebuggerTab;
-import org.eclipse.cdt.dsf.gdb.internal.ui.launching.GdbCoreDebuggerPage;
-import org.eclipse.cdt.dsf.gdb.internal.ui.launching.GdbDebuggerPage;
-import org.eclipse.cdt.dsf.gdb.internal.ui.launching.GdbServerDebuggerPage;
import org.eclipse.cdt.dsf.gdb.service.SessionType;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfiguration;
@@ -62,6 +59,7 @@ public class RemoteCDSFDebuggerTab extends CDebuggerTab {
super.initializeFrom(config);
}
+ @Override
protected void loadDynamicDebugArea() {
Composite dynamicTabHolder = getDynamicTabHolder();
// Dispose of any current child widgets in the tab holder area
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
index 98ddacd165..f3d7b58cd5 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
@@ -22,7 +22,6 @@
*******************************************************************************/
package org.eclipse.cdt.launch.remote.tabs;
-import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.dsf.gdb.internal.ui.launching.CMainTab;
import org.eclipse.cdt.internal.launch.remote.Messages;
import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
@@ -127,6 +126,7 @@ public class RemoteCDSFMainTab extends CMainTab {
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid
*/
+ @Override
public boolean isValid(ILaunchConfiguration config) {
boolean retVal = super.isValid(config);
if (retVal == true) {
@@ -184,6 +184,7 @@ public class RemoteCDSFMainTab extends CMainTab {
Messages.RemoteCMainTab_New, null);
newRemoteConnectionButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent evt) {
handleNewRemoteConnectionSelected();
updateLaunchConfigurationDialog();
@@ -196,6 +197,7 @@ public class RemoteCDSFMainTab extends CMainTab {
remoteConnectionPropertiesButton
.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent evt) {
handleRemoteConnectionPropertiesSelected();
}
@@ -239,6 +241,7 @@ public class RemoteCDSFMainTab extends CMainTab {
Messages.RemoteCMainTab_Remote_Path_Browse_Button, null);
remoteBrowseButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent evt) {
handleRemoteBrowseSelected();
updateLaunchConfigurationDialog();
@@ -281,6 +284,7 @@ public class RemoteCDSFMainTab extends CMainTab {
SKIP_DOWNLOAD_BUTTON_TEXT);
skipDownloadButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent evt) {
updateLaunchConfigurationDialog();
}
@@ -340,6 +344,7 @@ public class RemoteCDSFMainTab extends CMainTab {
fbLocalHost = fHost.getSystemType().isLocal();
}
+ @Override
protected Control createDialogArea(Composite parent) {
// create composite
Composite composite = (Composite) super
@@ -385,6 +390,7 @@ public class RemoteCDSFMainTab extends CMainTab {
return composite;
}
+ @Override
protected void buttonPressed(int buttonId) {
if (!fbLocalHost && (buttonId == IDialogConstants.OK_ID)) {
IPropertySet propertySet = fHost
@@ -646,6 +652,7 @@ public class RemoteCDSFMainTab extends CMainTab {
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy config) {
int currentSelection = connectionCombo.getSelectionIndex();
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java
index bd9a37e10f..1001144584 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java
@@ -33,6 +33,7 @@ public class RemoteCDebuggerTab extends CDebuggerTab {
super(false);
}
+ @Override
public void createControl(Composite parent) {
super.createControl(parent);
PlatformUI
@@ -48,6 +49,7 @@ public class RemoteCDebuggerTab extends CDebuggerTab {
super(attachMode);
}
+ @Override
protected void loadDebuggerComboBox(ILaunchConfiguration config,
String selection) {
ICDebugConfiguration[] debugConfigs = CDebugCorePlugin.getDefault()
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java
index 9b9d68f304..37d897b2b9 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java
@@ -103,6 +103,7 @@ public class RemoteCMainTab extends CMainTab {
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl
*/
+ @Override
public void createControl(Composite parent) {
Composite comp = new Composite(parent, SWT.NONE);
GridLayout topLayout = new GridLayout();
@@ -145,6 +146,7 @@ public class RemoteCMainTab extends CMainTab {
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid
*/
+ @Override
public boolean isValid(ILaunchConfiguration config) {
boolean retVal = super.isValid(config);
if (retVal == true) {
@@ -202,6 +204,7 @@ public class RemoteCMainTab extends CMainTab {
Messages.RemoteCMainTab_New, null);
newRemoteConnectionButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent evt) {
handleNewRemoteConnectionSelected();
updateLaunchConfigurationDialog();
@@ -214,6 +217,7 @@ public class RemoteCMainTab extends CMainTab {
remoteConnectionPropertiesButton
.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent evt) {
handleRemoteConnectionPropertiesSelected();
}
@@ -257,6 +261,7 @@ public class RemoteCMainTab extends CMainTab {
Messages.RemoteCMainTab_Remote_Path_Browse_Button, null);
remoteBrowseButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent evt) {
handleRemoteBrowseSelected();
updateLaunchConfigurationDialog();
@@ -299,6 +304,7 @@ public class RemoteCMainTab extends CMainTab {
SKIP_DOWNLOAD_BUTTON_TEXT);
skipDownloadButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent evt) {
updateLaunchConfigurationDialog();
}
@@ -311,6 +317,7 @@ public class RemoteCMainTab extends CMainTab {
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy config) {
int currentSelection = connectionCombo.getSelectionIndex();
@@ -334,6 +341,7 @@ public class RemoteCMainTab extends CMainTab {
/*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom
*/
+ @Override
public void initializeFrom(ILaunchConfiguration config) {
isInitializing = true;
@@ -421,6 +429,7 @@ public class RemoteCMainTab extends CMainTab {
fbLocalHost = fHost.getSystemType().isLocal();
}
+ @Override
protected Control createDialogArea(Composite parent) {
// create composite
Composite composite = (Composite) super
@@ -466,6 +475,7 @@ public class RemoteCMainTab extends CMainTab {
return composite;
}
+ @Override
protected void buttonPressed(int buttonId) {
if (!fbLocalHost && (buttonId == IDialogConstants.OK_ID)) {
IPropertySet propertySet = fHost
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java
index 486b69265d..34db365483 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java
@@ -15,8 +15,6 @@
package org.eclipse.cdt.launch.remote.tabs;
import org.eclipse.cdt.dsf.gdb.internal.ui.launching.GdbDebuggerPage;
-import org.eclipse.cdt.dsf.gdb.internal.ui.launching.SerialPortSettingsBlock;
-import org.eclipse.cdt.dsf.gdb.internal.ui.launching.TCPSettingsBlock;
import org.eclipse.cdt.internal.launch.remote.Messages;
import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
import org.eclipse.core.runtime.CoreException;
@@ -47,10 +45,12 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{
}
+ @Override
public String getName() {
return Messages.Remote_GDB_Debugger_Options;
}
+ @Override
public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) {
super.setDefaults(configuration);
configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND,
@@ -59,6 +59,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{
IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT );
}
+ @Override
public void initializeFrom( ILaunchConfiguration configuration ) {
setInitializing(true);
super.initializeFrom(configuration);
@@ -82,6 +83,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{
setInitializing(false);
}
+ @Override
public void performApply( ILaunchConfigurationWorkingCopy configuration ) {
super.performApply(configuration);
String str = fGDBServerCommandText.getText();
@@ -143,6 +145,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage{
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder)
*/
+ @Override
public void createTabs( TabFolder tabFolder ) {
super.createTabs( tabFolder );
createGdbserverSettingsTab( tabFolder );
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java
index b5d8ee7c36..4e3ea3f39d 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java
@@ -43,10 +43,12 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage {
protected Text fGDBServerPortNumberText;
+ @Override
public String getName() {
return Messages.Remote_GDB_Debugger_Options;
}
+ @Override
public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) {
super.setDefaults(configuration);
configuration.setAttribute( IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND,
@@ -55,6 +57,7 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage {
IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT_DEFAULT );
}
+ @Override
public void initializeFrom( ILaunchConfiguration configuration ) {
super.initializeFrom(configuration);
String gdbserverCommand = null;
@@ -75,6 +78,7 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage {
fGDBServerPortNumberText.setText( gdbserverPortNumber );
}
+ @Override
public void performApply( ILaunchConfigurationWorkingCopy configuration ) {
super.performApply(configuration);
String str = fGDBServerCommandText.getText();
@@ -136,6 +140,7 @@ public class RemoteGDBDebuggerPage extends GDBDebuggerPage {
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage#createTabs(org.eclipse.swt.widgets.TabFolder)
*/
+ @Override
public void createTabs( TabFolder tabFolder ) {
super.createTabs( tabFolder );
createGdbserverSettingsTab( tabFolder );

Back to the top