Bug 369524 - 'Installed JREs > Search...' should also find JDKs fromv20120430-2105I20120430-2000I20120430-1800

Developer Package

2 files changed, 5 insertions, 7 deletions

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java
index 7d1183045..839bb700a 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/InstalledJREsBlock.java
@@ -784,11 +784,13 @@ public class InstalledJREsBlock implements IAddVMDialogRequestor, ISelectionProv
 				Iterator<Object> iterator = fVMs.iterator();
 				while (iterator.hasNext()) {
 					IVMInstall vm = (IVMInstall) iterator.next();
-					exists.add(vm.getId());
+					exists.add(vm.getInstallLocation().getPath());
 				}
 				VMStandin[] standins = new MacVMSearch().search(monitor);
 				for (int i = 0; i < standins.length; i++) {
-					if (!exists.contains(standins[i].getId())) {
+					//we should be comparing install paths, as the ID can be computed differently 
+					//based on if the VM is searched or added manually
+					if (!exists.contains(standins[i].getInstallLocation().getPath())) {
 						added.add(standins[i]);
 					}
 				}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java
index d77410590..80617085f 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PListParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -153,10 +153,6 @@ public class PListParser {
 			}
 		} else if (nodeName.equalsIgnoreCase(STRING_ELEMENT)) {
 			return getText(element);
-		} else if (nodeName.equalsIgnoreCase(KEY_ELEMENT)) {
-			return getText(element);
-		} else {
-			// TODO: unsupported
 		}
 		return null;
 	}