commit 7863f3ea7dd9876255bb75a0e86f80e1984ec736
author Thomas Broyer <t.broyer@gmail.com> Sat Mar 08 15:27:47 2014 +0100
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 05 14:26:12 2014 +0000
tree 436151da41f32fd34b6baabfe76acd01cdeb4b3e
parent 4298446b6a61b4eccea7ef912cf046f7de9e6a4c

Windows compatibility for SuperDevMode

java.util.File normalizes separators for the platform, so comparisons
with paths with forward-slashes will fail on Windows.
Splitting the filename and directory path is now done using string
manipulation rather than through File.

Bug: issue 8618
Change-Id: Ib10d352dac04ce2b359e98ffa7481b4b6608aab3
(cherry picked from commit 19c8cdb8e0e46dd8c959f16be5f2493a0a2f9130)

dev/codeserver/java/com/google/gwt/dev/codeserver/SourceMap.java

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/SourceMap.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/SourceMap.java
index 3c13186..b44dc98 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/SourceMap.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/SourceMap.java
@@ -81,7 +81,8 @@
     Set<String> directories = new HashSet<String>();
     for (int i = 0; i < sources.getLength(); i++) {
       String filename = sources.get(i).asString().getString();
-      directories.add(new File(filename).getParent());
+      int lastSlashPos = filename.lastIndexOf('/');
+      directories.add(lastSlashPos < 0 ? "" : filename.substring(0, lastSlashPos));
     }
 
     List<String> result = new ArrayList<String>();
@@ -102,9 +103,13 @@
 
     List<String> result = new ArrayList<String>();
     for (int i = 0; i < sources.getLength(); i++) {
-      File candidate = new File(sources.get(i).asString().getString());
-      if (parent.equals(candidate.getParent() + "/")) {
-        result.add(candidate.getName());
+      String candidate = sources.get(i).asString().getString();
+      if (!candidate.startsWith(parent)) {
+        continue;
+      }
+      int nameStart = candidate.lastIndexOf('/') + 1;
+      if (nameStart == parent.length()) {
+        result.add(candidate.substring(nameStart));
       }
     }