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: remove duplication

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-12-28 19:55:24 +03:00
parent 093a992d7b
commit 89e5ce2e48
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/diff-impl.iml
+1
View File
@@ -12,5 +12,6 @@
<orderEntry type="module" module-name="platform-api" />
<orderEntry type="module" module-name="platform-impl" />
<orderEntry type="module" module-name="vcs-api-core" />
<orderEntry type="module" module-name="vcs-api" />
</component>
</module>
platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java
+3 -12
View File
@@ -37,6 +37,7 @@ import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Consumer;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcsUtil.VcsUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -103,23 +104,13 @@ public class DiffRequestFactoryImpl extends DiffRequestFactory {
@Override
@NotNull
public String getContentTitle(@NotNull VirtualFile file) {
if (file.isDirectory()) return file.getPath();
VirtualFile parent = file.getParent();
return getContentTitle(file.getName(), file.getPath(), parent != null ? parent.getPath() : null);
return getContentTitle(VcsUtil.getFilePath(file));
}
@Override
@NotNull
public String getTitle(@NotNull VirtualFile file1, @NotNull VirtualFile file2) {
if ((file1.isDirectory() || file2.isDirectory()) && file1.getPath().equals(file2.getPath())) return file1.getPath();
if (file1.isDirectory() ^ file2.isDirectory()) return getContentTitle(file1) + " vs " + getContentTitle(file2);
VirtualFile parent1 = file1.getParent();
VirtualFile parent2 = file2.getParent();
return getRequestTitle(file1.getName(), file1.getPath(), parent1 != null ? parent1.getPath() : null,
file2.getName(), file2.getPath(), parent2 != null ? parent2.getPath() : null,
" vs ");
return getTitle(VcsUtil.getFilePath(file1), VcsUtil.getFilePath(file2), " vs ");
}
@Override