From c4f4b1fc006572ab6f2d7fe45aa08b71bd16e0a7 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 21 Jun 2013 14:37:13 +0400 Subject: [PATCH] [vcs] simplify --- .../vcs/history/impl/VcsHistoryDialog.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java index 0952fa2861df..0225e5e5263a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java @@ -459,22 +459,23 @@ public class VcsHistoryDialog extends DialogWrapper implements DataProvider { @Nullable private Block getBlock(VcsFileRevision revision) throws FilesTooBigForDiffException, VcsException { - if (myRevisionToContentMap.containsKey(revision)) + if (myRevisionToContentMap.containsKey(revision)) { return myRevisionToContentMap.get(revision); - - int index = myRevisions.indexOf(revision); + } final String revisionContent = getContentOf(revision); if (revisionContent == null) return null; - if (index == 0) { - Block currentBlock = new Block(myEditor.getDocument().getText(), mySelectionStart, mySelectionEnd); - myRevisionToContentMap.put(revision, new FindBlock(revisionContent, currentBlock).getBlockInThePrevVersion()); - } - else { - Block prevBlock = getBlock(myRevisions.get(index - 1)); - if (prevBlock == null) return null; - myRevisionToContentMap.put(revision, new FindBlock(revisionContent, prevBlock).getBlockInThePrevVersion()); - } + + int index = myRevisions.indexOf(revision); + Block blockByIndex = getBlock(index); + if (blockByIndex == null) return null; + + myRevisionToContentMap.put(revision, new FindBlock(revisionContent, blockByIndex).getBlockInThePrevVersion()); return myRevisionToContentMap.get(revision); } + + private Block getBlock(int index) throws FilesTooBigForDiffException, VcsException { + return index > 0 ? getBlock(myRevisions.get(index - 1)) : new Block(myEditor.getDocument().getText(), mySelectionStart, mySelectionEnd); + } + }