From 9d1b6b8d758422810487630ca1eae73d97b9a930 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Thu, 21 Aug 2014 17:49:19 +0400
Subject: [PATCH] style

---
 .../src/com/intellij/dvcs/push/PushController.java  |  3 +--
 .../com/intellij/dvcs/push/ui/VcsPushDialog.java    | 13 +++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
index c34864a2044f..1b3106c8735c 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
@@ -235,8 +235,7 @@ public class PushController implements Disposable {
     ProgressManagerImpl.runProcessWithProgressAsynchronously(task, indicator, null, ModalityState.any());
   }
 
-
-  public PushLog getPushPanelInfo() {
+  public PushLog getPushPanelLog() {
     return myPushLog;
   }
 
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
index 996a04317b7d..7bf94a9633a2 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.dvcs.push.ui;
 
+import com.intellij.CommonBundle;
 import com.intellij.dvcs.push.PushController;
 import com.intellij.dvcs.push.VcsPushOptionsPanel;
 import com.intellij.dvcs.repo.Repository;
@@ -33,7 +34,7 @@ import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.intellij.openapi.ui.Messages.CANCEL;
+import static com.intellij.openapi.ui.Messages.OK;
 
 public class VcsPushDialog extends DialogWrapper {
 
@@ -49,7 +50,7 @@ public class VcsPushDialog extends DialogWrapper {
     super(project);
     myProject = project;
     myController = new PushController(project, this, selectedRepositories);
-    myListPanel = myController.getPushPanelInfo();
+    myListPanel = myController.getPushPanelLog();
     myAdditionalOptionsFromVcsPanel = new JPanel(new MigLayout("ins 0 0, flowx"));
     init();
     setOKButtonText("Push");
@@ -133,10 +134,10 @@ public class VcsPushDialog extends DialogWrapper {
     @Override
     public void actionPerformed(ActionEvent e) {
       if (myForce) {
-        int answer = Messages.showOkCancelDialog(myProject, "Would you like to <b>force push</b> in all selected repositories?",
-                                                 "Force Push Confirmation Dialog",
-                                                 "&Force Push", "&Cancel", Messages.getWarningIcon());
-        if (answer == CANCEL) return;
+        int answer = Messages.showOkCancelDialog(myProject, "Would you like to <b>force push</b> to all selected repositories?",
+                                                 "Force Push",
+                                                 "&Force Push", CommonBundle.getCancelButtonText(), Messages.getWarningIcon());
+        if (answer != OK) return;
       }
       myController.push(myForce);
       close(OK_EXIT_CODE);