X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=0c22b145b75266246cb67c62c12aac1214882342;hb=refs%2Fheads%2Ffeatures%2FJAL-1553_improvement-select-column-by-annotation-row-query-interface;hp=e18a5628293cbf1f58b80ad7c9b6a9d0453f1600;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java old mode 100755 new mode 100644 index e18a562..0c22b14 --- a/src/jalview/gui/CutAndPasteTransfer.java +++ b/src/jalview/gui/CutAndPasteTransfer.java @@ -1,20 +1,22 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 The Jalview Authors * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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. + * + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; @@ -26,9 +28,10 @@ import javax.swing.*; import jalview.datamodel.*; import jalview.io.*; import jalview.jbgui.*; +import jalview.util.MessageManager; /** - * DOCUMENT ME! + * Cut'n'paste files into the desktop See JAL-1105 * * @author $author$ * @version $Revision$ @@ -58,7 +61,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer this.viewport = viewport; if (viewport != null) { - ok.setText("Add"); + ok.setText(MessageManager.getString("action.add")); } getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH); @@ -78,7 +81,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer * DOCUMENT ME! * * @param text - * DOCUMENT ME! + * DOCUMENT ME! */ public void setText(String text) { @@ -92,13 +95,13 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer public void save_actionPerformed(ActionEvent e) { - JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache - .getProperty("LAST_DIRECTORY")); + JalviewFileChooser chooser = new JalviewFileChooser( + jalview.bin.Cache.getProperty("LAST_DIRECTORY")); 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); @@ -123,7 +126,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void copyItem_actionPerformed(ActionEvent e) { @@ -136,7 +139,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void pasteMenu_actionPerformed(ActionEvent e) { @@ -161,11 +164,12 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void ok_actionPerformed(ActionEvent e) { String format = new IdentifyFile().Identify(getText(), "Paste"); + // TODO: identify feature, annotation or tree file and parse appropriately. Alignment al = null; if (FormatAdapter.isValidFormat(format)) @@ -176,8 +180,11 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer } 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); } } @@ -198,9 +205,12 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer AlignFrame 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, MessageManager.formatMessage( + "label.input_cut_paste_params", new String[] + { format }), AlignFrame.DEFAULT_WIDTH, + AlignFrame.DEFAULT_HEIGHT); + af.statusBar.setText(MessageManager + .getString("label.successfully_pasted_alignment_file")); try { @@ -217,7 +227,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void cancel_actionPerformed(ActionEvent e) { @@ -233,8 +243,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) @@ -243,7 +255,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)