/*
 * Copyright 2000-2012 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.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.intellij.openapi.vcs.changes.ui;

import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangesUtil;
import com.intellij.util.ThreeState;

import java.util.Comparator;

public class ChangesComparator implements Comparator<Change> {
  private static final ChangesComparator ourFlattenedInstance = new ChangesComparator(false);
  private static final ChangesComparator ourTreeInstance = new ChangesComparator(true);
  private final boolean myTreeCompare;

  public static ChangesComparator getInstance(boolean flattened) {
    if (flattened) {
      return ourFlattenedInstance;
    } else {
      return ourTreeInstance;
    }
  }

  private ChangesComparator(boolean treeCompare) {
    myTreeCompare = treeCompare;
  }

  public int compare(final Change o1, final Change o2) {
    final FilePath filePath1 = ChangesUtil.getFilePath(o1);
    final FilePath filePath2 = ChangesUtil.getFilePath(o2);
    if (myTreeCompare) {
      final String path1 = FileUtilRt.toSystemIndependentName(filePath1.getPath());
      final String path2 = FileUtilRt.toSystemIndependentName(filePath2.getPath());
      final int lastSlash1 = path1.lastIndexOf('/');
      final String parentPath1 = lastSlash1 >= 0 && !filePath1.isDirectory() ? path1.substring(0, lastSlash1) : path1;
      final int lastSlash2 = path2.lastIndexOf('/');
      final String parentPath2 = lastSlash2 >= 0 && !filePath2.isDirectory() ? path2.substring(0, lastSlash2) : path2;
      // subdirs precede files
      if (ThreeState.YES == FileUtil.isAncestorThreeState(parentPath2, parentPath1, true)) {
        return -1;
      }
      else if (ThreeState.YES == FileUtil.isAncestorThreeState(parentPath1, parentPath2, true)) {
        return 1;
      }
      int parentPathComparison = parentPath1.compareToIgnoreCase(parentPath2);
      if (parentPathComparison != 0) {
        return parentPathComparison;
      }
    }
    return filePath1.getName().compareToIgnoreCase(filePath2.getName());
  }
}

@@ -880,45 +880,8 @@
 til;
-%0Aimport com.intellij.util.ThreeState;
 %0A%0Aim
@@ -2214,34 +2214,16 @@
     if (
-ThreeState.YES == 
 FileUtil
@@ -2229,34 +2229,24 @@
 l.isAncestor
-ThreeState
 (parentPath2
@@ -2315,26 +2315,8 @@
 if (
-ThreeState.YES == 
 File
@@ -2334,18 +2334,8 @@
 stor
-ThreeState
 (par

Revert "IDEA-134734 ChangesComparator: more explicit isAncestor check"