java2script
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java‎
Lines changed: 9 additions & 10 deletions b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java‎
Lines changed: 9 additions & 10 deletions
diff --git a/‎sources/net.sf.j2s.core/test/dev/js/j2sApplet.js‎
Lines changed: 3 additions & 3 deletions b/‎sources/net.sf.j2s.core/test/dev/js/j2sApplet.js‎
Lines changed: 3 additions & 3 deletions
@@ -1284,8 +1284,6 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 			trailingBuffer = new TrailingBuffer();
 		}
 
-		boolean hasSuperclass = hasSuperClass(binding);
-
 		for (Iterator<?> iter = bodyDeclarations.iterator(); iter.hasNext();) {
 			BodyDeclaration element = (BodyDeclaration) iter.next();
 			boolean isField = element instanceof FieldDeclaration;
@@ -1301,8 +1299,9 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 			if (isField || element instanceof Initializer) {
 				if ((isInterface || isStatic(element)) && !checkj2sIgnore(element)) {
 					lstStatic.add(element);
-					if (isField && hasSuperclass)
+					if (isField)
 						addFieldDeclaration((FieldDeclaration) element, FIELD_DECL_STATIC_DEFAULTS);
+						
 				}
 			} else if (!havePrivateMethods && element instanceof MethodDeclaration) {
 				if (Modifier.isPrivate(((MethodDeclaration) element).resolveBinding().getModifiers())) {
@@ -1313,18 +1312,17 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 		}
 		if (lstStatic.size() > 0 || hasDependents) {
 			pt = buffer.length();
-			buffer.append("\r\nC$.$clinit$ = function() {Clazz.load(C$, 1);\r\n");
 			boolean haveDeclarations = false;
+			buffer.append("\r\nC$.$clinit$ = function() {Clazz.load(C$, 1);\r\n");
 			for (int i = lstStatic.size(); --i >= 0;) {
 				BodyDeclaration element = lstStatic.remove(0);
 				if (element instanceof Initializer) {
 					element.accept(this);
 					buffer.append(";\r\n");
 					haveDeclarations = true;
-					continue;
-				}
-				if (addFieldDeclaration((FieldDeclaration) element, FIELD_DECL_STATIC_NONDEFAULT))
+				} else if (addFieldDeclaration((FieldDeclaration) element, FIELD_DECL_STATIC_NONDEFAULT)) {
 					haveDeclarations = true;
+				}
 			}
 			if (haveDeclarations || hasDependents)
 				buffer.append("}\r\n");
@@ -1542,18 +1540,19 @@ private boolean addFieldDeclaration(FieldDeclaration field, int mode) {
 		for (Iterator<?> iter = fragments.iterator(); iter.hasNext();) {
 			VariableDeclarationFragment fragment = (VariableDeclarationFragment) iter.next();
 			Expression initializer = fragment.getInitializer();
-			if (isFinal &&  VariableAdapter.getConstantValue(initializer) != null)
+			if (isFinal ? VariableAdapter.getConstantValue(initializer) != null
+					: isStatic && initializer == null && !needDefault)
 				continue;
 			int len = buffer.length();
 			String prefix = (isStatic ? "C$." : "this.")
 					+ getCheckedFieldName(J2SMapAdapter.getJ2SName(fragment.getName()), classBinding, false);
 			buffer.append(prefix);
 			buffer.append(" = ");
 			int len1 = buffer.length();
+			
 			if (initializer == null || needDefault) {
 				// Route default for this to the $init0$ buffer if nonstatic, or straight to the class if static
-				// if static and not initialized or nonstatic and there is a
-				// superclass
+				// if static and not initialized
 
 				buffer.append(code == null ? "null" : getPrimitiveDefault(code));
 				buffer.append(";\r\n");
 
@@ -781,7 +781,7 @@ J2S._getDefaultLanguage = function(isAll) { return (isAll ? J2S.featureDetection
 		return data.getBytes();
 	// ArrayBuffer assumed here
 	data = new Uint8Array(data);
-  var b = (Clazz.newArray$ ? Clazz.newArray$(Byte.TYPE, data.length) : Clazz.newByteArray(data.length, 0));
+  var b = Clazz.array(Byte.TYPE, data.length);
 	for (var i = data.length; --i >= 0;)
 		b[i] = data[i];
 	return b;
@@ -898,7 +898,7 @@ J2S._getDefaultLanguage = function(isAll) { return (isAll ? J2S.featureDetection
       return Clazz.load("javajs.util.Base64").decodeBase64$S(s.substring(8));
     }
     // not UTF-8
-		var b = (Clazz.newArray$ ? Clazz.newArray$(Byte.TYPE, s.length) : Clazz.newByteArray(s.length, 0));
+		var b = Clazz.array(Byte.TYPE, s.length);
 		for (var i = s.length; --i >= 0;)
 			b[i] = s.charCodeAt(i) & 0xFF;
 		return b;
@@ -1995,7 +1995,7 @@ J2S.Cache.put = function(filename, data) {
 		// false is from Repaintmanager.requestRepaintAndWait()
 		// called from apiPlatform Display.repaint()
 
-		//alert("_repaint " + Clazz.getStackTrace())
+		//alert("_repaint " + Clazz._getStackTrace())
 		if (!applet || !applet._appletPanel)return;
 
 		// asNewThread = false;