From 5f18bed8da4dda4fa516907ecbbe28f712e944f7 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 16 Jun 2015 12:14:11 +0200 Subject: [PATCH] fix API compatibility --- .../src/com/intellij/ui/components/JBSlidingPanel.java | 1 - .../src/com/intellij/openapi/wm/impl/IdePanePanel.java | 2 +- .../src/com/intellij/openapi/wm/impl/IdeRootPane.java | 2 +- .../src/com/intellij/ui/components/JBMovePanel.java | 1 - .../src/com/intellij/ui/components/SliderSelectorAction.java | 1 - .../src/com/intellij/{util => }/ui/components/JBPanel.java | 3 ++- .../src/com/intellij/util/ui/components/BorderLayoutPanel.java | 1 + .../src/com/intellij/vcs/log/impl/VcsLogContentProvider.java | 2 +- .../com/intellij/vcs/log/ui/filter/VcsStructureChooser.java | 2 +- .../src/org/jetbrains/java/decompiler/IdeaDecompiler.java | 2 +- .../intellij/codeInsight/template/emmet/EmmetPreviewHint.java | 2 +- 11 files changed, 9 insertions(+), 10 deletions(-) rename platform/util/src/com/intellij/{util => }/ui/components/JBPanel.java (94%) diff --git a/platform/platform-api/src/com/intellij/ui/components/JBSlidingPanel.java b/platform/platform-api/src/com/intellij/ui/components/JBSlidingPanel.java index 02e0b0ba8e00..ceccfa3d9cf2 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBSlidingPanel.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBSlidingPanel.java @@ -18,7 +18,6 @@ package com.intellij.ui.components; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.Pair; import com.intellij.ui.JBCardLayout; -import com.intellij.util.ui.components.JBPanel; import java.awt.*; import java.util.ArrayList; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdePanePanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdePanePanel.java index 005599a91433..346c676cc8f2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdePanePanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdePanePanel.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.wm.impl; -import com.intellij.util.ui.components.JBPanel; +import com.intellij.ui.components.JBPanel; import java.awt.*; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java index c89b2459fa67..481fe7382f85 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java @@ -39,10 +39,10 @@ import com.intellij.ui.BalloonLayout; import com.intellij.ui.BalloonLayoutImpl; import com.intellij.ui.PopupHandler; import com.intellij.ui.components.JBLayeredPane; +import com.intellij.ui.components.JBPanel; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import com.intellij.util.ui.components.JBPanel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/platform-impl/src/com/intellij/ui/components/JBMovePanel.java b/platform/platform-impl/src/com/intellij/ui/components/JBMovePanel.java index bceedc49064d..8e3befaf147e 100644 --- a/platform/platform-impl/src/com/intellij/ui/components/JBMovePanel.java +++ b/platform/platform-impl/src/com/intellij/ui/components/JBMovePanel.java @@ -25,7 +25,6 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ListUtil; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.GridBag; -import com.intellij.util.ui.components.JBPanel; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/platform/platform-impl/src/com/intellij/ui/components/SliderSelectorAction.java b/platform/platform-impl/src/com/intellij/ui/components/SliderSelectorAction.java index e687664bce3a..f854c41af059 100644 --- a/platform/platform-impl/src/com/intellij/ui/components/SliderSelectorAction.java +++ b/platform/platform-impl/src/com/intellij/ui/components/SliderSelectorAction.java @@ -24,7 +24,6 @@ import com.intellij.openapi.util.Ref; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.Consumer; import com.intellij.util.ui.UIUtil; -import com.intellij.util.ui.components.JBPanel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/util/src/com/intellij/util/ui/components/JBPanel.java b/platform/util/src/com/intellij/ui/components/JBPanel.java similarity index 94% rename from platform/util/src/com/intellij/util/ui/components/JBPanel.java rename to platform/util/src/com/intellij/ui/components/JBPanel.java index dde66f14507d..b265c961e496 100644 --- a/platform/util/src/com/intellij/util/ui/components/JBPanel.java +++ b/platform/util/src/com/intellij/ui/components/JBPanel.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.util.ui.components; +package com.intellij.ui.components; import com.intellij.util.ui.JBFont; +import com.intellij.util.ui.components.JBComponent; import javax.swing.*; import javax.swing.border.Border; diff --git a/platform/util/src/com/intellij/util/ui/components/BorderLayoutPanel.java b/platform/util/src/com/intellij/util/ui/components/BorderLayoutPanel.java index 586f50d83a6b..0d9ab4226f10 100644 --- a/platform/util/src/com/intellij/util/ui/components/BorderLayoutPanel.java +++ b/platform/util/src/com/intellij/util/ui/components/BorderLayoutPanel.java @@ -15,6 +15,7 @@ */ package com.intellij.util.ui.components; +import com.intellij.ui.components.JBPanel; import com.intellij.util.ui.JBUI; import java.awt.*; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogContentProvider.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogContentProvider.java index f373eaa3a08e..df4fff6076ea 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogContentProvider.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogContentProvider.java @@ -25,11 +25,11 @@ import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsListener; import com.intellij.openapi.vcs.changes.ui.ChangesViewContentEP; import com.intellij.openapi.vcs.changes.ui.ChangesViewContentProvider; +import com.intellij.ui.components.JBPanel; import com.intellij.util.Function; import com.intellij.util.NotNullFunction; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.MessageBusConnection; -import com.intellij.util.ui.components.JBPanel; import com.intellij.vcs.log.VcsLogSettings; import com.intellij.vcs.log.data.VcsLogUiProperties; import org.jetbrains.annotations.NotNull; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java index 954e5f08dfe2..230af16f84be 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java @@ -34,6 +34,7 @@ import com.intellij.openapi.vcs.changes.ui.VirtualFileListCellRenderer; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.*; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBPanel; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.PlatformIcons; @@ -44,7 +45,6 @@ import com.intellij.util.containers.Convertor; import com.intellij.util.treeWithCheckedNodes.SelectionManager; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import com.intellij.util.ui.components.JBPanel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.java b/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.java index 049bff1c26f1..b15a9f943983 100644 --- a/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.java +++ b/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.java @@ -43,11 +43,11 @@ import com.intellij.psi.compiled.ClassFileDecompilers; import com.intellij.psi.impl.compiled.ClsFileImpl; import com.intellij.ui.Gray; import com.intellij.ui.components.JBLabel; +import com.intellij.ui.components.JBPanel; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.MessageBusConnection; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import com.intellij.util.ui.components.JBPanel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewHint.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewHint.java index b5da551cd071..a5587cf1b996 100644 --- a/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewHint.java +++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewHint.java @@ -37,10 +37,10 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.ui.HintHint; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.LightweightHint; +import com.intellij.ui.components.JBPanel; import com.intellij.util.Alarm; import com.intellij.util.DocumentUtil; import com.intellij.util.Producer; -import com.intellij.util.ui.components.JBPanel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly;