diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java index a45fdcd2b03e..61b25a409be2 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java @@ -144,7 +144,7 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD @Override public boolean process(ShelvedChangeList shelvedChangeList) { - if (!shelvedChangeList.checkValid()) { + if (!shelvedChangeList.isValid()) { mySchemeManager.removeScheme(shelvedChangeList); } return true; @@ -189,7 +189,7 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD private void migrateOldShelfInfo(@NotNull Element element, boolean recycled) throws InvalidDataException { for (Element changeSetElement : element.getChildren(recycled ? ELEMENT_RECYCLED_CHANGELIST : ELEMENT_CHANGELIST)) { ShelvedChangeList list = readOneShelvedChangeList(changeSetElement); - if(!list.checkValid()) break; + if(!list.isValid()) break; File uniqueDir = generateUniqueSchemePatchDir(list.DESCRIPTION, false); list.setName(uniqueDir.getName()); list.setRecycled(recycled); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java index 51a47d5b51d4..da906749a467 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java @@ -164,7 +164,7 @@ public class ShelvedChangeList implements JDOMExternalizable, ExternalizableSche mySchemeName = newName; } - public boolean checkValid() { + public boolean isValid() { return new File(PATH).exists(); } }