ToolbarDecorator for PathEditor

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java
index 803ea45c1ae3eef7cae17af49ebd24d006fae365..728fd16179336614ca7f555f41b159e491a48bda 100644 (file)
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java
@@ -72,7 +72,6 @@ public class JavadocOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
       if(virtualFile != null){
         addElement(virtualFile);
         setModified(true);
-        updateButtons();
         requestDefaultFocus();
         setSelectedRoots(new Object[]{virtualFile});
       }

diff --git a/platform/core-api/src/com/intellij/util/PlatformIcons.java b/platform/core-api/src/com/intellij/util/PlatformIcons.java
index 0daa134d2349ac116c23b5ff7bb4e8935064a2c0..12ec1feb41e213f5812b7c7fe96fc6f38f797975 100644 (file)
--- a/platform/core-api/src/com/intellij/util/PlatformIcons.java
+++ b/platform/core-api/src/com/intellij/util/PlatformIcons.java
@@ -122,6 +122,7 @@ public interface PlatformIcons {
   Icon TABLE_EXCEPTION = IconLoader.getIcon("/tables/exception.png");
   Icon TABLE_EDIT_ROW = IconLoader.getIcon("/tables/edit.png");
   Icon TABLE_ANALYZE = IconLoader.getIcon("/tables/analyze.png");
+  Icon TABLE_URL = IconLoader.getIcon("/tables/url.png");
 
   Icon COMBOBOX_ARROW_ICON = IconLoader.getIcon("/general/comboArrow.png");
   

diff --git a/platform/icons/src/tables/url.png b/platform/icons/src/tables/url.png
new file mode 100644 (file)
index 0000000..ac9329c
Binary files /dev/null and b/platform/icons/src/tables/url.png differ

diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
index 24c02608ae4aa7cfc8da90d305eb8c74601744cd..bf285be9c8a46189a8f95eba99ec7ee2c5410d34 100644 (file)
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
@@ -16,7 +16,8 @@
 package com.intellij.openapi.projectRoots.ui;
 
 import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.CommonShortcuts;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CustomShortcutSet;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -33,8 +34,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.ex.http.HttpFileSystem;
-import com.intellij.ui.ListUtil;
-import com.intellij.ui.ScrollPaneFactory;
+import com.intellij.ui.*;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.HashSet;
@@ -43,12 +43,7 @@ import gnu.trove.TIntArrayList;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -62,10 +57,7 @@ public class PathEditor {
   public static final Color INVALID_COLOR = new Color(210, 0, 0);
 
   protected JPanel myPanel;
-  private JButton myRemoveButton;
-  private JButton myAddButton;
-  private JButton mySpecifyUrlButton;
-  private JList myList;
+  private JBList myList;
   private DefaultListModel myModel;
   private final Set<VirtualFile> myAllFiles = new HashSet<VirtualFile>();
   private boolean myModified = false;
@@ -124,61 +116,68 @@ public class PathEditor {
       addElement(file);
     }
     setModified(false);
-    updateButtons();
   }
 
   public JComponent createComponent() {
-    myPanel = new JPanel(new GridBagLayout());
+    myList = new JBList(getListModel());
+    myList.setCellRenderer(createListCellRenderer(myList));
 
-    myList = createList(myPanel, getListModel());
-
-    createButtons(myPanel);
-
-    return myPanel;
-  }
-
-  protected void createButtons(@NotNull JPanel panel) {
-    Insets anInsets = new Insets(2, 2, 2, 2);
-    myRemoveButton = new JButton(ProjectBundle.message("button.remove"));
-    myAddButton = new JButton(ProjectBundle.message("button.add"));
-    mySpecifyUrlButton = new JButton(ProjectBundle.message("sdk.paths.specify.url.button"));
-
-    mySpecifyUrlButton.setVisible(isShowUrlButton());
-
-    myAddButton.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
+    ToolbarDecorator toolbarDecorator = ToolbarDecorator.createDecorator(myList).disableUpDownActions();
+    toolbarDecorator.setAddAction(new AnActionButtonRunnable() {
+      @Override
+      public void run(AnActionButton button) {
         final VirtualFile[] added = doAdd();
         if (added.length > 0) {
           setModified(true);
         }
-        updateButtons();
         requestDefaultFocus();
         setSelectedRoots(added);
       }
     });
-    UIUtil.addKeyboardShortcut(myList, myAddButton, CommonShortcuts.getInsertKeystroke());
-    myRemoveButton.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
+
+    toolbarDecorator.setRemoveAction(new AnActionButtonRunnable() {
+      @Override
+      public void run(AnActionButton button) {
         int[] idxs = myList.getSelectedIndices();
         doRemoveItems(idxs, myList);
       }
     });
-    UIUtil.addKeyboardShortcut(myList, myRemoveButton, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
-    mySpecifyUrlButton.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        onSpecifyUrlButtonClicked();
+
+    if (isShowUrlButton()) {
+      AnActionButton specifyUrlButton = new AnActionButton(ProjectBundle.message("sdk.paths.specify.url.button"), PlatformIcons.TABLE_URL) {
+        @Override
+        public void actionPerformed(AnActionEvent e) {
+          onSpecifyUrlButtonClicked();
+        }
+      };
+      specifyUrlButton.setShortcut(CustomShortcutSet.fromString("alt S"));
+      specifyUrlButton.addCustomUpdater(new AnActionButtonUpdater() {
+        @Override
+        public boolean isEnabled(AnActionEvent e) {
+          return myEnabled && !isUrlInserted();
+        }
+      });
+      toolbarDecorator.addExtraAction(specifyUrlButton);
+    }
+
+    myPanel = toolbarDecorator.createPanel();
+    myPanel.setBorder(null);
+
+    ToolbarDecorator.findAddButton(myPanel).addCustomUpdater(new AnActionButtonUpdater() {
+      @Override
+      public boolean isEnabled(AnActionEvent e) {
+        return myEnabled;
+      }
+    });
+    ToolbarDecorator.findRemoveButton(myPanel).addCustomUpdater(new AnActionButtonUpdater() {
+      @Override
+      public boolean isEnabled(AnActionEvent e) {
+        Object[] values = getSelectedRoots();
+        return values.length > 0 && myEnabled;
       }
     });
 
-
-    panel.add(myAddButton,
-              new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, anInsets, 0, 0));
-    panel.add(myRemoveButton,
-              new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, anInsets, 0, 0));
-    panel.add(mySpecifyUrlButton,
-              new GridBagConstraints(1, 4, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, anInsets, 0, 0));
-    panel.add(Box.createRigidArea(new Dimension(mySpecifyUrlButton.getPreferredSize().width, 4)),
-              new GridBagConstraints(1, 5, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, anInsets, 0, 0));
+    return myPanel;
   }
 
   protected void doRemoveItems(int[] idxs, JList list) {
@@ -190,24 +189,6 @@ public class PathEditor {
     return new DefaultListModel();
   }
 
-  protected JBList createList(JPanel panel, DefaultListModel listModel) {
-    Insets anInsets = new Insets(2, 2, 2, 2);
-
-    JBList list = new JBList(listModel);
-    list.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-      public void valueChanged(ListSelectionEvent e) {
-        updateButtons();
-      }
-    });
-    list.setCellRenderer(createListCellRenderer(list));
-
-    JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(list);
-    scrollPane.setPreferredSize(new Dimension(500, 500));
-    panel
-      .add(scrollPane, new GridBagConstraints(0, 0, 1, 8, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, anInsets, 0, 0));
-    return list;
-  }
-
   protected ListCellRenderer createListCellRenderer(JBList list) {
     return new MyCellRenderer();
   }
