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
Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges
[jalview.git]
/
test
/
jalview
/
ws
/
gui
/
Jws2ParamView.java
diff --git
a/test/jalview/ws/gui/Jws2ParamView.java
b/test/jalview/ws/gui/Jws2ParamView.java
index
f982e9d
..
8dbb1fe
100644
(file)
--- a/
test/jalview/ws/gui/Jws2ParamView.java
+++ b/
test/jalview/ws/gui/Jws2ParamView.java
@@
-21,7
+21,9
@@
package jalview.ws.gui;
import java.util.Locale;
package jalview.ws.gui;
import java.util.Locale;
+
import jalview.bin.Cache;
import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.gui.JvOptionPane;
import jalview.gui.WsJobParameters;
import jalview.util.MessageManager;
import jalview.gui.JvOptionPane;
import jalview.gui.WsJobParameters;
import jalview.util.MessageManager;
@@
-79,7
+81,6
@@
public class Jws2ParamView
public static void setUpBeforeClass() throws Exception
{
Cache.loadProperties("test/jalview/io/testProps.jvprops");
public static void setUpBeforeClass() throws Exception
{
Cache.loadProperties("test/jalview/io/testProps.jvprops");
- Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
@@
-97,7
+98,7
@@
public class Jws2ParamView
// This will fail for non-jabaws services
Jws2Instance service = (Jws2Instance) _service;
if (serviceTests.size() == 0
// This will fail for non-jabaws services
Jws2Instance service = (Jws2Instance) _service;
if (serviceTests.size() == 0
- || serviceTests.contains(service.serviceType.toLowerCase(Locale.ROOT)))
+ || serviceTests.contains(service.getName().toLowerCase(Locale.ROOT)))
{
List<Preset> prl = null;
Preset pr = null;
{
List<Preset> prl = null;
Preset pr = null;