java2script
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java‎
Lines changed: 2 additions & 0 deletions b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java‎
Lines changed: 5 additions & 15 deletions b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java‎
Lines changed: 5 additions & 15 deletions
diff --git a/‎sources/net.sf.j2s.core/test/dev/js/j2sApplet.js‎
Lines changed: 7 additions & 1 deletion b/‎sources/net.sf.j2s.core/test/dev/js/j2sApplet.js‎
Lines changed: 7 additions & 1 deletion
@@ -198,6 +198,7 @@ public boolean visit(ArrayCreation node) {
 		ITypeBinding binding = node.resolveTypeBinding();
 		if (inode == null) {
 			buffer.append(ASTScriptVisitor.j2sGetArrayClass(binding, 0));
+			buffer.append(", [");
 			List<ASTNode> dim = node.dimensions();
 			visitList(dim, ", ");
 			for (int i = binding.getDimensions() - dim.size(); --i >= 0;)
@@ -214,6 +215,7 @@ public boolean visit(ArrayInitializer node) {
 		//ITypeBinding binding = node.resolveTypeBinding();
 		//int n = binding.getDimensions();
 		buffer.append(ASTScriptVisitor.j2sGetArrayClass(node.resolveTypeBinding(), -1));
+		buffer.append(", [");
 		@SuppressWarnings("unchecked")
 		List<ASTNode> expressions = node.expressions();
 		visitList(expressions, ", ");
 
@@ -2419,23 +2419,14 @@ public boolean visit(TypeLiteral node) {
 		Type type = node.getType();
 		ITypeBinding binding = type.resolveBinding();
 		if (type.isPrimitiveType()) {
-			String name = binding.getName();
 			// adds Integer.TYPE, Float.TYPE, etc.
-			buffer.append(getPrimitiveTYPE(name));
-			return false;
+			buffer.append(getPrimitiveTYPE(binding.getName()));
 		} else if (type instanceof ArrayType) {
 			buffer.append(j2sGetArrayClass(binding, 1));
-			return false;
 		} else {
-			String name = binding.getName();
-			if ("Object".equals(name) || "java.lang.Object".equals(name)) {
-				buffer.append("Clazz._O"); // BH was JavaObject, but that
-											// introduces a new top-level
-											// JavaScript object
-				return false;
-			}
+			// BH we are creating a new Class object around this class
+			buffer.append("Clazz.$newClass(" + Bindings.removeBrackets(binding.getQualifiedName()) + ")");
 		}
-		type.accept(this);
 		return false;
 	}
 
@@ -2615,16 +2606,15 @@ private void addCallInit() {
 	 * faux class with the correct _paramType and __NDIM
 	 *
 	 * @param type
-	 * @param dimFlag  -1 : initialized depth; n > 0 uninitialized depth; 0: not necessary 
-	 * 
+	 * @param dimFlag  -1 : initialized depth; n > 0 uninitialized depth as Clazz.arrayClass$; 0: not necessary 
 	 * @return JavaScript for array creation
 	 */
     static String j2sGetArrayClass(ITypeBinding type, int dimFlag) {
     	ITypeBinding ebinding = type.getElementType();
     	String params = (ebinding.isPrimitive() ? getPrimitiveTYPE(ebinding.getName()) : Bindings.removeBrackets(ebinding.getQualifiedName())) 
     			+ (dimFlag == 0 ? "" : ", " + dimFlag * type.getDimensions());
 		return (dimFlag > 0 ? "Clazz.arrayClass$(" + params + ")" 
-				: " Clazz.newArray$(" + params + ", [");
+				: " Clazz.newArray$(" + params);
 	}
 
 	private static boolean isStatic(int modifiers) {
 
@@ -1916,7 +1916,13 @@ J2S.Cache.put = function(filename, data) {
 			J2S._registerApplet(applet._id, applet);
 			try {
         if (applet.__Info.main) {
-          Clazz._4Name(applet.__Info.main).main([]);
+          try{
+            var cl = Clazz._4Name(applet.__Info.main);
+          }catch(e) {
+            alert ("Java class " +  applet.__Info.main + " was not found.");
+            return;
+          }
+          cl.$clazz$.main([]);
         } else {
   				applet._newApplet(viewerOptions);
         }