MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-89289 Commit changes presentation: when treeview is used with added subtree and missing [changed] folder in the middle

Browse Source
This commit is contained in:
irengrig
2012-07-26 12:54:14 +04:00
parent 92bfbc3e70
commit f5eeccef6a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserFilePathNode.java
+12 -4
View File
@@ -18,6 +18,8 @@ package com.intellij.openapi.vcs.changes.ui;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangesUtil;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.util.PlatformIcons;
@@ -76,14 +78,20 @@ public class ChangesBrowserFilePathNode extends ChangesBrowserNode<FilePath> {
public static FilePath safeCastToFilePath(Object o) {
if (o instanceof FilePath) return (FilePath)o;
if (o instanceof Change) {
return ChangesUtil.getAfterPath((Change)o);
}
return null;
}
public static String getRelativePath(FilePath parent, FilePath child) {
if (parent == null || ! child.getPath().startsWith(parent.getPath())) return child.getPath().replace('/', File.separatorChar);
final String parentPath = parent.getPath();
final int beginOffset = (parentPath.length() == 1 && '/' == parentPath.charAt(0)) ? 0 : 1; // IDEADEV-35767
return child.getPath().substring(parent.getPath().length() + beginOffset).replace('/', File.separatorChar);
final String systemDependentChild = child.getPath().replace('/', File.separatorChar);
final String systemDependentParent = parent == null ? null : parent.getPath().replace('/', File.separatorChar);
if (systemDependentParent == null || ! systemDependentChild.startsWith(systemDependentParent)) {
return systemDependentChild;
}
final int beginOffset = (systemDependentParent.length() == 1 && '/' == systemDependentParent.charAt(0)) ? 0 : 1; // IDEADEV-35767
return systemDependentChild.substring(systemDependentParent.length() + beginOffset).replace('/', File.separatorChar);
}
public int getSortWeight() {