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
Remove variables not used
[jalview.git]
/
src
/
jalview
/
gui
/
WebserviceInfo.java
diff --git
a/src/jalview/gui/WebserviceInfo.java
b/src/jalview/gui/WebserviceInfo.java
index
d8f6af5
..
b7d54d6
100755
(executable)
--- a/
src/jalview/gui/WebserviceInfo.java
+++ b/
src/jalview/gui/WebserviceInfo.java
@@
-1,6
+1,6
@@
/*
* Jalview - A Sequence Alignment Editor and Viewer
/*
* Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-63,7
+63,9
@@
public class WebserviceInfo extends GWebserviceInfo
JInternalFrame frame;
JTabbedPane subjobs=null;
java.util.Vector jobPanes = null;
JInternalFrame frame;
JTabbedPane subjobs=null;
java.util.Vector jobPanes = null;
- // tabbed or not
+ private boolean serviceCanMergeResults = false;
+ private boolean viewResultsImmediatly = true;
+ // tabbed or not
public synchronized int addJobPane() {
JScrollPane jobpane = new JScrollPane();
JTextArea progressText = new JTextArea();
public synchronized int addJobPane() {
JScrollPane jobpane = new JScrollPane();
JTextArea progressText = new JTextArea();
@@
-141,6
+143,8
@@
public class WebserviceInfo extends GWebserviceInfo
{
thisService = newservice;
serviceIsCancellable = newservice.isCancellable();
{
thisService = newservice;
serviceIsCancellable = newservice.isCancellable();
+ frame.setClosable(!serviceIsCancellable);
+ serviceCanMergeResults = newservice.canMergeResults();
}
/**
}
/**
@@
-355,19
+359,27
@@
public class WebserviceInfo extends GWebserviceInfo
else
{
thisService.cancelJob();
else
{
thisService.cancelJob();
- frame.setClosable(true);
}
}
+ frame.setClosable(true);
}
}
-
+ /**
+ * Set up GUI for user to get at results - and possibly automatically display
+ * them if viewResultsImmediatly is set.
+ */
public void setResultsReady()
{
frame.setClosable(true);
buttonPanel.remove(cancel);
buttonPanel.add(showResultsNewFrame);
public void setResultsReady()
{
frame.setClosable(true);
buttonPanel.remove(cancel);
buttonPanel.add(showResultsNewFrame);
- buttonPanel.add(mergeResults);
- buttonPanel.setLayout(new GridLayout(2,1,5,5));
+ if (serviceCanMergeResults)
+ {
+ buttonPanel.add(mergeResults);
+ buttonPanel.setLayout(new GridLayout(2, 1, 5, 5));
+ }
buttonPanel.validate();
validate();
buttonPanel.validate();
validate();
+ if (viewResultsImmediatly)
+ showResultsNewFrame.doClick();
}
/**
}
/**