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

diff: better title for "jar vs folder" romparison

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-12-28 19:55:41 +03:00
parent 89e5ce2e48
commit cad2049294
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java
+10 -3
View File
@@ -129,12 +129,19 @@ public class DiffRequestFactoryImpl extends DiffRequestFactory {
@NotNull
public static String getTitle(@NotNull FilePath path1, @NotNull FilePath path2, @NotNull String separator) {
if ((path1.isDirectory() || path2.isDirectory()) && path1.getPath().equals(path2.getPath())) return path1.getPath();
if (path1.isDirectory() ^ path2.isDirectory()) return getContentTitle(path1) + " vs " + getContentTitle(path2);
String name1 = path1.getName();
String name2 = path2.getName();
if (path1.isDirectory() ^ path2.isDirectory()) {
if (path1.isDirectory()) name1 += "/";
if (path2.isDirectory()) name2 += "/";
}
FilePath parent1 = path1.getParentPath();
FilePath parent2 = path2.getParentPath();
return getRequestTitle(path1.getName(), path1.getPath(), parent1 != null ? parent1.getPath() : null,
path2.getName(), path2.getPath(), parent2 != null ? parent2.getPath() : null,
return getRequestTitle(name1, path1.getPath(), parent1 != null ? parent1.getPath() : null,
name2, path2.getPath(), parent2 != null ? parent2.getPath() : null,
separator);
}