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

[jalviewjs.git] / site / swingjs / j2s / javax / swing / LayoutComparator.js

diff --git a/site/swingjs/j2s/javax/swing/LayoutComparator.js b/site/swingjs/j2s/javax/swing/LayoutComparator.js
index 32915d8..168d089 100644 (file)
--- a/site/swingjs/j2s/javax/swing/LayoutComparator.js
+++ b/site/swingjs/j2s/javax/swing/LayoutComparator.js
@@ -1,78 +1,78 @@
-Clazz.declarePackage ("javax.swing");\r
-Clazz.load (null, "javax.swing.LayoutComparator", ["java.lang.ClassCastException", "java.util.LinkedList", "java.awt.Window"], function () {\r
-c$ = Clazz.decorateAsClass (function () {\r
-this.horizontal = true;\r
-this.leftToRight = true;\r
-Clazz.instantialize (this, arguments);\r
-}, javax.swing, "LayoutComparator", null, [java.util.Comparator, java.io.Serializable]);\r
-Clazz.defineMethod (c$, "setComponentOrientation", \r
-function (orientation) {\r
-this.horizontal = orientation.isHorizontal ();\r
-this.leftToRight = orientation.isLeftToRight ();\r
-}, "java.awt.ComponentOrientation");\r
-Clazz.overrideMethod (c$, "compare", \r
-function (o1, o2) {\r
-var a = o1;\r
-var b = o2;\r
-if (a === b) {\r
-return 0;\r
-}if (a.getParent () !== b.getParent ()) {\r
-var aAncestory;\r
-var bAncestory;\r
-for (aAncestory =  new java.util.LinkedList (); a != null; a = a.getParent ()) {\r
-aAncestory.add (a);\r
-if (Clazz.instanceOf (a, java.awt.Window)) {\r
-break;\r
-}}\r
-if (a == null) {\r
-throw  new ClassCastException ();\r
-}for (bAncestory =  new java.util.LinkedList (); b != null; b = b.getParent ()) {\r
-bAncestory.add (b);\r
-if (Clazz.instanceOf (b, java.awt.Window)) {\r
-break;\r
-}}\r
-if (b == null) {\r
-throw  new ClassCastException ();\r
-}for (var aIter = aAncestory.listIterator (aAncestory.size ()), bIter = bAncestory.listIterator (bAncestory.size ()); ; ) {\r
-if (aIter.hasPrevious ()) {\r
-a = aIter.previous ();\r
-} else {\r
-return -1;\r
-}if (bIter.hasPrevious ()) {\r
-b = bIter.previous ();\r
-} else {\r
-return 1;\r
-}if (a !== b) {\r
-break;\r
-}}\r
-}var ax = a.getX ();\r
-var ay = a.getY ();\r
-var bx = b.getX ();\r
-var by = b.getY ();\r
-var zOrder = a.getParent ().getComponentZOrder (a) - b.getParent ().getComponentZOrder (b);\r
-if (this.horizontal) {\r
-if (this.leftToRight) {\r
-if (Math.abs (ay - by) < 10) {\r
-return (ax < bx) ? -1 : ((ax > bx) ? 1 : zOrder);\r
-} else {\r
-return (ay < by) ? -1 : 1;\r
-}} else {\r
-if (Math.abs (ay - by) < 10) {\r
-return (ax > bx) ? -1 : ((ax < bx) ? 1 : zOrder);\r
-} else {\r
-return (ay < by) ? -1 : 1;\r
-}}} else {\r
-if (this.leftToRight) {\r
-if (Math.abs (ax - bx) < 10) {\r
-return (ay < by) ? -1 : ((ay > by) ? 1 : zOrder);\r
-} else {\r
-return (ax < bx) ? -1 : 1;\r
-}} else {\r
-if (Math.abs (ax - bx) < 10) {\r
-return (ay < by) ? -1 : ((ay > by) ? 1 : zOrder);\r
-} else {\r
-return (ax > bx) ? -1 : 1;\r
-}}}}, "~O,~O");\r
-Clazz.defineStatics (c$,\r
-"ROW_TOLERANCE", 10);\r
-});\r
+Clazz.declarePackage ("javax.swing");
+Clazz.load (null, "javax.swing.LayoutComparator", ["java.lang.ClassCastException", "java.util.LinkedList", "java.awt.Window"], function () {
+c$ = Clazz.decorateAsClass (function () {
+this.horizontal = true;
+this.leftToRight = true;
+Clazz.instantialize (this, arguments);
+}, javax.swing, "LayoutComparator", null, [java.util.Comparator, java.io.Serializable]);
+Clazz.defineMethod (c$, "setComponentOrientation", 
+function (orientation) {
+this.horizontal = orientation.isHorizontal ();
+this.leftToRight = orientation.isLeftToRight ();
+}, "java.awt.ComponentOrientation");
+Clazz.overrideMethod (c$, "compare", 
+function (o1, o2) {
+var a = o1;
+var b = o2;
+if (a === b) {
+return 0;
+}if (a.getParent () !== b.getParent ()) {
+var aAncestory;
+var bAncestory;
+for (aAncestory =  new java.util.LinkedList (); a != null; a = a.getParent ()) {
+aAncestory.add (a);
+if (Clazz.instanceOf (a, java.awt.Window)) {
+break;
+}}
+if (a == null) {
+throw  new ClassCastException ();
+}for (bAncestory =  new java.util.LinkedList (); b != null; b = b.getParent ()) {
+bAncestory.add (b);
+if (Clazz.instanceOf (b, java.awt.Window)) {
+break;
+}}
+if (b == null) {
+throw  new ClassCastException ();
+}for (var aIter = aAncestory.listIterator (aAncestory.size ()), bIter = bAncestory.listIterator (bAncestory.size ()); ; ) {
+if (aIter.hasPrevious ()) {
+a = aIter.previous ();
+} else {
+return -1;
+}if (bIter.hasPrevious ()) {
+b = bIter.previous ();
+} else {
+return 1;
+}if (a !== b) {
+break;
+}}
+}var ax = a.getX ();
+var ay = a.getY ();
+var bx = b.getX ();
+var by = b.getY ();
+var zOrder = a.getParent ().getComponentZOrder (a) - b.getParent ().getComponentZOrder (b);
+if (this.horizontal) {
+if (this.leftToRight) {
+if (Math.abs (ay - by) < 10) {
+return (ax < bx) ? -1 : ((ax > bx) ? 1 : zOrder);
+} else {
+return (ay < by) ? -1 : 1;
+}} else {
+if (Math.abs (ay - by) < 10) {
+return (ax > bx) ? -1 : ((ax < bx) ? 1 : zOrder);
+} else {
+return (ay < by) ? -1 : 1;
+}}} else {
+if (this.leftToRight) {
+if (Math.abs (ax - bx) < 10) {
+return (ay < by) ? -1 : ((ay > by) ? 1 : zOrder);
+} else {
+return (ax < bx) ? -1 : 1;
+}} else {
+if (Math.abs (ax - bx) < 10) {
+return (ay < by) ? -1 : ((ay > by) ? 1 : zOrder);
+} else {
+return (ax > bx) ? -1 : 1;
+}}}}, "~O,~O");
+Clazz.defineStatics (c$,
+"ROW_TOLERANCE", 10);
+});