Put DBRefFether in a new thread
authoramwaterhouse <Andrew Waterhouse>
Fri, 21 Jul 2006 13:20:53 +0000 (13:20 +0000)
committeramwaterhouse <Andrew Waterhouse>
Fri, 21 Jul 2006 13:20:53 +0000 (13:20 +0000)
src/jalview/io/DasSequenceFeatureFetcher.java

index 1e07c49..f8bd7e0 100755 (executable)
@@ -83,7 +83,6 @@ public class DasSequenceFeatureFetcher implements Runnable
       DasCoordinateSystem[] coords = source.getCoordinateSystem();\r
       for (int c = 0; c < coords.length; c++)\r
       {\r
-        System.out.println(coords[c].getName());\r
         if (coords[c].getName().indexOf("UniProt")>-1)\r
         {\r
           uniprotCount++;\r
@@ -100,12 +99,9 @@ public class DasSequenceFeatureFetcher implements Runnable
       {\r
         for(int j=0; j<dbref.length; j++)\r
         {\r
-          System.out.println(dbref[j].getSource()\r
-                             +" "+jalview.datamodel.DBRefSource.UNIPROT);\r
           if(dbref[j].getSource()\r
              .equals(jalview.datamodel.DBRefSource.UNIPROT))\r
           {\r
-            System.out.println("got a match");\r
             refCount++;\r
             break;\r
           }\r
@@ -113,7 +109,6 @@ public class DasSequenceFeatureFetcher implements Runnable
       }\r
     }\r
 \r
-   System.out.println(refCount+" "+uniprotCount+" "+sequences.length);\r
     if(refCount<sequences.length && uniprotCount>0)\r
     {\r
 \r
@@ -126,21 +121,38 @@ public class DasSequenceFeatureFetcher implements Runnable
 \r
      if(reply == JOptionPane.YES_OPTION)\r
      {\r
-       new DBRefFetcher(\r
-             af.getViewport().getAlignment(), af).fetchDBRefs(true);\r
-\r
+       Thread thread = new Thread(new FetchDBRefs());\r
+       thread.start();\r
      }\r
+     else\r
+      startFetching();\r
     }\r
+    else\r
+      startFetching();\r
 \r
-   System.out.println("User selection is "\r
-                      +\r
+  /* System.out.println("User selection is "   +\r
                        ( ( (float) uniprotCount / (float) selectedSources.size()) * 100)\r
                       + " % Uniprot,  and "+refCount+" / " +sequences.length+" have uniprot accession");\r
+*/\r
+  }\r
 \r
-\r
+  void startFetching()\r
+  {\r
     Thread thread = new Thread(this);\r
     thread.start();\r
   }\r
+\r
+  class FetchDBRefs implements Runnable\r
+  {\r
+    public void run()\r
+    {\r
+      new DBRefFetcher(\r
+             af.getViewport().getAlignment(), af).fetchDBRefs(true);\r
+      startFetching();\r
+    }\r
+  }\r
+\r
+\r
   /**\r
    * creates a jalview sequence feature from a das feature document\r
    * @param dasfeature\r