MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: protect from the case when the CompareInfo has not been set to the panel yet

Browse Source 
GitOrigin-RevId: 0c69bc201857e85b60a92a52665ed6167a6e3aa6
This commit is contained in:
Kirill Likhodedov
2019-06-16 07:25:58 +03:00
committed by intellij-monorepo-bot
parent 74bcfb3df0
commit c490c67db1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/ui/CompareBranchesDiffPanel.java
+12 -7
View File
@@ -42,6 +42,7 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.CalledInAwt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.event.HyperlinkEvent;
@@ -57,7 +58,7 @@ public class CompareBranchesDiffPanel extends JPanel {
private final String myCurrentBranchName;
private final DvcsCompareSettings myVcsSettings;
private CommitCompareInfo myCompareInfo;
@Nullable private CommitCompareInfo myCompareInfo;
private final JEditorPane myLabel;
private final MyChangesBrowser myChangesBrowser;
@@ -106,11 +107,13 @@ public class CompareBranchesDiffPanel extends JPanel {
}
private void refreshView() {
boolean swapSides = myVcsSettings.shouldSwapSidesInCompareBranches();
updateLabelText();
List<Change> diff = myCompareInfo.getTotalDiff();
if (swapSides) diff = DvcsBranchUtil.swapRevisions(diff);
myChangesBrowser.setChangesToDisplay(diff);
if (myCompareInfo != null) {
boolean swapSides = myVcsSettings.shouldSwapSidesInCompareBranches();
updateLabelText();
List<Change> diff = myCompareInfo.getTotalDiff();
if (swapSides) diff = DvcsBranchUtil.swapRevisions(diff);
myChangesBrowser.setChangesToDisplay(diff);
}
}
private void updateLabelText() {
@@ -188,7 +191,9 @@ public class CompareBranchesDiffPanel extends JPanel {
@Override
public void run(@NotNull ProgressIndicator indicator) {
try {
((LocalCommitCompareInfo)myCompareInfo).copyChangesFromBranch(changes, swapSides);
if (myCompareInfo != null) {
((LocalCommitCompareInfo)myCompareInfo).copyChangesFromBranch(changes, swapSides);
}
}
catch (VcsException err) {
ApplicationManager.getApplication().invokeLater(() -> Messages.showErrorDialog(myProject, err.getMessage(), "Can't Copy Changes"));