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

diff: consistent window titles

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-02-27 20:43:12 +03:00
parent 1038eca3a5
commit eb8902ceec
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-api/src/com/intellij/diff/DiffRequestFactory.java
+3
View File
@@ -43,4 +43,7 @@ public abstract class DiffRequestFactory {
@NotNull
public abstract String getTitle(@NotNull VirtualFile file1, @NotNull VirtualFile file2);
@NotNull
public abstract String getTitle(@NotNull VirtualFile file);
}
platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java
+6
View File
@@ -79,6 +79,12 @@ public class DiffRequestFactoryImpl extends DiffRequestFactory {
" vs ");
}
@Override
@NotNull
public String getTitle(@NotNull VirtualFile file) {
return getTitle(file, file);
}
@NotNull
public static String getContentTitle(@NotNull FilePath path) {
if (path.isDirectory()) return path.getPath();
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java
+2 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.openapi.vcs.actions;
import com.intellij.diff.DiffContentFactory;
import com.intellij.diff.DiffDialogHints;
import com.intellij.diff.DiffManager;
import com.intellij.diff.DiffRequestFactory;
import com.intellij.diff.contents.DiffContent;
import com.intellij.diff.contents.DocumentContent;
import com.intellij.diff.requests.DiffRequest;
@@ -106,7 +107,7 @@ public abstract class DiffActionExecutor {
if (content1 == null) return;
DiffContent content2 = DiffContentFactory.getInstance().create(myProject, mySelectedFile);
String title = mySelectedFile.getPresentableUrl();
String title = DiffRequestFactory.getInstance().getTitle(mySelectedFile);
boolean inverted = false;
String title1;
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.actions.diff;
import com.intellij.CommonBundle;
import com.intellij.diff.DiffContentFactory;
import com.intellij.diff.DiffRequestFactory;
import com.intellij.diff.DiffRequestFactoryImpl;
import com.intellij.diff.chains.DiffRequestProducer;
import com.intellij.diff.chains.DiffRequestProducerException;
@@ -275,7 +276,7 @@ public class ChangeDiffRequestProducer implements DiffRequestProducer {
String beforeRevisionTitle = getRevisionTitle(bRev, "Your version");
String afterRevisionTitle = getRevisionTitle(aRev, "Server version");
String title = FileUtil.toSystemDependentName(file.getPresentableUrl());
String title = DiffRequestFactory.getInstance().getTitle(file);
List<String> titles = ContainerUtil.list(beforeRevisionTitle, "Base Version", afterRevisionTitle);
// Yep, we hope that it's a text file. And that charset wasn't changed.