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-3066 JAL-3070 pull up non-jabaws specific service descriptor components for annot...
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
jabaws2
/
Jws2InstanceFactory.java
diff --git
a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
index
671b5f1
..
c328670
100644
(file)
--- a/
src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
+++ b/
src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
@@
-20,8
+20,6
@@
*/
package jalview.ws.jws2.jabaws2;
*/
package jalview.ws.jws2.jabaws2;
-import jalview.ws.jws2.AAConClient;
-import jalview.ws.jws2.RNAalifoldClient;
import jalview.ws.uimodel.AlignAnalysisUIText;
import java.util.HashMap;
import jalview.ws.uimodel.AlignAnalysisUIText;
import java.util.HashMap;
@@
-37,7
+35,8
@@
public class Jws2InstanceFactory
private static String category_rewrite(String cat_name)
{
private static String category_rewrite(String cat_name)
{
- return (cat_name != null && cat_name.equals("Prediction")) ? "Secondary Structure Prediction"
+ return (cat_name != null && cat_name.equals("Prediction"))
+ ? "Secondary Structure Prediction"
: cat_name;
}
: cat_name;
}
@@
-45,13
+44,13
@@
public class Jws2InstanceFactory
{
if (aaConGUI == null)
{
{
if (aaConGUI == null)
{
- aaConGUI = new HashMap<String, AlignAnalysisUIText>();
+ aaConGUI = new HashMap<>();
aaConGUI.put(compbio.ws.client.Services.AAConWS.toString(),
aaConGUI.put(compbio.ws.client.Services.AAConWS.toString(),
- AAConClient.getAlignAnalysisUITest());
+ AAConClient.getAlignAnalysisUIText());
aaConGUI.put(compbio.ws.client.Services.RNAalifoldWS.toString(),
aaConGUI.put(compbio.ws.client.Services.RNAalifoldWS.toString(),
- RNAalifoldClient.getAlignAnalysisUITest());
+ RNAalifoldClient.getAlignAnalysisUIText());
// ignore list for JABAWS services not supported in jalview ...
// ignore list for JABAWS services not supported in jalview ...
- ignoreGUI = new HashSet<String>();
+ ignoreGUI = new HashSet<>();
}
}
}
}
@@
-86,7
+85,7
@@
public class Jws2InstanceFactory
init();
Jws2Instance svc = new Jws2Instance(jwsservers, serviceType,
category_rewrite(name), description, service);
init();
Jws2Instance svc = new Jws2Instance(jwsservers, serviceType,
category_rewrite(name), description, service);
- svc.aaui = aaConGUI.get(serviceType.toString());
+ svc.setAlignAnalysisUI(aaConGUI.get(serviceType.toString()));
return svc;
}
return svc;
}