Fixed bug#1844475 List.iterator does not return a valid iterator.

zhourenjian · zhourenjian · commit d1d8191e21af · 2007-12-12T17:14:19.000Z
Compiler trying to remove brackets results in incorrect qualified name. For example:
java.util.AbstractList&lt;E&gt;.SimpleListIterator results in java.util.AbstractList, which is wrong.
diff --git a/src/net/sf/j2s/core/astvisitors/ASTTypeVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTTypeVisitor.java
@@ -70,11 +70,7 @@ public String discardGenericType(String name) {
 		if (name == null) {
 			return null;
 		}
-		int index = name.indexOf('<');
-		if (index != -1) {
-			name = name.substring(0, index).trim();
-		}
-		return name;
+		return Bindings.removeBrackets(name);
 	}
 
 	/**
@@ -126,11 +122,8 @@ public boolean isInheritedClassName(ITypeBinding binding, String name) {
 	 * @return
 	 */
 	public String shortenQualifiedName(String name) {
-		int index = name.indexOf('<');
-		if (index != -1) {
-			name = name.substring(0, index).trim();
-		}
-		index = name.indexOf("java.lang.");
+		name = Bindings.removeBrackets(name);
+		int index = name.indexOf("java.lang.");
 		char ch = 0;
 		if (index != -1
 				&& (name.indexOf('.', index + 10) == -1 || ((ch = name
@@ -170,11 +163,8 @@ public String shortenQualifiedName(String name) {
 
 	public String shortenPackageName(String fullName) {
 		String name = fullName.substring(0, fullName.lastIndexOf('.'));
-		int index = name.indexOf('<');
-		if (index != -1) {
-			name = name.substring(0, index).trim();
-		}
-		index = name.indexOf("java.lang.");
+		name = Bindings.removeBrackets(name);
+		int index = name.indexOf("java.lang.");
 		char ch = 0;
 		if (index != -1
 				&& (name.indexOf('.', index + 10) == -1 || ((ch = name
diff --git a/src/net/sf/j2s/core/astvisitors/Bindings.java b/src/net/sf/j2s/core/astvisitors/Bindings.java
@@ -30,7 +30,6 @@
 import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
 import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
 import org.eclipse.jdt.core.dom.Assignment;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.FieldAccess;
 import org.eclipse.jdt.core.dom.IBinding;
@@ -43,7 +42,6 @@
 import org.eclipse.jdt.core.dom.QualifiedName;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.SuperFieldAccess;
-import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
 
 public class Bindings {
 	
@@ -223,6 +221,8 @@ public static String getTypeQualifiedName(ITypeBinding type) {
 	 */
 	public static String getFullyQualifiedName(ITypeBinding type) {
 		String name= type.getQualifiedName();
+		// TODO: ?
+		// return removeBrackets(name);
 		final int index= name.indexOf('<');
 		if (index > 0)
 			name= name.substring(0, index);
@@ -930,10 +930,14 @@ public static boolean isEqualMethod(IMethodBinding method, String methodName, St
 		int index;
 		for (int i= 0; i < parameters.length; i++) {
 			first= parameters[i];
+			// TODO: ?
+			// first = removeBrackets(first);
 			index= first.indexOf('<');
 			if (index > 0)
 				first= first.substring(0, index);
 			second= methodParameters[i].getErasure().getQualifiedName();
+			// TODO: ?
+			// second = removeBrackets(second);
 			index= second.indexOf('<');
 			if (index > 0)
 				second= second.substring(0, index);
@@ -1125,6 +1129,7 @@ private static boolean sameParameter(ITypeBinding type, String candidate, IType
 		return false;
 	}
 
+	/*
 	private static boolean isPrimitiveType(String s) {
 		return Signature.getTypeSignatureKind(s) == Signature.BASE_TYPE_SIGNATURE;
 	}
@@ -1133,6 +1138,7 @@ private static boolean isResolvedType(String s) {
 		int arrayCount= Signature.getArrayCount(s);
 		return s.charAt(arrayCount) == Signature.C_RESOLVED;
 	}
+	*/
 
 	/**
 	 * Normalizes a type binding received from an expression to a type binding that can be used in a declaration signature. 
@@ -1208,6 +1214,8 @@ public static ITypeBinding getBindingOfParentType(ASTNode node) {
 	public static String getRawName(ITypeBinding binding) {
 		String name= binding.getName();
 		if (binding.isParameterizedType() || binding.isGenericType()) {
+			// TODO: ?
+			// return removeBrackets(name);
 			int idx= name.indexOf('<');
 			if (idx != -1) {
 				return name.substring(0, idx);
@@ -1419,4 +1427,23 @@ public static boolean isMethodInvoking(Expression exp, String className, String
 		}
 		return false;
 	}
+
+	public static String removeBrackets(String qName) {
+		int length = qName.length();
+		StringBuffer buf = new StringBuffer();
+		int ltCount = 0;
+		for (int i = 0; i < length; i++) {
+			char c = qName.charAt(i);
+			if (c == '<') {
+				ltCount++;
+			} else if (c == '>') {
+				ltCount--;
+			}
+			if (ltCount == 0 && c != '>') {
+				buf.append(c);
+			}
+		}
+		qName = buf.toString().trim();
+		return qName;
+	}
 }
