From 522b85013979eae36d7a210cb4a17a9d97769a6c Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Tue, 14 Aug 2012 16:19:07 +0400
Subject: [PATCH] [git] UntrackedFilesNotifier: better variable name

---
 .../src/git4idea/branch/GitBranchOperation.java      |  2 +-
 .../src/git4idea/util/UntrackedFilesNotifier.java    | 12 ++++++------
 .../git4idea/branch/GitBranchOperationsTest.java     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
index 31baab85c6b9..4af329bf5945 100644
--- a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
+++ b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
@@ -350,7 +350,7 @@ abstract class GitBranchOperation {
 
   private void showUntrackedFilesDialogWithRollback(@NotNull Collection<VirtualFile> untrackedFiles) {
     String title = "Couldn't " + getOperationName();
-    String description = UntrackedFilesNotifier.createUntrackedFilesOverwrittenDescription(getOperationName(), true);
+    String description = UntrackedFilesNotifier.createUntrackedFilesOverwrittenDescription(getOperationName(), false);
 
     final SelectFilesDialog dialog = new UntrackedFilesDialog(myProject, new ArrayList<VirtualFile>(untrackedFiles),
                                                               stripHtml(description, true));
diff --git a/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java b/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java
index 1d27df76e5a7..98aaee11fd8f 100644
--- a/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java
+++ b/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java
@@ -48,14 +48,14 @@ public class UntrackedFilesNotifier {
                                                        @NotNull final Collection<VirtualFile> untrackedFiles,
                                                        @NotNull final String operation, @Nullable String description) {
     final String notificationTitle = StringUtil.capitalize(operation) + " error";
-    final String notificationDesc = description == null ? createUntrackedFilesOverwrittenDescription(operation, false) : description;
-    final String dialogDesc = createUntrackedFilesOverwrittenDescription(operation, true);
+    final String notificationDesc = description == null ? createUntrackedFilesOverwrittenDescription(operation, true) : description;
 
     platformFacade.getNotificator(project).notifyError(notificationTitle, notificationDesc,
                                                   new NotificationListener() {
       @Override
       public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) {
         if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+          final String dialogDesc = createUntrackedFilesOverwrittenDescription(operation, false);
           SelectFilesDialog dlg = new SelectFilesDialog(project, new ArrayList<VirtualFile>(untrackedFiles),
                                                         StringUtil.stripHtml(dialogDesc, true), null, false, false) {
             @Override
@@ -70,15 +70,15 @@ public class UntrackedFilesNotifier {
     });
   }
   
-  public static String createUntrackedFilesOverwrittenDescription(@NotNull final String operation, boolean filesAreShown) {
+  public static String createUntrackedFilesOverwrittenDescription(@NotNull final String operation, boolean addLinkToViewFiles) {
     final String description1 = " untracked working tree files would be overwritten by " + operation + ".";
     final String description2 = "Please move or remove them before you can " + operation + ".";
     final String notificationDesc;
-    if (filesAreShown) {
-      notificationDesc = "These" + description1 + "<br/>" + description2;
+    if (addLinkToViewFiles) {
+      notificationDesc = "Some" + description1 + "<br/>" + description2 + " <a href='view'>View them</a>";
     }
     else {
-      notificationDesc = "Some" + description1 + "<br/>" + description2 + " <a href='view'>View them</a>";
+      notificationDesc = "These" + description1 + "<br/>" + description2;
     }
     return notificationDesc;
   }
diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java b/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java
index 2e6d750c5034..3a776e0f0d80 100644
--- a/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java
+++ b/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java
@@ -230,7 +230,7 @@ public class GitBranchOperationsTest extends AbstractVcsTestCase  {
 
     doCheckoutOrMerge(checkout, "feature");
     String operation = checkout ? "checkout" : "merge";
-    assertNotify(NotificationType.ERROR, UntrackedFilesNotifier.createUntrackedFilesOverwrittenDescription(operation, false));
+    assertNotify(NotificationType.ERROR, UntrackedFilesNotifier.createUntrackedFilesOverwrittenDescription(operation, true));
   }
 
   @Test