From 2a99fd2edb89845d66890590e4e19ffe665fea1d Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 10 May 2017 18:28:33 +0300 Subject: [PATCH] vcs: remove unnecessary throws --- .../ui/models/SelectionCalculator.java | 9 ++++---- .../ui/models/SelectionDifferenceModel.java | 22 +++---------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.java index 10db2ed2c404..b12b220d2a39 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.java @@ -21,7 +21,6 @@ import com.intellij.history.core.Content; import com.intellij.history.core.revisions.Revision; import com.intellij.history.core.tree.Entry; import com.intellij.history.integration.IdeaGateway; -import com.intellij.util.diff.FilesTooBigForDiffException; import org.jetbrains.annotations.Nullable; import java.util.HashMap; @@ -44,7 +43,7 @@ public class SelectionCalculator { myToLine = toLine; } - public boolean canCalculateFor(Revision r, Progress p) throws FilesTooBigForDiffException { + public boolean canCalculateFor(Revision r, Progress p) { try { doGetSelectionFor(r, p); } @@ -54,16 +53,16 @@ public class SelectionCalculator { return true; } - public Block getSelectionFor(Revision r, Progress p) throws FilesTooBigForDiffException { + public Block getSelectionFor(Revision r, Progress p) { return doGetSelectionFor(r, p); } - private Block doGetSelectionFor(Revision r, Progress p) throws FilesTooBigForDiffException { + private Block doGetSelectionFor(Revision r, Progress p) { int target = myRevisions.indexOf(r); return getSelectionFor(target, target + 1, p); } - private Block getSelectionFor(int revisionIndex, int totalRevisions, Progress p) throws FilesTooBigForDiffException { + private Block getSelectionFor(int revisionIndex, int totalRevisions, Progress p) { Block cached = myCache.get(revisionIndex); if (cached != null) return cached; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionDifferenceModel.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionDifferenceModel.java index 20f04f3726fa..ca6bca26b2cb 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionDifferenceModel.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionDifferenceModel.java @@ -25,7 +25,6 @@ import com.intellij.history.integration.IdeaGateway; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; -import com.intellij.util.diff.FilesTooBigForDiffException; public class SelectionDifferenceModel extends FileDifferenceModel { private final SelectionCalculator myCalculator; @@ -62,22 +61,12 @@ public class SelectionDifferenceModel extends FileDifferenceModel { @Override protected boolean isLeftContentAvailable(RevisionProcessingProgress p) { - try { - return myCalculator.canCalculateFor(myLeftRevision, p); - } - catch (FilesTooBigForDiffException e) { - return false; - } + return myCalculator.canCalculateFor(myLeftRevision, p); } @Override protected boolean isRightContentAvailable(RevisionProcessingProgress p) { - try { - return myCalculator.canCalculateFor(myRightRevision, p); - } - catch (FilesTooBigForDiffException e) { - return false; - } + return myCalculator.canCalculateFor(myRightRevision, p); } @Override @@ -105,11 +94,6 @@ public class SelectionDifferenceModel extends FileDifferenceModel { } private String getContentOf(Revision r, RevisionProcessingProgress p) { - try { - return myCalculator.getSelectionFor(r, p).getBlockContent(); - } - catch (FilesTooBigForDiffException e) { - return ""; - } + return myCalculator.getSelectionFor(r, p).getBlockContent(); } }