diff options
author | Tor Norbye <tnorbye@google.com> | 2012-03-07 15:46:28 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-07 15:46:28 -0800 |
commit | c1a04bc8bfaa1aa2e48e1e08b9ff0ed78795f9d8 (patch) | |
tree | e8638b49f433d99d58d7b46b74f1c86a96d5aecd /eclipse | |
parent | 63eaae28b16b2205e047d7c9ed03e8b493894103 (diff) | |
parent | 785d57bd7555cbbd2451be02079dac77b3280aee (diff) | |
download | sdk-c1a04bc8bfaa1aa2e48e1e08b9ff0ed78795f9d8.zip sdk-c1a04bc8bfaa1aa2e48e1e08b9ff0ed78795f9d8.tar.gz sdk-c1a04bc8bfaa1aa2e48e1e08b9ff0ed78795f9d8.tar.bz2 |
am 785d57bd: Merge "fixes a bug that Working Set specified in "New Android Project" wizard is ignored in some cases."
* commit '785d57bd7555cbbd2451be02079dac77b3280aee':
fixes a bug that Working Set specified in "New Android Project" wizard is ignored in some cases.
Diffstat (limited to 'eclipse')
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/ProjectNamePage.java | 5 |
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(); } } |