Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.debug.ui/schema/launchConfigurationTabs.exsd2
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java7
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java4
3 files changed, 10 insertions, 3 deletions
diff --git a/org.eclipse.debug.ui/schema/launchConfigurationTabs.exsd b/org.eclipse.debug.ui/schema/launchConfigurationTabs.exsd
index c9b865155..b764fef23 100644
--- a/org.eclipse.debug.ui/schema/launchConfigurationTabs.exsd
+++ b/org.eclipse.debug.ui/schema/launchConfigurationTabs.exsd
@@ -83,7 +83,7 @@
<attribute name="after" type="string" use="required">
<annotation>
<documentation>
- specifies the id of the tab that this tab should appear immediately after in the left to right arrangement of tabs
+ Specifies the id of the tab that this tab should appear immediately after in the left to right arrangement of tabs. The ID specified here should match the value returned by org.eclipse.debug.ui.AbstractLaunchConfigurationTab.getID(), which may be different than the ID specified in the tab declaration of this extension point.
</documentation>
</annotation>
</attribute>
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java
index d0762f58b..60c4d9719 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupWrapper.java
@@ -62,7 +62,7 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT
for (Iterator iterator = extList.iterator(); iterator.hasNext();) {
LaunchConfigurationTabExtension launchConfigurationTabExtension = (LaunchConfigurationTabExtension)iterator.next();
String relativeTab = launchConfigurationTabExtension.getRelativeTabId();
- if (idSet.contains(relativeTab)) {
+ if (relativeTab == null || idSet.contains(relativeTab)) {
iterator.remove();
return launchConfigurationTabExtension.getTab();
}
@@ -169,7 +169,10 @@ public class LaunchConfigurationTabGroupWrapper implements ILaunchConfigurationT
if(ext.length > 0) {
TabCollector collector = new TabCollector(Arrays.asList(fGroup.getTabs()), Arrays.asList(ext));
while(collector.hasNext()) {
- fTabs.add(collector.next());
+ Object next = collector.next();
+ if (next != null) {
+ fTabs.add(next);
+ }
}
}
else {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java
index c3692a36d..d2dfe3ecd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java
@@ -87,6 +87,10 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab {
fSourceLookupPanel.performApply(configuration);
}
+ public String getId() {
+ return "org.eclipse.debug.ui.sourceLookupTab"; //$NON-NLS-1$
+ }
+
/* (non-Javadoc)
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/

Back to the top