Fixing bug that Enum with constructors is not compiled correctly

zhourenjian@gmail.com · zhourenjian@gmail.com · commit 25ef6038ec11 · 2012-09-09T15:10:00.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/MethodReferenceASTVisitor.java b/src/net/sf/j2s/core/astvisitors/MethodReferenceASTVisitor.java
@@ -20,6 +20,7 @@
 import org.eclipse.jdt.core.dom.BodyDeclaration;
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
 import org.eclipse.jdt.core.dom.ConstructorInvocation;
+import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
 import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.Javadoc;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
@@ -88,6 +89,22 @@ public boolean visit(ConstructorInvocation node) {
 		return super.visit(node);
 	}
 	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.EnumConstantDeclaration)
+	 */
+	public boolean visit(EnumConstantDeclaration node) {
+		IMethodBinding constructorBinding = node.resolveConstructorBinding();
+		String key = constructorBinding.getKey();
+		if (key != null) {
+			key = key.replaceAll("%?<[^>]+>", "");
+		}
+		if (methodSignature.equals(key)) {
+			isReferenced = true;
+			return false;
+		}
+		return super.visit(node);
+	}
+	
 	/* (non-Javadoc)
 	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.MethodInvocation)
 	 */
