From: jprocter <Jim Procter>
Date: Mon, 22 Aug 2005 14:22:12 +0000 (+0000)
Subject: regenerated Jpred stubs and tidied client thread.
X-Git-Tag: Release_2_04~31
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=cbccf5d4e522cfcbe4f61609cee61f7128f183ec;p=jalview.git

regenerated Jpred stubs and tidied client thread.
---

diff --git a/src/ext/vamsas/JpredSoapBindingStub.java b/src/ext/vamsas/JpredSoapBindingStub.java
index bed6fa3..360a522 100755
--- a/src/ext/vamsas/JpredSoapBindingStub.java
+++ b/src/ext/vamsas/JpredSoapBindingStub.java
@@ -3,387 +3,297 @@
  *
  * This file was auto-generated from WSDL
  * by the Apache Axis 1.2RC2 Nov 16, 2004 (12:19:44 EST) WSDL2Java emitter.
- */
-
-/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 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
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-package ext.vamsas;
-
-public class JpredSoapBindingStub extends org.apache.axis.client.Stub
-    implements ext.vamsas.JPredWS {
-    static org.apache.axis.description.OperationDesc[] _operations;
-
-    static {
-        _operations = new org.apache.axis.description.OperationDesc[4];
-        _initOperationDesc1();
-    }
-
-    private java.util.Vector cachedSerClasses = new java.util.Vector();
-    private java.util.Vector cachedSerQNames = new java.util.Vector();
-    private java.util.Vector cachedSerFactories = new java.util.Vector();
-    private java.util.Vector cachedDeserFactories = new java.util.Vector();
-
-    public JpredSoapBindingStub() throws org.apache.axis.AxisFault {
-        this(null);
-    }
-
-    public JpredSoapBindingStub(java.net.URL endpointURL,
-        javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
-        this(service);
-        super.cachedEndpoint = endpointURL;
-    }
-
-    public JpredSoapBindingStub(javax.xml.rpc.Service service)
-        throws org.apache.axis.AxisFault {
-        if (service == null) {
-            super.service = new org.apache.axis.client.Service();
-        } else {
-            super.service = service;
-        }
-
-        java.lang.Class cls;
-        javax.xml.namespace.QName qName;
-        java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
-        java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
-        java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
-        java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
-        java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
-        java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
-        java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
-        java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
-        java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
-        java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
-        qName = new javax.xml.namespace.QName("http://dataTypes.vamsas",
-                "Sequence");
-        cachedSerQNames.add(qName);
-        cls = ext.vamsas.Sequence.class;
-        cachedSerClasses.add(cls);
-        cachedSerFactories.add(beansf);
-        cachedDeserFactories.add(beandf);
-
-        qName = new javax.xml.namespace.QName("http://dataTypes.vamsas",
-                "Secstructpred");
-        cachedSerQNames.add(qName);
-        cls = ext.vamsas.Secstructpred.class;
-        cachedSerClasses.add(cls);
-        cachedSerFactories.add(beansf);
-        cachedDeserFactories.add(beandf);
-
-        qName = new javax.xml.namespace.QName("http://dataTypes.vamsas",
-                "Msfalignment");
-        cachedSerQNames.add(qName);
-        cls = ext.vamsas.Msfalignment.class;
-        cachedSerClasses.add(cls);
-        cachedSerFactories.add(beansf);
-        cachedDeserFactories.add(beandf);
-
-        qName = new javax.xml.namespace.QName("http://dataTypes.vamsas",
-                "JpredResult");
-        cachedSerQNames.add(qName);
-        cls = ext.vamsas.JpredResult.class;
-        cachedSerClasses.add(cls);
-        cachedSerFactories.add(beansf);
-        cachedDeserFactories.add(beandf);
-
-        qName = new javax.xml.namespace.QName("http://dataTypes.vamsas",
-                "Result");
-        cachedSerQNames.add(qName);
-        cls = ext.vamsas.Result.class;
-        cachedSerClasses.add(cls);
-        cachedSerFactories.add(beansf);
-        cachedDeserFactories.add(beandf);
-    }
-
-    private static void _initOperationDesc1() {
-        org.apache.axis.description.OperationDesc oper;
-        oper = new org.apache.axis.description.OperationDesc();
-        oper.setName("predict");
-        oper.addParameter(new javax.xml.namespace.QName("vamsas", "in0"),
-            new javax.xml.namespace.QName("http://dataTypes.vamsas", "Sequence"),
-            ext.vamsas.Sequence.class,
-            org.apache.axis.description.ParameterDesc.IN, false, false);
-        oper.setReturnType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "string"));
-        oper.setReturnClass(java.lang.String.class);
-        oper.setReturnQName(new javax.xml.namespace.QName("vamsas",
-                "predictReturn"));
-        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
-        oper.setUse(org.apache.axis.constants.Use.LITERAL);
-        _operations[0] = oper;
-
-        oper = new org.apache.axis.description.OperationDesc();
-        oper.setName("predictOnMsa");
-        oper.addParameter(new javax.xml.namespace.QName("vamsas", "in0"),
-            new javax.xml.namespace.QName("http://dataTypes.vamsas",
-                "Msfalignment"), ext.vamsas.Msfalignment.class,
-            org.apache.axis.description.ParameterDesc.IN, false, false);
-        oper.setReturnType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "string"));
-        oper.setReturnClass(java.lang.String.class);
-        oper.setReturnQName(new javax.xml.namespace.QName("vamsas",
-                "predictOnMsaReturn"));
-        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
-        oper.setUse(org.apache.axis.constants.Use.LITERAL);
-        _operations[1] = oper;
-
-        oper = new org.apache.axis.description.OperationDesc();
-        oper.setName("getpredict");
-        oper.addParameter(new javax.xml.namespace.QName("vamsas", "in0"),
-            new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema",
-                "string"), java.lang.String.class,
-            org.apache.axis.description.ParameterDesc.IN, false, false);
-        oper.setReturnType(new javax.xml.namespace.QName(
-                "http://dataTypes.vamsas", "Secstructpred"));
-        oper.setReturnClass(ext.vamsas.Secstructpred.class);
-        oper.setReturnQName(new javax.xml.namespace.QName("vamsas",
-                "getpredictReturn"));
-        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
-        oper.setUse(org.apache.axis.constants.Use.LITERAL);
-        _operations[2] = oper;
-
-        oper = new org.apache.axis.description.OperationDesc();
-        oper.setName("getresult");
-        oper.addParameter(new javax.xml.namespace.QName("vamsas", "in0"),
-            new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema",
-                "string"), java.lang.String.class,
-            org.apache.axis.description.ParameterDesc.IN, false, false);
-        oper.setReturnType(new javax.xml.namespace.QName(
-                "http://dataTypes.vamsas", "JpredResult"));
-        oper.setReturnClass(ext.vamsas.JpredResult.class);
-        oper.setReturnQName(new javax.xml.namespace.QName("vamsas",
-                "getresultReturn"));
-        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
-        oper.setUse(org.apache.axis.constants.Use.LITERAL);
-        _operations[3] = oper;
-    }
-
-    protected org.apache.axis.client.Call createCall()
-        throws java.rmi.RemoteException {
-        try {
-            org.apache.axis.client.Call _call = (org.apache.axis.client.Call) super.service.createCall();
-
-            if (super.maintainSessionSet) {
-                _call.setMaintainSession(super.maintainSession);
-            }
-
-            if (super.cachedUsername != null) {
-                _call.setUsername(super.cachedUsername);
-            }
-
-            if (super.cachedPassword != null) {
-                _call.setPassword(super.cachedPassword);
-            }
-
-            if (super.cachedEndpoint != null) {
-                _call.setTargetEndpointAddress(super.cachedEndpoint);
-            }
-
-            if (super.cachedTimeout != null) {
-                _call.setTimeout(super.cachedTimeout);
-            }
-
-            if (super.cachedPortName != null) {
-                _call.setPortName(super.cachedPortName);
-            }
-
-            java.util.Enumeration keys = super.cachedProperties.keys();
-
-            while (keys.hasMoreElements()) {
-                java.lang.String key = (java.lang.String) keys.nextElement();
-                _call.setProperty(key, super.cachedProperties.get(key));
-            }
-
-            // All the type mapping information is registered
-            // when the first call is made.
-            // The type mapping information is actually registered in
-            // the TypeMappingRegistry of the service, which
-            // is the reason why registration is only needed for the first call.
-            synchronized (this) {
-                if (firstCall()) {
-                    // must set encoding style before registering serializers
-                    _call.setEncodingStyle(null);
-
-                    for (int i = 0; i < cachedSerFactories.size(); ++i) {
-                        java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i);
-                        javax.xml.namespace.QName qName = (javax.xml.namespace.QName) cachedSerQNames.get(i);
-                        java.lang.Class sf = (java.lang.Class) cachedSerFactories.get(i);
-                        java.lang.Class df = (java.lang.Class) cachedDeserFactories.get(i);
-                        _call.registerTypeMapping(cls, qName, sf, df, false);
-                    }
-                }
-            }
-
-            return _call;
-        } catch (java.lang.Throwable _t) {
-            throw new org.apache.axis.AxisFault("Failure trying to get the Call object",
-                _t);
-        }
-    }
-
-    public java.lang.String predict(ext.vamsas.Sequence in0)
-        throws java.rmi.RemoteException {
-        if (super.cachedEndpoint == null) {
-            throw new org.apache.axis.NoEndPointException();
-        }
-
-        org.apache.axis.client.Call _call = createCall();
-        _call.setOperation(_operations[0]);
-        _call.setUseSOAPAction(true);
-        _call.setSOAPActionURI("");
-        _call.setEncodingStyle(null);
-        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR,
-            Boolean.FALSE);
-        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS,
-            Boolean.FALSE);
-        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
-        _call.setOperationName(new javax.xml.namespace.QName("vamsas", "predict"));
-
-        setRequestHeaders(_call);
-        setAttachments(_call);
-
-        java.lang.Object _resp = _call.invoke(new java.lang.Object[] { in0 });
-
-        if (_resp instanceof java.rmi.RemoteException) {
-            throw (java.rmi.RemoteException) _resp;
-        } else {
-            extractAttachments(_call);
-
-            try {
-                return (java.lang.String) _resp;
-            } catch (java.lang.Exception _exception) {
-                return (java.lang.String) org.apache.axis.utils.JavaUtils.convert(_resp,
-                    java.lang.String.class);
-            }
-        }
-    }
-
-    public java.lang.String predictOnMsa(ext.vamsas.Msfalignment in0)
-        throws java.rmi.RemoteException {
-        if (super.cachedEndpoint == null) {
-            throw new org.apache.axis.NoEndPointException();
-        }
-
-        org.apache.axis.client.Call _call = createCall();
-        _call.setOperation(_operations[1]);
-        _call.setUseSOAPAction(true);
-        _call.setSOAPActionURI("");
-        _call.setEncodingStyle(null);
-        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR,
-            Boolean.FALSE);
-        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS,
-            Boolean.FALSE);
-        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
-        _call.setOperationName(new javax.xml.namespace.QName("vamsas",
-                "predictOnMsa"));
-
-        setRequestHeaders(_call);
-        setAttachments(_call);
-
-        java.lang.Object _resp = _call.invoke(new java.lang.Object[] { in0 });
-
-        if (_resp instanceof java.rmi.RemoteException) {
-            throw (java.rmi.RemoteException) _resp;
-        } else {
-            extractAttachments(_call);
-
-            try {
-                return (java.lang.String) _resp;
-            } catch (java.lang.Exception _exception) {
-                return (java.lang.String) org.apache.axis.utils.JavaUtils.convert(_resp,
-                    java.lang.String.class);
-            }
-        }
-    }
-
-    public ext.vamsas.Secstructpred getpredict(java.lang.String in0)
-        throws java.rmi.RemoteException {
-        if (super.cachedEndpoint == null) {
-            throw new org.apache.axis.NoEndPointException();
-        }
-
-        org.apache.axis.client.Call _call = createCall();
-        _call.setOperation(_operations[2]);
-        _call.setUseSOAPAction(true);
-        _call.setSOAPActionURI("");
-        _call.setEncodingStyle(null);
-        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR,
-            Boolean.FALSE);
-        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS,
-            Boolean.FALSE);
-        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
-        _call.setOperationName(new javax.xml.namespace.QName("vamsas",
-                "getpredict"));
-
-        setRequestHeaders(_call);
-        setAttachments(_call);
-
-        java.lang.Object _resp = _call.invoke(new java.lang.Object[] { in0 });
-
-        if (_resp instanceof java.rmi.RemoteException) {
-            throw (java.rmi.RemoteException) _resp;
-        } else {
-            extractAttachments(_call);
-
-            try {
-                return (ext.vamsas.Secstructpred) _resp;
-            } catch (java.lang.Exception _exception) {
-                return (ext.vamsas.Secstructpred) org.apache.axis.utils.JavaUtils.convert(_resp,
-                    ext.vamsas.Secstructpred.class);
-            }
-        }
-    }
-
-    public ext.vamsas.JpredResult getresult(java.lang.String in0)
-        throws java.rmi.RemoteException {
-        if (super.cachedEndpoint == null) {
-            throw new org.apache.axis.NoEndPointException();
-        }
-
-        org.apache.axis.client.Call _call = createCall();
-        _call.setOperation(_operations[3]);
-        _call.setUseSOAPAction(true);
-        _call.setSOAPActionURI("");
-        _call.setEncodingStyle(null);
-        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR,
-            Boolean.FALSE);
-        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS,
-            Boolean.FALSE);
-        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
-        _call.setOperationName(new javax.xml.namespace.QName("vamsas",
-                "getresult"));
-
-        setRequestHeaders(_call);
-        setAttachments(_call);
-
-        java.lang.Object _resp = _call.invoke(new java.lang.Object[] { in0 });
-
-        if (_resp instanceof java.rmi.RemoteException) {
-            throw (java.rmi.RemoteException) _resp;
-        } else {
-            extractAttachments(_call);
-
-            try {
-                return (ext.vamsas.JpredResult) _resp;
-            } catch (java.lang.Exception _exception) {
-                return (ext.vamsas.JpredResult) org.apache.axis.utils.JavaUtils.convert(_resp,
-                    ext.vamsas.JpredResult.class);
-            }
-        }
-    }
-}
+ */
+
+package ext.vamsas;
+
+public class JpredSoapBindingStub extends org.apache.axis.client.Stub implements ext.vamsas.Jpred {
+    private java.util.Vector cachedSerClasses = new java.util.Vector();
+    private java.util.Vector cachedSerQNames = new java.util.Vector();
+    private java.util.Vector cachedSerFactories = new java.util.Vector();
+    private java.util.Vector cachedDeserFactories = new java.util.Vector();
+
+    static org.apache.axis.description.OperationDesc [] _operations;
+
+    static {
+        _operations = new org.apache.axis.description.OperationDesc[4];
+        _initOperationDesc1();
+    }
+
+    private static void _initOperationDesc1(){
+        org.apache.axis.description.OperationDesc oper;
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("predict");
+        oper.addParameter(new javax.xml.namespace.QName("", "seq"), new javax.xml.namespace.QName("simple.objects.vamsas", "Sequence"), vamsas.objects.simple.Sequence.class, org.apache.axis.description.ParameterDesc.IN, false, false);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(java.lang.String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "predictReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        _operations[0] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("predictOnMsa");
+        oper.addParameter(new javax.xml.namespace.QName("", "msf"), new javax.xml.namespace.QName("http://simple.objects.vamsas", "Msfalignment"), vamsas.objects.simple.Msfalignment.class, org.apache.axis.description.ParameterDesc.IN, false, false);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(java.lang.String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "predictOnMsaReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        _operations[1] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("getpredict");
+        oper.addParameter(new javax.xml.namespace.QName("", "job_id"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false);
+        oper.setReturnType(new javax.xml.namespace.QName("http://simple.objects.vamsas", "Secstructpred"));
+        oper.setReturnClass(vamsas.objects.simple.Secstructpred.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "getpredictReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        _operations[2] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("getresult");
+        oper.addParameter(new javax.xml.namespace.QName("", "job_id"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false);
+        oper.setReturnType(new javax.xml.namespace.QName("http://simple.objects.vamsas", "JpredResult"));
+        oper.setReturnClass(vamsas.objects.simple.JpredResult.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "getresultReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        _operations[3] = oper;
+
+    }
+
+    public JpredSoapBindingStub() throws org.apache.axis.AxisFault {
+         this(null);
+    }
+
+    public JpredSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
+         this(service);
+         super.cachedEndpoint = endpointURL;
+    }
+
+    public JpredSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
+        if (service == null) {
+            super.service = new org.apache.axis.client.Service();
+        } else {
+            super.service = service;
+        }
+            java.lang.Class cls;
+            javax.xml.namespace.QName qName;
+            java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
+            java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
+            java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
+            java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
+            java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
+            java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
+            java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
+            java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
+            java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
+            java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
+            qName = new javax.xml.namespace.QName("http://simple.objects.vamsas", "JpredResult");
+            cachedSerQNames.add(qName);
+            cls = vamsas.objects.simple.JpredResult.class;
+            cachedSerClasses.add(cls);
+            cachedSerFactories.add(beansf);
+            cachedDeserFactories.add(beandf);
+
+            qName = new javax.xml.namespace.QName("simple.objects.vamsas", "Result");
+            cachedSerQNames.add(qName);
+            cls = vamsas.objects.simple.Result.class;
+            cachedSerClasses.add(cls);
+            cachedSerFactories.add(beansf);
+            cachedDeserFactories.add(beandf);
+
+            qName = new javax.xml.namespace.QName("http://simple.objects.vamsas", "Secstructpred");
+            cachedSerQNames.add(qName);
+            cls = vamsas.objects.simple.Secstructpred.class;
+            cachedSerClasses.add(cls);
+            cachedSerFactories.add(beansf);
+            cachedDeserFactories.add(beandf);
+
+            qName = new javax.xml.namespace.QName("http://simple.objects.vamsas", "Msfalignment");
+            cachedSerQNames.add(qName);
+            cls = vamsas.objects.simple.Msfalignment.class;
+            cachedSerClasses.add(cls);
+            cachedSerFactories.add(beansf);
+            cachedDeserFactories.add(beandf);
+
+            qName = new javax.xml.namespace.QName("simple.objects.vamsas", "Sequence");
+            cachedSerQNames.add(qName);
+            cls = vamsas.objects.simple.Sequence.class;
+            cachedSerClasses.add(cls);
+            cachedSerFactories.add(beansf);
+            cachedDeserFactories.add(beandf);
+
+    }
+
+    protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
+        try {
+            org.apache.axis.client.Call _call =
+                    (org.apache.axis.client.Call) super.service.createCall();
+            if (super.maintainSessionSet) {
+                _call.setMaintainSession(super.maintainSession);
+            }
+            if (super.cachedUsername != null) {
+                _call.setUsername(super.cachedUsername);
+            }
+            if (super.cachedPassword != null) {
+                _call.setPassword(super.cachedPassword);
+            }
+            if (super.cachedEndpoint != null) {
+                _call.setTargetEndpointAddress(super.cachedEndpoint);
+            }
+            if (super.cachedTimeout != null) {
+                _call.setTimeout(super.cachedTimeout);
+            }
+            if (super.cachedPortName != null) {
+                _call.setPortName(super.cachedPortName);
+            }
+            java.util.Enumeration keys = super.cachedProperties.keys();
+            while (keys.hasMoreElements()) {
+                java.lang.String key = (java.lang.String) keys.nextElement();
+                _call.setProperty(key, super.cachedProperties.get(key));
+            }
+            // All the type mapping information is registered
+            // when the first call is made.
+            // The type mapping information is actually registered in
+            // the TypeMappingRegistry of the service, which
+            // is the reason why registration is only needed for the first call.
+            synchronized (this) {
+                if (firstCall()) {
+                    // must set encoding style before registering serializers
+                    _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+                    _call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC);
+                    for (int i = 0; i < cachedSerFactories.size(); ++i) {
+                        java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i);
+                        javax.xml.namespace.QName qName =
+                                (javax.xml.namespace.QName) cachedSerQNames.get(i);
+                        java.lang.Class sf = (java.lang.Class)
+                                 cachedSerFactories.get(i);
+                        java.lang.Class df = (java.lang.Class)
+                                 cachedDeserFactories.get(i);
+                        _call.registerTypeMapping(cls, qName, sf, df, false);
+                    }
+                }
+            }
+            return _call;
+        }
+        catch (java.lang.Throwable _t) {
+            throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
+        }
+    }
+
+    public java.lang.String predict(vamsas.objects.simple.Sequence seq) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[0]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("vamsas", "predict"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {seq});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (java.lang.String) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (java.lang.String) org.apache.axis.utils.JavaUtils.convert(_resp, java.lang.String.class);
+            }
+        }
+    }
+
+    public java.lang.String predictOnMsa(vamsas.objects.simple.Msfalignment msf) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[1]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("vamsas", "predictOnMsa"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {msf});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (java.lang.String) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (java.lang.String) org.apache.axis.utils.JavaUtils.convert(_resp, java.lang.String.class);
+            }
+        }
+    }
+
+    public vamsas.objects.simple.Secstructpred getpredict(java.lang.String job_id) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[2]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("vamsas", "getpredict"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {job_id});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (vamsas.objects.simple.Secstructpred) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (vamsas.objects.simple.Secstructpred) org.apache.axis.utils.JavaUtils.convert(_resp, vamsas.objects.simple.Secstructpred.class);
+            }
+        }
+    }
+
+    public vamsas.objects.simple.JpredResult getresult(java.lang.String job_id) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[3]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("vamsas", "getresult"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {job_id});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (vamsas.objects.simple.JpredResult) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (vamsas.objects.simple.JpredResult) org.apache.axis.utils.JavaUtils.convert(_resp, vamsas.objects.simple.JpredResult.class);
+            }
+        }
+    }
+
+}
diff --git a/src/jalview/ws/JPredClient.java b/src/jalview/ws/JPredClient.java
index c7508df..04a6101 100755
--- a/src/jalview/ws/JPredClient.java
+++ b/src/jalview/ws/JPredClient.java
@@ -30,7 +30,7 @@ import jalview.gui.*;
 public class JPredClient
     extends WSClient
 {
-  ext.vamsas.JPredWS server;
+  ext.vamsas.Jpred server;
   String altitle = "";
   java.util.Hashtable SequenceInfo = null;
   public JPredClient(ext.vamsas.ServiceHandle sh, String title, SequenceI seq) {
@@ -115,7 +115,7 @@ public class JPredClient
 
   private boolean locateWebService()
   {
-    JPredWSServiceLocator loc = new JPredWSServiceLocator(); // Default
+    ext.vamsas.JpredServiceLocator loc = new JpredServiceLocator(); // Default
 
     try
     {
@@ -146,9 +146,9 @@ public class JPredClient
       extends Thread
   {
     String OutputHeader;
-    ext.vamsas.JpredResult result;
-    ext.vamsas.Sequence sequence;
-    ext.vamsas.Msfalignment msa;
+    vamsas.objects.simple.JpredResult result;
+    vamsas.objects.simple.Sequence sequence;
+    vamsas.objects.simple.Msfalignment msa;
     String jobId;
     boolean jobComplete = false;
     int allowedServerExceptions = 3; // thread dies if too many exceptions.
@@ -156,7 +156,7 @@ public class JPredClient
     JPredThread(SequenceI seq)
     {
       OutputHeader = wsInfo.getProgressText();
-      this.sequence = new ext.vamsas.Sequence();
+      this.sequence = new vamsas.objects.simple.Sequence();
       this.sequence.setId(seq.getName());
       this.sequence.setSeq(AlignSeq.extractGaps("-. ", seq.getSequence()));
     }
@@ -164,13 +164,13 @@ public class JPredClient
     JPredThread(SequenceI[] msf)
     {
       OutputHeader = wsInfo.getProgressText();
-      this.sequence = new ext.vamsas.Sequence();
+      this.sequence = new vamsas.objects.simple.Sequence();
       this.sequence.setId(msf[0].getName());
       this.sequence.setSeq(AlignSeq.extractGaps("-. ",
                                                 msf[0].getSequence()));
 
       jalview.io.PileUpfile mwrite = new jalview.io.PileUpfile();
-      this.msa = new ext.vamsas.Msfalignment();
+      this.msa = new vamsas.objects.simple.Msfalignment();
       msa.setMsf(mwrite.print(msf));
     }
 
@@ -187,27 +187,28 @@ public class JPredClient
             throw (new Exception(
                 "Timed out when communicating with server\nTry again later.\n"));
           }
-
+          if (result.getState()==0)
+            jalview.bin.Jalview.log.debug("Finished "+jobId);
           if (result.isRunning())
           {
             wsInfo.setStatus(WebserviceInfo.STATE_RUNNING);
           }
-          else if (result.isQueued())
+          if (result.isQueued())
           {
             wsInfo.setStatus(WebserviceInfo.STATE_QUEUING);
           }
 
+          wsInfo.setProgressText(OutputHeader + "\n" +
+                                 result.getStatus());
+
           if (result.isFinished())
           {
+
             parseResult();
             jobComplete = true;
             jobsRunning--;
-          }
-          else
-          {
-            wsInfo.setProgressText(OutputHeader + "\n" +
-                                   result.getStatus());
-
+          } else {
+            // catch exceptions
             if (! (result.isJobFailed() || result.isServerError()))
             {
               try
@@ -223,6 +224,8 @@ public class JPredClient
             else
             {
               wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);
+              jobsRunning--;
+              jobComplete = true;
             }
           }
         }
@@ -298,7 +301,7 @@ public class JPredClient
             "JPredWS Client: Failed to submit the prediction (Probably a server error - see below)\n" +
             e.toString() + "\n");
 
-        // e.printStackTrace(); TODO: JBPNote DEBUG
+        jalview.bin.Jalview.log.debug("Failed Submission",e);
       }
     }
 
