git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
jbgui
/
GPairwiseAlignPanel.java
diff --git
a/src/jalview/jbgui/GPairwiseAlignPanel.java
b/src/jalview/jbgui/GPairwiseAlignPanel.java
index
fcb6036
..
b064551
100755
(executable)
--- a/
src/jalview/jbgui/GPairwiseAlignPanel.java
+++ b/
src/jalview/jbgui/GPairwiseAlignPanel.java
@@
-1,27
+1,34
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, 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
*
* 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.
*
*
* 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.jbgui;
import jalview.util.MessageManager;
*/
package jalview.jbgui;
import jalview.util.MessageManager;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
/**
* DOCUMENT ME!
/**
* DOCUMENT ME!
@@
-68,7
+75,8
@@
public class GPairwiseAlignPanel extends JPanel
textarea.setText("");
textarea.setWrapStyleWord(false);
viewInEditorButton.setFont(new java.awt.Font("Verdana", 0, 12));
textarea.setText("");
textarea.setWrapStyleWord(false);
viewInEditorButton.setFont(new java.awt.Font("Verdana", 0, 12));
- viewInEditorButton.setText(MessageManager.getString("label.view_alignment_editor"));
+ viewInEditorButton.setText(MessageManager
+ .getString("label.view_alignment_editor"));
viewInEditorButton
.addActionListener(new java.awt.event.ActionListener()
{
viewInEditorButton
.addActionListener(new java.awt.event.ActionListener()
{