From dc607fff9c86a064b48cf0ebea1cf06f5b729930 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 1 Jun 2011 14:48:27 +0400
Subject: [PATCH] force repaint on category change

---
 .../com/intellij/openapi/diff/impl/dir/DirDiffPanel.java | 9 ++-------
 .../openapi/diff/impl/dir/DirDiffTableModel.java         | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
index 6e5c52d614bb..fccaa4c8f214 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
@@ -33,7 +33,6 @@ import com.intellij.ui.TableSpeedSearch;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.ui.components.JBLoadingPanel;
 import com.intellij.ui.table.JBTable;
-import com.intellij.util.containers.Convertor;
 import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
@@ -277,8 +276,6 @@ public class DirDiffPanel implements Disposable {
         myCurrentElement = element.getSource();
       } else {
         myDiffPanel.add(getErrorLabel(), BorderLayout.CENTER);
-        myDiffPanel.revalidate();
-        myDiffPanel.repaint();
       }
     } else {
       final DiffElement object;
@@ -293,14 +290,12 @@ public class DirDiffPanel implements Disposable {
         myCurrentElement = object;
         myDiffPanel.add(myViewComponent, BorderLayout.CENTER);
         DataManager.registerDataProvider(myDiffPanel, myCurrentElement.getDataProvider(project));
-        myDiffPanel.revalidate();
-        myDiffPanel.repaint();
       } else {
         myDiffPanel.add(getErrorLabel(), BorderLayout.CENTER);
-        myDiffPanel.revalidate();
-        myDiffPanel.repaint();
       }
     }
+    myDiffPanel.revalidate();
+    myDiffPanel.repaint();
   }
 
   private void registerCustomShortcuts(DirDiffToolbarActions actions, JPanel rootPanel) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
index 461f762aac41..95ebb8b9ca04 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
@@ -113,6 +113,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
     myUpdating.set(false);
     selectFirstRow();
     myPanel.focusTable();
+    myPanel.update(true);
   }
 
   private void selectFirstRow() {