X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteHtmlTransfer.java;h=74297bb843b83f8a680a7a838139c3ff0380e169;hb=c2214808f64b811a25cec10399dcff38db0c592c;hp=83e8399c3ef61ec8a6ffc4b29836d8a0f00f7e82;hpb=87dc20d03f1d296ba1daea8983f0f28b5974626c;p=jalview.git

diff --git a/src/jalview/gui/CutAndPasteHtmlTransfer.java b/src/jalview/gui/CutAndPasteHtmlTransfer.java
index 83e8399..74297bb 100644
--- a/src/jalview/gui/CutAndPasteHtmlTransfer.java
+++ b/src/jalview/gui/CutAndPasteHtmlTransfer.java
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
 
@@ -27,13 +30,12 @@ import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import javax.swing.event.HyperlinkEvent.EventType;
 
-import jalview.datamodel.*;
 import jalview.io.*;
 import jalview.jbgui.*;
+import jalview.util.MessageManager;
 
 /**
- * Cut'n'paste files into the desktop
- * See JAL-1105
+ * Cut'n'paste files into the desktop See JAL-1105
  * 
  * @author $author$
  * @version $Revision$
@@ -49,35 +51,35 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
     displaySource.setSelected(false);
     textarea.addKeyListener(new KeyListener()
     {
-      
+
       @Override
       public void keyTyped(KeyEvent arg0)
       {
-        //if (arg0.isControlDown() && arg0.getKeyCode()==KeyEvent.VK_C)
-        //{
-        //  copyItem_actionPerformed(null);
-        //} 
+        // if (arg0.isControlDown() && arg0.getKeyCode()==KeyEvent.VK_C)
+        // {
+        // copyItem_actionPerformed(null);
+        // }
         arg0.consume();
       }
-      
+
       @Override
       public void keyReleased(KeyEvent arg0)
       {
         // TODO Auto-generated method stub
-        
+
       }
-      
+
       @Override
       public void keyPressed(KeyEvent arg0)
       {
         // TODO Auto-generated method stub
-        
+
       }
     });
     textarea.setEditable(false);
     textarea.addHyperlinkListener(new HyperlinkListener()
     {
-      
+
       @Override
       public void hyperlinkUpdate(HyperlinkEvent e)
       {
@@ -91,7 +93,7 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
     {
       public void run()
       {
-//        textarea.requestFocus();
+        textarea.requestFocus();
       }
     });
 
@@ -105,7 +107,7 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
     this.viewport = viewport;
     if (viewport != null)
     {
-      ok.setText("Add");
+      ok.setText(MessageManager.getString("action.add"));
     }
 
     getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);
@@ -120,10 +122,12 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
   {
     return textarea.getText();
   }
+
   /**
    * Set contents of HTML Display pane
    * 
-   * @param text HTML text
+   * @param text
+   *          HTML text
    */
   public void setText(String text)
   {
@@ -138,7 +142,7 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
     chooser.setAcceptAllFileFilterUsed(false);
     chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle("Save Text to File");
-    chooser.setToolTipText("Save");
+    chooser.setToolTipText(MessageManager.getString("action.save"));
 
     int value = chooser.showSaveDialog(this);
 
@@ -161,10 +165,12 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
 
   public void toggleHtml_actionPerformed(ActionEvent e)
   {
-    String txt=textarea.getText();
-    textarea.setContentType(displaySource.isSelected() ? "text/text" : "text/html");
+    String txt = textarea.getText();
+    textarea.setContentType(displaySource.isSelected() ? "text/text"
+            : "text/html");
     textarea.setText(txt);
   }
+
   /**
    * DOCUMENT ME!
    * 
@@ -175,14 +181,19 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
   {
     Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
     StringWriter sw = new StringWriter();
-    try {
-      textarea.getEditorKit().write(sw, textarea.getDocument(), textarea.getSelectionStart(), textarea.getSelectionEnd()-textarea.getSelectionStart());
-    } catch (Exception x){};
-    StringSelection ssel=new StringSelection(sw.getBuffer().toString());
-    c.setContents(ssel,ssel);
+    try
+    {
+      textarea.getEditorKit().write(sw, textarea.getDocument(),
+              textarea.getSelectionStart(),
+              textarea.getSelectionEnd() - textarea.getSelectionStart());
+    } catch (Exception x)
+    {
+    }
+    ;
+    StringSelection ssel = new StringSelection(sw.getBuffer().toString());
+    c.setContents(ssel, ssel);
   }
 
-
   /**
    * DOCUMENT ME!
    * 
@@ -203,8 +214,10 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
   {
     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)