Git push: remove redundant unused "push all" case

[idea/community.git] / plugins / git4idea / src / git4idea / push / GitPushDialog.java

diff --git a/plugins/git4idea/src/git4idea/push/GitPushDialog.java b/plugins/git4idea/src/git4idea/push/GitPushDialog.java
index 96159428b8016a5dad7ef0c1652fefc1e8545ace..781dbae73e4e1f310f0a6e38836a8f6646cde72f 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitPushDialog.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushDialog.java
@@ -35,8 +35,6 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -50,7 +48,6 @@ public class GitPushDialog extends DialogWrapper {
   private static final Logger LOG = Logger.getInstance(GitPushDialog.class);
   private static final String DEFAULT_REMOTE = "origin";
 
-  private JComponent myRootPanel;
   private Project myProject;
   private final GitPusher myPusher;
   private final GitPushLog myListPanel;
@@ -58,7 +55,6 @@ public class GitPushDialog extends DialogWrapper {
   private Map<GitRepository, GitPushSpec> myPushSpecs;
   private final Collection<GitRepository> myRepositories;
   private final JBLoadingPanel myLoadingPanel;
-  private final JCheckBox myPushAllCheckbox;
   private final Object COMMITS_LOADING_LOCK = new Object();
   private final GitManualPushToBranch myRefspecPanel;
   private final AtomicReference<String> myDestBranchInfoOnRefresh = new AtomicReference<String>();
@@ -73,17 +69,6 @@ public class GitPushDialog extends DialogWrapper {
     myRepositories = GitRepositoryManager.getInstance(myProject).getRepositories();
 
     myLoadingPanel = new JBLoadingPanel(new BorderLayout(), this.getDisposable());
-    myPushAllCheckbox = new JCheckBox("Push all branches", false);
-    myPushAllCheckbox.setMnemonic('p');
-    myPushAllCheckbox.addActionListener(new ActionListener() {
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        loadCommitsInBackground();
-      }
-    });
-    /* hidden: it may confuse users, the target is not clear, hidden until really needed,
-       not removed completely because it is default behavior for 'git push' in command line. */
-    myPushAllCheckbox.setVisible(false);
 
     myListPanel = new GitPushLog(myProject, myRepositories, new RepositoryCheckboxListener());
     myRefspecPanel = new GitManualPushToBranch(myRepositories, new RefreshButtonListener());
@@ -100,19 +85,17 @@ public class GitPushDialog extends DialogWrapper {
     init();
     setOKButtonText("Push");
     setTitle("Git Push");
-
   }
 
   @Override
   protected JComponent createCenterPanel() {
     JPanel optionsPanel = new JPanel(new BorderLayout());
-    optionsPanel.add(myPushAllCheckbox, BorderLayout.NORTH);
     optionsPanel.add(myRefspecPanel);
 
-    myRootPanel = new JPanel(new BorderLayout(0, 15));
-    myRootPanel.add(createCommitListPanel(), BorderLayout.CENTER);
-    myRootPanel.add(optionsPanel, BorderLayout.SOUTH);
-    return myRootPanel;
+    JComponent rootPanel = new JPanel(new BorderLayout(0, 15));
+    rootPanel.add(createCommitListPanel(), BorderLayout.CENTER);
+    rootPanel.add(optionsPanel, BorderLayout.SOUTH);
+    return rootPanel;
   }
 
 
@@ -209,8 +192,7 @@ public class GitPushDialog extends DialogWrapper {
   @Nullable
   private String collectInfoToPush() {
     try {
-      boolean pushAll = myPushAllCheckbox.isSelected();
-      myPushSpecs = pushAll ? pushSpecsForPushAll() : pushSpecsForCurrentOrEnteredBranches();
+      myPushSpecs = pushSpecsForCurrentOrEnteredBranches();
       myGitCommitsToPush = myPusher.collectCommitsToPush(myPushSpecs);
       return null;
     }
@@ -280,14 +262,6 @@ public class GitPushDialog extends DialogWrapper {
     return null;
   }
 
-  private Map<GitRepository, GitPushSpec> pushSpecsForPushAll() {
-    Map<GitRepository, GitPushSpec> specs = new HashMap<GitRepository, GitPushSpec>();
-    for (GitRepository repository : myRepositories) {
-      specs.put(repository, GitPushSpec.pushAllSpec());
-    }
-    return specs;
-  }
-
   @Override
   public JComponent getPreferredFocusedComponent() {
     return myListPanel.getPreferredFocusComponent();