LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 71f5d130: Merge change 1739 into donut

Browse Source 
Merge commit '71f5d130f5d2c512cc811f538b4d0f6613451973'

* commit '71f5d130f5d2c512cc811f538b4d0f6613451973':
  Fix an NPE in the New Project Wizard when no test project is specified
This commit is contained in:
Android (Google) Code Review
2009-05-14 19:43:59 -07:00
committed by The Android Open Source Project
parent 12ad2e48ee 71f5d130f5
commit 3ffb5c7544
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectWizard.java
View File

@@ -352,9 +352,6 @@ public class NewProjectWizard extends Wizard implements INewWizard {
} }
final ProjectInfo testData = collectTestPageInfo(); final ProjectInfo testData = collectTestPageInfo();
if (mTestPage != null && testData == null) {
return false;
}
// Create a monitored operation to create the actual project // Create a monitored operation to create the actual project
WorkspaceModifyOperation op = new WorkspaceModifyOperation() { WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
@@ -439,9 +436,12 @@ public class NewProjectWizard extends Wizard implements INewWizard {
if (mTestPage == null) { if (mTestPage == null) {
return null; return null;
} }
TestInfo info = mTestPage.getTestInfo(); TestInfo info = mTestPage.getTestInfo();
if (!info.getCreateTestProject()) {
return null;
}
IWorkspace workspace = ResourcesPlugin.getWorkspace(); IWorkspace workspace = ResourcesPlugin.getWorkspace();
final IProject project = workspace.getRoot().getProject(info.getProjectName()); final IProject project = workspace.getRoot().getProject(info.getProjectName());
final IProjectDescription description = workspace.newProjectDescription(project.getName()); final IProjectDescription description = workspace.newProjectDescription(project.getName());