From 6f2922669b27a75ef7a77502fee4c1572437fb99 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 28 Feb 2012 15:51:24 +0100
Subject: [PATCH] p4: apply patch to a newly created changelist should really
 move all files to that changelist

---
 .../intellij/openapi/vcs/changes/VcsDirtyScopeManager.java | 4 ++--
 .../src/com/intellij/util/ui/VcsBackgroundTask.java        | 7 -------
 .../openapi/vcs/changes/VcsDirtyScopeManagerImpl.java      | 4 ++--
 .../openapi/vcs/changes/VcsDirtyScopeManagerProxy.java     | 4 ++--
 .../src/com/intellij/openapi/vcs/changes/VcsGuess.java     | 5 +++--
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManager.java
index ce42d25f3ec2..60caeb50e53a 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManager.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManager.java
@@ -46,14 +46,14 @@ public abstract class VcsDirtyScopeManager {
    *
    * @param file the file for which the status update is requested.
    */
-  public abstract void fileDirty(VirtualFile file);
+  public abstract void fileDirty(@NotNull VirtualFile file);
 
   /**
    * Requests an asynchronous file status update for the specified file path. Must be called from a read action.
    *
    * @param file the file path for which the status update is requested.
    */
-  public abstract void fileDirty(FilePath file);
+  public abstract void fileDirty(@NotNull FilePath file);
 
   /**
    * Requests an asynchronous file status update for all files under the specified directory.
diff --git a/platform/vcs-api/src/com/intellij/util/ui/VcsBackgroundTask.java b/platform/vcs-api/src/com/intellij/util/ui/VcsBackgroundTask.java
index 78a5f6abb0a2..06cc1a094892 100644
--- a/platform/vcs-api/src/com/intellij/util/ui/VcsBackgroundTask.java
+++ b/platform/vcs-api/src/com/intellij/util/ui/VcsBackgroundTask.java
@@ -32,22 +32,15 @@ import java.util.List;
  * @author yole
  */
 public abstract class VcsBackgroundTask<T> extends Task.ConditionalModal {
-  @NotNull private final PerformInBackgroundOption myBackgroundOption;
   private final Collection<T> myItems;
   private final List<VcsException> myExceptions = new ArrayList<VcsException>();
 
   public VcsBackgroundTask(final Project project, @NotNull final String title, @NotNull final PerformInBackgroundOption backgroundOption,
                            final Collection<T> itemsToProcess) {
     super(project, title, false, backgroundOption);
-    myBackgroundOption = backgroundOption;
     myItems = itemsToProcess;
   }
 
-  @NotNull
-  public PerformInBackgroundOption getBackgroundOption() {
-    return myBackgroundOption;
-  }
-
   public void run(@NotNull ProgressIndicator indicator) {
     for(T item: myItems) {
       try {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerImpl.java
index decb13a4393a..8ffa72209ea7 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerImpl.java
@@ -252,7 +252,7 @@ public class VcsDirtyScopeManagerImpl extends VcsDirtyScopeManager implements Pr
     }
   }
 
-  public void fileDirty(final VirtualFile file) {
+  public void fileDirty(@NotNull final VirtualFile file) {
     try {
       final AbstractVcs vcs = myGuess.getVcsForDirty(file);
       if (vcs == null) return;
@@ -269,7 +269,7 @@ public class VcsDirtyScopeManagerImpl extends VcsDirtyScopeManager implements Pr
     }
   }
 
-  public void fileDirty(final FilePath file) {
+  public void fileDirty(@NotNull final FilePath file) {
     try {
       final AbstractVcs vcs = myGuess.getVcsForDirty(file);
       if (vcs == null) return;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerProxy.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerProxy.java
index 135d73f7fa4e..fdcf04749ef8 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerProxy.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerProxy.java
@@ -54,11 +54,11 @@ class VcsDirtyScopeManagerProxy extends VcsDirtyScopeManager {
     myFiles.clear();
   }
 
-  public void fileDirty(final VirtualFile file) {
+  public void fileDirty(@NotNull final VirtualFile file) {
     myVFiles.add(file);
   }
 
-  public void fileDirty(final FilePath file) {
+  public void fileDirty(@NotNull final FilePath file) {
     myFiles.add(file);
   }
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsGuess.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsGuess.java
index 93bd355171fe..2ce7ea62b1fe 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsGuess.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsGuess.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class VcsGuess {
@@ -41,7 +42,7 @@ public class VcsGuess {
   }
 
   @Nullable
-  public AbstractVcs getVcsForDirty(final VirtualFile file) {
+  public AbstractVcs getVcsForDirty(@NotNull final VirtualFile file) {
     if (!file.isInLocalFileSystem()) {
       return null;
     }
@@ -56,7 +57,7 @@ public class VcsGuess {
   }
 
   @Nullable
-  public AbstractVcs getVcsForDirty(final FilePath filePath) {
+  public AbstractVcs getVcsForDirty(@NotNull final FilePath filePath) {
     if (filePath.isNonLocal()) {
       return null;
     }