Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse')
-rw-r--r--debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java2
-rw-r--r--debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/IMIUIConstants.java4
-rw-r--r--debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java34
-rw-r--r--debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java4
-rw-r--r--debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java4
-rw-r--r--debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java15
6 files changed, 42 insertions, 21 deletions
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java
index fa93fefa7ba..d1a347565e2 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBServerDebuggerPage.java
@@ -193,7 +193,7 @@ public class GDBServerDebuggerPage extends GDBDebuggerPage
field.setDialogFieldListener(
new IDialogFieldListener()
{
- public void dialogFieldChanged( DialogField field )
+ public void dialogFieldChanged( DialogField f )
{
connectionTypeChanged();
}
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/IMIUIConstants.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/IMIUIConstants.java
index 462eeca6e46..86bbf9f450f 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/IMIUIConstants.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/IMIUIConstants.java
@@ -14,7 +14,7 @@ package org.eclipse.cdt.debug.mi.internal.ui;
public interface IMIUIConstants
{
/**
- * C/C++ Debug UI plug-in identifier (value <code>"org.eclipse.cdt.debug.ui"</code>).
+ * Plug-in identifier (value <code>"org.eclipse.cdt.debug.mi.ui"</code>).
*/
- public static final String PLUGIN_ID = MIUIPlugin.getDefault().getDescriptor().getUniqueIdentifier();
+ public static final String PLUGIN_ID = MIUIPlugin.getUniqueIdentifier();
}
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java
index d942590d22b..ff26dfa0351 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java
@@ -1,14 +1,21 @@
package org.eclipse.cdt.debug.mi.internal.ui;
-import org.eclipse.ui.plugin.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.resources.*;
-import java.util.*;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* The main plugin class to be used in the desktop.
*/
public class MIUIPlugin extends AbstractUIPlugin {
+
+ /**
+ * The plug-in identifier (value <code>"org.eclipse.cdt.debug.mi.ui"</code>).
+ */
+ public static final String PLUGIN_ID = "org.eclipse.cdt.debug.mi.ui" ; //$NON-NLS-1$
+
//The shared instance.
private static MIUIPlugin plugin;
//Resource bundle.
@@ -23,8 +30,8 @@ public class MIUIPlugin extends AbstractUIPlugin {
/**
* The constructor.
*/
- public MIUIPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
+ public MIUIPlugin() {
+ super();
plugin = this;
}
@@ -62,4 +69,19 @@ public class MIUIPlugin extends AbstractUIPlugin {
public ResourceBundle getResourceBundle() {
return resourceBundle;
}
+
+ /**
+ * Convenience method which returns the unique identifier of this plugin.
+ *
+ * @return the unique identifier of this plugin
+ */
+ public static String getUniqueIdentifier() {
+ if ( getDefault() == null ) {
+ // If the default instance is not yet initialized,
+ // return a static identifier. This identifier must
+ // match the plugin id defined in plugin.xml
+ return PLUGIN_ID; //$NON-NLS-1$
+ }
+ return getDefault().getBundle().getSymbolicName();
+ }
}
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java
index 2de930d1b45..cfe4e5d3e5f 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SerialPortSettingsBlock.java
@@ -114,7 +114,7 @@ public class SerialPortSettingsBlock extends Observable
field.setDialogFieldListener(
new IDialogFieldListener()
{
- public void dialogFieldChanged( DialogField field )
+ public void dialogFieldChanged( DialogField f )
{
deviceFieldChanged();
}
@@ -130,7 +130,7 @@ public class SerialPortSettingsBlock extends Observable
field.setDialogFieldListener(
new IDialogFieldListener()
{
- public void dialogFieldChanged( DialogField field )
+ public void dialogFieldChanged( DialogField f )
{
speedFieldChanged();
}
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java
index 28f9762fc0a..112996e48f7 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/TCPSettingsBlock.java
@@ -108,7 +108,7 @@ public class TCPSettingsBlock extends Observable
field.setDialogFieldListener(
new IDialogFieldListener()
{
- public void dialogFieldChanged( DialogField field )
+ public void dialogFieldChanged( DialogField f )
{
hostNameFieldChanged();
}
@@ -123,7 +123,7 @@ public class TCPSettingsBlock extends Observable
field.setDialogFieldListener(
new IDialogFieldListener()
{
- public void dialogFieldChanged( DialogField field )
+ public void dialogFieldChanged( DialogField f )
{
portNumberFieldChanged();
}
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java
index d387dc4fb24..4232916cfff 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/dialogfields/SelectionButtonDialogFieldGroup.java
@@ -87,14 +87,13 @@ public class SelectionButtonDialogFieldGroup extends DialogField {
buttonsgroup.setLayoutData(gd);
return new Control[] { label, buttonsgroup };
- } else {
- Composite buttonsgroup= getSelectionButtonsGroup(parent);
- GridData gd= new GridData();
- gd.horizontalSpan= nColumns;
- buttonsgroup.setLayoutData(gd);
-
- return new Control[] { buttonsgroup };
- }
+ }
+ Composite buttonsgroup= getSelectionButtonsGroup(parent);
+ GridData gd= new GridData();
+ gd.horizontalSpan= nColumns;
+ buttonsgroup.setLayoutData(gd);
+
+ return new Control[] { buttonsgroup };
}
/*

Back to the top