From 8d38bb1bbf620b76d08e311b20c204112fa11273 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 30 Apr 2015 18:53:57 +0200 Subject: [PATCH] Cleanup (deprecated VCS change list API dropped) --- .../vcs/MockChangeListManagerGate.java | 24 ++++++++----------- .../vcs/changes/ChangeListManagerGate.java | 8 +------ .../openapi/vcs/changes/ChangeListWorker.java | 21 ++++++++-------- 3 files changed, 22 insertions(+), 31 deletions(-) diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManagerGate.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManagerGate.java index 73abf13f7ffc..0ed53c88ac85 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManagerGate.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManagerGate.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,9 +15,7 @@ */ package com.intellij.testFramework.vcs; -import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.FileStatus; -import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.ChangeListManagerGate; import com.intellij.openapi.vcs.changes.LocalChangeList; @@ -35,18 +33,22 @@ public class MockChangeListManagerGate implements ChangeListManagerGate { myManager = manager; } + @Override public List getListsCopy() { return myManager.getChangeListsCopy(); } + @Override public LocalChangeList findChangeList(final String name) { return myManager.findChangeList(name); } + @Override public LocalChangeList addChangeList(final String name, final String comment) { return myManager.addChangeList(name, comment); } + @Override public LocalChangeList findOrCreateList(final String name, final String comment) { LocalChangeList changeList = myManager.findChangeList(name); if (changeList == null) { @@ -55,23 +57,18 @@ public class MockChangeListManagerGate implements ChangeListManagerGate { return changeList; } + @Override public void editComment(final String name, final String comment) { myManager.editComment(name, comment); } + @Override public void editName(String oldName, String newName) { myManager.editName(oldName, newName); } - public void moveChanges(String toList, Collection changes) { - final LocalChangeList changeList = myManager.findChangeList(toList); - if (changeList != null) { - myManager.moveChangesTo(changeList, changes.toArray(new Change[changes.size()])); - } - } - - public void setListsToDisappear(Collection names) { - } + @Override + public void setListsToDisappear(Collection names) { } @Override public FileStatus getStatus(VirtualFile file) { @@ -84,6 +81,5 @@ public class MockChangeListManagerGate implements ChangeListManagerGate { } @Override - public void setDefaultChangeList(@NotNull String list) { - } + public void setDefaultChangeList(@NotNull String list) { } } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManagerGate.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManagerGate.java index d0c28f5583fc..caeeb18c7da6 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManagerGate.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManagerGate.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,12 +39,6 @@ public interface ChangeListManagerGate { void editComment(final String name, final String comment); void editName(final String oldName, final String newName); - - /** - * @deprecated unused, to be removed in IDEA 15 - */ - void moveChanges(final String toList, final Collection changes); - void setListsToDisappear(final Collection names); FileStatus getStatus(final VirtualFile file); FileStatus getStatus(final File file); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java index 63ed9d4768b2..d6293ed1be7a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -737,19 +737,23 @@ public class ChangeListWorker implements ChangeListsWriteOperations { myWorker = worker; } + @Override public List getListsCopy() { return myWorker.getListsCopy(); } @Nullable + @Override public LocalChangeList findChangeList(final String name) { return myWorker.getCopyByName(name); } + @Override public LocalChangeList addChangeList(final String name, final String comment) { return myWorker.addChangeList(null, name, comment, true, null); } + @Override public LocalChangeList findOrCreateList(final String name, final String comment) { LocalChangeList list = myWorker.getCopyByName(name); if (list == null) { @@ -758,19 +762,17 @@ public class ChangeListWorker implements ChangeListsWriteOperations { return list; } + @Override public void editComment(final String name, final String comment) { myWorker.editComment(name, comment); } + @Override public void editName(String oldName, String newName) { myWorker.editName(oldName, newName); } - // todo usage allowed only when.. - public void moveChanges(String toList, Collection changes) { - myWorker.moveChangesTo(toList, changes.toArray(new Change[changes.size()])); - } - + @Override public void setListsToDisappear(final Collection names) { myWorker.setListsToDisappear(names); } @@ -795,16 +797,15 @@ public class ChangeListWorker implements ChangeListsWriteOperations { myIdx.remove(path); for (LocalChangeList list : myMap.values()) { - for (Iterator iterator = list.getChanges().iterator(); iterator.hasNext(); ) { - final Change change = iterator.next(); + for (Change change : list.getChanges()) { final ContentRevision afterRevision = change.getAfterRevision(); if (afterRevision != null && afterRevision.getFile().equals(path)) { - ((LocalChangeListImpl) list).removeChange(change); + ((LocalChangeListImpl)list).removeChange(change); return; } final ContentRevision beforeRevision = change.getBeforeRevision(); if (beforeRevision != null && beforeRevision.getFile().equals(path)) { - ((LocalChangeListImpl) list).removeChange(change); + ((LocalChangeListImpl)list).removeChange(change); return; } }