@@ -494,7 +497,8 @@ public class JPredClient
       }
       catch (Exception ex)
       {
-        ex.printStackTrace();
+        jalview.bin.Jalview.log.warn("Exception whilst parsing JNet style secondary structure prediction.");
+        jalview.bin.Jalview.log.debug(ex);
       }
     }
   }
diff --git a/src/vamsas/objects/simple/Result.java b/src/vamsas/objects/simple/Result.java
index 49756e2..b349019 100755
--- a/src/vamsas/objects/simple/Result.java
+++ b/src/vamsas/objects/simple/Result.java
@@ -3,325 +3,322 @@
  *
  * This file was auto-generated from WSDL
  * by the Apache Axis 1.2RC2 Nov 16, 2004 (12:19:44 EST) WSDL2Java emitter.
- */
-
-/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 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
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-package vamsas.objects.simple;
-
-public class Result implements java.io.Serializable {
-    private boolean broken;
-    private boolean failed;
-    private boolean finished;
-    private boolean invalid;
-    private boolean jobFailed;
-    private boolean queued;
-    private boolean running;
-    private boolean serverError;
-    private int state;
-    private java.lang.String status;
-    private boolean suspended;
-    private java.lang.Object __equalsCalc = null;
-    private boolean __hashCodeCalc = false;
-
-    public Result() {
-    }
-
-    public Result(boolean broken, boolean failed, boolean finished,
-        boolean invalid, boolean jobFailed, boolean queued, boolean running,
-        boolean serverError, int state, java.lang.String status,
-        boolean suspended) {
-        this.broken = broken;
-        this.failed = failed;
-        this.finished = finished;
-        this.invalid = invalid;
-        this.jobFailed = jobFailed;
-        this.queued = queued;
-        this.running = running;
-        this.serverError = serverError;
-        this.state = state;
-        this.status = status;
-        this.suspended = suspended;
-    }
-
+ */
+
+package vamsas.objects.simple;
+
+public class Result  implements java.io.Serializable {
+    private boolean broken;
+    private boolean failed;
+    private boolean finished;
+    private boolean invalid;
+    private boolean jobFailed;
+    private boolean queued;
+    private boolean running;
+    private boolean serverError;
+    private int state;
+    private java.lang.String status;
+    private boolean suspended;
+
+    public Result() {
+    }
+
+    public Result(
+           boolean broken,
+           boolean failed,
+           boolean finished,
+           boolean invalid,
+           boolean jobFailed,
+           boolean queued,
+           boolean running,
+           boolean serverError,
+           int state,
+           java.lang.String status,
+           boolean suspended) {
+           this.broken = broken;
+           this.failed = failed;
+           this.finished = finished;
+           this.invalid = invalid;
+           this.jobFailed = jobFailed;
+           this.queued = queued;
+           this.running = running;
+           this.serverError = serverError;
+           this.state = state;
+           this.status = status;
+           this.suspended = suspended;
+    }
+
+
     /**
- * Gets the broken value for this Result.
- *
- * @return broken
- */
-    public boolean isBroken() {
-        return broken;
-    }
-
+     * Gets the broken value for this Result.
+     * 
+     * @return broken
+     */
+    public boolean isBroken() {
+        return broken;
+    }
+
+
     /**
- * Sets the broken value for this Result.
- *
- * @param broken
- */
-    public void setBroken(boolean broken) {
-        this.broken = broken;
-    }
-
+     * Sets the broken value for this Result.
+     * 
+     * @param broken
+     */
+    public void setBroken(boolean broken) {
+        this.broken = broken;
+    }
+
+
     /**
- * Gets the failed value for this Result.
- *
- * @return failed
- */
-    public boolean isFailed() {
-        return failed;
-    }
-
+     * Gets the failed value for this Result.
+     * 
+     * @return failed
+     */
+    public boolean isFailed() {
+        return failed;
+    }
+
+
     /**
- * Sets the failed value for this Result.
- *
- * @param failed
- */
-    public void setFailed(boolean failed) {
-        this.failed = failed;
-    }
-
+     * Sets the failed value for this Result.
+     * 
+     * @param failed
+     */
+    public void setFailed(boolean failed) {
+        this.failed = failed;
+    }
+
+
     /**
- * Gets the finished value for this Result.
- *
- * @return finished
- */
-    public boolean isFinished() {
-        return finished;
-    }
-
+     * Gets the finished value for this Result.
+     * 
+     * @return finished
+     */
+    public boolean isFinished() {
+        return finished;
+    }
+
+
     /**
- * Sets the finished value for this Result.
- *
- * @param finished
- */
-    public void setFinished(boolean finished) {
-        this.finished = finished;
-    }
-
+     * Sets the finished value for this Result.
+     * 
+     * @param finished
+     */
+    public void setFinished(boolean finished) {
+        this.finished = finished;
+    }
+
+
     /**
- * Gets the invalid value for this Result.
- *
- * @return invalid
- */
-    public boolean isInvalid() {
-        return invalid;
-    }
-
+     * Gets the invalid value for this Result.
+     * 
+     * @return invalid
+     */
+    public boolean isInvalid() {
+        return invalid;
+    }
+
+
     /**
- * Sets the invalid value for this Result.
- *
- * @param invalid
- */
-    public void setInvalid(boolean invalid) {
-        this.invalid = invalid;
-    }
-
+     * Sets the invalid value for this Result.
+     * 
+     * @param invalid
+     */
+    public void setInvalid(boolean invalid) {
+        this.invalid = invalid;
+    }
+
+
     /**
- * Gets the jobFailed value for this Result.
- *
- * @return jobFailed
- */
-    public boolean isJobFailed() {
-        return jobFailed;
-    }
-
+     * Gets the jobFailed value for this Result.
+     * 
+     * @return jobFailed
+     */
+    public boolean isJobFailed() {
+        return jobFailed;
+    }
+
+
     /**
- * Sets the jobFailed value for this Result.
- *
- * @param jobFailed
- */
-    public void setJobFailed(boolean jobFailed) {
-        this.jobFailed = jobFailed;
-    }
-
+     * Sets the jobFailed value for this Result.
+     * 
+     * @param jobFailed
+     */
+    public void setJobFailed(boolean jobFailed) {
+        this.jobFailed = jobFailed;
+    }
+
+
     /**
- * Gets the queued value for this Result.
- *
- * @return queued
- */
-    public boolean isQueued() {
-        return queued;
-    }
-
+     * Gets the queued value for this Result.
+     * 
+     * @return queued
+     */
+    public boolean isQueued() {
+        return queued;
+    }
+
+
     /**
- * Sets the queued value for this Result.
- *
- * @param queued
- */
-    public void setQueued(boolean queued) {
-        this.queued = queued;
-    }
-
+     * Sets the queued value for this Result.
+     * 
+     * @param queued
+     */
+    public void setQueued(boolean queued) {
+        this.queued = queued;
+    }
+
+
     /**
- * Gets the running value for this Result.
- *
- * @return running
- */
-    public boolean isRunning() {
-        return running;
-    }
-
+     * Gets the running value for this Result.
+     * 
+     * @return running
+     */
+    public boolean isRunning() {
+        return running;
+    }
+
+
     /**
- * Sets the running value for this Result.
- *
- * @param running
- */
-    public void setRunning(boolean running) {
-        this.running = running;
-    }
-
+     * Sets the running value for this Result.
+     * 
+     * @param running
+     */
+    public void setRunning(boolean running) {
+        this.running = running;
+    }
+
+
     /**
- * Gets the serverError value for this Result.
- *
- * @return serverError
- */
-    public boolean isServerError() {
-        return serverError;
-    }
-
+     * Gets the serverError value for this Result.
+     * 
+     * @return serverError
+     */
+    public boolean isServerError() {
+        return serverError;
+    }
+
+
     /**
- * Sets the serverError value for this Result.
- *
- * @param serverError
- */
-    public void setServerError(boolean serverError) {
-        this.serverError = serverError;
-    }
-
+     * Sets the serverError value for this Result.
+     * 
+     * @param serverError
+     */
+    public void setServerError(boolean serverError) {
+        this.serverError = serverError;
+    }
+
+
     /**
- * Gets the state value for this Result.
- *
- * @return state
- */
-    public int getState() {
-        return state;
-    }
-
+     * Gets the state value for this Result.
+     * 
+     * @return state
+     */
+    public int getState() {
+        return state;
+    }
+
+
     /**
- * Sets the state value for this Result.
- *
- * @param state
- */
-    public void setState(int state) {
-        this.state = state;
-    }
-
+     * Sets the state value for this Result.
+     * 
+     * @param state
+     */
+    public void setState(int state) {
+        this.state = state;
+    }
+
+
     /**
- * Gets the status value for this Result.
- *
- * @return status
- */
-    public java.lang.String getStatus() {
-        return status;
-    }
-
+     * Gets the status value for this Result.
+     * 
+     * @return status
+     */
+    public java.lang.String getStatus() {
+        return status;
+    }
+
+
     /**
- * Sets the status value for this Result.
- *
- * @param status
- */
-    public void setStatus(java.lang.String status) {
-        this.status = status;
-    }
-
+     * Sets the status value for this Result.
+     * 
+     * @param status
+     */
+    public void setStatus(java.lang.String status) {
+        this.status = status;
+    }
+
+
     /**
- * Gets the suspended value for this Result.
- *
- * @return suspended
- */
-    public boolean isSuspended() {
-        return suspended;
-    }
-
+     * Gets the suspended value for this Result.
+     * 
+     * @return suspended
+     */
+    public boolean isSuspended() {
+        return suspended;
+    }
+
+
     /**
- * Sets the suspended value for this Result.
- *
- * @param suspended
- */
-    public void setSuspended(boolean suspended) {
-        this.suspended = suspended;
-    }
-
-    public synchronized boolean equals(java.lang.Object obj) {
-        if (!(obj instanceof Result)) {
-            return false;
-        }
-
-        Result other = (Result) obj;
-
-        if (obj == null) {
-            return false;
-        }
-
-        if (this == obj) {
-            return true;
-        }
-
-        if (__equalsCalc != null) {
-            return (__equalsCalc == obj);
-        }
-
-        __equalsCalc = obj;
-
-        boolean _equals;
-        _equals = true && (this.broken == other.isBroken()) &&
-            (this.failed == other.isFailed()) &&
-            (this.finished == other.isFinished()) &&
-            (this.invalid == other.isInvalid()) &&
-            (this.jobFailed == other.isJobFailed()) &&
-            (this.queued == other.isQueued()) &&
-            (this.running == other.isRunning()) &&
-            (this.serverError == other.isServerError()) &&
-            (this.state == other.getState()) &&
-            (((this.status == null) && (other.getStatus() == null)) ||
-            ((this.status != null) && this.status.equals(other.getStatus()))) &&
-            (this.suspended == other.isSuspended());
-        __equalsCalc = null;
-
-        return _equals;
-    }
-
-    public synchronized int hashCode() {
-        if (__hashCodeCalc) {
-            return 0;
-        }
-
-        __hashCodeCalc = true;
-
-        int _hashCode = 1;
-        _hashCode += (isBroken() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        _hashCode += (isFailed() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        _hashCode += (isFinished() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        _hashCode += (isInvalid() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        _hashCode += (isJobFailed() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        _hashCode += (isQueued() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        _hashCode += (isRunning() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        _hashCode += (isServerError() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        _hashCode += getState();
-
-        if (getStatus() != null) {
-            _hashCode += getStatus().hashCode();
-        }
-
-        _hashCode += (isSuspended() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        __hashCodeCalc = false;
-
-        return _hashCode;
-    }
-}
+     * Sets the suspended value for this Result.
+     * 
+     * @param suspended
+     */
+    public void setSuspended(boolean suspended) {
+        this.suspended = suspended;
+    }
+
+    private java.lang.Object __equalsCalc = null;
+    public synchronized boolean equals(java.lang.Object obj) {
+        if (!(obj instanceof Result)) return false;
+        Result other = (Result) obj;
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (__equalsCalc != null) {
+            return (__equalsCalc == obj);
+        }
+        __equalsCalc = obj;
+        boolean _equals;
+        _equals = true && 
+            this.broken == other.isBroken() &&
+            this.failed == other.isFailed() &&
+            this.finished == other.isFinished() &&
+            this.invalid == other.isInvalid() &&
+            this.jobFailed == other.isJobFailed() &&
+            this.queued == other.isQueued() &&
+            this.running == other.isRunning() &&
+            this.serverError == other.isServerError() &&
+            this.state == other.getState() &&
+            ((this.status==null && other.getStatus()==null) || 
+             (this.status!=null &&
+              this.status.equals(other.getStatus()))) &&
+            this.suspended == other.isSuspended();
+        __equalsCalc = null;
+        return _equals;
+    }
+
+    private boolean __hashCodeCalc = false;
+    public synchronized int hashCode() {
+        if (__hashCodeCalc) {
+            return 0;
+        }
+        __hashCodeCalc = true;
+        int _hashCode = 1;
+        _hashCode += (isBroken() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        _hashCode += (isFailed() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        _hashCode += (isFinished() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        _hashCode += (isInvalid() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        _hashCode += (isJobFailed() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        _hashCode += (isQueued() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        _hashCode += (isRunning() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        _hashCode += (isServerError() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        _hashCode += getState();
+        if (getStatus() != null) {
+            _hashCode += getStatus().hashCode();
+        }
+        _hashCode += (isSuspended() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        __hashCodeCalc = false;
+        return _hashCode;
+    }
+
+}
diff --git a/src/vamsas/objects/simple/Result_Helper.java b/src/vamsas/objects/simple/Result_Helper.java
index 42584f5..14ed2b5 100755
--- a/src/vamsas/objects/simple/Result_Helper.java
+++ b/src/vamsas/objects/simple/Result_Helper.java
@@ -3,129 +3,103 @@
  *
  * This file was auto-generated from WSDL
  * by the Apache Axis 1.2RC2 Nov 16, 2004 (12:19:44 EST) WSDL2Java emitter.
- */
-
-/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 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
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-package vamsas.objects.simple;
-
-public class Result_Helper {
-    // Type metadata
-    private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(Result.class,
-            true);
-
-    static {
-        typeDesc.setXmlType(new javax.xml.namespace.QName(
-                "simple.objects.vamsas", "Result"));
-
-        org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("broken");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "broken"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "boolean"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("failed");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "failed"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "boolean"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("finished");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "finished"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "boolean"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("invalid");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "invalid"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "boolean"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("jobFailed");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "jobFailed"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "boolean"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("queued");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "queued"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "boolean"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("running");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "running"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "boolean"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("serverError");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "serverError"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "boolean"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("state");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "state"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "int"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("status");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "status"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://schemas.xmlsoap.org/soap/encoding/", "string"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("suspended");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "suspended"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://www.w3.org/2001/XMLSchema", "boolean"));
-        typeDesc.addFieldDesc(elemField);
-    }
-
+ */
+
+package vamsas.objects.simple;
+
+public class Result_Helper {
+    // Type metadata
+    private static org.apache.axis.description.TypeDesc typeDesc =
+        new org.apache.axis.description.TypeDesc(Result.class, true);
+
+    static {
+        typeDesc.setXmlType(new javax.xml.namespace.QName("simple.objects.vamsas", "Result"));
+        org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("broken");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "broken"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("failed");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "failed"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("finished");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "finished"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("invalid");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "invalid"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("jobFailed");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "jobFailed"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("queued");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "queued"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("running");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "running"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("serverError");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "serverError"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("state");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "state"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("status");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "status"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("suspended");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "suspended"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        typeDesc.addFieldDesc(elemField);
+    }
+
     /**
- * Return type metadata object
- */
-    public static org.apache.axis.description.TypeDesc getTypeDesc() {
-        return typeDesc;
-    }
-
+     * Return type metadata object
+     */
+    public static org.apache.axis.description.TypeDesc getTypeDesc() {
+        return typeDesc;
+    }
+
     /**
- * Get Custom Serializer
- */
-    public static org.apache.axis.encoding.Serializer getSerializer(
-        java.lang.String mechType, java.lang.Class _javaType,
-        javax.xml.namespace.QName _xmlType) {
-        return new org.apache.axis.encoding.ser.BeanSerializer(_javaType,
-            _xmlType, typeDesc);
-    }
-
+     * Get Custom Serializer
+     */
+    public static org.apache.axis.encoding.Serializer getSerializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanSerializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
     /**
- * Get Custom Deserializer
- */
-    public static org.apache.axis.encoding.Deserializer getDeserializer(
-        java.lang.String mechType, java.lang.Class _javaType,
-        javax.xml.namespace.QName _xmlType) {
-        return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType,
-            _xmlType, typeDesc);
-    }
-}
+     * Get Custom Deserializer
+     */
+    public static org.apache.axis.encoding.Deserializer getDeserializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanDeserializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+}
diff --git a/src/vamsas/objects/simple/Sequence.java b/src/vamsas/objects/simple/Sequence.java
index ddf0177..d2eccb0 100755
--- a/src/vamsas/objects/simple/Sequence.java
+++ b/src/vamsas/objects/simple/Sequence.java
@@ -3,129 +3,101 @@
  *
  * This file was auto-generated from WSDL
  * by the Apache Axis 1.2RC2 Nov 16, 2004 (12:19:44 EST) WSDL2Java emitter.
- */
-
-/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 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
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-package vamsas.objects.simple;
-
-public class Sequence implements java.io.Serializable {
-    private java.lang.String id;
-    private java.lang.String seq;
-    private java.lang.Object __equalsCalc = null;
-    private boolean __hashCodeCalc = false;
-
-    public Sequence() {
-    }
-
-    public Sequence(java.lang.String id, java.lang.String seq) {
-        this.id = id;
-        this.seq = seq;
-    }
-
+ */
+
+package vamsas.objects.simple;
+
+public class Sequence  implements java.io.Serializable {
+    private java.lang.String id;
+    private java.lang.String seq;
+
+    public Sequence() {
+    }
+
+    public Sequence(
+           java.lang.String id,
+           java.lang.String seq) {
+           this.id = id;
+           this.seq = seq;
+    }
+
+
     /**
- * Gets the id value for this Sequence.
- *
- * @return id
- */
-    public java.lang.String getId() {
-        return id;
-    }
-
+     * Gets the id value for this Sequence.
+     * 
+     * @return id
+     */
+    public java.lang.String getId() {
+        return id;
+    }
+
+
     /**
- * Sets the id value for this Sequence.
- *
- * @param id
- */
-    public void setId(java.lang.String id) {
-        this.id = id;
-    }
-
+     * Sets the id value for this Sequence.
+     * 
+     * @param id
+     */
+    public void setId(java.lang.String id) {
+        this.id = id;
+    }
+
+
     /**
- * Gets the seq value for this Sequence.
- *
- * @return seq
- */
-    public java.lang.String getSeq() {
-        return seq;
-    }
-
+     * Gets the seq value for this Sequence.
+     * 
+     * @return seq
+     */
+    public java.lang.String getSeq() {
+        return seq;
+    }
+
+
     /**
- * Sets the seq value for this Sequence.
- *
- * @param seq
- */
-    public void setSeq(java.lang.String seq) {
-        this.seq = seq;
-    }
-
-    public synchronized boolean equals(java.lang.Object obj) {
-        if (!(obj instanceof Sequence)) {
-            return false;
-        }
-
-        Sequence other = (Sequence) obj;
-
-        if (obj == null) {
-            return false;
-        }
-
-        if (this == obj) {
-            return true;
-        }
-
-        if (__equalsCalc != null) {
-            return (__equalsCalc == obj);
-        }
-
-        __equalsCalc = obj;
-
-        boolean _equals;
-        _equals = true &&
-            (((this.id == null) && (other.getId() == null)) ||
-            ((this.id != null) && this.id.equals(other.getId()))) &&
-            (((this.seq == null) && (other.getSeq() == null)) ||
-            ((this.seq != null) && this.seq.equals(other.getSeq())));
-        __equalsCalc = null;
-
-        return _equals;
-    }
-
-    public synchronized int hashCode() {
-        if (__hashCodeCalc) {
-            return 0;
-        }
-
-        __hashCodeCalc = true;
-
-        int _hashCode = 1;
-
-        if (getId() != null) {
-            _hashCode += getId().hashCode();
-        }
-
-        if (getSeq() != null) {
-            _hashCode += getSeq().hashCode();
-        }
-
-        __hashCodeCalc = false;
-
-        return _hashCode;
-    }
-}
+     * Sets the seq value for this Sequence.
+     * 
+     * @param seq
+     */
+    public void setSeq(java.lang.String seq) {
+        this.seq = seq;
+    }
+
+    private java.lang.Object __equalsCalc = null;
+    public synchronized boolean equals(java.lang.Object obj) {
+        if (!(obj instanceof Sequence)) return false;
+        Sequence other = (Sequence) obj;
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (__equalsCalc != null) {
+            return (__equalsCalc == obj);
+        }
+        __equalsCalc = obj;
+        boolean _equals;
+        _equals = true && 
+            ((this.id==null && other.getId()==null) || 
+             (this.id!=null &&
+              this.id.equals(other.getId()))) &&
+            ((this.seq==null && other.getSeq()==null) || 
+             (this.seq!=null &&
+              this.seq.equals(other.getSeq())));
+        __equalsCalc = null;
+        return _equals;
+    }
+
+    private boolean __hashCodeCalc = false;
+    public synchronized int hashCode() {
+        if (__hashCodeCalc) {
+            return 0;
+        }
+        __hashCodeCalc = true;
+        int _hashCode = 1;
+        if (getId() != null) {
+            _hashCode += getId().hashCode();
+        }
+        if (getSeq() != null) {
+            _hashCode += getSeq().hashCode();
+        }
+        __hashCodeCalc = false;
+        return _hashCode;
+    }
+
+}
diff --git a/src/vamsas/objects/simple/Sequence_Helper.java b/src/vamsas/objects/simple/Sequence_Helper.java
index b080dc5..f675384 100755
--- a/src/vamsas/objects/simple/Sequence_Helper.java
+++ b/src/vamsas/objects/simple/Sequence_Helper.java
@@ -3,75 +3,58 @@
  *
  * This file was auto-generated from WSDL
  * by the Apache Axis 1.2RC2 Nov 16, 2004 (12:19:44 EST) WSDL2Java emitter.
- */
-
-/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 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
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-package vamsas.objects.simple;
-
-public class Sequence_Helper {
-    // Type metadata
-    private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(Sequence.class,
-            true);
-
-    static {
-        typeDesc.setXmlType(new javax.xml.namespace.QName(
-                "simple.objects.vamsas", "Sequence"));
-
-        org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("id");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "id"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://schemas.xmlsoap.org/soap/encoding/", "string"));
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("seq");
-        elemField.setXmlName(new javax.xml.namespace.QName("", "seq"));
-        elemField.setXmlType(new javax.xml.namespace.QName(
-                "http://schemas.xmlsoap.org/soap/encoding/", "string"));
-        typeDesc.addFieldDesc(elemField);
-    }
-
+ */
+
+package vamsas.objects.simple;
+
+public class Sequence_Helper {
+    // Type metadata
+    private static org.apache.axis.description.TypeDesc typeDesc =
+        new org.apache.axis.description.TypeDesc(Sequence.class, true);
+
+    static {
+        typeDesc.setXmlType(new javax.xml.namespace.QName("simple.objects.vamsas", "Sequence"));
+        org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("id");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "id"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("seq");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "seq"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
+        typeDesc.addFieldDesc(elemField);
+    }
+
     /**
- * Return type metadata object
- */
-    public static org.apache.axis.description.TypeDesc getTypeDesc() {
-        return typeDesc;
-    }
-
+     * Return type metadata object
+     */
+    public static org.apache.axis.description.TypeDesc getTypeDesc() {
+        return typeDesc;
+    }
+
     /**
- * Get Custom Serializer
- */
-    public static org.apache.axis.encoding.Serializer getSerializer(
-        java.lang.String mechType, java.lang.Class _javaType,
-        javax.xml.namespace.QName _xmlType) {
-        return new org.apache.axis.encoding.ser.BeanSerializer(_javaType,
-            _xmlType, typeDesc);
-    }
-
+     * Get Custom Serializer
+     */
+    public static org.apache.axis.encoding.Serializer getSerializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanSerializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
     /**
- * Get Custom Deserializer
- */
-    public static org.apache.axis.encoding.Deserializer getDeserializer(
-        java.lang.String mechType, java.lang.Class _javaType,
-        javax.xml.namespace.QName _xmlType) {
-        return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType,
-            _xmlType, typeDesc);
-    }
-}
+     * Get Custom Deserializer
+     */
+    public static org.apache.axis.encoding.Deserializer getDeserializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanDeserializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+}