From: jprocter Date: Thu, 10 May 2012 15:04:35 +0000 (+0100) Subject: formatting X-Git-Tag: Jalview_2_9~532^2~13 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d8fc47d6101df1c71674b2635bb2cadc11a7136c;p=jalview.git formatting --- diff --git a/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java b/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java index 3883245..4a7b4bd 100644 --- a/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java +++ b/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java @@ -122,7 +122,6 @@ public class DasSequenceSource extends DbSourceProxyImpl implements return coordsys.getVersion(); } - public AlignmentI getSequenceRecords(String queries) throws Exception { StringTokenizer st = new StringTokenizer(queries, "\t"); @@ -211,7 +210,7 @@ public class DasSequenceSource extends DbSourceProxyImpl implements } else { - Vector seqs=null; + Vector seqs = null; for (Map.Entry, DasSequenceAdapter>> resset : resultset .entrySet()) { @@ -241,14 +240,15 @@ public class DasSequenceSource extends DbSourceProxyImpl implements + lbl + ") from " + resset.getKey() - + " (source is " - + getDbName()); + + " (source is " + getDbName()); continue; } } seqs = new java.util.Vector(); - // JDAS returns a sequence complete with any newlines and spaces in the XML - Sequence sq = new Sequence(lbl, e.getContent().replaceAll("\\s+", "")); + // JDAS returns a sequence complete with any newlines and spaces + // in the XML + Sequence sq = new Sequence(lbl, e.getContent().replaceAll( + "\\s+", "")); sq.addDBRef(new DBRefEntry(getDbSource(), getDbVersion() + ":" + e.getVersion(), lbl)); seqs.addElement(sq); @@ -269,12 +269,15 @@ public class DasSequenceSource extends DbSourceProxyImpl implements { java.util.Vector srcs = new java.util.Vector(); srcs.addElement(jsrc); - try { + try + { new jalview.ws.DasSequenceFeatureFetcher(sqs, null, srcs, false, - false); + false); } catch (Exception x) { - Cache.log.error("Couldn't retrieve features for sequence from its source.",x); + Cache.log + .error("Couldn't retrieve features for sequence from its source.", + x); } }