From 99f603ffe6bfaa243fe6ee6518d379930f73e1f2 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 19 Apr 2017 13:45:40 +0300 Subject: [PATCH] vcs: remove dead code `createFilePathOn` can't return `null` --- .../vcs/changes/ChangeListManagerSerialization.java | 11 ++--------- .../intellij/openapi/vcs/changes/FakeRevision.java | 6 ++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java index cc9d06acd5e4..df9b1327d221 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java @@ -85,12 +85,7 @@ class ChangeListManagerSerialization { //noinspection unchecked final List changeNodes = listNode.getChildren(NODE_CHANGE); for (Element changeNode : changeNodes) { - try { - myWorker.addChangeToList(changeListName, readChange(changeNode), null); - } - catch (OutdatedFakeRevisionException e) { - // Do nothing. Just skip adding outdated revisions to the list. - } + myWorker.addChangeToList(changeListName, readChange(changeNode), null); } if (ATT_VALUE_TRUE.equals(listNode.getAttributeValue(ATT_DEFAULT))) { @@ -176,11 +171,9 @@ class ChangeListManagerSerialization { changeNode.setAttribute(ATT_CHANGE_AFTER_PATH, aRev != null ? aRev.getFile().getPath() : ""); } - private static Change readChange(Element changeNode) throws OutdatedFakeRevisionException { + private static Change readChange(Element changeNode) { String bRev = changeNode.getAttributeValue(ATT_CHANGE_BEFORE_PATH); String aRev = changeNode.getAttributeValue(ATT_CHANGE_AFTER_PATH); return new Change(StringUtil.isEmpty(bRev) ? null : new FakeRevision(bRev), StringUtil.isEmpty(aRev) ? null : new FakeRevision(aRev)); } - - static final class OutdatedFakeRevisionException extends Exception {} } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FakeRevision.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FakeRevision.java index 2e6af3ccc631..2b2cd964dc4b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FakeRevision.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FakeRevision.java @@ -26,10 +26,8 @@ import java.io.File; public class FakeRevision implements ContentRevision { private final FilePath myFile; - public FakeRevision(String path) throws ChangeListManagerSerialization.OutdatedFakeRevisionException { - final FilePath file = VcsContextFactory.SERVICE.getInstance().createFilePathOn(new File(path)); - if (file == null) throw new ChangeListManagerSerialization.OutdatedFakeRevisionException(); - myFile = file; + public FakeRevision(String path) { + myFile = VcsContextFactory.SERVICE.getInstance().createFilePathOn(new File(path)); } @Nullable