diff options
8 files changed, 31 insertions, 22 deletions
diff --git a/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardPath.java b/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardPath.java index 69abb07..1a7fc0a 100644 --- a/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardPath.java +++ b/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardPath.java @@ -15,7 +15,12 @@ */ package com.google.gct.idea.appengine.wizard; -import com.android.tools.idea.wizard.*; +import com.android.tools.idea.npw.FormFactorUtils; +import com.android.tools.idea.npw.ModuleTemplate; +import com.android.tools.idea.npw.NewModuleDynamicPath; +import com.android.tools.idea.wizard.WizardConstants; +import com.android.tools.idea.wizard.dynamic.DynamicWizardPath; +import com.android.tools.idea.wizard.dynamic.ScopedStateStore; import com.google.common.collect.Lists; import com.google.gct.idea.util.GctBundle; import icons.GoogleCloudToolsIcons; @@ -27,7 +32,7 @@ import javax.swing.*; import java.io.File; import java.util.List; -import static com.android.tools.idea.wizard.ScopedStateStore.*; +import static com.android.tools.idea.wizard.dynamic.ScopedStateStore.*; /** * The global path used in the "create a new AppEngine module" wizard process. diff --git a/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardPathFactory.java b/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardPathFactory.java index 158e366..e9ce72c 100644 --- a/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardPathFactory.java +++ b/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardPathFactory.java @@ -15,8 +15,8 @@ */ package com.google.gct.idea.appengine.wizard; -import com.android.tools.idea.wizard.NewModuleDynamicPath; -import com.android.tools.idea.wizard.NewModuleDynamicPathFactory; +import com.android.tools.idea.npw.NewModuleDynamicPath; +import com.android.tools.idea.npw.NewModuleDynamicPathFactory; import com.google.common.collect.ImmutableList; import com.intellij.openapi.Disposable; import com.intellij.openapi.project.Project; diff --git a/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStep.java b/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStep.java index 1af209c..a7c64ae 100644 --- a/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStep.java +++ b/android-studio-plugin/src/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStep.java @@ -17,9 +17,9 @@ package com.google.gct.idea.appengine.wizard; import com.android.tools.idea.templates.Parameter; import com.android.tools.idea.templates.TemplateMetadata; -import com.android.tools.idea.wizard.ComboBoxItem; -import com.android.tools.idea.wizard.DynamicWizardStepWithHeaderAndDescription; -import com.android.tools.idea.wizard.ScopedStateStore.Key; +import com.android.tools.idea.ui.ComboBoxItemWithApiTag; +import com.android.tools.idea.wizard.dynamic.DynamicWizardStepWithHeaderAndDescription; +import com.android.tools.idea.wizard.dynamic.ScopedStateStore.Key; import com.android.tools.idea.wizard.WizardConstants; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -32,7 +32,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.psi.PsiNameHelper; import com.intellij.ui.JBColor; -import com.intellij.util.ui.UIUtil; import icons.GoogleCloudToolsIcons; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.annotations.NonNls; @@ -106,7 +105,7 @@ public class NewCloudModuleDynamicWizardStep extends DynamicWizardStepWithHeader @SuppressWarnings("unchecked") private void initModuleTypes() { for (TemplateInfo template : CLOUD_TEMPLATES) { - myModuleTypesCombo.addItem(new ComboBoxItem(template.getFile(), template.getMetadata().getTitle(), 1, 1)); + myModuleTypesCombo.addItem(new ComboBoxItemWithApiTag(template.getFile(), template.getMetadata().getTitle(), 1, 1)); } } @@ -124,7 +123,7 @@ public class NewCloudModuleDynamicWizardStep extends DynamicWizardStepWithHeader moduleNameLabel += String.format(" (%s)", packageName); } } - myClientModuleCombo.addItem(new ComboBoxItem(module.getName(), moduleNameLabel, 1, 1)); + myClientModuleCombo.addItem(new ComboBoxItemWithApiTag(module.getName(), moduleNameLabel, 1, 1)); } } } diff --git a/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.java b/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.java index 5c23695..038d600 100644 --- a/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.java +++ b/android-studio-plugin/src/com/google/gct/idea/samples/SampleBrowserStep.java @@ -15,7 +15,8 @@ */ package com.google.gct.idea.samples; -import com.android.tools.idea.wizard.*; +import com.android.tools.idea.wizard.dynamic.DynamicWizardStepWithHeaderAndDescription; +import com.android.tools.idea.wizard.dynamic.ScopedStateStore; import com.android.utils.HtmlBuilder; import com.appspot.gsamplesindex.samplesindex.model.Sample; import com.appspot.gsamplesindex.samplesindex.model.SampleCollection; @@ -43,7 +44,7 @@ import java.awt.event.ActionListener; import java.util.HashSet; import java.util.Set; -import static com.android.tools.idea.wizard.ScopedStateStore.*; +import static com.android.tools.idea.wizard.dynamic.ScopedStateStore.*; import static com.google.gct.idea.samples.SampleImportWizardPath.SAMPLE_KEY; import static com.google.gct.idea.samples.SampleImportWizardPath.SAMPLE_URL; diff --git a/android-studio-plugin/src/com/google/gct/idea/samples/SampleImportWizard.java b/android-studio-plugin/src/com/google/gct/idea/samples/SampleImportWizard.java index 554c8cb..6aeed18 100644 --- a/android-studio-plugin/src/com/google/gct/idea/samples/SampleImportWizard.java +++ b/android-studio-plugin/src/com/google/gct/idea/samples/SampleImportWizard.java @@ -15,7 +15,7 @@ */ package com.google.gct.idea.samples; -import com.android.tools.idea.wizard.DynamicWizard; +import com.android.tools.idea.wizard.dynamic.DynamicWizard; import com.appspot.gsamplesindex.samplesindex.model.SampleCollection; import com.google.gct.idea.util.GctBundle; import com.intellij.openapi.project.Project; @@ -77,7 +77,7 @@ public class SampleImportWizard extends DynamicWizard { } @Override - protected String getWizardActionDescription() { + public String getWizardActionDescription() { return GctBundle.message("sample.import.title"); } } diff --git a/android-studio-plugin/src/com/google/gct/idea/samples/SampleImportWizardPath.java b/android-studio-plugin/src/com/google/gct/idea/samples/SampleImportWizardPath.java index 4d34bca..11821a8 100644 --- a/android-studio-plugin/src/com/google/gct/idea/samples/SampleImportWizardPath.java +++ b/android-studio-plugin/src/com/google/gct/idea/samples/SampleImportWizardPath.java @@ -17,7 +17,8 @@ package com.google.gct.idea.samples; import com.android.tools.idea.gradle.project.GradleProjectImporter; import com.android.tools.idea.stats.UsageTracker; -import com.android.tools.idea.wizard.*; +import com.android.tools.idea.wizard.dynamic.DynamicWizardPath; +import com.android.tools.idea.wizard.dynamic.ScopedStateStore; import com.appspot.gsamplesindex.samplesindex.model.Sample; import com.appspot.gsamplesindex.samplesindex.model.SampleCollection; import com.google.common.base.Strings; @@ -39,8 +40,8 @@ import java.io.File; import java.io.IOException; import java.util.List; -import static com.android.tools.idea.wizard.ScopedStateStore.Scope.PATH; -import static com.android.tools.idea.wizard.ScopedStateStore.createKey; +import static com.android.tools.idea.wizard.dynamic.ScopedStateStore.Scope.PATH; +import static com.android.tools.idea.wizard.dynamic.ScopedStateStore.createKey; /** * Wizard path for importing a Sample as a Project diff --git a/android-studio-plugin/src/com/google/gct/idea/samples/SampleSetupStep.java b/android-studio-plugin/src/com/google/gct/idea/samples/SampleSetupStep.java index dcc1fca..1c32b7e 100644 --- a/android-studio-plugin/src/com/google/gct/idea/samples/SampleSetupStep.java +++ b/android-studio-plugin/src/com/google/gct/idea/samples/SampleSetupStep.java @@ -15,7 +15,10 @@ */ package com.google.gct.idea.samples; -import com.android.tools.idea.wizard.*; +import com.android.tools.idea.npw.NewProjectWizardState; +import com.android.tools.idea.npw.WizardUtils; +import com.android.tools.idea.wizard.dynamic.DynamicWizardStepWithHeaderAndDescription; +import com.android.tools.idea.wizard.dynamic.ScopedStateStore; import com.appspot.gsamplesindex.samplesindex.model.Sample; import com.google.gct.idea.util.GctBundle; import com.intellij.openapi.Disposable; @@ -37,7 +40,7 @@ import static com.google.gct.idea.samples.SampleImportWizardPath.SAMPLE_NAME; import static com.google.gct.idea.samples.SampleImportWizardPath.SAMPLE_DIR; import static com.google.gct.idea.samples.SampleImportWizardPath.SAMPLE_KEY; import static com.google.gct.idea.samples.SampleImportWizardPath.SAMPLE_URL; -import static com.android.tools.idea.wizard.ScopedStateStore.Key; +import static com.android.tools.idea.wizard.dynamic.ScopedStateStore.Key; /** * SampleSetupStep is the second/final page in the Sample Import wizard that sets project/module name, location, and other project-global diff --git a/android-studio-plugin/testSrc/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStepTest.java b/android-studio-plugin/testSrc/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStepTest.java index 820c3ef..ddd27d1 100644 --- a/android-studio-plugin/testSrc/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStepTest.java +++ b/android-studio-plugin/testSrc/com/google/gct/idea/appengine/wizard/NewCloudModuleDynamicWizardStepTest.java @@ -15,9 +15,9 @@ */ package com.google.gct.idea.appengine.wizard; -import com.android.tools.idea.wizard.AndroidStudioWizardPath; -import com.android.tools.idea.wizard.ModuleTemplate; -import com.android.tools.idea.wizard.NewModuleWizardDynamic; +import com.android.tools.idea.wizard.dynamic.AndroidStudioWizardPath; +import com.android.tools.idea.npw.ModuleTemplate; +import com.android.tools.idea.npw.NewModuleWizardDynamic; import com.android.tools.idea.wizard.WizardConstants; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; |