From 8d1b536b7d8473d86991343c6c545897f7cff889 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Tue, 13 Dec 2016 19:07:27 +0300 Subject: [PATCH] Common schemes UI elements moved to 'schemes' package --- .../options/codeStyle/CodeStyleSchemesActions.java | 2 +- .../application/options/codeStyle/CodeStyleSchemesPanel.java | 2 +- .../application/options/colors/ColorSchemeActions.java | 2 +- .../com/intellij/application/options/colors/SchemesPanel.java | 2 +- .../options/{ => schemes}/DefaultSchemeActions.java | 2 +- .../options/schemes}/ManageSchemesComboAction.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) rename platform/lang-impl/src/com/intellij/application/options/{ => schemes}/DefaultSchemeActions.java (99%) rename platform/lang-impl/src/com/intellij/{ui => application/options/schemes}/ManageSchemesComboAction.java (94%) diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesActions.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesActions.java index 198aaa43fa97..0652ce0e0f47 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesActions.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesActions.java @@ -15,7 +15,7 @@ */ package com.intellij.application.options.codeStyle; -import com.intellij.application.options.DefaultSchemeActions; +import com.intellij.application.options.schemes.DefaultSchemeActions; import com.intellij.application.options.SaveSchemeDialog; import com.intellij.application.options.SchemesToImportPopup; import com.intellij.openapi.actionSystem.AnAction; diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java index b1bac0db77e2..b94474c97cc6 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java @@ -20,7 +20,7 @@ package com.intellij.application.options.codeStyle; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.codeStyle.CodeStyleScheme; import com.intellij.ui.ListCellRendererWrapper; -import com.intellij.ui.ManageSchemesComboAction; +import com.intellij.application.options.schemes.ManageSchemesComboAction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorSchemeActions.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorSchemeActions.java index 0de3060b4bc6..62621020c210 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorSchemeActions.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorSchemeActions.java @@ -15,7 +15,7 @@ */ package com.intellij.application.options.colors; -import com.intellij.application.options.DefaultSchemeActions; +import com.intellij.application.options.schemes.DefaultSchemeActions; import com.intellij.application.options.SaveSchemeDialog; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.editor.colors.EditorColorsScheme; diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java index eca8a685b483..be41fc261945 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java @@ -22,7 +22,7 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.colors.impl.AbstractColorsScheme; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.ui.ComboBox; -import com.intellij.ui.ManageSchemesComboAction; +import com.intellij.application.options.schemes.ManageSchemesComboAction; import com.intellij.util.EventDispatcher; import com.intellij.util.ui.JBInsets; import org.jetbrains.annotations.NotNull; diff --git a/platform/lang-impl/src/com/intellij/application/options/DefaultSchemeActions.java b/platform/lang-impl/src/com/intellij/application/options/schemes/DefaultSchemeActions.java similarity index 99% rename from platform/lang-impl/src/com/intellij/application/options/DefaultSchemeActions.java rename to platform/lang-impl/src/com/intellij/application/options/schemes/DefaultSchemeActions.java index 6651df2439b9..86eeede73f7d 100644 --- a/platform/lang-impl/src/com/intellij/application/options/DefaultSchemeActions.java +++ b/platform/lang-impl/src/com/intellij/application/options/schemes/DefaultSchemeActions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.application.options; +package com.intellij.application.options.schemes; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationBundle; diff --git a/platform/lang-impl/src/com/intellij/ui/ManageSchemesComboAction.java b/platform/lang-impl/src/com/intellij/application/options/schemes/ManageSchemesComboAction.java similarity index 94% rename from platform/lang-impl/src/com/intellij/ui/ManageSchemesComboAction.java rename to platform/lang-impl/src/com/intellij/application/options/schemes/ManageSchemesComboAction.java index 8b35a36b4230..e6f43164683b 100644 --- a/platform/lang-impl/src/com/intellij/ui/ManageSchemesComboAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/schemes/ManageSchemesComboAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ui; +package com.intellij.application.options.schemes; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; @@ -21,7 +21,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ex.ComboBoxAction; -import com.intellij.application.options.DefaultSchemeActions; +import com.intellij.application.options.schemes.DefaultSchemeActions; import com.intellij.openapi.options.Scheme; import org.jetbrains.annotations.NotNull;