From 8930a32cbac9a94b9d8f6331b3722cb3ec46d5e5 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 27 Apr 2017 16:34:27 +0300 Subject: [PATCH] vcs: cleanup - remove unused methods --- .../openapi/vcs/changes/ChangeListManager.java | 17 ++++------------- .../vcs/changes/ChangeListManagerEx.java | 6 +----- .../vcs/changes/ChangeListManagerImpl.java | 11 +---------- .../vcs/MockChangeListManager.java | 10 ---------- .../jetbrains/idea/svn/IgnoredFilesTest.java | 2 +- .../jetbrains/idea/svn16/IgnoredFilesTest.java | 2 +- 6 files changed, 8 insertions(+), 40 deletions(-) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java index fcaf63f1efbe..fed40266a16c 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java @@ -43,6 +43,7 @@ public abstract class ChangeListManager implements ChangeListModification { } public abstract void scheduleUpdate(); + @Deprecated public abstract void scheduleUpdate(boolean updateUnversionedFiles); public abstract void invokeAfterUpdate(@NotNull Runnable afterUpdate, @NotNull InvokeAfterUpdateMode mode, @@ -58,7 +59,9 @@ public abstract class ChangeListManager implements ChangeListModification { public abstract int getChangeListsNumber(); @NotNull - public abstract List getChangeListsCopy(); + public List getChangeListsCopy() { + return getChangeLists(); + } @NotNull public abstract List getChangeLists(); @@ -78,8 +81,6 @@ public abstract class ChangeListManager implements ChangeListModification { public abstract LocalChangeList findChangeList(String name); @Nullable public abstract LocalChangeList getChangeList(String id); - // public abstract LocalChangeList addChangeList(@NotNull String name, final String comment); - // public abstract void setDefaultChangeList(@NotNull LocalChangeList list); /** * Returns currently active changelist @@ -121,10 +122,6 @@ public abstract class ChangeListManager implements ChangeListModification { @Nullable public abstract AbstractVcs getVcsFor(@NotNull Change change); - // public abstract void removeChangeList(final LocalChangeList list); - - // public abstract void moveChangesTo(final LocalChangeList list, final Change[] changes); - public abstract void addChangeListListener(@NotNull ChangeListListener listener); public abstract void removeChangeListListener(@NotNull ChangeListListener listener); @@ -133,12 +130,6 @@ public abstract class ChangeListManager implements ChangeListModification { public abstract void commitChanges(@NotNull LocalChangeList changeList, @NotNull List changes); - public abstract void commitChangesSynchronously(@NotNull LocalChangeList changeList, @NotNull List changes); - /** - * @return if commit successful - */ - public abstract boolean commitChangesSynchronouslyWithResult(@NotNull LocalChangeList changeList, @NotNull List changes); - @Deprecated // used in TeamCity public abstract void reopenFiles(@NotNull List paths); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerEx.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerEx.java index 484af503b62b..fa7464ff3255 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerEx.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerEx.java @@ -37,17 +37,13 @@ public abstract class ChangeListManagerEx extends ChangeListManager { /** * Blocks modal dialogs that we don't want to popup during some process, for example, above the commit dialog. + * They will be shown when notifications are unblocked. */ @CalledInAwt public abstract void blockModalNotifications(); - - /** - * Unblocks modal dialogs showing and shows the ones which were queued. - */ @CalledInAwt public abstract void unblockModalNotifications(); - /** * Temporarily disable CLM update * For example, to preserve FilePath->ChangeList mapping during "stash-do_smth-unstash" routine. diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java index 2af83ae05d45..dc789e712b79 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java @@ -746,10 +746,6 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec } } - /** - * @deprecated this method made equivalent to {@link #getChangeListsCopy()} so to don't be confused by method name, - * better use {@link #getChangeListsCopy()} - */ @Override @NotNull public List getChangeLists() { @@ -1261,12 +1257,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec false, synchronously, FunctionUtil.nullConstant(), null, false, null).doCommit(); } - @Override - public void commitChangesSynchronously(@NotNull LocalChangeList changeList, @NotNull List changes) { - doCommit(changeList, changes, true); - } - - @Override + @TestOnly public boolean commitChangesSynchronouslyWithResult(@NotNull LocalChangeList changeList, @NotNull List changes) { return doCommit(changeList, changes, true); } diff --git a/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java b/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java index 54a78fad73ae..e565b72733db 100644 --- a/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java +++ b/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java @@ -252,16 +252,6 @@ public class MockChangeListManager extends ChangeListManagerEx { throw new UnsupportedOperationException(); } - @Override - public void commitChangesSynchronously(@NotNull LocalChangeList changeList, @NotNull List changes) { - throw new UnsupportedOperationException(); - } - - @Override - public boolean commitChangesSynchronouslyWithResult(@NotNull LocalChangeList changeList, @NotNull List changes) { - throw new UnsupportedOperationException(); - } - @Override public void reopenFiles(@NotNull List paths) { throw new UnsupportedOperationException(); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java index f5ca62221b3f..2d2dd7a750cf 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java @@ -123,7 +123,7 @@ public class IgnoredFilesTest extends Svn17TestCase { private void dirty() { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - myChangeListManager.scheduleUpdate(true); + myChangeListManager.scheduleUpdate(); myChangeListManager.ensureUpToDate(false); } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/IgnoredFilesTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/IgnoredFilesTest.java index b99e6d7f17d1..b07de2de426f 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/IgnoredFilesTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/IgnoredFilesTest.java @@ -121,7 +121,7 @@ public class IgnoredFilesTest extends Svn16TestCase { private void dirty() { VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); - myChangeListManager.scheduleUpdate(true); + myChangeListManager.scheduleUpdate(); myChangeListManager.ensureUpToDate(false); }