formatting
authorjprocter <jprocter@compbio.dundee.ac.uk>
Thu, 10 May 2012 15:04:35 +0000 (16:04 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Thu, 10 May 2012 15:04:35 +0000 (16:04 +0100)
src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java

index 3883245..4a7b4bd 100644 (file)
@@ -122,7 +122,6 @@ public class DasSequenceSource extends DbSourceProxyImpl implements
     return coordsys.getVersion();\r
   }\r
 \r
-\r
   public AlignmentI getSequenceRecords(String queries) throws Exception\r
   {\r
     StringTokenizer st = new StringTokenizer(queries, "\t");\r
@@ -211,7 +210,7 @@ public class DasSequenceSource extends DbSourceProxyImpl implements
     }\r
     else\r
     {\r
-      Vector<SequenceI> seqs=null;\r
+      Vector<SequenceI> seqs = null;\r
       for (Map.Entry<String, Map<List<String>, DasSequenceAdapter>> resset : resultset\r
               .entrySet())\r
       {\r
@@ -241,14 +240,15 @@ public class DasSequenceSource extends DbSourceProxyImpl implements
                                   + lbl\r
                                   + ") from "\r
                                   + resset.getKey()\r
-                                  + " (source is "\r
-                                  + getDbName());\r
+                                  + " (source is " + getDbName());\r
                   continue;\r
                 }\r
               }\r
               seqs = new java.util.Vector<SequenceI>();\r
-              // JDAS returns a sequence complete with any newlines and spaces in the XML\r
-              Sequence sq = new Sequence(lbl, e.getContent().replaceAll("\\s+", ""));\r
+              // JDAS returns a sequence complete with any newlines and spaces\r
+              // in the XML\r
+              Sequence sq = new Sequence(lbl, e.getContent().replaceAll(\r
+                      "\\s+", ""));\r
               sq.addDBRef(new DBRefEntry(getDbSource(), getDbVersion()\r
                       + ":" + e.getVersion(), lbl));\r
               seqs.addElement(sq);\r
@@ -269,12 +269,15 @@ public class DasSequenceSource extends DbSourceProxyImpl implements
       {\r
         java.util.Vector<jalviewSourceI> srcs = new java.util.Vector<jalviewSourceI>();\r
         srcs.addElement(jsrc);\r
-        try {\r
+        try\r
+        {\r
           new jalview.ws.DasSequenceFeatureFetcher(sqs, null, srcs, false,\r
-                false);\r
+                  false);\r
         } catch (Exception x)\r
         {\r
-          Cache.log.error("Couldn't retrieve features for sequence from its source.",x);\r
+          Cache.log\r
+                  .error("Couldn't retrieve features for sequence from its source.",\r
+                          x);\r
         }\r
       }\r
 \r