X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAnnotationFile.java;h=86b4402b0b8bf9a7958b96773fd15658413e7b62;hb=121a4b153bdd56b15ff2c528e6b84219affc09d5;hp=885a298fe5da12589c175c80d5b9503e00b55de4;hpb=2a66892874abea357a5e5d9ef2f69919453c31d0;p=jalview.git diff --git a/src/jalview/io/AnnotationFile.java b/src/jalview/io/AnnotationFile.java index 885a298..86b4402 100755 --- a/src/jalview/io/AnnotationFile.java +++ b/src/jalview/io/AnnotationFile.java @@ -274,7 +274,7 @@ public class AnnotationFile if (row.graphGroup > -1) { graphGroupSeen.set(row.graphGroup); - Integer key = new Integer(row.graphGroup); + Integer key = Integer.valueOf(row.graphGroup); if (graphGroup.containsKey(key)) { graphGroup.put(key, graphGroup.get(key) + "\t" + row.label); @@ -762,7 +762,7 @@ public class AnnotationFile autoAnnotsKey(aa[aai], aa[aai].sequenceRef, (aa[aai].groupRef == null ? null : aa[aai].groupRef.getName())), - new Integer(1)); + Integer.valueOf(1)); } } } @@ -968,7 +968,7 @@ public class AnnotationFile else { // consider deferring this till after the file has been parsed ? - hidden.hideInsertionsFor(sr.getInsertions()); + hidden.hideList(sr.getInsertions()); } } modified = true; @@ -1271,7 +1271,7 @@ public class AnnotationFile { displayChar = token; // foo - value = new Float(token).floatValue(); + value = Float.valueOf(token).floatValue(); parsedValue = true; continue; } catch (NumberFormatException ex) @@ -1617,8 +1617,10 @@ public class AnnotationFile } else if (key.equalsIgnoreCase("colour")) { + // TODO need to notify colourscheme of view reference once it is + // available sg.cs.setColourScheme( - ColourSchemeProperty.getColourScheme(al, value)); + ColourSchemeProperty.getColourScheme(null, al, value)); } else if (key.equalsIgnoreCase("pidThreshold")) {