From 1deefef0ecfce15a74b85861147268a9d7a1bd04 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 30 Apr 2012 11:43:00 +0200 Subject: [PATCH] no impl in platform-api --- .../roots/ui/configuration/ConfigurationErrorsComponent.java | 2 +- .../src/com/intellij/openapi/ui/DetailsComponent.java | 1 - .../src/com/intellij/openapi/ui/DialogWrapper.java | 4 ++-- .../openapi/{wm/impl/content => ui}/GraphicsConfig.java | 4 ++-- .../src/com/intellij/ui/switcher/SwitchingSession.java | 4 ++-- .../src/com/intellij/ui/tabs/impl/JBTabsImpl.java | 2 +- .../platform-api/src/com/intellij/ui/treeStructure/Tree.java | 2 +- .../intellij/ide/actions/SwitcherToolWindowsListRenderer.java | 2 +- .../intellij/openapi/wm/impl/content/ComboContentLayout.java | 3 ++- .../openapi/wm/impl/status/InlineProgressIndicator.java | 4 ++-- platform/platform-impl/src/com/intellij/ui/BalloonImpl.java | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) rename platform/platform-api/src/com/intellij/openapi/{wm/impl/content => ui}/GraphicsConfig.java (93%) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java index dd994f87f514..47021b9899ad 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.MessageType; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.IconLoader; -import com.intellij.openapi.wm.impl.content.GraphicsConfig; +import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.components.JBList; import com.intellij.ui.components.JBScrollPane; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/DetailsComponent.java index 659eb6bad0ee..23976bfe7f0c 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DetailsComponent.java @@ -16,7 +16,6 @@ package com.intellij.openapi.ui; -import com.intellij.openapi.wm.impl.content.GraphicsConfig; import com.intellij.ui.components.panels.NonOpaquePanel; import com.intellij.ui.components.panels.Wrapper; import com.intellij.ui.treeStructure.Tree; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java index bff6336086e2..6185510b4c4d 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -33,7 +33,6 @@ import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.IdeGlassPaneUtil; -import com.intellij.openapi.wm.impl.content.GraphicsConfig; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.UIBundle; import com.intellij.ui.components.JBOptionButton; @@ -1135,7 +1134,8 @@ public abstract class DialogWrapper { final ValidationInfo result = doValidate(); if (result == null) { clearProblems(); - } else { + } + else { reportProblem(result); } diff --git a/platform/platform-api/src/com/intellij/openapi/wm/impl/content/GraphicsConfig.java b/platform/platform-api/src/com/intellij/openapi/ui/GraphicsConfig.java similarity index 93% rename from platform/platform-api/src/com/intellij/openapi/wm/impl/content/GraphicsConfig.java rename to platform/platform-api/src/com/intellij/openapi/ui/GraphicsConfig.java index 8f03b42a0045..eef4d2d39042 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/impl/content/GraphicsConfig.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/GraphicsConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intellij.openapi.wm.impl.content; +package com.intellij.openapi.ui; import java.awt.*; import java.util.Map; diff --git a/platform/platform-api/src/com/intellij/ui/switcher/SwitchingSession.java b/platform/platform-api/src/com/intellij/ui/switcher/SwitchingSession.java index 0f5045843532..b8a6801b2ef6 100644 --- a/platform/platform-api/src/com/intellij/ui/switcher/SwitchingSession.java +++ b/platform/platform-api/src/com/intellij/ui/switcher/SwitchingSession.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.wm.IdeGlassPane; import com.intellij.openapi.wm.IdeGlassPaneUtil; -import com.intellij.openapi.wm.impl.content.GraphicsConfig; +import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.ColorUtil; import com.intellij.ui.awt.RelativeRectangle; import com.intellij.util.Alarm; diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java index e48a903b9317..aed4055b1853 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java @@ -24,7 +24,7 @@ import com.intellij.openapi.ui.ShadowAction; import com.intellij.openapi.util.*; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.wm.*; -import com.intellij.openapi.wm.impl.content.GraphicsConfig; +import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.CaptionPanel; import com.intellij.ui.ColorUtil; import com.intellij.ui.Gray; diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java index 08a504538651..10e982510430 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java @@ -20,7 +20,7 @@ import com.intellij.ide.util.treeView.*; import com.intellij.openapi.ui.Queryable; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.SystemInfo; -import com.intellij.openapi.wm.impl.content.GraphicsConfig; +import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.*; import com.intellij.util.ReflectionUtil; import com.intellij.util.ui.AsyncProcessIcon; diff --git a/platform/platform-impl/src/com/intellij/ide/actions/SwitcherToolWindowsListRenderer.java b/platform/platform-impl/src/com/intellij/ide/actions/SwitcherToolWindowsListRenderer.java index 1cdef03be13e..93c69f572abc 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/SwitcherToolWindowsListRenderer.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/SwitcherToolWindowsListRenderer.java @@ -19,7 +19,7 @@ import com.intellij.openapi.editor.markup.EffectType; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.ToolWindow; -import com.intellij.openapi.wm.impl.content.GraphicsConfig; +import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.SpeedSearchBase; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboContentLayout.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboContentLayout.java index 6a5a54b7f160..683bda452eee 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboContentLayout.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboContentLayout.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ package com.intellij.openapi.wm.impl.content; +import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.awt.RelativeRectangle; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java index 4e90cec9b9fd..44eaea9a677a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import com.intellij.openapi.ui.popup.IconButton; import com.intellij.openapi.util.EmptyRunnable; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; -import com.intellij.openapi.wm.impl.content.GraphicsConfig; +import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.ColorUtil; import com.intellij.ui.InplaceButton; import com.intellij.ui.components.panels.NonOpaquePanel; diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java index d765354c6743..5fc42bf8fd4d 100644 --- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java @@ -34,7 +34,7 @@ import com.intellij.openapi.wm.FocusRequestor; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.IdeGlassPaneUtil; import com.intellij.openapi.wm.impl.IdeGlassPaneEx; -import com.intellij.openapi.wm.impl.content.GraphicsConfig; +import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.components.panels.NonOpaquePanel; import com.intellij.ui.components.panels.Wrapper;