From 2a19db9ece5c7eca570b9c2c51882306c1eb8076 Mon Sep 17 00:00:00 2001 From: David Herman Date: Tue, 14 Jul 2015 18:24:53 -0700 Subject: Moved wizard UI components into ui package Various UI components lived in the wizard package for, what seems like, convenience, as they were only used by initial wizard code. However, there is a ui package which should really be the home for classes like that, and as a bonus, it cleans up the wizard package, which became cluttered with all sorts of extra classes over time. Change-Id: I28ddd5f9db593e63f0a60d3f830023361bd88e3c --- .../org/jetbrains/android/actions/CreateResourceActionBase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'android/src/org') 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); -- cgit v1.2.3