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

IDEA-71224 Paste multiple items from clipboard history

Browse Source
This commit is contained in:
Denis Zhdanov
2011-06-24 14:53:54 +04:00
parent 4a27f20f1c
commit cf24e13eeb
2 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/editor/actions/ContentChooser.java
+41 -8
View File
@@ -30,6 +30,7 @@ import com.intellij.ui.SimpleTextAttributes;
import com.intellij.ui.components.JBList;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@@ -54,11 +55,17 @@ public abstract class ContentChooser<Data> extends DialogWrapper {
private Splitter mySplitter;
private final Project myProject;
private final boolean myAllowMultipleSelections;
public ContentChooser(Project project, String title, boolean useIdeaEditor) {
this(project, title, useIdeaEditor, false);
}
public ContentChooser(Project project, String title, boolean useIdeaEditor, boolean allowMultipleSelections) {
super(project, true);
myProject = project;
myUseIdeaEditor = useIdeaEditor;
myAllowMultipleSelections = allowMultipleSelections;
setOKButtonText(CommonBundle.getOkButtonText());
setTitle(title);
@@ -72,7 +79,9 @@ public abstract class ContentChooser<Data> extends DialogWrapper {
protected JComponent createCenterPanel() {
myList = new JBList();
myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
final int selectionMode = myAllowMultipleSelections ? ListSelectionModel.MULTIPLE_INTERVAL_SELECTION
: ListSelectionModel.SINGLE_SELECTION;
myList.setSelectionMode(selectionMode);
rebuildListContent();
@@ -92,15 +101,21 @@ public abstract class ContentChooser<Data> extends DialogWrapper {
myList.addKeyListener(new KeyAdapter() {
public void keyReleased(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_DELETE) {
int selectedIndex = getSelectedIndex();
int size = myAllContents.size();
removeContentAt(myAllContents.get(selectedIndex));
int newSelectionIndex = -1;
for (int i : getSelectedIndices()) {
removeContentAt(myAllContents.get(i));
if (newSelectionIndex < 0) {
newSelectionIndex = i;
}
}
rebuildListContent();
if (size == 1) {
if (myAllContents.size() <= 0) {
close(CANCEL_EXIT_CODE);
return;
}
myList.setSelectedIndex(Math.min(selectedIndex, myAllContents.size() - 1));
newSelectionIndex = Math.min(newSelectionIndex, myAllContents.size() - 1);
myList.setSelectedIndex(newSelectionIndex);
}
else if (e.getKeyCode() == KeyEvent.VK_ENTER) {
close(OK_EXIT_CODE);
@@ -141,8 +156,11 @@ public abstract class ContentChooser<Data> extends DialogWrapper {
private void updateViewerForSelection() {
if (myAllContents.size() == 0) return;
String fullString = getStringRepresentationFor(myAllContents.get(getSelectedIndex()));
fullString = StringUtil.convertLineSeparators(fullString);
String fullString = "";
for (int i : getSelectedIndices()) {
String s = getStringRepresentationFor(myAllContents.get(i));
fullString += StringUtil.convertLineSeparators(s);
}
if (myViewer != null) {
EditorFactory.getInstance().releaseEditor(myViewer);
@@ -219,11 +237,26 @@ public abstract class ContentChooser<Data> extends DialogWrapper {
if (myList.getSelectedIndex() == -1) return 0;
return myList.getSelectedIndex();
}
@NotNull
public int[] getSelectedIndices() {
return myList.getSelectedIndices();
}
public List<Data> getAllContents() {
return myAllContents;
}
@NotNull
public String getSelectedText() {
String result = "";
for (int i : getSelectedIndices()) {
String s = getStringRepresentationFor(myAllContents.get(i));
result += StringUtil.convertLineSeparators(s);
}
return result;
}
private static class MyListCellRenderer extends ColoredListCellRenderer {
protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) {
// Fix GTK background
platform/platform-impl/src/com/intellij/openapi/editor/actions/MultiplePasteAction.java
+13 -5
View File
@@ -23,12 +23,14 @@ import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.ide.CopyPasteManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.ui.UIBundle;
import javax.swing.*;
import javax.swing.text.DefaultEditorKit;
import java.awt.*;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.event.ActionEvent;
@@ -52,8 +54,9 @@ public class MultiplePasteAction extends AnAction implements DumbAware {
if (!(focusedComponent instanceof JComponent)) return;
final CopyPasteManagerEx copyPasteManager = (CopyPasteManagerEx)CopyPasteManager.getInstance();
final ContentChooser<Transferable> chooser = new ContentChooser<Transferable>(project, UIBundle.message(
"choose.content.to.paste.dialog.title"), true){
"choose.content.to.paste.dialog.title"), true, true){
protected String getStringRepresentationFor(final Transferable content) {
try {
return (String)content.getTransferData(DataFlavor.stringFlavor);
@@ -71,7 +74,7 @@ public class MultiplePasteAction extends AnAction implements DumbAware {
}
protected void removeContentAt(final Transferable content) {
((CopyPasteManagerEx)CopyPasteManager.getInstance()).removeContent(content);
copyPasteManager.removeContent(content);
}
};
@@ -79,12 +82,17 @@ public class MultiplePasteAction extends AnAction implements DumbAware {
chooser.show();
}
else {
chooser.close(ContentChooser.CANCEL_EXIT_CODE);
chooser.close(DialogWrapper.CANCEL_EXIT_CODE);
}
if (chooser.isOK()) {
final int selectedIndex = chooser.getSelectedIndex();
((CopyPasteManagerEx)CopyPasteManager.getInstance()).moveContentTopStackTop(chooser.getAllContents().get(selectedIndex));
final int[] selectedIndices = chooser.getSelectedIndices();
if (selectedIndices.length == 1) {
copyPasteManager.moveContentTopStackTop(chooser.getAllContents().get(selectedIndices[0]));
}
else {
copyPasteManager.setContents(new StringSelection(chooser.getSelectedText()));
}
if (editor != null) {
if (!FileDocumentManager.getInstance().requestWriting(editor.getDocument(), project)){