From da4df5dd46f65c943342a2c5269922741ad362a0 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 21 Dec 2011 13:17:21 +0400
Subject: [PATCH] SVN: init panel in UI thread

---
 .../jetbrains/idea/svn/history/RootsAndBranches.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
index aaee1d9663ce..15c8d5302923 100644
--- a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
+++ b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
@@ -210,11 +210,12 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
         indicator.setIndeterminate(true);
         final Map<String, SvnMergeInfoRootPanelManual> panels = new HashMap<String, SvnMergeInfoRootPanelManual>();
         final Map<String, MergeInfoHolder> holders = new HashMap<String, MergeInfoHolder>();
-        final JPanel mainPanel = prepareData(panels, holders);
+        final List<WCInfoWithBranches> roots = myDataLoader.loadRoots();
         SwingUtilities.invokeLater(new Runnable() {
           public void run() {
             if (myDisposed) return;
-            
+            final JPanel mainPanel = prepareData(panels, holders, roots);
+
             myMergePanels.clear();
             myHolders.clear();
             myMergePanels.putAll(panels);
@@ -270,9 +271,9 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
     myToolbarComponent = actionToolbar.getComponent();
   }
 
-  private JPanel prepareData(final Map<String, SvnMergeInfoRootPanelManual> panels, final Map<String, MergeInfoHolder> holders) {
-      final List<WCInfoWithBranches> roots = myDataLoader.loadRoots();
-
+  private JPanel prepareData(final Map<String, SvnMergeInfoRootPanelManual> panels,
+                             final Map<String, MergeInfoHolder> holders,
+                             List<WCInfoWithBranches> roots) {
       final JPanel mainPanel = new JPanel(new GridBagLayout());
       boolean onlyOneRoot = roots.size() == 1;
       final GridBagConstraints gb = new GridBagConstraints(0, 0, 1, 1, 1, 0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL,