More work to disorder prediction client & services.

[jabaws.git] / webservices / compbio / ws / server / AAConWS.java

diff --git a/webservices/compbio/ws/server/AAConWS.java b/webservices/compbio/ws/server/AAConWS.java
index fab12b8..1625ded 100644 (file)
--- a/webservices/compbio/ws/server/AAConWS.java
+++ b/webservices/compbio/ws/server/AAConWS.java
@@ -123,7 +123,7 @@ public class AAConWS implements SequenceAnnotation<AACon> {
                return aaconOptions;\r
        }\r
 \r
-       String analize(List<FastaSequence> sequences,\r
+       private String analize(List<FastaSequence> sequences,\r
                        ConfiguredExecutable<AACon> confExec, Logger log, String method,\r
                        Limit<AACon> limit) throws JobSubmissionException {\r
                if (limit != null && limit.isExceeded(sequences)) {\r
@@ -140,7 +140,8 @@ public class AAConWS implements SequenceAnnotation<AACon> {
        public String analize(List<FastaSequence> sequences)\r
                        throws UnsupportedRuntimeException, LimitExceededException,\r
                        JobSubmissionException {\r
-               WSUtil.validateFastaInput(sequences);\r
+\r
+               WSUtil.validateAAConInput(sequences);\r
                ConfiguredExecutable<AACon> confAAcon = init(sequences);\r
 \r
                // set default conservation method to fastest - SHENKIN\r
@@ -155,7 +156,7 @@ public class AAConWS implements SequenceAnnotation<AACon> {
                        List<Option<AACon>> options) throws UnsupportedRuntimeException,\r
                        LimitExceededException, JobSubmissionException,\r
                        WrongParameterException {\r
-               WSUtil.validateFastaInput(sequences);\r
+               WSUtil.validateAAConInput(sequences);\r
                ConfiguredExecutable<AACon> confAACon = init(sequences);\r
                // Could not do that! Space separated values\r
                // will all be treated as keys! thus duplicates removed\r
@@ -172,7 +173,7 @@ public class AAConWS implements SequenceAnnotation<AACon> {
                        Preset<AACon> preset) throws UnsupportedRuntimeException,\r
                        LimitExceededException, JobSubmissionException,\r
                        WrongParameterException {\r
-               WSUtil.validateFastaInput(sequences);\r
+               WSUtil.validateAAConInput(sequences);\r
                if (preset == null) {\r
                        throw new WrongParameterException("Preset must be provided!");\r
                }\r