Correct citation

[jalview.git] / src / jalview / gui / SequenceFetcher.java

diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java
index e2b5730..f973fbb 100755 (executable)
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@ -119,8 +119,8 @@ public class SequenceFetcher
                                               new Insets(0, 4, 0, 0), 1, 0));\r
     this.add(textfield, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0\r
                                                , GridBagConstraints.CENTER,\r
-                                               GridBagConstraints.HORIZONTAL,\r
-                                               new Insets(0, 0, 0, 6), 200, 1));\r
+                                               GridBagConstraints.NONE,\r
+                                               new Insets(0, 0, 0, 6), 211, 1));\r
   }\r
 \r
   JComboBox database = new JComboBox();\r
@@ -183,16 +183,26 @@ public class SequenceFetcher
     else if (database.getSelectedItem().equals("EMBL")\r
              || database.getSelectedItem().equals("EMBLCDS"))\r
     {\r
-      EBIFetchClient dbFetch = new EBIFetchClient();\r
-      String[] reply = dbFetch.fetchData(\r
-          database.getSelectedItem().toString().toLowerCase(\r
-          ) + ":" + textfield.getText(),\r
-          "fasta", "raw");\r
+      StringTokenizer st = new StringTokenizer(textfield.getText(), ";");\r
+      while(st.hasMoreTokens())\r
+      {\r
+        EBIFetchClient dbFetch = new EBIFetchClient();\r
+\r
+        String[] reply = dbFetch.fetchData(\r
+            database.getSelectedItem().toString().toLowerCase(\r
+            ) + ":" + st.nextToken(),\r
+            "fasta", "raw");\r
+//\r
+        if (reply != null)\r
+        {\r
+          for (int i = 0; i < reply.length; i++)\r
+            result.append(reply[i] + "\n");\r
+        }\r
+      }\r
 \r
-      if(reply!=null)\r
+      if(result!=null)\r
       {\r
-        for (int i = 0; i < reply.length; i++)\r
-          result.append(reply[i] + "\n");\r
+        System.out.println(result.toString());\r
 \r
         parseResult(result.toString(), null);\r
       }\r
@@ -239,7 +249,7 @@ public class SequenceFetcher
   {\r
     EBIFetchClient ebi = new EBIFetchClient();\r
     File file = ebi.fetchDataAsFile("uniprot:" + id, "xml", null);\r
-   // File file = new File("H:/jalview/classes/fer1.xml");\r
+\r
     SequenceFeatureFetcher sff = new SequenceFeatureFetcher();\r
     Vector entries = sff.getUniprotEntries(file);\r
 \r