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
Replaced image
[jalview.git]
/
src
/
jalview
/
jbgui
/
GWebserviceInfo.java
diff --git
a/src/jalview/jbgui/GWebserviceInfo.java
b/src/jalview/jbgui/GWebserviceInfo.java
index
e5a163c
..
3dfb905
100755
(executable)
--- a/
src/jalview/jbgui/GWebserviceInfo.java
+++ b/
src/jalview/jbgui/GWebserviceInfo.java
@@
-33,8
+33,6
@@
public class GWebserviceInfo extends JPanel
{
\r
protected JTextArea infoText = new JTextArea();
\r
JScrollPane jScrollPane1 = new JScrollPane();
\r
{
\r
protected JTextArea infoText = new JTextArea();
\r
JScrollPane jScrollPane1 = new JScrollPane();
\r
- JScrollPane jScrollPane2 = new JScrollPane();
\r
- protected JTextArea progressText = new JTextArea();
\r
JPanel jPanel1 = new JPanel();
\r
BorderLayout borderLayout1 = new BorderLayout();
\r
BorderLayout borderLayout2 = new BorderLayout();
\r
JPanel jPanel1 = new JPanel();
\r
BorderLayout borderLayout1 = new BorderLayout();
\r
BorderLayout borderLayout2 = new BorderLayout();
\r
@@
-74,17
+72,10
@@
public class GWebserviceInfo extends JPanel
infoText.setLineWrap(true);
\r
infoText.setWrapStyleWord(true);
\r
this.setLayout(borderLayout1);
\r
infoText.setLineWrap(true);
\r
infoText.setWrapStyleWord(true);
\r
this.setLayout(borderLayout1);
\r
- progressText.setFont(new java.awt.Font("Verdana", 0, 10));
\r
- progressText.setBorder(null);
\r
- progressText.setEditable(false);
\r
- progressText.setText("");
\r
- progressText.setLineWrap(true);
\r
- progressText.setWrapStyleWord(true);
\r
jPanel1.setLayout(borderLayout2);
\r
titlePanel.setBackground(Color.white);
\r
titlePanel.setPreferredSize(new Dimension(0, 60));
\r
titlePanel.setLayout(borderLayout3);
\r
jPanel1.setLayout(borderLayout2);
\r
titlePanel.setBackground(Color.white);
\r
titlePanel.setPreferredSize(new Dimension(0, 60));
\r
titlePanel.setLayout(borderLayout3);
\r
- jScrollPane2.setBorder(null);
\r
jScrollPane1.setBorder(null);
\r
jScrollPane1.setPreferredSize(new Dimension(400, 70));
\r
cancel.setFont(new java.awt.Font("Verdana", 0, 11));
\r
jScrollPane1.setBorder(null);
\r
jScrollPane1.setPreferredSize(new Dimension(400, 70));
\r
cancel.setFont(new java.awt.Font("Verdana", 0, 11));
\r
@@
-100,11
+91,9
@@
public class GWebserviceInfo extends JPanel
buttonPanel.setOpaque(false);
\r
showResultsNewFrame.setText("New Frame");
\r
mergeResults.setText("Merge Results");
\r
buttonPanel.setOpaque(false);
\r
showResultsNewFrame.setText("New Frame");
\r
mergeResults.setText("Merge Results");
\r
- this.add(jScrollPane2, BorderLayout.CENTER);
\r
this.add(jPanel1, BorderLayout.NORTH);
\r
jPanel1.add(jScrollPane1, BorderLayout.CENTER);
\r
jScrollPane1.getViewport().add(infoText, null);
\r
this.add(jPanel1, BorderLayout.NORTH);
\r
jPanel1.add(jScrollPane1, BorderLayout.CENTER);
\r
jScrollPane1.getViewport().add(infoText, null);
\r
- jScrollPane2.getViewport().add(progressText, null);
\r
jPanel1.add(titlePanel, BorderLayout.NORTH);
\r
titlePanel.add(buttonPanel, BorderLayout.EAST);
\r
buttonPanel.add(cancel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
\r
jPanel1.add(titlePanel, BorderLayout.NORTH);
\r
titlePanel.add(buttonPanel, BorderLayout.EAST);
\r
buttonPanel.add(cancel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
\r