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

style

Browse Source
This commit is contained in:
Nadya Zabrodina
2014-08-21 17:57:23 +04:00
parent 2615409ffe
commit 9d1b6b8d75
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
+1 -2
View File
@@ -235,8 +235,7 @@ public class PushController implements Disposable {
ProgressManagerImpl.runProcessWithProgressAsynchronously(task, indicator, null, ModalityState.any());
}
public PushLog getPushPanelInfo() {
public PushLog getPushPanelLog() {
return myPushLog;
}
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsPushDialog.java
+7 -6
View File
@@ -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);