mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
breakpoints-ui. some ui changes. don't close dialog on click outside. IDEA-89248 View breakpoints dialog is unusable: class filter dialog — add class pattern
This commit is contained in:
andrey.zaytsev
@@ -17,7 +17,6 @@ package com.intellij.ui.popup.util;
|
||||
|
||||
import com.intellij.openapi.actionSystem.AnAction;
|
||||
import com.intellij.openapi.actionSystem.AnActionEvent;
|
||||
import com.intellij.openapi.actionSystem.KeyboardShortcut;
|
||||
import com.intellij.openapi.editor.*;
|
||||
import com.intellij.openapi.editor.colors.EditorColorsManager;
|
||||
import com.intellij.openapi.editor.colors.EditorColorsScheme;
|
||||
@@ -167,7 +166,7 @@ public class DetailViewImpl extends JPanel implements DetailView, UserDataHolder
|
||||
validate();
|
||||
getEditor().getScrollingModel().scrollToCaret(ScrollType.CENTER);
|
||||
|
||||
getEditor().setBorder(IdeBorderFactory.createBorder(SideBorder.BOTTOM));
|
||||
getEditor().setBorder(IdeBorderFactory.createBorder(SideBorder.TOP));
|
||||
|
||||
clearHightlighting();
|
||||
if (lineAttributes != null) {
|
||||
@@ -204,7 +203,7 @@ public class DetailViewImpl extends JPanel implements DetailView, UserDataHolder
|
||||
if (panel != null) {
|
||||
if (myDetailScrollPanel == null) {
|
||||
myDetailPanelWrapper = new JPanel(new GridLayout(1, 1));
|
||||
myDetailPanelWrapper.setBorder(BorderFactory.createEmptyBorder(5, 30, 5, 30));
|
||||
myDetailPanelWrapper.setBorder(IdeBorderFactory.createEmptyBorder(5, 30, 5, 30));
|
||||
myDetailPanelWrapper.add(panel);
|
||||
|
||||
myDetailScrollPanel =
|
||||
@@ -212,7 +211,7 @@ public class DetailViewImpl extends JPanel implements DetailView, UserDataHolder
|
||||
myDetailScrollPanel.setPreferredSize(myDetailPanelWrapper.getPreferredSize());
|
||||
myDetailScrollPanel.setBorder(null);
|
||||
|
||||
add(wrapWithDoneButtonIfNeeded(myDetailScrollPanel), BorderLayout.SOUTH);
|
||||
add(myDetailScrollPanel, BorderLayout.NORTH);
|
||||
} else {
|
||||
myDetailPanelWrapper.removeAll();
|
||||
myDetailPanelWrapper.add(panel);
|
||||
|
||||
@@ -1,473 +1,517 @@
|
||||
/*
|
||||
* Copyright 2000-2012 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.popup.util;
|
||||
|
||||
import com.intellij.openapi.actionSystem.*;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.ui.popup.JBPopup;
|
||||
import com.intellij.openapi.ui.popup.JBPopupListener;
|
||||
import com.intellij.openapi.ui.popup.LightweightWindowEvent;
|
||||
import com.intellij.openapi.ui.popup.PopupChooserBuilder;
|
||||
import com.intellij.openapi.wm.IdeFocusManager;
|
||||
import com.intellij.ui.*;
|
||||
import com.intellij.ui.components.JBList;
|
||||
import com.intellij.ui.speedSearch.FilteringListModel;
|
||||
import com.intellij.util.Alarm;
|
||||
import com.intellij.util.Function;
|
||||
import com.intellij.util.ui.UIUtil;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.ListSelectionEvent;
|
||||
import javax.swing.event.ListSelectionListener;
|
||||
import javax.swing.event.TreeSelectionEvent;
|
||||
import javax.swing.event.TreeSelectionListener;
|
||||
import java.awt.*;
|
||||
import java.awt.event.KeyAdapter;
|
||||
import java.awt.event.KeyEvent;
|
||||
import java.io.File;
|
||||
|
||||
public class MasterDetailPopupBuilder {
|
||||
|
||||
private static final Color BORDER_COLOR = Gray._135;
|
||||
private Project myProject;
|
||||
private ActionGroup myActions;
|
||||
private Delegate myDelegate;
|
||||
private boolean myCloseOnEnter;
|
||||
|
||||
private DetailView myDetailView;
|
||||
|
||||
private JLabel myPathLabel;
|
||||
|
||||
private JBPopup myPopup;
|
||||
private Alarm myUpdateAlarm;
|
||||
private JComponent myChooserComponent;
|
||||
private ActionToolbar myActionToolbar;
|
||||
private boolean myAddDetailViewToEast = true;
|
||||
private Dimension myMinSize;
|
||||
private boolean myCancelOnWindowDeactivation = true;
|
||||
|
||||
|
||||
public String getDimensionServiceKey() {
|
||||
return myDimensionServiceKey;
|
||||
}
|
||||
|
||||
public void setDimensionServiceKey(String dimensionServiceKey) {
|
||||
myDimensionServiceKey = dimensionServiceKey;
|
||||
}
|
||||
|
||||
private String myDimensionServiceKey;
|
||||
|
||||
|
||||
public MasterDetailPopupBuilder setDetailView(DetailView detailView) {
|
||||
myDetailView = detailView;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ActionToolbar getActionToolbar() {
|
||||
return myActionToolbar;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder(Project project) {
|
||||
myProject = project;
|
||||
}
|
||||
|
||||
private String getTitle2Text(String fullText) {
|
||||
int labelWidth = myPathLabel.getWidth();
|
||||
if (fullText == null || fullText.length() == 0) return " ";
|
||||
while (myPathLabel.getFontMetrics(myPathLabel.getFont()).stringWidth(fullText) > labelWidth) {
|
||||
int sep = fullText.indexOf(File.separatorChar, 4);
|
||||
if (sep < 0) return fullText;
|
||||
fullText = "..." + fullText.substring(sep);
|
||||
}
|
||||
|
||||
return fullText;
|
||||
}
|
||||
|
||||
private void doUpdateDetailView() {
|
||||
final Object[] values = getSelectedItems();
|
||||
ItemWrapper wrapper = null;
|
||||
if (values != null && values.length == 1) {
|
||||
wrapper = (ItemWrapper)values[0];
|
||||
myPathLabel.setText(getTitle2Text(wrapper.footerText()));
|
||||
}
|
||||
else {
|
||||
myPathLabel.setText(" ");
|
||||
}
|
||||
final ItemWrapper wrapper1 = wrapper;
|
||||
myUpdateAlarm.cancelAllRequests();
|
||||
myUpdateAlarm.addRequest(new Runnable() {
|
||||
public void run() {
|
||||
doUpdateDetailViewWithItem(wrapper1);
|
||||
}
|
||||
}, 100);
|
||||
}
|
||||
|
||||
protected void doUpdateDetailViewWithItem(ItemWrapper wrapper1) {
|
||||
if (wrapper1 != null) {
|
||||
wrapper1.updateDetailView(myDetailView);
|
||||
}
|
||||
else {
|
||||
myDetailView.clearEditor();
|
||||
}
|
||||
}
|
||||
|
||||
public JBPopup createMasterDetailPopup() {
|
||||
|
||||
setupRenderer();
|
||||
|
||||
myPathLabel = new JLabel(" ");
|
||||
myPathLabel.setHorizontalAlignment(SwingConstants.RIGHT);
|
||||
|
||||
final Font font = myPathLabel.getFont();
|
||||
myPathLabel.setFont(font.deriveFont((float)10));
|
||||
|
||||
myUpdateAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
|
||||
|
||||
if (myDetailView == null) {
|
||||
myDetailView = new DetailViewImpl(myProject);
|
||||
}
|
||||
|
||||
JPanel footerPanel = new JPanel(new BorderLayout()) {
|
||||
@Override
|
||||
protected void paintComponent(Graphics g) {
|
||||
super.paintComponent(g);
|
||||
g.setColor(BORDER_COLOR);
|
||||
g.drawLine(0, 0, getWidth(), 0);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Runnable runnable = new Runnable() {
|
||||
public void run() {
|
||||
IdeFocusManager.getInstance(myProject).doWhenFocusSettlesDown(new Runnable() {
|
||||
public void run() {
|
||||
Object[] values = getSelectedItems();
|
||||
if (values.length == 1) {
|
||||
myDelegate.itemChosen((ItemWrapper)values[0], myProject, myPopup, false);
|
||||
}
|
||||
else {
|
||||
for (Object value : values) {
|
||||
if (value instanceof ItemWrapper) {
|
||||
myDelegate.itemChosen((ItemWrapper)value, myProject, myPopup, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
footerPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
|
||||
footerPanel.add(myPathLabel);
|
||||
|
||||
JComponent toolBar = null;
|
||||
if (myActions != null) {
|
||||
myActionToolbar = ActionManager.getInstance().createActionToolbar("", myActions, true);
|
||||
myActionToolbar.setReservePlaceAutoPopupIcon(false);
|
||||
myActionToolbar.setMinimumButtonSize(new Dimension(20, 20));
|
||||
toolBar = myActionToolbar.getComponent();
|
||||
toolBar.setOpaque(false);
|
||||
}
|
||||
|
||||
final PopupChooserBuilder builder = createInnerBuilder().
|
||||
setMovable(true).
|
||||
setResizable(true).
|
||||
setAutoselectOnMouseMove(false).
|
||||
setSettingButton(toolBar).
|
||||
setSouthComponent(footerPanel).
|
||||
setCancelOnWindowDeactivation(myCancelOnWindowDeactivation);
|
||||
|
||||
|
||||
if (myAddDetailViewToEast) {
|
||||
builder.
|
||||
setEastComponent((JComponent)myDetailView);
|
||||
}
|
||||
|
||||
String title = myDelegate.getTitle();
|
||||
if (title != null) {
|
||||
builder.setTitle(title);
|
||||
}
|
||||
|
||||
|
||||
builder.
|
||||
setItemChoosenCallback(runnable).
|
||||
setCloseOnEnter(myCloseOnEnter).
|
||||
setMayBeParent(true).
|
||||
setDimensionServiceKey(myDimensionServiceKey).
|
||||
setFilteringEnabled(new Function<Object, String>() {
|
||||
public String fun(Object o) {
|
||||
return ((ItemWrapper)o).speedSearchText();
|
||||
}
|
||||
});
|
||||
|
||||
if (myMinSize != null) {
|
||||
builder.setMinSize(myMinSize);
|
||||
}
|
||||
|
||||
myPopup = builder.createPopup();
|
||||
builder.getScrollPane().setBorder(IdeBorderFactory.createBorder(SideBorder.RIGHT));
|
||||
myPopup.addListener(new JBPopupListener() {
|
||||
@Override
|
||||
public void beforeShown(LightweightWindowEvent event) {
|
||||
//To change body of implemented methods use File | Settings | File Templates.
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClosed(LightweightWindowEvent event) {
|
||||
myDetailView.clearEditor();
|
||||
}
|
||||
});
|
||||
return myPopup;
|
||||
}
|
||||
|
||||
private void setupRenderer() {
|
||||
if (myChooserComponent instanceof JList) {
|
||||
final JList list = (JList)myChooserComponent;
|
||||
list.setCellRenderer(new ListItemRenderer(myDelegate, myProject));
|
||||
}
|
||||
}
|
||||
|
||||
private PopupChooserBuilder createInnerBuilder() {
|
||||
if (myChooserComponent instanceof JList) {
|
||||
return new PopupChooserBuilder((JList)myChooserComponent);
|
||||
}
|
||||
else if (myChooserComponent instanceof JTree) {
|
||||
return new PopupChooserBuilder((JTree)myChooserComponent);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public ItemWrapper[] getSelectedItems() {
|
||||
Object[] values = new Object[0];
|
||||
if (myChooserComponent instanceof JList) {
|
||||
values = ((JList)myChooserComponent).getSelectedValues();
|
||||
|
||||
}
|
||||
else if (myChooserComponent instanceof JTree) {
|
||||
values = myDelegate.getSelectedItemsInTree();
|
||||
}
|
||||
ItemWrapper[] items = new ItemWrapper[values.length];
|
||||
for (int i = 0; i < values.length; i++) {
|
||||
items[i] = (ItemWrapper)values[i];
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
private void updateDetailViewLater() {
|
||||
//noinspection SSBasedInspection
|
||||
//SwingUtilities.invokeLater(new Runnable() {
|
||||
// public void run() {
|
||||
// doUpdateDetailView();
|
||||
// }
|
||||
//});
|
||||
doUpdateDetailView();
|
||||
}
|
||||
|
||||
public void setAddDetailViewToEast(boolean addDetailViewToEast) {
|
||||
myAddDetailViewToEast = addDetailViewToEast;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setMinSize(Dimension minSize) {
|
||||
myMinSize = minSize;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setCancelOnWindowDeactivation(boolean cancelOnWindowDeactivation) {
|
||||
myCancelOnWindowDeactivation = cancelOnWindowDeactivation;
|
||||
return this;
|
||||
}
|
||||
|
||||
public static boolean allowedToRemoveItems(Object[] values) {
|
||||
for (Object value : values) {
|
||||
ItemWrapper item = (ItemWrapper)value;
|
||||
if (!item.allowedToRemove()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return values.length > 0;
|
||||
}
|
||||
|
||||
public void removeSelectedItems(Project project) {
|
||||
if (myChooserComponent instanceof JList) {
|
||||
final JList list = (JList)myChooserComponent;
|
||||
int index = list.getSelectedIndex();
|
||||
if (index == -1 || index >= list.getModel().getSize()) {
|
||||
return;
|
||||
}
|
||||
Object[] values = list.getSelectedValues();
|
||||
for (Object value : values) {
|
||||
ItemWrapper item = (ItemWrapper)value;
|
||||
|
||||
DefaultListModel model = list.getModel() instanceof DefaultListModel
|
||||
? (DefaultListModel)list.getModel()
|
||||
: (DefaultListModel)((FilteringListModel)list.getModel()).getOriginalModel();
|
||||
if (item.allowedToRemove()) {
|
||||
model.removeElement(item);
|
||||
|
||||
if (model.getSize() > 0) {
|
||||
if (model.getSize() == index) {
|
||||
list.setSelectedIndex(model.getSize() - 1);
|
||||
}
|
||||
else if (model.getSize() > index) {
|
||||
list.setSelectedIndex(index);
|
||||
}
|
||||
}
|
||||
else {
|
||||
list.clearSelection();
|
||||
}
|
||||
item.removed(project);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
final Object[] items = getSelectedItems();
|
||||
for (Object item : items) {
|
||||
((ItemWrapper)item).removed(project);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setActionsGroup(@Nullable ActionGroup actions) {
|
||||
myActions = actions;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setTree(final JTree tree) {
|
||||
setChooser(tree);
|
||||
|
||||
tree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() {
|
||||
@Override
|
||||
public void valueChanged(TreeSelectionEvent event) {
|
||||
updateDetailViewLater();
|
||||
}
|
||||
});
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setList(final JBList list) {
|
||||
setChooser(list);
|
||||
final ListSelectionModel listSelectionModel = list.getSelectionModel();
|
||||
listSelectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
||||
|
||||
listSelectionModel.addListSelectionListener(new ListSelectionListener() {
|
||||
public void valueChanged(final ListSelectionEvent e) {
|
||||
updateDetailViewLater();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
if (list.getModel().getSize() == 0) {
|
||||
list.clearSelection();
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
private void setChooser(JComponent list) {
|
||||
myChooserComponent = list;
|
||||
list.addKeyListener(new KeyAdapter() {
|
||||
public void keyPressed(KeyEvent e) {
|
||||
if (e.getKeyCode() == KeyEvent.VK_DELETE) {
|
||||
removeSelectedItems(myProject);
|
||||
}
|
||||
else if (e.getModifiersEx() == 0) {
|
||||
myDelegate.handleMnemonic(e, myProject, myPopup);
|
||||
}
|
||||
}
|
||||
});
|
||||
new AnAction(){
|
||||
@Override
|
||||
public void actionPerformed(AnActionEvent e) {
|
||||
ItemWrapper[] items = getSelectedItems();
|
||||
if (items.length > 0) {
|
||||
myDelegate.itemChosen(items[0], myProject, myPopup, true);
|
||||
}
|
||||
}
|
||||
}.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)), list);
|
||||
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setDelegate(Delegate delegate) {
|
||||
myDelegate = delegate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setCloseOnEnter(boolean closeOnEnter) {
|
||||
myCloseOnEnter = closeOnEnter;
|
||||
return this;
|
||||
}
|
||||
|
||||
public interface Delegate {
|
||||
@Nullable
|
||||
String getTitle();
|
||||
|
||||
void handleMnemonic(KeyEvent e, Project project, JBPopup popup);
|
||||
|
||||
@Nullable
|
||||
JComponent createAccessoryView(Project project);
|
||||
|
||||
Object[] getSelectedItemsInTree();
|
||||
|
||||
void itemChosen(ItemWrapper item, Project project, JBPopup popup, boolean withEnterOrDoubleClick);
|
||||
}
|
||||
|
||||
public static class ListItemRenderer extends JPanel implements ListCellRenderer {
|
||||
private final Project myProject;
|
||||
private final ColoredListCellRenderer myRenderer;
|
||||
private Delegate myDelegate;
|
||||
|
||||
private ListItemRenderer(Delegate delegate, Project project) {
|
||||
super(new BorderLayout());
|
||||
myProject = project;
|
||||
setBackground(UIUtil.getListBackground());
|
||||
this.myDelegate = delegate;
|
||||
final JComponent accessory = myDelegate.createAccessoryView(project);
|
||||
|
||||
if (accessory != null) {
|
||||
add(accessory, BorderLayout.WEST);
|
||||
}
|
||||
|
||||
myRenderer = new ColoredListCellRenderer() {
|
||||
@Override
|
||||
protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) {
|
||||
if (value instanceof ItemWrapper) {
|
||||
final ItemWrapper wrapper = (ItemWrapper)value;
|
||||
wrapper.setupRenderer(this, myProject, selected);
|
||||
if (accessory != null) {
|
||||
wrapper.updateAccessoryView(accessory);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
add(myRenderer, BorderLayout.CENTER);
|
||||
}
|
||||
|
||||
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
|
||||
if (value instanceof SplitterItem) {
|
||||
String label = ((SplitterItem)value).getText();
|
||||
final TitledSeparator separator = new TitledSeparator(label);
|
||||
separator.setBackground(UIUtil.getListBackground());
|
||||
separator.setForeground(UIUtil.getListForeground());
|
||||
return separator;
|
||||
}
|
||||
myRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
|
||||
myRenderer.revalidate();
|
||||
|
||||
return this;
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Copyright 2000-2012 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.popup.util;
|
||||
|
||||
import com.intellij.openapi.actionSystem.*;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.ui.popup.JBPopup;
|
||||
import com.intellij.openapi.ui.popup.JBPopupListener;
|
||||
import com.intellij.openapi.ui.popup.LightweightWindowEvent;
|
||||
import com.intellij.openapi.ui.popup.PopupChooserBuilder;
|
||||
import com.intellij.openapi.wm.IdeFocusManager;
|
||||
import com.intellij.ui.*;
|
||||
import com.intellij.ui.components.JBList;
|
||||
import com.intellij.ui.speedSearch.FilteringListModel;
|
||||
import com.intellij.util.Alarm;
|
||||
import com.intellij.util.Function;
|
||||
import com.intellij.util.ui.UIUtil;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.ListSelectionEvent;
|
||||
import javax.swing.event.ListSelectionListener;
|
||||
import javax.swing.event.TreeSelectionEvent;
|
||||
import javax.swing.event.TreeSelectionListener;
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.io.File;
|
||||
|
||||
public class MasterDetailPopupBuilder {
|
||||
|
||||
private static final Color BORDER_COLOR = Gray._135;
|
||||
private Project myProject;
|
||||
private ActionGroup myActions;
|
||||
private Delegate myDelegate;
|
||||
private boolean myCloseOnEnter;
|
||||
|
||||
private DetailView myDetailView;
|
||||
|
||||
private JLabel myPathLabel;
|
||||
|
||||
private JBPopup myPopup;
|
||||
private Alarm myUpdateAlarm;
|
||||
private JComponent myChooserComponent;
|
||||
private ActionToolbar myActionToolbar;
|
||||
private boolean myAddDetailViewToEast = true;
|
||||
private Dimension myMinSize;
|
||||
private boolean myCancelOnWindowDeactivation = true;
|
||||
private Runnable myDoneRunnable;
|
||||
private boolean myCancelOnClickOutside;
|
||||
|
||||
|
||||
public String getDimensionServiceKey() {
|
||||
return myDimensionServiceKey;
|
||||
}
|
||||
|
||||
public void setDimensionServiceKey(String dimensionServiceKey) {
|
||||
myDimensionServiceKey = dimensionServiceKey;
|
||||
}
|
||||
|
||||
private String myDimensionServiceKey;
|
||||
|
||||
|
||||
public MasterDetailPopupBuilder setDetailView(DetailView detailView) {
|
||||
myDetailView = detailView;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ActionToolbar getActionToolbar() {
|
||||
return myActionToolbar;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder(Project project) {
|
||||
myProject = project;
|
||||
}
|
||||
|
||||
private String getTitle2Text(String fullText) {
|
||||
int labelWidth = myPathLabel.getWidth();
|
||||
if (fullText == null || fullText.length() == 0) return " ";
|
||||
while (myPathLabel.getFontMetrics(myPathLabel.getFont()).stringWidth(fullText) > labelWidth) {
|
||||
int sep = fullText.indexOf(File.separatorChar, 4);
|
||||
if (sep < 0) return fullText;
|
||||
fullText = "..." + fullText.substring(sep);
|
||||
}
|
||||
|
||||
return fullText;
|
||||
}
|
||||
|
||||
private void doUpdateDetailView() {
|
||||
final Object[] values = getSelectedItems();
|
||||
ItemWrapper wrapper = null;
|
||||
if (values != null && values.length == 1) {
|
||||
wrapper = (ItemWrapper)values[0];
|
||||
myPathLabel.setText(getTitle2Text(wrapper.footerText()));
|
||||
}
|
||||
else {
|
||||
myPathLabel.setText(" ");
|
||||
}
|
||||
final ItemWrapper wrapper1 = wrapper;
|
||||
myUpdateAlarm.cancelAllRequests();
|
||||
myUpdateAlarm.addRequest(new Runnable() {
|
||||
public void run() {
|
||||
doUpdateDetailViewWithItem(wrapper1);
|
||||
}
|
||||
}, 100);
|
||||
}
|
||||
|
||||
protected void doUpdateDetailViewWithItem(ItemWrapper wrapper1) {
|
||||
if (wrapper1 != null) {
|
||||
wrapper1.updateDetailView(myDetailView);
|
||||
}
|
||||
else {
|
||||
myDetailView.clearEditor();
|
||||
}
|
||||
}
|
||||
|
||||
public JBPopup createMasterDetailPopup() {
|
||||
|
||||
setupRenderer();
|
||||
|
||||
myPathLabel = new JLabel(" ");
|
||||
myPathLabel.setHorizontalAlignment(SwingConstants.RIGHT);
|
||||
|
||||
final Font font = myPathLabel.getFont();
|
||||
myPathLabel.setFont(font.deriveFont((float)10));
|
||||
|
||||
myUpdateAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
|
||||
|
||||
if (myDetailView == null) {
|
||||
myDetailView = new DetailViewImpl(myProject);
|
||||
}
|
||||
|
||||
JPanel footerPanel = new JPanel(new BorderLayout()) {
|
||||
@Override
|
||||
protected void paintComponent(Graphics g) {
|
||||
super.paintComponent(g);
|
||||
g.setColor(BORDER_COLOR);
|
||||
g.drawLine(0, 0, getWidth(), 0);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Runnable runnable = new Runnable() {
|
||||
public void run() {
|
||||
IdeFocusManager.getInstance(myProject).doWhenFocusSettlesDown(new Runnable() {
|
||||
public void run() {
|
||||
Object[] values = getSelectedItems();
|
||||
if (values.length == 1) {
|
||||
myDelegate.itemChosen((ItemWrapper)values[0], myProject, myPopup, false);
|
||||
}
|
||||
else {
|
||||
for (Object value : values) {
|
||||
if (value instanceof ItemWrapper) {
|
||||
myDelegate.itemChosen((ItemWrapper)value, myProject, myPopup, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
footerPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
|
||||
footerPanel.add(myPathLabel);
|
||||
|
||||
JComponent toolBar = null;
|
||||
if (myActions != null) {
|
||||
myActionToolbar = ActionManager.getInstance().createActionToolbar("", myActions, true);
|
||||
myActionToolbar.setReservePlaceAutoPopupIcon(false);
|
||||
myActionToolbar.setMinimumButtonSize(new Dimension(20, 20));
|
||||
toolBar = myActionToolbar.getComponent();
|
||||
toolBar.setOpaque(false);
|
||||
}
|
||||
|
||||
|
||||
final PopupChooserBuilder builder = createInnerBuilder().
|
||||
setMovable(true).
|
||||
setResizable(true).
|
||||
setAutoselectOnMouseMove(false).
|
||||
setSettingButton(toolBar).
|
||||
setSouthComponent(footerPanel).
|
||||
setCancelOnWindowDeactivation(myCancelOnWindowDeactivation).
|
||||
setCancelOnClickOutside(myCancelOnClickOutside);
|
||||
|
||||
|
||||
if (myAddDetailViewToEast) {
|
||||
builder.
|
||||
setEastComponent((JComponent)myDetailView);
|
||||
}
|
||||
|
||||
if (myDoneRunnable != null) {
|
||||
|
||||
final JButton done = new JButton("Done");
|
||||
done.setMnemonic('o');
|
||||
done.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent event) {
|
||||
myDoneRunnable.run();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
builder.setCommandButton(new ActiveComponent() {
|
||||
@Override
|
||||
public void setActive(boolean active) {
|
||||
//To change body of implemented methods use File | Settings | File Templates.
|
||||
}
|
||||
|
||||
@Override
|
||||
public JComponent getComponent() {
|
||||
return done;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
String title = myDelegate.getTitle();
|
||||
if (title != null) {
|
||||
builder.setTitle(title);
|
||||
}
|
||||
|
||||
|
||||
builder.
|
||||
setItemChoosenCallback(runnable).
|
||||
setCloseOnEnter(myCloseOnEnter).
|
||||
setMayBeParent(true).
|
||||
setDimensionServiceKey(myDimensionServiceKey).
|
||||
setFilteringEnabled(new Function<Object, String>() {
|
||||
public String fun(Object o) {
|
||||
return ((ItemWrapper)o).speedSearchText();
|
||||
}
|
||||
});
|
||||
|
||||
if (myMinSize != null) {
|
||||
builder.setMinSize(myMinSize);
|
||||
}
|
||||
|
||||
myPopup = builder.createPopup();
|
||||
builder.getScrollPane().setBorder(IdeBorderFactory.createBorder(SideBorder.RIGHT));
|
||||
myPopup.addListener(new JBPopupListener() {
|
||||
@Override
|
||||
public void beforeShown(LightweightWindowEvent event) {
|
||||
//To change body of implemented methods use File | Settings | File Templates.
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClosed(LightweightWindowEvent event) {
|
||||
myDetailView.clearEditor();
|
||||
}
|
||||
});
|
||||
|
||||
if (myDoneRunnable != null) {
|
||||
new AnAction("Done") {
|
||||
@Override
|
||||
public void actionPerformed(AnActionEvent e) {
|
||||
myDoneRunnable.run();
|
||||
}
|
||||
}.registerCustomShortcutSet(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK, myPopup.getContent());
|
||||
}
|
||||
|
||||
return myPopup;
|
||||
}
|
||||
|
||||
private void setupRenderer() {
|
||||
if (myChooserComponent instanceof JList) {
|
||||
final JList list = (JList)myChooserComponent;
|
||||
list.setCellRenderer(new ListItemRenderer(myDelegate, myProject));
|
||||
}
|
||||
}
|
||||
|
||||
private PopupChooserBuilder createInnerBuilder() {
|
||||
if (myChooserComponent instanceof JList) {
|
||||
return new PopupChooserBuilder((JList)myChooserComponent);
|
||||
}
|
||||
else if (myChooserComponent instanceof JTree) {
|
||||
return new PopupChooserBuilder((JTree)myChooserComponent);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public ItemWrapper[] getSelectedItems() {
|
||||
Object[] values = new Object[0];
|
||||
if (myChooserComponent instanceof JList) {
|
||||
values = ((JList)myChooserComponent).getSelectedValues();
|
||||
}
|
||||
else if (myChooserComponent instanceof JTree) {
|
||||
values = myDelegate.getSelectedItemsInTree();
|
||||
}
|
||||
ItemWrapper[] items = new ItemWrapper[values.length];
|
||||
for (int i = 0; i < values.length; i++) {
|
||||
items[i] = (ItemWrapper)values[i];
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
private void updateDetailViewLater() {
|
||||
//noinspection SSBasedInspection
|
||||
//SwingUtilities.invokeLater(new Runnable() {
|
||||
// public void run() {
|
||||
// doUpdateDetailView();
|
||||
// }
|
||||
//});
|
||||
doUpdateDetailView();
|
||||
}
|
||||
|
||||
public void setAddDetailViewToEast(boolean addDetailViewToEast) {
|
||||
myAddDetailViewToEast = addDetailViewToEast;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setMinSize(Dimension minSize) {
|
||||
myMinSize = minSize;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setCancelOnWindowDeactivation(boolean cancelOnWindowDeactivation) {
|
||||
myCancelOnWindowDeactivation = cancelOnWindowDeactivation;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setDoneRunnable(Runnable doneRunnable) {
|
||||
myDoneRunnable = doneRunnable;
|
||||
}
|
||||
|
||||
public void setCancelOnClickOutside(boolean cancelOnClickOutside) {
|
||||
myCancelOnClickOutside = cancelOnClickOutside;
|
||||
}
|
||||
|
||||
public static boolean allowedToRemoveItems(Object[] values) {
|
||||
for (Object value : values) {
|
||||
ItemWrapper item = (ItemWrapper)value;
|
||||
if (!item.allowedToRemove()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return values.length > 0;
|
||||
}
|
||||
|
||||
public void removeSelectedItems(Project project) {
|
||||
if (myChooserComponent instanceof JList) {
|
||||
final JList list = (JList)myChooserComponent;
|
||||
int index = list.getSelectedIndex();
|
||||
if (index == -1 || index >= list.getModel().getSize()) {
|
||||
return;
|
||||
}
|
||||
Object[] values = list.getSelectedValues();
|
||||
for (Object value : values) {
|
||||
ItemWrapper item = (ItemWrapper)value;
|
||||
|
||||
DefaultListModel model = list.getModel() instanceof DefaultListModel
|
||||
? (DefaultListModel)list.getModel()
|
||||
: (DefaultListModel)((FilteringListModel)list.getModel()).getOriginalModel();
|
||||
if (item.allowedToRemove()) {
|
||||
model.removeElement(item);
|
||||
|
||||
if (model.getSize() > 0) {
|
||||
if (model.getSize() == index) {
|
||||
list.setSelectedIndex(model.getSize() - 1);
|
||||
}
|
||||
else if (model.getSize() > index) {
|
||||
list.setSelectedIndex(index);
|
||||
}
|
||||
}
|
||||
else {
|
||||
list.clearSelection();
|
||||
}
|
||||
item.removed(project);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
final Object[] items = getSelectedItems();
|
||||
for (Object item : items) {
|
||||
((ItemWrapper)item).removed(project);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setActionsGroup(@Nullable ActionGroup actions) {
|
||||
myActions = actions;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setTree(final JTree tree) {
|
||||
setChooser(tree);
|
||||
|
||||
tree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() {
|
||||
@Override
|
||||
public void valueChanged(TreeSelectionEvent event) {
|
||||
updateDetailViewLater();
|
||||
}
|
||||
});
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setList(final JBList list) {
|
||||
setChooser(list);
|
||||
final ListSelectionModel listSelectionModel = list.getSelectionModel();
|
||||
listSelectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
|
||||
|
||||
listSelectionModel.addListSelectionListener(new ListSelectionListener() {
|
||||
public void valueChanged(final ListSelectionEvent e) {
|
||||
updateDetailViewLater();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
if (list.getModel().getSize() == 0) {
|
||||
list.clearSelection();
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
private void setChooser(JComponent list) {
|
||||
myChooserComponent = list;
|
||||
list.addKeyListener(new KeyAdapter() {
|
||||
public void keyPressed(KeyEvent e) {
|
||||
if (e.getKeyCode() == KeyEvent.VK_DELETE) {
|
||||
removeSelectedItems(myProject);
|
||||
}
|
||||
else if (e.getModifiersEx() == 0) {
|
||||
myDelegate.handleMnemonic(e, myProject, myPopup);
|
||||
}
|
||||
}
|
||||
});
|
||||
new AnAction() {
|
||||
@Override
|
||||
public void actionPerformed(AnActionEvent e) {
|
||||
ItemWrapper[] items = getSelectedItems();
|
||||
if (items.length > 0) {
|
||||
myDelegate.itemChosen(items[0], myProject, myPopup, true);
|
||||
}
|
||||
}
|
||||
}.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)), list);
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setDelegate(Delegate delegate) {
|
||||
myDelegate = delegate;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MasterDetailPopupBuilder setCloseOnEnter(boolean closeOnEnter) {
|
||||
myCloseOnEnter = closeOnEnter;
|
||||
return this;
|
||||
}
|
||||
|
||||
public interface Delegate {
|
||||
@Nullable
|
||||
String getTitle();
|
||||
|
||||
void handleMnemonic(KeyEvent e, Project project, JBPopup popup);
|
||||
|
||||
@Nullable
|
||||
JComponent createAccessoryView(Project project);
|
||||
|
||||
Object[] getSelectedItemsInTree();
|
||||
|
||||
void itemChosen(ItemWrapper item, Project project, JBPopup popup, boolean withEnterOrDoubleClick);
|
||||
}
|
||||
|
||||
public static class ListItemRenderer extends JPanel implements ListCellRenderer {
|
||||
private final Project myProject;
|
||||
private final ColoredListCellRenderer myRenderer;
|
||||
private Delegate myDelegate;
|
||||
|
||||
private ListItemRenderer(Delegate delegate, Project project) {
|
||||
super(new BorderLayout());
|
||||
myProject = project;
|
||||
setBackground(UIUtil.getListBackground());
|
||||
this.myDelegate = delegate;
|
||||
final JComponent accessory = myDelegate.createAccessoryView(project);
|
||||
|
||||
if (accessory != null) {
|
||||
add(accessory, BorderLayout.WEST);
|
||||
}
|
||||
|
||||
myRenderer = new ColoredListCellRenderer() {
|
||||
@Override
|
||||
protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) {
|
||||
if (value instanceof ItemWrapper) {
|
||||
final ItemWrapper wrapper = (ItemWrapper)value;
|
||||
wrapper.setupRenderer(this, myProject, selected);
|
||||
if (accessory != null) {
|
||||
wrapper.updateAccessoryView(accessory);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
add(myRenderer, BorderLayout.CENTER);
|
||||
}
|
||||
|
||||
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
|
||||
if (value instanceof SplitterItem) {
|
||||
String label = ((SplitterItem)value).getText();
|
||||
final TitledSeparator separator = new TitledSeparator(label);
|
||||
separator.setBackground(UIUtil.getListBackground());
|
||||
separator.setForeground(UIUtil.getListForeground());
|
||||
return separator;
|
||||
}
|
||||
myRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
|
||||
myRenderer.revalidate();
|
||||
|
||||
return this;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Computable;
|
||||
import com.intellij.openapi.util.Condition;
|
||||
import com.intellij.openapi.util.Pair;
|
||||
import com.intellij.ui.InplaceButton;
|
||||
import com.intellij.ui.ActiveComponent;
|
||||
import com.intellij.util.BooleanFunction;
|
||||
import com.intellij.util.Processor;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
@@ -127,7 +127,7 @@ public interface ComponentPopupBuilder {
|
||||
@NotNull ComponentPopupBuilder setShowShadow(boolean show);
|
||||
|
||||
@NotNull
|
||||
ComponentPopupBuilder setCommandButton(@NotNull InplaceButton commandButton);
|
||||
ComponentPopupBuilder setCommandButton(@NotNull ActiveComponent commandButton);
|
||||
|
||||
@NotNull
|
||||
ComponentPopupBuilder setCouldPin(@Nullable Processor<JBPopup> callback);
|
||||
|
||||
+566
-560
File diff suppressed because it is too large
Load Diff
@@ -176,7 +176,7 @@ public class AbstractPopup implements JBPopup {
|
||||
final boolean cancelOnClickOutside,
|
||||
@Nullable final Set<JBPopupListener> listeners,
|
||||
final boolean useDimServiceForXYLocation,
|
||||
InplaceButton commandButton,
|
||||
ActiveComponent commandButton,
|
||||
@Nullable final IconButton cancelButton,
|
||||
@Nullable final MouseChecker cancelOnMouseOutCallback,
|
||||
final boolean cancelOnWindow,
|
||||
|
||||
@@ -23,7 +23,7 @@ import com.intellij.openapi.util.Computable;
|
||||
import com.intellij.openapi.util.Condition;
|
||||
import com.intellij.openapi.util.Disposer;
|
||||
import com.intellij.openapi.util.Pair;
|
||||
import com.intellij.ui.InplaceButton;
|
||||
import com.intellij.ui.ActiveComponent;
|
||||
import com.intellij.util.BooleanFunction;
|
||||
import com.intellij.util.Processor;
|
||||
import com.intellij.util.ui.EmptyIcon;
|
||||
@@ -78,7 +78,7 @@ public class ComponentPopupBuilderImpl implements ComponentPopupBuilder {
|
||||
private boolean myShowShadow = true;
|
||||
private boolean myFocusable = true;
|
||||
private boolean myHeaderAlwaysFocusable;
|
||||
private InplaceButton myCommandButton;
|
||||
private ActiveComponent myCommandButton;
|
||||
private List<Pair<ActionListener, KeyStroke>> myKeyboardActions = Collections.emptyList();
|
||||
private Component mySettingsButtons;
|
||||
private boolean myMayBeParent;
|
||||
@@ -171,7 +171,7 @@ public class ComponentPopupBuilderImpl implements ComponentPopupBuilder {
|
||||
return this;
|
||||
}
|
||||
@NotNull
|
||||
public ComponentPopupBuilder setCommandButton(@NotNull InplaceButton button) {
|
||||
public ComponentPopupBuilder setCommandButton(@NotNull ActiveComponent button) {
|
||||
myCommandButton = button;
|
||||
return this;
|
||||
}
|
||||
|
||||
+7
-5
@@ -118,6 +118,7 @@ public class BreakpointMasterDetailPopupBuilder {
|
||||
myPopupBuilder = new MasterDetailPopupBuilder(myProject);
|
||||
if (!myPlainView) {
|
||||
myPopupBuilder.setDimensionServiceKey(getClass().getName());
|
||||
myPopupBuilder.setCancelOnClickOutside(false);
|
||||
}
|
||||
myPopupBuilder.setCancelOnWindowDeactivation(false);
|
||||
|
||||
@@ -212,17 +213,18 @@ public class BreakpointMasterDetailPopupBuilder {
|
||||
myPopupBuilder.setMinSize(new Dimension(-1, 700));
|
||||
}
|
||||
|
||||
myPopup = myPopupBuilder.setCloseOnEnter(false).createMasterDetailPopup();
|
||||
|
||||
if (view != null) {
|
||||
view.setDoneRunnable(new Runnable() {
|
||||
if (!myPlainView) {
|
||||
myPopupBuilder.setDoneRunnable(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
myPopup.cancel();
|
||||
}
|
||||
}, myPopup.getContent());
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
myPopup = myPopupBuilder.setCloseOnEnter(false).createMasterDetailPopup();
|
||||
|
||||
myTreeController.setDelegate(new BreakpointItemsTreeController.BreakpointItemsTreeDelegate() {
|
||||
@Override
|
||||
public void execute(BreakpointItem item) {
|
||||
|
||||
Reference in New Issue
Block a user