X-Git-Url: http://source.jalview.org/gitweb/?p=jalviewjs.git;a=blobdiff_plain;f=site%2Fj2s%2Fjalview%2Fanalysis%2FCodonComparator.js;h=afa4c8d62b018c21a9be0deaffe9241f48c61795;hp=7c07b9206a82d9164d73ba6007448c904db0d399;hb=b9b7a352eee79b7764c3b09c9d19663075061d8c;hpb=8ffd05b3abe52c0b6b79b011c0966361f82d5fe6 diff --git a/site/j2s/jalview/analysis/CodonComparator.js b/site/j2s/jalview/analysis/CodonComparator.js index 7c07b92..afa4c8d 100644 --- a/site/j2s/jalview/analysis/CodonComparator.js +++ b/site/j2s/jalview/analysis/CodonComparator.js @@ -1,21 +1,21 @@ -Clazz.declarePackage ("jalview.analysis"); -c$ = Clazz.declareType (jalview.analysis, "CodonComparator", null, java.util.Comparator); -Clazz.overrideMethod (c$, "compare", -function (ac1, ac2) { -if (ac1 == null || ac2 == null || ac1.equals (ac2)) { -return 0; -}if (ac1.pos1 < ac2.pos1 && ac1.pos3 <= ac2.pos3) { -return -1; -}if (ac2.pos1 < ac1.pos1 && ac2.pos3 <= ac1.pos3) { -return 1; -}if (ac1.pos3 > ac2.pos3 && ac1.pos1 >= ac2.pos1) { -return 1; -}if (ac2.pos3 > ac1.pos3 && ac2.pos1 >= ac1.pos1) { -return -1; -}if (ac1.pos1 == ac2.pos1 && ac1.pos3 == ac2.pos3) { -return Integer.compare (ac1.pos2, ac2.pos2); -}var compareMiddles = Integer.compare (ac1.pos2, ac2.pos2); -if (compareMiddles != 0) { -return compareMiddles; -}return Integer.compare (ac1.pos1, ac2.pos1); -}, "jalview.datamodel.AlignedCodon,jalview.datamodel.AlignedCodon"); +Clazz.declarePackage ("jalview.analysis"); +c$ = Clazz.declareType (jalview.analysis, "CodonComparator", null, java.util.Comparator); +Clazz.overrideMethod (c$, "compare", +function (ac1, ac2) { +if (ac1 == null || ac2 == null || ac1.equals (ac2)) { +return 0; +}if (ac1.pos1 < ac2.pos1 && ac1.pos3 <= ac2.pos3) { +return -1; +}if (ac2.pos1 < ac1.pos1 && ac2.pos3 <= ac1.pos3) { +return 1; +}if (ac1.pos3 > ac2.pos3 && ac1.pos1 >= ac2.pos1) { +return 1; +}if (ac2.pos3 > ac1.pos3 && ac2.pos1 >= ac1.pos1) { +return -1; +}if (ac1.pos1 == ac2.pos1 && ac1.pos3 == ac2.pos3) { +return Integer.compare (ac1.pos2, ac2.pos2); +}var compareMiddles = Integer.compare (ac1.pos2, ac2.pos2); +if (compareMiddles != 0) { +return compareMiddles; +}return Integer.compare (ac1.pos1, ac2.pos1); +}, "jalview.datamodel.AlignedCodon,jalview.datamodel.AlignedCodon");