aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2010-03-26 15:57:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-26 15:57:53 -0700
commit424db69cdfc405b531554522b1393000d0a04d79 (patch)
tree6df38d8136001b1872f1dbbeac9f668a6cfb9e39 /eclipse
parent7b38bc7597b2f9b959023aa9266e47bbb3077d55 (diff)
parente1409d671365c758a85a518101b298500fa575bc (diff)
downloadsdk-424db69cdfc405b531554522b1393000d0a04d79.zip
sdk-424db69cdfc405b531554522b1393000d0a04d79.tar.gz
sdk-424db69cdfc405b531554522b1393000d0a04d79.tar.bz2
Merge "ADT project-lib: handle \\ dir separator for windows path."
Diffstat (limited to 'eclipse')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java
index a4c7f15..8c08baf 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java
@@ -35,6 +35,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.regex.Matcher;
/**
* Centralized state for Android Eclipse project.
@@ -551,7 +552,7 @@ public final class ProjectState {
* Converts a path containing only / by the proper platform separator.
*/
private String convertPath(String path) {
- return path.replaceAll("/", File.separator); //$NON-NLS-1$
+ return path.replaceAll("/", Matcher.quoteReplacement(File.separator)); //$NON-NLS-1$
}
/**