From f3a1c511c69b5733256e12b5b659e69f006a77fb Mon Sep 17 00:00:00 2001 From: Siva Velusamy Date: Fri, 7 Oct 2011 10:17:06 -0700 Subject: [PATCH] Cherrypick e6c1198 from master for r14. do not merge. Project location should not be set if it is in workspace. If the project is created inside the workspace, then the project description should not set the location. Otherwise the project creation will fail with an error. Change-Id: Id1b1a2e6f18d988659727953fad131a14c841dfb --- .../ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java index dc70d3881..e6739b39c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java @@ -319,7 +319,7 @@ public class NewProjectCreator { IPath path = new Path(mValues.projectLocation.getPath()); IPath defaultLocation = Platform.getLocation(); if ((!mValues.useDefaultLocation || mValues.useExisting) - && !path.equals(defaultLocation)) { + && !defaultLocation.isPrefixOf(path)) { description.setLocation(path); } -- 2.11.0