MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

change Runnable to AnActionButtonRunnable to show popups

Browse Source
This commit is contained in:
Konstantin Bulenkov
2011-07-28 11:29:06 +04:00
parent 1eb1071b32
commit 959934ae6e
5 changed files with 82 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java
+2 -2
View File
@@ -65,9 +65,9 @@ public abstract class AddDeleteListPanel<T> extends PanelWithButtons implements
final ToolbarDecorator decorator = ToolbarDecorator.createDecorator(myList)
.disableUpAction()
.disableDownAction()
.setAddAction(new Runnable() {
.setAddAction(new AnActionButtonRunnable() {
@Override
public void run() {
public void run(AnActionButton button) {
addElement(findItemToAdd());
}
});
platform/platform-api/src/com/intellij/ui/AddEditRemovePanel.java
+4 -4
View File
@@ -76,15 +76,15 @@ public abstract class AddEditRemovePanel<T> extends PanelWithButtons implements
}
final JPanel panel = ToolbarDecorator.createDecorator(myTable)
.setAddAction(new Runnable() {
.setAddAction(new AnActionButtonRunnable() {
@Override
public void run() {
public void run(AnActionButton button) {
doAdd();
}
})
.setRemoveAction(new Runnable() {
.setRemoveAction(new AnActionButtonRunnable() {
@Override
public void run() {
public void run(AnActionButton button) {
doRemove();
}
})
platform/platform-api/src/com/intellij/ui/AddRemoveUpDownPanel.java
+11 -2
View File
@@ -75,7 +75,7 @@ class AddRemoveUpDownPanel extends JPanel {
void doAdd();
void doRemove();
void doUp();
void doDown();
void doDown();
class Adapter implements Listener {
public void doAdd() {}
@@ -88,11 +88,12 @@ class AddRemoveUpDownPanel extends JPanel {
private Map<Buttons, MyActionButton> myButtons = new HashMap<Buttons, MyActionButton>();
private final AnActionButton[] myActions;
AddRemoveUpDownPanel(Listener listener, @Nullable JComponent contextComponent, boolean isHorizontal,
AddRemoveUpDownPanel(ListenerFactory factory, @Nullable JComponent contextComponent, boolean isHorizontal,
@Nullable AnActionButton[] additionalActions,
String addName, String removeName, String moveUpName,String moveDownName,
Buttons... buttons) {
super(new BorderLayout());
final Listener listener = factory.createListener(this);
AnActionButton[] actions = new AnActionButton[buttons.length];
for (int i = 0; i < buttons.length; i++) {
Buttons button = buttons[i];
@@ -122,6 +123,10 @@ class AddRemoveUpDownPanel extends JPanel {
toolbar.getComponent().setBorder(null);
add(toolbar.getComponent(), BorderLayout.CENTER);
}
public AnActionButton getAnActionButton(Buttons button) {
return myButtons.get(button);
}
@Override
public void addNotify() {
@@ -181,4 +186,8 @@ class AddRemoveUpDownPanel extends JPanel {
}
}
}
interface ListenerFactory {
Listener createListener(AddRemoveUpDownPanel panel);
}
}
platform/platform-api/src/com/intellij/ui/AnActionButtonRunnable.java
+24
View File
@@ -0,0 +1,24 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.ui;
import com.intellij.util.ParameterizedRunnable;
/**
* @author Konstantin Bulenkov
*/
public interface AnActionButtonRunnable extends ParameterizedRunnable<AnActionButton> {
}
platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
+41 -29
View File
@@ -44,7 +44,7 @@ import java.util.List;
* @author Konstantin Bulenkov
*/
@SuppressWarnings("UnusedDeclaration")
public class ToolbarDecorator implements DataProvider {
public class ToolbarDecorator implements DataProvider, AddRemoveUpDownPanel.ListenerFactory {
private JTable myTable;
private TableModel myTableModel;
private ListModel myListModel;
@@ -56,10 +56,10 @@ public class ToolbarDecorator implements DataProvider {
private Border myBorder;
private List<AnActionButton> myExtraActions = new ArrayList<AnActionButton>();
private ActionToolbarPosition myToolbarPosition;
private Runnable myAddAction;
private Runnable myRemoveAction;
private Runnable myUpAction;
private Runnable myDownAction;
private AnActionButtonRunnable myAddAction;
private AnActionButtonRunnable myRemoveAction;
private AnActionButtonRunnable myUpAction;
private AnActionButtonRunnable myDownAction;
private String myAddName;
private String myRemoveName;
private String myMoveUpName;
@@ -108,23 +108,23 @@ public class ToolbarDecorator implements DataProvider {
}
private void createDefaultListActions() {
myRemoveAction = new Runnable() {
myRemoveAction = new AnActionButtonRunnable() {
@Override
public void run() {
public void run(AnActionButton button) {
ListUtil.removeSelectedItems(myList);
updateListButtons(myList, myPanel);
}
};
myUpAction = new Runnable() {
myUpAction = new AnActionButtonRunnable() {
@Override
public void run() {
public void run(AnActionButton button) {
ListUtil.moveSelectedItemsUp(myList);
updateListButtons(myList, myPanel);
}
};
myDownAction = new Runnable() {
myDownAction = new AnActionButtonRunnable() {
@Override
public void run() {
public void run(AnActionButton button) {
ListUtil.moveSelectedItemsDown(myList);
updateListButtons(myList, myPanel);
}
@@ -143,8 +143,9 @@ public class ToolbarDecorator implements DataProvider {
final JTable table = myTable;
final EditableModel tableModel = (EditableModel)myTableModel;
myAddAction = new Runnable() {
public void run() {
myAddAction = new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
TableUtil.stopEditing(table);
final int rowCount = table.getRowCount();
if (tableModel instanceof ListTableModel && producer != null) {
@@ -168,8 +169,9 @@ public class ToolbarDecorator implements DataProvider {
}
};
myRemoveAction = new Runnable() {
public void run() {
myRemoveAction = new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
TableUtil.stopEditing(table);
int index = table.getSelectedRow();
if (0 <= index && index < myTableModel.getRowCount()) {
@@ -190,8 +192,9 @@ public class ToolbarDecorator implements DataProvider {
}
};
myUpAction = new Runnable() {
public void run() {
myUpAction = new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
TableUtil.stopEditing(table);
final int[] indexes = table.getSelectedRows();
for (int index : indexes) {
@@ -204,8 +207,9 @@ public class ToolbarDecorator implements DataProvider {
}
};
myDownAction = new Runnable() {
public void run() {
myDownAction = new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
TableUtil.stopEditing(table);
final int[] indexes = table.getSelectedRows();
for (int index : indexes) {
@@ -310,25 +314,25 @@ public class ToolbarDecorator implements DataProvider {
return this;
}
public ToolbarDecorator setAddAction(Runnable action) {
public ToolbarDecorator setAddAction(AnActionButtonRunnable action) {
myAddActionEnabled = action != null;
myAddAction = action;
return this;
}
public ToolbarDecorator setRemoveAction(Runnable action) {
public ToolbarDecorator setRemoveAction(AnActionButtonRunnable action) {
myRemoveActionEnabled = action != null;
myRemoveAction = action;
return this;
}
public ToolbarDecorator setUpAction(Runnable action) {
public ToolbarDecorator setUpAction(AnActionButtonRunnable action) {
myUpActionEnabled = action != null;
myUpAction = action;
return this;
}
public ToolbarDecorator setDownAction(Runnable action) {
public ToolbarDecorator setDownAction(AnActionButtonRunnable action) {
myDownActionEnabled = action != null;
myDownAction = action;
return this;
@@ -356,7 +360,7 @@ public class ToolbarDecorator implements DataProvider {
public JPanel createPanel() {
final AddRemoveUpDownPanel.Buttons[] buttons = getButtons();
myPanel = new AddRemoveUpDownPanel(createListener(),
myPanel = new AddRemoveUpDownPanel(this,
myTable == null ? myList : myTable,
myToolbarPosition == ActionToolbarPosition.TOP || myToolbarPosition == ActionToolbarPosition.BOTTOM,
myExtraActions.toArray(new AnActionButton[myExtraActions.size()]),
@@ -445,26 +449,34 @@ public class ToolbarDecorator implements DataProvider {
return buttons.toArray(new AddRemoveUpDownPanel.Buttons[buttons.size()]);
}
private AddRemoveUpDownPanel.Listener createListener() {
public AddRemoveUpDownPanel.Listener createListener(final AddRemoveUpDownPanel panel) {
return new AddRemoveUpDownPanel.Listener() {
@Override
public void doAdd() {
if (myAddAction != null) myAddAction.run();
if (myAddAction != null) {
myAddAction.run(panel.getAnActionButton(AddRemoveUpDownPanel.Buttons.ADD));
}
}
@Override
public void doRemove() {
if (myRemoveAction != null) myRemoveAction.run();
if (myRemoveAction != null) {
myRemoveAction.run(panel.getAnActionButton(AddRemoveUpDownPanel.Buttons.REMOVE));
}
}
@Override
public void doUp() {
if (myUpAction != null) myUpAction.run();
if (myUpAction != null) {
myUpAction.run(panel.getAnActionButton(AddRemoveUpDownPanel.Buttons.UP));
}
}
@Override
public void doDown() {
if (myDownAction != null) myDownAction.run();
if (myDownAction != null) {
myDownAction.run(panel.getAnActionButton(AddRemoveUpDownPanel.Buttons.DOWN));
}
}
};
}