Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarin Wright2002-05-03 13:44:40 +0000
committerDarin Wright2002-05-03 13:44:40 +0000
commit185b4274a06ae32f68e2d7cf912e0aefead5ab57 (patch)
tree0cf51a92852b684c77d3bd6be89d9049f8b1f57e
parentd03889e651b4d15c94912bfdb9ba1e43d658ddeb (diff)
downloadeclipse.platform.debug-Debug-M5.tar.gz
eclipse.platform.debug-Debug-M5.tar.xz
eclipse.platform.debug-Debug-M5.zip
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java12
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationHistoryElement.java3
2 files changed, 15 insertions, 0 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
index 3cc45fcf4..7914bc651 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
@@ -1109,6 +1109,18 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
all.addAll(fDebugHistory);
all.addAll(fRunHistory);
+ // fix for bug 14877 - remove entries with no configuration if using configs
+ if (usingConfigurationStyleLaunching()) {
+ List remove = new ArrayList();
+ Iterator iter = all.iterator();
+ while (iter.hasNext()) {
+ LaunchConfigurationHistoryElement item = (LaunchConfigurationHistoryElement)iter.next();
+ if (item.getLaunchConfiguration() == null) {
+ remove.add(item);
+ }
+ }
+ all.removeAll(remove);
+ }
Iterator iter = all.iterator();
while (iter.hasNext()) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationHistoryElement.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationHistoryElement.java
index 8b4d5e5e2..d11a95788 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationHistoryElement.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationHistoryElement.java
@@ -169,6 +169,9 @@ public class LaunchConfigurationHistoryElement {
* @see Object#equals(java.lang.Object)
*/
public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
if (o instanceof LaunchConfigurationHistoryElement) {
LaunchConfigurationHistoryElement e= (LaunchConfigurationHistoryElement)o;
if (isConfigurationBased()) {

Back to the top