diff: consistent window titles

roshan · Feb 27, 2015 · eb8902c · eb8902c
1 parent 1038eca
commit eb8902c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/platform/diff-api/src/com/intellij/diff/DiffRequestFactory.java b/platform/diff-api/src/com/intellij/diff/DiffRequestFactory.java
@@ -43,4 +43,7 @@ public static DiffRequestFactory getInstance() {
 
   @NotNull
   public abstract String getTitle(@NotNull VirtualFile file1, @NotNull VirtualFile file2);
+
+  @NotNull
+  public abstract String getTitle(@NotNull VirtualFile file);
 }
diff --git a/platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java b/platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java
@@ -79,6 +79,12 @@ public String getTitle(@NotNull VirtualFile file1, @NotNull VirtualFile file2) {
                            " 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();

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java
@@ -18,6 +18,7 @@
 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 void run(@NotNull ProgressIndicator indicator) {
           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;

diff --git a/...vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java b/...vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java
@@ -17,6 +17,7 @@
 
 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 void run() {
         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.
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,4 +43,7 @@ public static DiffRequestFactory getInstance() { @@
       @NotNull
       public abstract String getTitle(@NotNull VirtualFile file1, @NotNull VirtualFile file2);
+      @NotNull
+      public abstract String getTitle(@NotNull VirtualFile file);
     }