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-2446 merged to spike branch
[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
696dba3
..
671b5f1
100644
(file)
--- a/
src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
+++ b/
src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-21,7
+21,6
@@
package jalview.ws.jws2.jabaws2;
import jalview.ws.jws2.AAConClient;
package jalview.ws.jws2.jabaws2;
import jalview.ws.jws2.AAConClient;
-import jalview.ws.jws2.JPred301Client;
import jalview.ws.jws2.RNAalifoldClient;
import jalview.ws.uimodel.AlignAnalysisUIText;
import jalview.ws.jws2.RNAalifoldClient;
import jalview.ws.uimodel.AlignAnalysisUIText;
@@
-35,6
+34,7
@@
public class Jws2InstanceFactory
private static HashMap<String, AlignAnalysisUIText> aaConGUI;
private static HashSet<String> ignoreGUI;
private static HashMap<String, AlignAnalysisUIText> aaConGUI;
private static HashSet<String> ignoreGUI;
+
private static String category_rewrite(String cat_name)
{
return (cat_name != null && cat_name.equals("Prediction")) ? "Secondary Structure Prediction"
private static String category_rewrite(String cat_name)
{
return (cat_name != null && cat_name.equals("Prediction")) ? "Secondary Structure Prediction"
@@
-50,11
+50,8
@@
public class Jws2InstanceFactory
AAConClient.getAlignAnalysisUITest());
aaConGUI.put(compbio.ws.client.Services.RNAalifoldWS.toString(),
RNAalifoldClient.getAlignAnalysisUITest());
AAConClient.getAlignAnalysisUITest());
aaConGUI.put(compbio.ws.client.Services.RNAalifoldWS.toString(),
RNAalifoldClient.getAlignAnalysisUITest());
- // disable the JPred301 client in jalview ...
+ // ignore list for JABAWS services not supported in jalview ...
ignoreGUI = new HashSet<String>();
ignoreGUI = new HashSet<String>();
- ignoreGUI.add(compbio.ws.client.Services.JpredWS.toString());
- aaConGUI.put(compbio.ws.client.Services.JpredWS.toString(),
- JPred301Client.getAlignAnalysisUITest());
}
}
}
}
@@
-70,6
+67,7
@@
public class Jws2InstanceFactory
init();
return (ignoreGUI.contains(serviceType.toString()));
}
init();
return (ignoreGUI.contains(serviceType.toString()));
}
+
/**
* construct a service instance and configure it with any additional
* properties needed so Jalview can access it correctly
/**
* construct a service instance and configure it with any additional
* properties needed so Jalview can access it correctly