diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java index 051943e90f3f..792ca5bb5dd8 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java @@ -75,6 +75,7 @@ public class ChangesFragmentedDiffPanel implements Disposable { private boolean myCurrentHorizontal; private JPanel myTopPanel; + // todo here public ChangesFragmentedDiffPanel(final Project project, final FragmentedContent fragmentedContent, final LinkedList cache, String filePath) { myProject = project; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java index 6c5783fe3473..569a9f07ceda 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java @@ -202,23 +202,8 @@ public class FragmentedDiffRequestFromChange { private String notNullContentRevision(final ContentRevision cr) throws VcsException { if (cr == null) return ""; - final Ref ref = new Ref(); - final String s = new BackgroundSynchronousInvisibleComputable() { - @Override - protected String runImpl() { - try { - return cr.getContent(); - } - catch (VcsException e) { - ref.set(e); - return null; - } - } - }.compute(); - if (! ref.isNull()) { - throw ref.get(); - } - return s == null ? "" : s; + String content = cr.getContent(); + return content == null ? "" : content; } }