implements order for interface with $defaults$

hansonr · hansonr · commit 54e9d47b8a84 · 2021-02-13T11:00:15.000-06:00
interprets Java spec "one of" interfaces with competing default method
as "first listed after "implements"
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -7,6 +7,7 @@
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
+// BH 2021.02.12 implements better(?) interface defaults resolution -- in order of presentation
 // BH 2020.12.31 3.3.1-v1 full 64-bit long support; BigDecimal, BigInteger fully 64-bit
 
 // BH 2020.12.19 3.2.10-v1 preliminary work aiming to back long with [r,m,s].
@@ -1699,14 +1700,14 @@ var copyStatics = function(clazzFrom, clazzThis, isInterface) {
     }
   }
   if (isInterface) {
+	clazzThis.$defaults$ && clazzThis.$defaults$(clazzThis);
 	for (var o in clazzFrom.prototype) {
 	if (clazzThis.prototype[o] == undefined && !excludeSuper(o)) {
 	clazzThis.prototype[o] = clazzFrom.prototype[o];
 	}
 	}
 	if (clazzFrom.$defaults$) {
 		__allowOverwriteClass = false;
-		clazzThis.$defaults$ && clazzThis.$defaults$(clazzThis);
 		clazzFrom.$defaults$(clazzThis);
 		__allowOverwriteClass = true;
 	}
@@ -2063,7 +2064,7 @@ var setSuperclass = function(clazzThis, clazzSuper){
  */
 var addInterface = function (clazzThis, interfacez) {
   if (interfacez instanceof Array) {
-    for (var i = interfacez.length; --i >= 0;) {
+    for (var i = 0, n = interfacez.length; i < n; i++) {
       var iface = interfacez[i];
       if (iface instanceof Array) {
         var cl;

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`// Google closure compiler cannot handle Clazz.new or Clazz.super`
`9`	`9`
	`10`	`+// BH 2021.02.12 implements better(?) interface defaults resolution -- in order of presentation`
`10`	`11`	`// BH 2020.12.31 3.3.1-v1 full 64-bit long support; BigDecimal, BigInteger fully 64-bit`
`11`	`12`
`12`	`13`	`// BH 2020.12.19 3.2.10-v1 preliminary work aiming to back long with [r,m,s].`
`@@ -1699,14 +1700,14 @@ var copyStatics = function(clazzFrom, clazzThis, isInterface) {`
`1699`	`1700`	`}`
`1700`	`1701`	`}`
`1701`	`1702`	`if (isInterface) {`
	`1703`	`+ clazzThis.$defaults$ && clazzThis.$defaults$(clazzThis);`
`1702`	`1704`	`for (var o in clazzFrom.prototype) {`
`1703`	`1705`	`if (clazzThis.prototype[o] == undefined && !excludeSuper(o)) {`
`1704`	`1706`	`clazzThis.prototype[o] = clazzFrom.prototype[o];`
`1705`	`1707`	`}`
`1706`	`1708`	`}`
`1707`	`1709`	`if (clazzFrom.$defaults$) {`
`1708`	`1710`	`__allowOverwriteClass = false;`
`1709`		`- clazzThis.$defaults$ && clazzThis.$defaults$(clazzThis);`
`1710`	`1711`	`clazzFrom.$defaults$(clazzThis);`
`1711`	`1712`	`__allowOverwriteClass = true;`
`1712`	`1713`	`}`
`@@ -2063,7 +2064,7 @@ var setSuperclass = function(clazzThis, clazzSuper){`
`2063`	`2064`	`*/`
`2064`	`2065`	`var addInterface = function (clazzThis, interfacez) {`
`2065`	`2066`	`if (interfacez instanceof Array) {`
`2066`		`- for (var i = interfacez.length; --i >= 0;) {`
	`2067`	`+ for (var i = 0, n = interfacez.length; i < n; i++) {`
`2067`	`2068`	`var iface = interfacez[i];`
`2068`	`2069`	`if (iface instanceof Array) {`
`2069`	`2070`	`var cl;`