Merging /trunk to [214]

jossonsmith · jossonsmith · commit 6506b5ad78fe · 2006-07-26T13:55:56.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -308,21 +308,55 @@ public boolean visit(CastExpression node) {
 		 * TODO: some casting should have its meaning!
 		 */
 		if (type.isPrimitiveType()) {
+			ITypeBinding resolveTypeBinding = node.getExpression().resolveTypeBinding();
+			String name = resolveTypeBinding.getName();
 			PrimitiveType pType = (PrimitiveType) type;
 			if (pType.getPrimitiveTypeCode() == PrimitiveType.INT
 					|| pType.getPrimitiveTypeCode() == PrimitiveType.BYTE
 					|| pType.getPrimitiveTypeCode() == PrimitiveType.SHORT
 					|| pType.getPrimitiveTypeCode() == PrimitiveType.LONG) {
-				buffer.append("parseInt (");
-				node.getExpression().accept(this);
-				buffer.append (")");
-				return false;
+				if ("char".equals(name)) {
+					buffer.append("(");
+					node.getExpression().accept(this);
+					buffer.append (").charCodeAt (0)");
+					return false;
+				} else if ("float".equals(name) || "double".equals(name)) {
+					// TODO:
+					buffer.append("Math.round (");
+					node.getExpression().accept(this);
+					buffer.append (")");
+//				} else if ("int".equals(name) || "byte".equals(name)
+//						|| "double".equals(name) || "float".equals(name)
+//						|| "short".equals(name) || "long".equals(name)) {
+					
+				}
+//				buffer.append("parseInt (");
+//				node.getExpression().accept(this);
+//				buffer.append (")");
+//				return false;
 			}
 			if (pType.getPrimitiveTypeCode() == PrimitiveType.CHAR) {
-				buffer.append("String.fromCharCode (");
-				node.getExpression().accept(this);
-				buffer.append (")");
-				return false;
+				if ("char".equals(name)) {
+//					buffer.append("(");
+//					node.getExpression().accept(this);
+//					buffer.append (").charCodeAt (0)");
+//					return false;
+				} else if ("float".equals(name) || "double".equals(name)) {
+					// TODO:
+					buffer.append("String.fromCharCode (");
+					buffer.append("Math.round (");
+					node.getExpression().accept(this);
+					buffer.append (")");
+					buffer.append (")");
+					return false;
+				} else if ("int".equals(name) || "byte".equals(name)
+						|| "double".equals(name) || "float".equals(name)
+						|| "short".equals(name) || "long".equals(name)) {
+					buffer.append("String.fromCharCode (");
+					node.getExpression().accept(this);
+					buffer.append (")");
+					return false;
+				}
 			}
 		}
 		node.getExpression().accept(this);
diff --git a/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -43,6 +43,7 @@
 import org.eclipse.jdt.core.dom.TextElement;
 import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.dom.TypeLiteral;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 
 /**
@@ -414,6 +415,30 @@ protected void readClasses(TagElement tagEl, Set set) {
 			}
 		}
 	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.TypeLiteral)
+	 */
+	public boolean visit(TypeLiteral node) {
+		ITypeBinding resolveTypeBinding = node.getType().resolveBinding();
+		ITypeBinding declaringClass = resolveTypeBinding.getDeclaringClass();
+		QNTypeBinding qn = new QNTypeBinding();
+		String qualifiedName = null;
+		if (declaringClass != null) {
+			qualifiedName = declaringClass.getQualifiedName();
+			qn.binding = declaringClass;
+		} else {
+			qualifiedName = resolveTypeBinding.getQualifiedName();
+			qn.binding = resolveTypeBinding;
+		}
+		qualifiedName = JavaLangUtil.ripGeneric(qualifiedName);
+		qn.qualifiedName = qualifiedName;
+		if (isQualifiedNameOK(qualifiedName, node) 
+				&& !musts.contains(qn)
+				&& !requires.contains(qn)) {
+			optionals.add(qn);
+		}
+		return false;
+	}
 	/*
 	 * (non-Javadoc)
 	 * 
diff --git a/src/net/sf/j2s/core/astvisitors/JavaLangUtil.java b/src/net/sf/j2s/core/astvisitors/JavaLangUtil.java
@@ -24,7 +24,12 @@ public static String ripJavaLang(String name) {
 						|| ((ch = name.charAt(index + 10)) >= 'A' && ch <= 'Z'))) {
 //				((idx2 = name.indexOf('.', index + 10)) == -1 
 //						|| !name.substring(index + 10, idx2).startsWith ("ref"))) {
-			name = name.substring(10);
+			if (name.indexOf ("Error") != -1 || name.indexOf("Exception") != -1
+					|| name.indexOf("ThreadDeath") != -1) {
+				
+			} else {
+				name = name.substring(10);
+			}
 		}
 		String swt = "org.eclipse.swt.SWT";
 		index = name.indexOf(swt);
