am af6d1e01: am c1a04bc8: am 785d57bd: Merge "fixes a bug that Working Set specified in "New Android Project" wizard is ignored in some cases."

* commit 'af6d1e01e84f2f30b8dc8a82cf343a3636e7e2b9':
  fixes a bug that Working Set specified in "New Android Project" wizard is ignored in some cases.

1 files changed, 3 insertions, 2 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/ProjectNamePage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/ProjectNamePage.java
index ff77b9f..d4c342c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/ProjectNamePage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/ProjectNamePage.java
@@ -40,6 +40,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.osgi.util.TextProcessor;
 import org.eclipse.swt.SWT;
@@ -625,11 +626,11 @@ class ProjectNamePage extends WizardPage implements SelectionListener, ModifyLis
     }
 
     @Override
-    public boolean canFlipToNextPage() {
+    public IWizardPage getNextPage() {
         // Sync working set data to the value object, since the WorkingSetGroup
         // doesn't let us add listeners to do this lazily
         mValues.workingSets = getWorkingSets();
 
-        return super.canFlipToNextPage();
+        return super.getNextPage();
     }
 }