From cd7caa1c1261d65aba7b35c9e9ba328cc315d1a8 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 11 Sep 2017 14:39:13 +0300 Subject: [PATCH] vcs: cleanup - add default method implementation --- .../openapi/vcs/versionBrowser/CommittedChangeList.java | 4 +++- .../vcs/versionBrowser/CommittedChangeListImpl.java | 8 -------- .../intellij/cvsSupport2/changeBrowser/CvsChangeList.java | 5 ----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/CommittedChangeList.java b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/CommittedChangeList.java index 589de8683f6a..e8cdf3f543bb 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/CommittedChangeList.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/CommittedChangeList.java @@ -49,7 +49,9 @@ public interface CommittedChangeList extends ChangeList { */ AbstractVcs getVcs(); - Collection getChangesWithMovedTrees(); + default Collection getChangesWithMovedTrees() { + return getChanges(); + } /** * @return true if this change list can be modified, for example, by reverting some of the changes. diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/CommittedChangeListImpl.java b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/CommittedChangeListImpl.java index a7c7787b60e2..c13f51385a44 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/CommittedChangeListImpl.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/CommittedChangeListImpl.java @@ -63,10 +63,6 @@ public class CommittedChangeListImpl implements CommittedChangeList { return null; } - public Collection getChangesWithMovedTrees() { - return getChangesWithMovedTreesImpl(this); - } - @Override public boolean isModifiable() { return true; @@ -77,10 +73,6 @@ public class CommittedChangeListImpl implements CommittedChangeList { myComment = newMessage; } - public static Collection getChangesWithMovedTreesImpl(final CommittedChangeList list) { - return list.getChanges(); - } - public Collection getChanges() { return myChanges; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeList.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeList.java index c0b887fc6d54..bc1a97dee80b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeList.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeList.java @@ -26,7 +26,6 @@ import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ContentRevision; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; -import com.intellij.openapi.vcs.versionBrowser.CommittedChangeListImpl; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.io.IOUtil; import org.jetbrains.annotations.NonNls; @@ -110,10 +109,6 @@ public class CvsChangeList implements CommittedChangeList { return CvsVcs2.getInstance(myProject); } - public Collection getChangesWithMovedTrees() { - return CommittedChangeListImpl.getChangesWithMovedTreesImpl(this); - } - @Override public boolean isModifiable() { return true;