myPanel.removeTopComponent(myTopMessageDiffPanel);
}
LineBlocks blocks = myData.updateEditors();
- setLineBlocks(blocks);
- if (blocks.getCount() == 0) {
+ setLineBlocks(blocks != null ? blocks : LineBlocks.EMPTY);
+ if (blocks != null && blocks.getCount() == 0) {
if (myData.isContentsEqual()) {
setFileContentsAreIdentical();
}
setTitle(title, false);
}
- private void setLineBlocks(LineBlocks blocks) {
+ private void setLineBlocks(@NotNull LineBlocks blocks) {
myLineBlocks = blocks;
mySplitter.redrawDiffs();
updateStatusBar();
import com.intellij.util.Consumer;
import com.intellij.util.diff.FilesTooBigForDiffException;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
myAppender2.resetHighlighters();
}
+ @Nullable
public LineBlocks updateEditors() throws FilesTooBigForDiffException {
resetMarkup();
mySeparatorsPositionConsumer.clear();
if (myAppender1.getEditor() == null || myAppender2.getEditor() == null) {
- return LineBlocks.EMPTY;
+ return null;
}
int previousBefore = -1;
import com.intellij.openapi.util.Disposer;
import com.intellij.util.diff.FilesTooBigForDiffException;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Iterator;
ApplicationManager.getApplication().runWriteAction(new ResetMarkupRunnable(this));
}
+ @Nullable
public LineBlocks updateEditors() throws FilesTooBigForDiffException {
resetMarkup();
if (myAppender1.getEditor() == null || myAppender2.getEditor() == null) {
- return LineBlocks.EMPTY;
+ return null;
}
return addMarkup(