Skip to content

Commit 9262436

Browse files
authored
Merge pull request #108 from eharris369/107-compareFilesInsteadOfPaths
Issue #107: Use files to compare instead of paths
2 parents 4d807fe + 1290df4 commit 9262436

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MCUtil.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,6 @@ public static boolean isWindows() {
7373
return os != null && os.toLowerCase().startsWith("windows");
7474
}
7575

76-
public static boolean pathEquals(IPath path, IPath path2) {
77-
if (isWindows()) {
78-
// case-insensitivity on windows
79-
String pathStr = path.toOSString();
80-
String pathStr2 = path2.toOSString();
81-
return pathStr.equalsIgnoreCase(pathStr2);
82-
}
83-
return path.equals(path2);
84-
}
85-
8676
/**
8777
* Append finish to start, removing the last segment of start if it is equal to the first segment of finish.
8878
*/

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/DeleteProjectAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void run() {
6666
try {
6767
app.mcConnection.requestProjectDelete(app.projectID);
6868
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(app.name);
69-
if (project != null && project.exists() && project.getLocation().equals(app.fullLocalPath)) {
69+
if (project != null && project.exists() && project.getLocation().toFile().equals(app.fullLocalPath.toFile())) {
7070
project.delete(false, true, new NullProgressMonitor());
7171
}
7272
} catch (Exception e) {

0 commit comments

Comments
 (0)