From 901137d5e8a1b2b1e24b1847fd4d3236f75175cc Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Mon, 5 Jul 2010 22:23:49 +0400 Subject: [PATCH] moved LanguageTextField to lang-impl --- .../lang-impl/src/com/intellij/ui}/LanguageTextField.java | 3 +-- .../lang-impl/src/com/intellij/ui}/ShiftTabAction.java | 3 +-- .../org/intellij/plugins/intelliLang/AdvancedSettingsUI.java | 2 +- .../plugins/intelliLang/inject/config/ui/AdvancedPanel.java | 2 +- .../plugins/intelliLang/inject/config/ui/LanguagePanel.java | 2 +- .../plugins/intelliLang/inject/config/ui/AdvancedXmlPanel.java | 2 +- .../plugins/intelliLang/inject/config/ui/TagPanel.java | 2 +- .../intelliLang/inject/config/ui/XmlAttributePanel.java | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) rename {plugins/IntelliLang/src/org/intellij/plugins/intelliLang/util => platform/lang-impl/src/com/intellij/ui}/LanguageTextField.java (97%) rename {plugins/IntelliLang/src/org/intellij/plugins/intelliLang/util => platform/lang-impl/src/com/intellij/ui}/ShiftTabAction.java (96%) diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/util/LanguageTextField.java b/platform/lang-impl/src/com/intellij/ui/LanguageTextField.java similarity index 97% rename from plugins/IntelliLang/src/org/intellij/plugins/intelliLang/util/LanguageTextField.java rename to platform/lang-impl/src/com/intellij/ui/LanguageTextField.java index a59cba990ee5..34be0615721c 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/util/LanguageTextField.java +++ b/platform/lang-impl/src/com/intellij/ui/LanguageTextField.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.intellij.plugins.intelliLang.util; +package com.intellij.ui; import com.intellij.ide.highlighter.HighlighterFactory; import com.intellij.lang.Language; @@ -26,7 +26,6 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileFactory; -import com.intellij.ui.EditorTextField; import com.intellij.util.Consumer; import com.intellij.util.LocalTimeCounter; import org.jetbrains.annotations.NotNull; diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/util/ShiftTabAction.java b/platform/lang-impl/src/com/intellij/ui/ShiftTabAction.java similarity index 96% rename from plugins/IntelliLang/src/org/intellij/plugins/intelliLang/util/ShiftTabAction.java rename to platform/lang-impl/src/com/intellij/ui/ShiftTabAction.java index 19db6b05b77a..d12a1dcf7614 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/util/ShiftTabAction.java +++ b/platform/lang-impl/src/com/intellij/ui/ShiftTabAction.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.intellij.plugins.intelliLang.util; +package com.intellij.ui; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CustomShortcutSet; -import com.intellij.ui.EditorTextField; import javax.swing.*; import java.awt.*; diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/AdvancedSettingsUI.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/AdvancedSettingsUI.java index 56cf6cbfd5f0..afe0523adc26 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/AdvancedSettingsUI.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/AdvancedSettingsUI.java @@ -26,9 +26,9 @@ import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.ReferenceEditorWithBrowseButton; +import com.intellij.ui.ShiftTabAction; import com.intellij.util.Function; import org.intellij.plugins.intelliLang.util.PsiUtilEx; -import org.intellij.plugins.intelliLang.util.ShiftTabAction; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/AdvancedPanel.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/AdvancedPanel.java index 934cdb0be3d8..7cf4c81b7bad 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/AdvancedPanel.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/AdvancedPanel.java @@ -21,7 +21,7 @@ import com.intellij.ui.EditorTextField; import com.intellij.util.Consumer; import org.intellij.lang.regexp.RegExpLanguage; import org.intellij.plugins.intelliLang.inject.config.BaseInjection; -import org.intellij.plugins.intelliLang.util.LanguageTextField; +import com.intellij.ui.LanguageTextField; import javax.swing.*; diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java index 6fb097020e42..d842c7d03f31 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java @@ -29,7 +29,7 @@ import com.intellij.ui.EditorTextField; import com.intellij.ui.SimpleTextAttributes; import org.intellij.plugins.intelliLang.inject.InjectedLanguage; import org.intellij.plugins.intelliLang.inject.config.BaseInjection; -import org.intellij.plugins.intelliLang.util.ShiftTabAction; +import com.intellij.ui.ShiftTabAction; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/AdvancedXmlPanel.java b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/AdvancedXmlPanel.java index eb5ed150f2b0..f5ed086b6067 100644 --- a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/AdvancedXmlPanel.java +++ b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/AdvancedXmlPanel.java @@ -23,7 +23,7 @@ import org.intellij.lang.regexp.RegExpLanguage; import org.intellij.plugins.intelliLang.inject.InjectedLanguage; import org.intellij.plugins.intelliLang.inject.config.AbstractTagInjection; import org.intellij.plugins.intelliLang.inject.config.XPathSupportProxy; -import org.intellij.plugins.intelliLang.util.LanguageTextField; +import com.intellij.ui.LanguageTextField; import javax.swing.*; diff --git a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/TagPanel.java b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/TagPanel.java index d7218366bb48..0f180ca0943b 100644 --- a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/TagPanel.java +++ b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/TagPanel.java @@ -28,7 +28,7 @@ import org.intellij.lang.regexp.RegExpLanguage; import org.intellij.plugins.intelliLang.inject.config.AbstractTagInjection; import org.intellij.plugins.intelliLang.inject.config.JspSupportProxy; import org.intellij.plugins.intelliLang.inject.config.XmlTagInjection; -import org.intellij.plugins.intelliLang.util.LanguageTextField; +import com.intellij.ui.LanguageTextField; import javax.swing.*; import java.util.ArrayList; diff --git a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/XmlAttributePanel.java b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/XmlAttributePanel.java index ffb890b805ea..9568b0450748 100644 --- a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/XmlAttributePanel.java +++ b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/XmlAttributePanel.java @@ -20,7 +20,7 @@ import com.intellij.openapi.ui.ComboBox; import com.intellij.ui.EditorTextField; import org.intellij.lang.regexp.RegExpLanguage; import org.intellij.plugins.intelliLang.inject.config.XmlAttributeInjection; -import org.intellij.plugins.intelliLang.util.LanguageTextField; +import com.intellij.ui.LanguageTextField; import javax.swing.*;