From 857b83656a6cd9f5e32cee770eb8697e3747343d Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 31 Jan 2018 14:57:32 +0000 Subject: [PATCH] JAL-1158 use CutAndPasteHtmlTransfer for alignment properties report --- resources/lang/Messages.properties | 1 - resources/lang/Messages_es.properties | 1 - src/jalview/appletgui/APopupMenu.java | 4 +--- src/jalview/gui/AlignFrame.java | 13 +++---------- src/jalview/io/AlignmentProperties.java | 2 +- src/jalview/jbgui/GUserDefinedColours.java | 9 ++++----- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index f526699..05f7a57 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -314,7 +314,6 @@ label.removed_columns = Removed {0} columns. label.removed_empty_columns = Removed {0} empty columns. label.paste_newick_tree_file = Paste your Newick tree file here. label.order_by_params = Order by {0} -label.html_content = {0} label.paste_pdb_file= Paste your PDB file here. label.paste_pdb_file_for_sequence = Paste PDB file for sequence {0} label.could_not_parse_newick_file = Could not parse Newick file\!\n {0} diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties index 77f053e..1c62648 100644 --- a/resources/lang/Messages_es.properties +++ b/resources/lang/Messages_es.properties @@ -283,7 +283,6 @@ label.removed_columns = {0} columnas eliminadas. label.removed_empty_columns = {0} columnas vacías eliminadas. label.paste_newick_tree_file = Pegar su fichero árbol Newick aquí. label.order_by_params = Ordenar por {0} -label.html_content = {0} label.paste_pdb_file= Pegar tu fichero PDB aquí. label.paste_pdb_file_for_sequence = Pegar fichero PDB para la secuencia {0} label.could_not_parse_newick_file = No se pudo analizar el fichero Newick\!\n {0} diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index 46bd4fd..da04d23 100644 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -914,9 +914,7 @@ public class APopupMenu extends java.awt.PopupMenu ? sequences[0].getDisplayId(true) : "Selection"), 600, 500); - cap.setText( - MessageManager.formatMessage("label.html_content", new Object[] - { contents.toString() })); + cap.setText("" + contents.toString() + ""); } void editName() diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 298688b..da11536 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -134,12 +134,10 @@ import java.util.List; import java.util.Vector; import javax.swing.JCheckBoxMenuItem; -import javax.swing.JEditorPane; import javax.swing.JInternalFrame; import javax.swing.JLayeredPane; import javax.swing.JMenu; import javax.swing.JMenuItem; -import javax.swing.JScrollPane; import javax.swing.SwingUtilities; /** @@ -3222,17 +3220,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, @Override public void alignmentProperties() { - JEditorPane editPane = new JEditorPane("text/html", ""); - editPane.setEditable(false); + CutAndPasteHtmlTransfer cap = new CutAndPasteHtmlTransfer(); StringBuffer contents = new AlignmentProperties(viewport.getAlignment()) .formatAsHtml(); - editPane.setText( - MessageManager.formatMessage("label.html_content", new Object[] - { contents.toString() })); - JInternalFrame frame = new JInternalFrame(); - frame.getContentPane().add(new JScrollPane(editPane)); + cap.setText("" + contents.toString() + ""); - Desktop.addInternalFrame(frame, MessageManager + Desktop.addInternalFrame(cap, MessageManager .formatMessage("label.alignment_properties", new Object[] { getTitle() }), 500, 400); } diff --git a/src/jalview/io/AlignmentProperties.java b/src/jalview/io/AlignmentProperties.java index f2a6150..6a7d1c1 100644 --- a/src/jalview/io/AlignmentProperties.java +++ b/src/jalview/io/AlignmentProperties.java @@ -50,7 +50,7 @@ public class AlignmentProperties * @param pw * @param html */ - public void writeProperties(PrintWriter pw, boolean html) + protected void writeProperties(PrintWriter pw, boolean html) { final String nl = html ? "
" : System.getProperty("line.separator"); float avg = 0; diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java index 3d7d779..f98e5c0 100755 --- a/src/jalview/jbgui/GUserDefinedColours.java +++ b/src/jalview/jbgui/GUserDefinedColours.java @@ -207,10 +207,9 @@ public class GUserDefinedColours extends JPanel label.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10)); label.setOpaque(false); label.setPreferredSize(new Dimension(260, 34)); - label.setText( - MessageManager.formatMessage("label.html_content", new String[] - { MessageManager.getString( - "label.save_colour_scheme_with_unique_name_added_to_colour_menu") })); + label.setText("" + MessageManager.getString( + "label.save_colour_scheme_with_unique_name_added_to_colour_menu") + + ""); caseSensitive.setText(MessageManager.getString("label.case_sensitive")); caseSensitive.addActionListener(new ActionListener() { @@ -259,7 +258,7 @@ public class GUserDefinedColours extends JPanel { choosers[0] }); } - selectedButtons = new ArrayList(); + selectedButtons = new ArrayList<>(); } /** -- 1.7.10.2