X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FAADisorderClient.java;h=fb6ffc412e5400057362cdf841366776ced174d6;hb=3d0101179759ef157b088ea135423cd909512d9f;hp=001f6a88ca2aa2765c3b7d754d9defba80e01a6a;hpb=b0cee3aaf7d8873910939f97b6acb217d518968d;p=jalview.git diff --git a/src/jalview/ws/jws2/AADisorderClient.java b/src/jalview/ws/jws2/AADisorderClient.java index 001f6a8..fb6ffc4 100644 --- a/src/jalview/ws/jws2/AADisorderClient.java +++ b/src/jalview/ws/jws2/AADisorderClient.java @@ -104,8 +104,9 @@ public class AADisorderClient extends JabawsCalcWorker Map fmap; featureMap.put(compbio.ws.client.Services.IUPredWS.toString(), fmap = new HashMap()); - fmap.put("Glob", new String[] { "Globular Domain", - "Predicted globular domain" }); + fmap.put("Glob", + new String[] + { "Globular Domain", "Predicted globular domain" }); featureMap.put(compbio.ws.client.Services.JronnWS.toString(), fmap = new HashMap()); featureMap.put(compbio.ws.client.Services.DisemblWS.toString(), @@ -115,10 +116,12 @@ public class AADisorderClient extends JabawsCalcWorker fmap.put("COILS", new String[] { "COILS", "Random coil" }); featureMap.put(compbio.ws.client.Services.GlobPlotWS.toString(), fmap = new HashMap()); - fmap.put("GlobDoms", new String[] { "Globular Domain", - "Predicted globular domain" }); - fmap.put("Disorder", new String[] { "Protein Disorder", - "Probable unstructured peptide region" }); + fmap.put("GlobDoms", + new String[] + { "Globular Domain", "Predicted globular domain" }); + fmap.put("Disorder", + new String[] + { "Protein Disorder", "Probable unstructured peptide region" }); Map> amap; annotMap = new HashMap>>(); annotMap.put(compbio.ws.client.Services.GlobPlotWS.toString(), @@ -207,9 +210,7 @@ public class AADisorderClient extends JabawsCalcWorker { Cache.log .info("Couldn't recover disorder prediction for sequence " - + seq.getName() - + "(Prediction name was " - + seqId + + seq.getName() + "(Prediction name was " + seqId + ")" + "\nSee http://issues.jalview.org/browse/JAL-1319 for one possible reason why disorder predictions might fail."); } @@ -238,14 +239,14 @@ public class AADisorderClient extends JabawsCalcWorker } if (vals.hasNext()) { - sf = new SequenceFeature(type[0], type[1], - base + rn.from, base + rn.to, val = vals.next() - .floatValue(), methodName); + sf = new SequenceFeature(type[0], type[1], base + rn.from, + base + rn.to, val = vals.next().floatValue(), + methodName); } else { - sf = new SequenceFeature(type[0], type[1], null, base - + rn.from, base + rn.to, methodName); + sf = new SequenceFeature(type[0], type[1], null, + base + rn.from, base + rn.to, methodName); } dseq.addSequenceFeature(sf); if (last != val && !Float.isNaN(last)) @@ -268,13 +269,15 @@ public class AADisorderClient extends JabawsCalcWorker typename = service.serviceType + " (" + scr.getMethod() + ")", calcName = service.getServiceTypeURI() + "/" - + scr.getMethod(), aseq, base + 1, scr); + + scr.getMethod(), + aseq, base + 1, scr); annot.graph = AlignmentAnnotation.LINE_GRAPH; Map styleMap = (annotTypeMap == null) ? null : annotTypeMap.get(scr.getMethod()); - annot.visible = (styleMap == null || styleMap.get(INVISIBLE) == null); + annot.visible = (styleMap == null + || styleMap.get(INVISIBLE) == null); double[] thrsh = (styleMap == null) ? null : (double[]) styleMap.get(THRESHOLD); float[] range = (styleMap == null) ? null @@ -308,8 +311,8 @@ public class AADisorderClient extends JabawsCalcWorker annot.description += "
" + threshNote; } annot.description += ""; - Color col = ColorUtils.createColourFromName(typeName - + scr.getMethod()); + Color col = ColorUtils + .createColourFromName(typeName + scr.getMethod()); for (int p = 0, ps = annot.annotations.length; p < ps; p++) { if (annot.annotations[p] != null)