X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FGroupUrlLink.java;h=e2e83a4d672caf531f60306603e1a888137263df;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=4900fc8fca3a2c625d61506c8438d825d7c30390;hpb=619cc880371f3228e6a1fb33c6bfb6e7a7e2622c;p=jalview.git diff --git a/src/jalview/util/GroupUrlLink.java b/src/jalview/util/GroupUrlLink.java index 4900fc8..e2e83a4 100644 --- a/src/jalview/util/GroupUrlLink.java +++ b/src/jalview/util/GroupUrlLink.java @@ -24,7 +24,6 @@ import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; import java.util.Hashtable; -import java.util.Vector; public class GroupUrlLink { @@ -83,8 +82,7 @@ public class GroupUrlLink { if (tokens == null) { - tokens = new String[] - { "SEQUENCEIDS", "SEQUENCES", "DATASETID" }; + tokens = new String[] { "SEQUENCEIDS", "SEQUENCES", "DATASETID" }; } } @@ -392,11 +390,12 @@ public class GroupUrlLink Hashtable rstrings = new Hashtable(); rstrings.put(tokens[0], idstrings); rstrings.put(tokens[1], seqstrings); - rstrings.put(tokens[2], new String[] - { dsstring }); + rstrings.put(tokens[2], new String[] { dsstring }); if (idstrings.length != seqstrings.length) { - throw new Error(MessageManager.getString("error.idstring_seqstrings_only_one_per_sequence")); + throw new Error( + MessageManager + .getString("error.idstring_seqstrings_only_one_per_sequence")); } return rstrings; } @@ -423,9 +422,8 @@ public class GroupUrlLink Object[] stubs = makeUrlsIf(false, rstrings, b); if (stubs != null) { - return new Object[] - { stubs[0], stubs[1], rstrings, new boolean[] - { b } }; + return new Object[] { stubs[0], stubs[1], rstrings, + new boolean[] { b } }; } // TODO Auto-generated method stub return null; @@ -486,14 +484,19 @@ public class GroupUrlLink { if (maxs != idseq[i].length) { - throw new Error(MessageManager.formatMessage("error.cannot_have_mixed_length_replacement_vectors", - new String[]{(mtch[i]), Integer.valueOf(idseq[i].length).toString(),Integer.valueOf(maxs).toString()})); + throw new Error(MessageManager.formatMessage( + "error.cannot_have_mixed_length_replacement_vectors", + new String[] { (mtch[i]), + Integer.valueOf(idseq[i].length).toString(), + Integer.valueOf(maxs).toString() })); } } } else { - throw new Error(MessageManager.getString("error.cannot_have_zero_length_vector_replacement_strings")); + throw new Error( + MessageManager + .getString("error.cannot_have_zero_length_vector_replacement_strings")); } } // iterate through input, collating segments to be inserted into url @@ -689,9 +692,7 @@ public class GroupUrlLink { // just return the essential info about what the URL would be generated // from - return new Object[] - { new int[] - { seqsmatched }, thismatched }; + return new Object[] { new int[] { seqsmatched }, thismatched }; } // otherwise, create the URL completely. @@ -706,10 +707,8 @@ public class GroupUrlLink } } - return new Object[] - { new int[] - { seqsmatched }, thismatched, matched, new String[] - { submiturl.toString() } }; + return new Object[] { new int[] { seqsmatched }, thismatched, matched, + new String[] { submiturl.toString() } }; } /** @@ -817,8 +816,7 @@ public class GroupUrlLink public static void main(String argv[]) { // note - JAL-1383 - these services are all dead - String[] links = new String[] - { + String[] links = new String[] { "EnVision2|IDS|http://www.ebi.ac.uk/enfin-srv/envision2/pages/linkin.jsf?workflow=Enfin%20Default%20Workflow&datasetName=linkInDatasetFromJalview&input=$SEQUENCEIDS$&inputType=0|,", "EnVision2|Seqs|http://www.ebi.ac.uk/enfin-srv/envision2/pages/linkin.jsf?workflow=Enfin%20Default%20Workflow&datasetName=linkInDatasetFromJalview&input=$SEQUENCES$&inputType=1|,", "EnVision2|IDS|http://www.ebi.ac.uk/enfin-srv/envision2/pages/linkin.jsf?workflow=Enfin%20Default%20Workflow&datasetName=$DATASETID$&input=$SEQUENCEIDS$&inputType=0|,", @@ -834,8 +832,8 @@ public class GroupUrlLink */ }; - SequenceI[] seqs = new SequenceI[] - { new Sequence("StupidLabel:gi|9234|pdb|102L|A", + SequenceI[] seqs = new SequenceI[] { new Sequence( + "StupidLabel:gi|9234|pdb|102L|A", "asdiasdpasdpadpwpadasdpaspdw"), }; String[][] seqsandids = formStrings(seqs); for (int i = 0; i < links.length; i++)