compare BundleInfo locations using Path.toFile to avoid case sensitivity on windows

1 files changed, 8 insertions, 8 deletions

diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundleInfo.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundleInfo.java
index 2de2c0dc3..c2ea527a0 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundleInfo.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundleInfo.java
@@ -85,7 +85,7 @@ public class BundleInfo {
 			if (info.symbolicName != null && info.version != null && symbolicName != null && version != null) {
 				// TODO: the equalsIgnoreCase for location comparison is a bug;
 				//		 need a platform sensitive location comparison method
-				if (info.symbolicName.equals(symbolicName) && info.version.equals(version) && (info.location == null || location == null ? true : new Path(info.location).equals(new Path(location))))
+				if (info.symbolicName.equals(symbolicName) && info.version.equals(version) && (info.location == null || location == null ? true : new Path(info.location).toFile().equals(new Path(location).toFile())))
 					return true;
 			} else {
 				return (info.location == null || location == null ? false : info.location.equals(location));
@@ -177,21 +177,21 @@ public class BundleInfo {
 		buffer.append("BundleInfo("); //$NON-NLS-1$
 		if (symbolicName != null)
 			buffer.append(symbolicName);
-		buffer.append(", ");
+		buffer.append(", "); //$NON-NLS-1$
 		if (version != null)
 			buffer.append(version);
-		buffer.append(", ");
-		buffer.append("location=");
+		buffer.append(", "); //$NON-NLS-1$
+		buffer.append("location="); //$NON-NLS-1$
 		buffer.append(location);
 		buffer.append(", startLevel="); //$NON-NLS-1$
 		buffer.append(startLevel);
-		buffer.append(", toBeStarted=");
+		buffer.append(", toBeStarted="); //$NON-NLS-1$
 		buffer.append(markedAsStarted);
-		buffer.append(", resolved=");
+		buffer.append(", resolved="); //$NON-NLS-1$
 		buffer.append(resolved);
-		buffer.append(", id=");
+		buffer.append(", id="); //$NON-NLS-1$
 		buffer.append(this.bundleId);//		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available");
-		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available");
+		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available"); //$NON-NLS-1$ //$NON-NLS-2$
 		buffer.append(')');
 		return buffer.toString();
 	}