X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FSequenceAnnotationReport.java;h=95d0bc6a8b7e463653f7c569a1b1c1fcc42918ca;hb=refs%2Fheads%2Fimprovement%2FJAL-4381_dynamic_value_colouring_of_annotations;hp=721cd4733d72935fd5b7e9b715cc4a7423ac2ccc;hpb=c932f0e85a8852824cdd8ce790af68682732c85c;p=jalview.git diff --git a/src/jalview/io/SequenceAnnotationReport.java b/src/jalview/io/SequenceAnnotationReport.java index 721cd47..95d0bc6 100644 --- a/src/jalview/io/SequenceAnnotationReport.java +++ b/src/jalview/io/SequenceAnnotationReport.java @@ -55,7 +55,7 @@ public class SequenceAnnotationReport private static final int MAX_REFS_PER_SOURCE = 4; - private static final int MAX_SOURCES = 40; + private static final int MAX_SOURCES = 5; private static String linkImageURL; @@ -79,10 +79,19 @@ public class SequenceAnnotationReport { return 1; } + String s1 = ref1.getSource(); String s2 = ref2.getSource(); boolean s1Primary = DBRefSource.isPrimarySource(s1); boolean s2Primary = DBRefSource.isPrimarySource(s2); + if (ref1.isCanonical() && !ref2.isCanonical()) + { + return -1; + } + if (!ref1.isCanonical() && ref2.isCanonical()) + { + return 1; + } if (s1Primary && !s2Primary) { return -1;