From 26682884b8cbc696e76bf5f81fc6a701e8efc7ad Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 10 Jan 2012 12:17:08 +0400 Subject: [PATCH 1/7] conventional @Nullable removed --- .../src/com/intellij/openapi/wm/ToolWindowManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowManager.java b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowManager.java index fa47c33eddb2..9b103708544b 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowManager.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowManager.java @@ -113,7 +113,6 @@ public abstract class ToolWindowManager { * @return registered tool window with specified id. If there is no registered * tool window with specified id then the method returns null. */ - @Nullable public abstract ToolWindow getToolWindow(String id); /** From 9549c2a079e5827e3ed919072f343547ff43792a Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 10 Jan 2012 13:56:17 +0400 Subject: [PATCH 2/7] @Nullable --- platform/util/src/com/intellij/openapi/ui/Splitter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/util/src/com/intellij/openapi/ui/Splitter.java b/platform/util/src/com/intellij/openapi/ui/Splitter.java index 93e446a10bfa..a37599ca843d 100644 --- a/platform/util/src/com/intellij/openapi/ui/Splitter.java +++ b/platform/util/src/com/intellij/openapi/ui/Splitter.java @@ -20,6 +20,7 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.FocusWatcher; import com.intellij.ui.UIBundle; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -437,7 +438,7 @@ public class Splitter extends JPanel { * * @param component */ - public void setSecondComponent(JComponent component) { + public void setSecondComponent(@Nullable JComponent component) { if (mySecondComponent != component) { if (mySecondComponent != null) { remove(mySecondComponent); From 15c8e73fc7134f8ff7f05b1d816d6073565e6fb0 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 10 Jan 2012 13:56:47 +0400 Subject: [PATCH 3/7] @Nullable --- platform/util/src/com/intellij/openapi/ui/Splitter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/util/src/com/intellij/openapi/ui/Splitter.java b/platform/util/src/com/intellij/openapi/ui/Splitter.java index a37599ca843d..25933d3f5490 100644 --- a/platform/util/src/com/intellij/openapi/ui/Splitter.java +++ b/platform/util/src/com/intellij/openapi/ui/Splitter.java @@ -407,7 +407,7 @@ public class Splitter extends JPanel { * * @param component */ - public void setFirstComponent(JComponent component) { + public void setFirstComponent(@Nullable JComponent component) { if (myFirstComponent != component) { if (myFirstComponent != null) { remove(myFirstComponent); From 1e2e17345fb849c98bc47bb528afaa12c4bb7927 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 10 Jan 2012 15:13:16 +0400 Subject: [PATCH 4/7] hide empty toolbars --- .../intellij/openapi/actionSystem/impl/ActionToolbarImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java index 4c1c92dd8cc7..bb1f727859fb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java @@ -643,7 +643,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar { public Dimension getPreferredSize() { final ArrayList bounds = new ArrayList(); calculateBounds(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE), bounds); - + if (bounds.isEmpty()) return new Dimension(0, 0); int xLeft = Integer.MAX_VALUE; int yTop = Integer.MAX_VALUE; int xRight = Integer.MIN_VALUE; From 812a8d75ac2adbb161e617c40c26e434e8a3dc15 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 10 Jan 2012 16:04:33 +0400 Subject: [PATCH 5/7] progress in status bar is aligned --- .../intellij/openapi/wm/impl/status/InfoAndProgressPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java index 7d86677fa4c8..b32216be18df 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java @@ -338,7 +338,7 @@ public class InfoAndProgressPanel extends JPanel implements CustomStatusBarWidge final JPanel inlinePanel = new JPanel(new BorderLayout()); - inline.getComponent().setBorder(new EmptyBorder(0, 0, 0, 2)); + inline.getComponent().setBorder(new EmptyBorder(1, 0, 0, 2)); final JComponent inlineComponent = inline.getComponent(); inlineComponent.setOpaque(false); inlinePanel.add(inlineComponent, BorderLayout.CENTER); From 24d1f797d8a69ccd33092d95ae8979fffcd0104d Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 10 Jan 2012 12:27:13 +0100 Subject: [PATCH 6/7] spaces (IDEA-79610) --- .../execution/junit2/configuration/JUnitConfigurable.form | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form index fa8e1f60e5b8..90db52f6e012 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form +++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form @@ -8,8 +8,7 @@ - - + @@ -19,6 +18,7 @@ + @@ -31,6 +31,7 @@ + From 1056c61140a27e75d381f9ee63f85e271b66867f Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 10 Jan 2012 13:14:02 +0100 Subject: [PATCH 7/7] paint in AWT thread (DEA-79489) --- .../packageDependencies/ui/FileTreeModelBuilder.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java index 32396c8643e1..2d5ad682d109 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java @@ -448,7 +448,7 @@ public class FileTreeModelBuilder { PackageDependenciesNode directoryNode = myModuleDirNodes.get(virtualFile); if (directoryNode != null) { if (myCompactEmptyMiddlePackages) { - DirectoryNode nestedNode = ((DirectoryNode)directoryNode).getCompactedDirNode(); + final DirectoryNode nestedNode = ((DirectoryNode)directoryNode).getCompactedDirNode(); if (nestedNode != null) { //decompact boolean expand = false; if (myTree != null){ @@ -465,7 +465,12 @@ public class FileTreeModelBuilder { parentWrapper.add(nestedNode); nestedNode.removeUpReference(); if (myTree != null && expand) { - myTree.expandPath(new TreePath(nestedNode.getPath())); + final Runnable expandRunnable = new Runnable() { + public void run() { + myTree.expandPath(new TreePath(nestedNode.getPath())); + } + }; + SwingUtilities.invokeLater(expandRunnable); } return parentWrapper; }