diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java index fd299b982115..894c0574022c 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManager.java @@ -127,7 +127,7 @@ public class MockChangeListManager extends ChangeListManager { } @Override - public LocalChangeList getChangeList(Change change) { + public LocalChangeList getChangeList(@NotNull Change change) { throw new UnsupportedOperationException(); } 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 e12b0b8aa9e2..b6486e6ae757 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 @@ -81,7 +81,7 @@ public abstract class ChangeListManager implements ChangeListModification { public abstract boolean isDefaultChangeList(ChangeList list); @Nullable - public abstract LocalChangeList getChangeList(Change change); + public abstract LocalChangeList getChangeList(@NotNull Change change); @Nullable public abstract String getChangeListNameIfOnlyOne(Change[] changes); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListModification.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListModification.java index f336525a4487..31bad2ed1340 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListModification.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListModification.java @@ -25,7 +25,7 @@ public interface ChangeListModification { void removeChangeList(final String name); void removeChangeList(final LocalChangeList list); - void moveChangesTo(final LocalChangeList list, final Change[] changes); + void moveChangesTo(final LocalChangeList list, final Change... changes); // added - since ChangeListManager wouldn't pass internal lists, only copies boolean setReadOnly(final String name, final boolean value); 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 7cc08d423f3b..3b23852f5e4e 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 @@ -906,7 +906,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec } @Nullable - public LocalChangeList getChangeList(Change change) { + public LocalChangeList getChangeList(@NotNull Change change) { synchronized (myDataLock) { return myWorker.listForChange(change); } @@ -1016,7 +1016,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec } } - public void moveChangesTo(final LocalChangeList list, final Change[] changes) { + public void moveChangesTo(final LocalChangeList list, final Change... changes) { ApplicationManager.getApplication().runReadAction(new Runnable() { @Override public void run() { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListOwner.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListOwner.java index ef17f19b4fe8..96c8f3cda36a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListOwner.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListOwner.java @@ -25,7 +25,7 @@ import java.util.List; * @author max */ public interface ChangeListOwner { - void moveChangesTo(LocalChangeList list, Change[] changes); + void moveChangesTo(LocalChangeList list, Change... changes); void addUnversionedFiles(final LocalChangeList list, @NotNull final List unversionedFiles); Project getProject(); }