X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FCutAndPasteHtmlTransfer.java;h=71a152069f97b3dd8149358606047d692addb8d5;hb=bd894ca9f2aae448653d7431ab8a170e1105e85c;hp=83e8399c3ef61ec8a6ffc4b29836d8a0f00f7e82;hpb=87dc20d03f1d296ba1daea8983f0f28b5974626c;p=jalview.git
diff --git a/src/jalview/gui/CutAndPasteHtmlTransfer.java b/src/jalview/gui/CutAndPasteHtmlTransfer.java
index 83e8399..71a1520 100644
--- a/src/jalview/gui/CutAndPasteHtmlTransfer.java
+++ b/src/jalview/gui/CutAndPasteHtmlTransfer.java
@@ -1,39 +1,50 @@
/*
- * 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-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 jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
+import jalview.jbgui.GCutAndPasteHtmlTransfer;
+import jalview.util.MessageManager;
+import jalview.viewmodel.AlignmentViewport;
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
import java.io.StringWriter;
-import javax.swing.*;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
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 javax.swing.event.HyperlinkListener;
/**
- * Cut'n'paste files into the desktop
- * See JAL-1105
+ * Cut'n'paste files into the desktop See JAL-1105
*
* @author $author$
* @version $Revision$
@@ -41,7 +52,7 @@ import jalview.jbgui.*;
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
{
- AlignViewport viewport;
+ AlignmentViewport viewport;
public CutAndPasteHtmlTransfer()
{
@@ -49,35 +60,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)
{
@@ -89,9 +100,10 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
});
SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
-// textarea.requestFocus();
+ textarea.requestFocus();
}
});
@@ -100,12 +112,12 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
/**
* DOCUMENT ME!
*/
- public void setForInput(AlignViewport viewport)
+ public void setForInput(AlignmentViewport viewport)
{
this.viewport = viewport;
if (viewport != null)
{
- ok.setText("Add");
+ ok.setText(MessageManager.getString("action.add"));
}
getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);
@@ -120,16 +132,19 @@ 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)
{
textarea.setText(text);
}
+ @Override
public void save_actionPerformed(ActionEvent e)
{
JalviewFileChooser chooser = new JalviewFileChooser(
@@ -137,8 +152,9 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
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);
@@ -159,36 +175,46 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
}
}
+ @Override
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!
*
* @param e
* DOCUMENT ME!
*/
+ @Override
public void copyItem_actionPerformed(ActionEvent e)
{
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!
*
* @param e
* DOCUMENT ME!
*/
+ @Override
public void cancel_actionPerformed(ActionEvent e)
{
try
@@ -199,14 +225,19 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
}
}
+ @Override
public void textarea_mousePressed(MouseEvent e)
{
- if (SwingUtilities.isRightMouseButton(e))
+ // isPopupTrigger is on mousePressed (Mac) or mouseReleased (Windows)
+ if (e.isPopupTrigger())
{
- 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()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
copyItem_actionPerformed(e);