@@ -217,7 +198,6 @@ public class PathEditor {
     if (removedItems.size() > 0) {
       setModified(true);
     }
-    updateButtons();
     requestDefaultFocus();
   }
 
@@ -254,14 +234,6 @@ public class PathEditor {
     return files;
   }
 
-  public void updateButtons() {
-    Object[] values = getSelectedRoots();
-    myRemoveButton.setEnabled((values.length > 0) && myEnabled);
-    myAddButton.setEnabled(myEnabled);
-    mySpecifyUrlButton.setEnabled(myEnabled && !isUrlInserted());
-    mySpecifyUrlButton.setVisible(isShowUrlButton());
-  }
-
   private boolean isUrlInserted() {
     if (getRowCount() > 0) {
       return ((VirtualFile)getListModel().lastElement()).getFileSystem() instanceof HttpFileSystem;
@@ -285,7 +257,6 @@ public class PathEditor {
     }
     if (added) {
       setModified(true);
-      updateButtons();
     }
   }
 

diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/SdkPathEditor.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/SdkPathEditor.java
index 09621f3c8fc5df7a868f11b2a74a7795357f075d..78eaf1867a08b99029800c54824723bc2c3075d5 100644 (file)
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/SdkPathEditor.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/SdkPathEditor.java
@@ -46,7 +46,6 @@ public class SdkPathEditor extends PathEditor {
       sdkModificator.addRoot(getValueAt(i), myOrderRootType);
     }
     setModified(false);
-    updateButtons();
   }
 
   public void reset(@Nullable SdkModificator modificator) {

diff --git a/platform/platform-resources-en/src/messages/ProjectBundle.properties b/platform/platform-resources-en/src/messages/ProjectBundle.properties
index ab1c4ae0ee854db0ab7016328dfc71f784f0849d..694fc07924eaadd186d5da2e1b75dc0b2a691ad3 100644 (file)
--- a/platform/platform-resources-en/src/messages/ProjectBundle.properties
+++ b/platform/platform-resources-en/src/messages/ProjectBundle.properties
@@ -64,7 +64,7 @@ sdk.list.name.required.error=Please specify SDK name
 sdk.list.unique.name.required.error=Please specify a different SDK name
 button.add=Add
 button.remove=Remove
-sdk.paths.specify.url.button=&Specify URL...
+sdk.paths.specify.url.button=Specify URL...
 sdk.configure.title=Configure SDK
 sdk.configure.save.settings.error=Cannot Save Settings
 sdk.configure.editor.title=SDK Editor