aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2012-03-26 08:50:27 -0700
committerSiva Velusamy <vsiva@google.com>2012-03-26 08:50:27 -0700
commitac94b5115f07d079af021cb3f113410e0ffa6541 (patch)
tree45ec18239f8d8c9b733572701e11834f6a0e7fa3 /eclipse
parent9af3fd6975e0fc4d63de0523288ebc78835b7266 (diff)
downloadsdk-ac94b5115f07d079af021cb3f113410e0ffa6541.zip
sdk-ac94b5115f07d079af021cb3f113410e0ffa6541.tar.gz
sdk-ac94b5115f07d079af021cb3f113410e0ffa6541.tar.bz2
Use different names for the application and test projects.
This patch fixes the bug where the test project & application projects were both using the same name if they were created outside the workspace. Change-Id: I0fa83ef62346ee39c6ec942d9bcd59e5f14cf0e7
Diffstat (limited to 'eclipse')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java3
1 files changed, 3 insertions, 0 deletions
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 ab34f92..5b557ac 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
@@ -395,7 +395,10 @@ public class NewProjectCreator {
final HashMap<String, String> dictionary = new HashMap<String, String>();
dictionary.put(STRING_APP_NAME, mValues.testApplicationName);
+ // Use the same logic to determine test project location as in
+ // ApplicationInfoPage#validateTestProjectLocation
IPath path = new Path(mValues.projectLocation.getPath());
+ path = path.removeLastSegments(1).append(mValues.testProjectName);
IPath defaultLocation = Platform.getLocation();
if ((!mValues.useDefaultLocation || mValues.useExisting)
&& !path.equals(defaultLocation)) {