Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git

[jalviewjs.git] / site / j2s / jalview / analysis / CodonComparator.js

diff --git a/site/j2s/jalview/analysis/CodonComparator.js b/site/j2s/jalview/analysis/CodonComparator.js
index 7c07b92..afa4c8d 100644 (file)
--- a/site/j2s/jalview/analysis/CodonComparator.js
+++ b/site/j2s/jalview/analysis/CodonComparator.js
@@ -1,21 +1,21 @@
-Clazz.declarePackage ("jalview.analysis");\r
-c$ = Clazz.declareType (jalview.analysis, "CodonComparator", null, java.util.Comparator);\r
-Clazz.overrideMethod (c$, "compare", \r
-function (ac1, ac2) {\r
-if (ac1 == null || ac2 == null || ac1.equals (ac2)) {\r
-return 0;\r
-}if (ac1.pos1 < ac2.pos1 && ac1.pos3 <= ac2.pos3) {\r
-return -1;\r
-}if (ac2.pos1 < ac1.pos1 && ac2.pos3 <= ac1.pos3) {\r
-return 1;\r
-}if (ac1.pos3 > ac2.pos3 && ac1.pos1 >= ac2.pos1) {\r
-return 1;\r
-}if (ac2.pos3 > ac1.pos3 && ac2.pos1 >= ac1.pos1) {\r
-return -1;\r
-}if (ac1.pos1 == ac2.pos1 && ac1.pos3 == ac2.pos3) {\r
-return Integer.compare (ac1.pos2, ac2.pos2);\r
-}var compareMiddles = Integer.compare (ac1.pos2, ac2.pos2);\r
-if (compareMiddles != 0) {\r
-return compareMiddles;\r
-}return Integer.compare (ac1.pos1, ac2.pos1);\r
-}, "jalview.datamodel.AlignedCodon,jalview.datamodel.AlignedCodon");\r
+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");