diff options
| author | David Herman <davidherman@google.com> | 2015-07-16 16:44:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-16 16:44:35 +0000 |
| commit | eece2f0d2213fdd64375360b2a8da001ab9b8f7a (patch) | |
| tree | 7b3fc98d92b152fa319be39a624e6e4adfc23424 /android/src/org | |
| parent | 80d475d9611f3c13a35e99ef45a718a534ae3df7 (diff) | |
| parent | 386b800bddff2f3c89d5a4933b2c4a6e3be826c0 (diff) | |
| download | idea-eece2f0d2213fdd64375360b2a8da001ab9b8f7a.tar.gz | |
Merge changes from topic 'wizard_reorg' into studio-1.4-dev
* changes:
Moved stray class to idea.template
Moved wizard UI components into ui package
Moved wizard forms into npw package
Moved some wizard classes into wizard.dynamic
Moved some wizard classes into wizard.template
Removed unused wizard classes
Diffstat (limited to 'android/src/org')
| -rw-r--r-- | android/src/org/jetbrains/android/actions/CreateResourceActionBase.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android/src/org/jetbrains/android/actions/CreateResourceActionBase.java b/android/src/org/jetbrains/android/actions/CreateResourceActionBase.java index 0f014f15c43..c61c506fb48 100644 --- a/android/src/org/jetbrains/android/actions/CreateResourceActionBase.java +++ b/android/src/org/jetbrains/android/actions/CreateResourceActionBase.java @@ -19,7 +19,7 @@ package org.jetbrains.android.actions; import com.android.builder.model.SourceProvider; import com.android.tools.idea.AndroidPsiUtils; import com.android.tools.idea.navigator.AndroidProjectViewPane; -import com.android.tools.idea.wizard.ComboBoxItem; +import com.android.tools.idea.ui.ComboBoxItemWithApiTag; import com.intellij.ide.IdeView; import com.intellij.ide.actions.ElementCreator; import com.intellij.ide.projectView.ProjectView; @@ -71,8 +71,8 @@ public abstract class CreateResourceActionBase extends AnAction { public static SourceProvider getSourceProvider(@Nullable JComboBox combo) { if (combo != null && combo.isVisible()) { Object selectedItem = combo.getSelectedItem(); - if (selectedItem instanceof ComboBoxItem) { - return (SourceProvider)((ComboBoxItem)selectedItem).id; + if (selectedItem instanceof ComboBoxItemWithApiTag) { + return (SourceProvider)((ComboBoxItemWithApiTag)selectedItem).id; } } @@ -132,7 +132,7 @@ public abstract class CreateResourceActionBase extends AnAction { DefaultComboBoxModel model = new DefaultComboBoxModel(); for (SourceProvider sourceProvider : providers) { //noinspection unchecked - model.addElement(new ComboBoxItem(sourceProvider, sourceProvider.getName(), 0, 0)); + model.addElement(new ComboBoxItemWithApiTag(sourceProvider, sourceProvider.getName(), 0, 0)); } combo.setModel(model); |