am 71f5d130: Merge change 1739 into donut
Merge commit '71f5d130f5d2c512cc811f538b4d0f6613451973' * commit '71f5d130f5d2c512cc811f538b4d0f6613451973': Fix an NPE in the New Project Wizard when no test project is specified
This commit is contained in:
committed by
The Android Open Source Project
commit
3ffb5c7544
@@ -352,9 +352,6 @@ public class NewProjectWizard extends Wizard implements INewWizard {
|
||||
}
|
||||
|
||||
final ProjectInfo testData = collectTestPageInfo();
|
||||
if (mTestPage != null && testData == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Create a monitored operation to create the actual project
|
||||
WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
|
||||
@@ -439,9 +436,12 @@ public class NewProjectWizard extends Wizard implements INewWizard {
|
||||
if (mTestPage == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
TestInfo info = mTestPage.getTestInfo();
|
||||
|
||||
if (!info.getCreateTestProject()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
IWorkspace workspace = ResourcesPlugin.getWorkspace();
|
||||
final IProject project = workspace.getRoot().getProject(info.getProjectName());
|
||||
final IProjectDescription description = workspace.newProjectDescription(project.getName());
|
||||
|
||||
Reference in New Issue
Block a user