svn: vcs: Refactoring - renames, @Deprecated

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangesUtil.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangesUtil.java
index 65f130890d3b073f2a42f08b114a618c0dcd1176..ec38fe253ffa03f88c1889c0b32e6a7d1593cc8e 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangesUtil.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangesUtil.java
@@ -80,7 +80,12 @@ public class ChangesUtil {
     return ProjectLevelVcsManager.getInstance(project).getVcsFor(VcsContextFactory.SERVICE.getInstance().createFilePathOn(file));
   }
 
-  public static class Adder {
+  /**
+   * TODO: Provide common approach for either case sensitive or case insensitive comparison of File, FilePath, etc. depending on used VCS,
+   * TODO: OS, VCS operation (several hashing and equality strategies seems to be useful here)
+   */
+  @Deprecated
+  public static class CaseSensitiveFilePathList {
     @NotNull private final List<FilePath> myResult = new ArrayList<FilePath>();
     @NotNull private final Set<String> myDuplicatesControlSet = new HashSet<String>();
 
@@ -109,25 +114,25 @@ public class ChangesUtil {
 
   @NotNull
   public static List<FilePath> getPaths(@NotNull Collection<Change> changes) {
-    return getPathsAdder(changes).getResult();
+    return getPathsList(changes).getResult();
   }
 
   @NotNull
-  public static Adder getPathsAdder(@NotNull Collection<Change> changes) {
-    Adder adder = new Adder();
+  public static CaseSensitiveFilePathList getPathsList(@NotNull Collection<Change> changes) {
+    CaseSensitiveFilePathList list = new CaseSensitiveFilePathList();
 
     for (Change change : changes) {
       ContentRevision beforeRevision = change.getBeforeRevision();
       if (beforeRevision != null) {
-        adder.add(beforeRevision.getFile());
+        list.add(beforeRevision.getFile());
       }
       ContentRevision afterRevision = change.getAfterRevision();
       if (afterRevision != null) {
-        adder.add(afterRevision.getFile());
+        list.add(afterRevision.getFile());
       }
     }
 
-    return adder;
+    return list;
   }
 
   public static List<File> getIoFilesFromChanges(final Collection<Change> changes) {

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java
index 9895e45e4775a9a1b8a8a2160f81836ac80270ca..588e218c016775039e6b733b1d8c2678082fba1d 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java
@@ -146,10 +146,10 @@ public class SvnCheckinEnvironment implements CheckinEnvironment {
 
   @NotNull
   private List<FilePath> getCommitables(@NotNull List<Change> changes) {
-    ChangesUtil.Adder adder = ChangesUtil.getPathsAdder(changes);
+    ChangesUtil.CaseSensitiveFilePathList list = ChangesUtil.getPathsList(changes);
 
-    for (FilePath path : ContainerUtil.newArrayList(adder.getResult())) {
-      adder.addParents(path, new Condition<FilePath>() {
+    for (FilePath path : ContainerUtil.newArrayList(list.getResult())) {
+      list.addParents(path, new Condition<FilePath>() {
         @Override
         public boolean value(@NotNull FilePath file) {
           Status status = getStatus(file);
@@ -159,7 +159,7 @@ public class SvnCheckinEnvironment implements CheckinEnvironment {
       });
     }
 
-    return adder.getResult();
+    return list.getResult();
   }
 
   @Nullable