Roll back JpredWS JABAWS namespace: from V3 to V2. V3 will be a Matrix

[jabaws.git] / webservices / compbio / ws / client / Services.java

diff --git a/webservices/compbio/ws/client/Services.java b/webservices/compbio/ws/client/Services.java
index 28bb5dd..8a392d7 100644 (file)
--- a/webservices/compbio/ws/client/Services.java
+++ b/webservices/compbio/ws/client/Services.java
@@ -71,7 +71,6 @@ public enum Services {
 \r
        Class<? extends JABAService> getServiceType() {\r
                switch (this) {\r
-                       // deliberate leaking\r
                        case AAConWS :\r
                        case JpredWS :\r
                        case JronnWS :\r
@@ -79,8 +78,6 @@ public enum Services {
                        case GlobPlotWS :\r
                        case IUPredWS :\r
                                return SequenceAnnotation.class;\r
-\r
-                       // deliberate leaking\r
                        case ClustalWS :\r
                        case ClustalOWS :\r
                        case MafftWS :\r
@@ -88,12 +85,33 @@ public enum Services {
                        case ProbconsWS :\r
                        case TcoffeeWS :\r
                                return MsaWS.class;\r
-\r
                        default :\r
                                throw new RuntimeException("Unrecognised Web Service Type " + this + " - Should never happen!");\r
                }\r
        }\r
 \r
+       \r
+       String getServiceNamespace() {\r
+               switch (this) {\r
+                       case JpredWS :\r
+                       case AAConWS :\r
+                       case JronnWS :\r
+                       case DisemblWS :\r
+                       case GlobPlotWS :\r
+                       case IUPredWS :\r
+                       case ClustalOWS :\r
+                               return JABAService.V2_SERVICE_NAMESPACE;\r
+                       case ClustalWS :\r
+                       case MafftWS :\r
+                       case MuscleWS :\r
+                       case ProbconsWS :\r
+                       case TcoffeeWS :\r
+                               return JABAService.SERVICE_NAMESPACE;\r
+                       default :\r
+                               throw new RuntimeException("Unrecognised JABAWS Namespace for service " + this +"!");\r
+               }\r
+       }\r
+       \r
        JABAService getInterface(Service service) {\r
                assert service != null;\r
 \r