Class.getFields() broken; not giving static fields

hansonr · hansonr · commit 68a2dd38616f · 2019-10-18T22:23:15.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Class.java b/sources/net.sf.j2s.java.core/src/java/lang/Class.java
@@ -1565,11 +1565,10 @@ public Field[] getFields() throws SecurityException {
 		if (fields != null)
 			return fields;
 	    fields = new Field[0];
-		int _static = Modifier.STATIC;
-		Object cl = /** @j2sNative this.$clazz$ || */null;
+	    Object cl = /** @j2sNative this.$clazz$ || */null;
 		Object proto = /** @j2sNative cl.prototype || */null;
 		addFields(proto, this.fields, 0);
-		addFields(cl, this.fields, _static);
+		addFields(cl, this.fields, Modifier.STATIC);
 		return fields;
 	}
 
@@ -1741,12 +1740,12 @@ private void addFields(Object c, Field[] f, int modifiers) {
 		 * @j2sNative
 		 * 
 		 * 			for (m in c) { 
-		 *            if (!modifiers && this.$clazz$[m])
+		 *            if (!!modifiers != !!this.$clazz$[m])
 		 *              continue; 
 		 *            if (this.excludeField$S(m)) continue; 
 		 *            var o = c[m]; 
 		 *            switch (typeof o) {
-		 *             case "object": if (o && o.__CLASS_NAME__) continue; 
+		 *             case "object": if (o && !o.__CLASS_NAME__) continue; 
 		 *             case "number": case "boolean": case "string":
 		 */
 		 
@@ -1762,7 +1761,13 @@ private void addFields(Object c, Field[] f, int modifiers) {
 	}
 
 	boolean excludeField(String name) { 
-		return (name == "prototype" || name.startsWith("__"));
+		return (name == "prototype" 
+				|| name.startsWith("__") 
+				|| name == "$isInterface" 
+				|| name == "$isEnum" 
+				|| name == "implementz"
+				|| name == "$init$"
+				|| name == "$init0$");
 	} 
 
 	private void addField(Field[] fields, String m, int modifiers) {
