X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=e663cf87f6bb1087371853e32d31e46a711be54d;hb=3f3c6c3a2b99fee2e726d18302af1b3320331212;hp=7e55f38e7627eee9d04f3ae630975c0f111d70f6;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java old mode 100755 new mode 100644 index 7e55f38..e663cf8 --- a/src/jalview/gui/CutAndPasteTransfer.java +++ b/src/jalview/gui/CutAndPasteTransfer.java @@ -1,31 +1,54 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; -import java.awt.*; -import java.awt.datatransfer.*; -import java.awt.event.*; -import javax.swing.*; +import jalview.api.AlignViewportI; +import jalview.api.AlignmentViewPanel; +import jalview.api.ComplexAlignFile; +import jalview.api.FeaturesDisplayedI; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.ColumnSelection; +import jalview.datamodel.SequenceI; +import jalview.io.FileParse; +import jalview.io.FormatAdapter; +import jalview.io.IdentifyFile; +import jalview.io.JalviewFileChooser; +import jalview.io.JalviewFileView; +import jalview.jbgui.GCutAndPasteTransfer; +import jalview.schemes.ColourSchemeI; +import jalview.util.MessageManager; -import jalview.datamodel.*; -import jalview.io.*; -import jalview.jbgui.*; +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.StringSelection; +import java.awt.datatransfer.Transferable; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; + +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPopupMenu; +import javax.swing.SwingUtilities; /** * Cut'n'paste files into the desktop See JAL-1105 @@ -36,8 +59,11 @@ import jalview.jbgui.*; public class CutAndPasteTransfer extends GCutAndPasteTransfer { - AlignViewport viewport; + AlignmentViewPanel alignpanel; + + AlignViewportI viewport; + FileParse source = null; public CutAndPasteTransfer() { SwingUtilities.invokeLater(new Runnable() @@ -53,12 +79,16 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer /** * DOCUMENT ME! */ - public void setForInput(AlignViewport viewport) + public void setForInput(AlignmentViewPanel viewpanel) { - this.viewport = viewport; + this.alignpanel = viewpanel; + if (alignpanel != null) + { + this.viewport = alignpanel.getAlignViewport(); + } if (viewport != null) { - ok.setText("Add"); + ok.setText(MessageManager.getString("action.add")); } getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH); @@ -97,8 +127,8 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer chooser.setAcceptAllFileFilterUsed(false); chooser.setFileView(new JalviewFileView()); - chooser.setDialogTitle("Save Text to File"); - chooser.setToolTipText("Save"); + chooser.setDialogTitle(MessageManager.getString("label.save_text_to_file")); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); @@ -167,41 +197,69 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer { String format = new IdentifyFile().Identify(getText(), "Paste"); // TODO: identify feature, annotation or tree file and parse appropriately. - Alignment al = null; + AlignmentI al = null; if (FormatAdapter.isValidFormat(format)) { try { - al = new FormatAdapter().readFile(getText(), "Paste", format); + FormatAdapter fa = new FormatAdapter(alignpanel); + al = fa.readFile(getText(), "Paste", format); + source = fa.getAlignFile(); + } catch (java.io.IOException ex) { JOptionPane.showInternalMessageDialog(Desktop.desktop, - "Couldn't read the pasted text.\n" + ex.toString(), - "Error parsing text", JOptionPane.WARNING_MESSAGE); + MessageManager.formatMessage( + "label.couldnt_read_pasted_text", new String[] + { ex.toString() }), MessageManager + .getString("label.error_parsing_text"), + JOptionPane.WARNING_MESSAGE); } } if (al != null) { + String title = MessageManager.formatMessage( + "label.input_cut_paste_params", new String[] + { format }); if (viewport != null) { - for (int i = 0; i < al.getHeight(); i++) - { - viewport.getAlignment().addSequence(al.getSequenceAt(i)); - } - - viewport.firePropertyChange("alignment", null, viewport - .getAlignment().getSequences()); + ((AlignViewport) viewport).addAlignment(al, title); } else { - AlignFrame af = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, - AlignFrame.DEFAULT_HEIGHT); + + AlignFrame af; + if (source instanceof ComplexAlignFile) + { + ColumnSelection colSel = ((ComplexAlignFile) source) + .getColumnSelection(); + SequenceI[] hiddenSeqs = ((ComplexAlignFile) source) + .getHiddenSequences(); + boolean showSeqFeatures = ((ComplexAlignFile) source) + .isShowSeqFeatures(); + ColourSchemeI cs = ((ComplexAlignFile) source).getColourScheme(); + FeaturesDisplayedI fd = ((ComplexAlignFile) source) + .getDisplayedFeatures(); + af = new AlignFrame(al, hiddenSeqs, colSel, + AlignFrame.DEFAULT_WIDTH, + AlignFrame.DEFAULT_HEIGHT); + af.getViewport().setShowSequenceFeatures(showSeqFeatures); + af.getViewport().setFeaturesDisplayed(fd); + af.changeColour(cs); + } + else + { + af = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, + AlignFrame.DEFAULT_HEIGHT); + } + af.currentFileFormat = format; - Desktop.addInternalFrame(af, "Cut & Paste input - " + format, - AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - af.statusBar.setText("Successfully pasted alignment file"); + Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH, + AlignFrame.DEFAULT_HEIGHT); + af.statusBar.setText(MessageManager + .getString("label.successfully_pasted_alignment_file")); try { @@ -214,6 +272,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer } } + /** * DOCUMENT ME! * @@ -234,8 +293,10 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer { if (SwingUtilities.isRightMouseButton(e)) { - JPopupMenu popup = new JPopupMenu("Edit"); - JMenuItem item = new JMenuItem("Copy"); + JPopupMenu popup = new JPopupMenu( + MessageManager.getString("action.edit")); + JMenuItem item = new JMenuItem( + MessageManager.getString("action.copy")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -244,7 +305,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer } }); popup.add(item); - item = new JMenuItem("Paste"); + item = new JMenuItem(MessageManager.getString("action.paste")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e)