Code refactor

zhourenjian · zhourenjian · commit d98d948e7ce0 · 2007-08-25T16:39:11.000Z
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java
@@ -162,10 +162,7 @@ public boolean visit(ArrayCreation node) {
 			initializer.accept(this);
 		} else {
 			List dim = node.dimensions();
-			node.getType().resolveBinding();
-			node.getType().getComponentType().resolveBinding();
 			ITypeBinding elementType = node.getType().getElementType().resolveBinding();
-			elementType = node.getType().getElementType().resolveBinding();
 			if(elementType != null){
 				if (elementType.isPrimitive()) {
 					String typeCode = elementType.getName();
@@ -411,7 +408,8 @@ public boolean visit(Assignment node) {
 		buffer.append(' ');
 		buffer.append(op);
 		buffer.append(' ');
-		if (right.resolveTypeBinding() != null && "char".equals(right.resolveTypeBinding().getName())) {
+		ITypeBinding binding = right.resolveTypeBinding();
+		if (binding != null && "char".equals(binding.getName())) {
 			buffer.append('(');
 			right.accept(this);
 			buffer.append(").charCodeAt (0)");
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -1225,9 +1225,9 @@ public boolean visit(MethodDeclaration node) {
 			}
 		}
 		if ((node.getModifiers() & Modifier.PRIVATE) != 0) {
-			if(node.resolveBinding() != null){
+			if(mBinding != null){
 				boolean isReferenced = MethodReferenceASTVisitor.checkReference(node.getRoot(), 
-						node.resolveBinding().getKey());
+						mBinding.getKey());
 				if (!isReferenced && getJ2SDocTag(node, "@j2sKeep") == null) {
 					return false;
 				}
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTTypeVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTTypeVisitor.java
@@ -230,8 +230,9 @@ public String getTypeStringName(Type type) {
 			return getTypeStringName(qualType.getQualifier()) + "." + qualType.getName().getIdentifier();//.getFullyQualifiedName();
 		} else if (type instanceof SimpleType) {
 			SimpleType simpType = (SimpleType) type;
-			if(simpType.resolveBinding() != null){
-				return simpType.resolveBinding().getQualifiedName();
+			ITypeBinding binding = simpType.resolveBinding();
+			if(binding != null){
+				return binding.getQualifiedName();
 			}
 		}
 		return null;

Original file line number	Diff line number	Diff line change
`@@ -1225,9 +1225,9 @@ public boolean visit(MethodDeclaration node) {`
`1225`	`1225`	`}`
`1226`	`1226`	`}`
`1227`	`1227`	`if ((node.getModifiers() & Modifier.PRIVATE) != 0) {`
`1228`		`- if(node.resolveBinding() != null){`
	`1228`	`+ if(mBinding != null){`
`1229`	`1229`	`boolean isReferenced = MethodReferenceASTVisitor.checkReference(node.getRoot(),`
`1230`		`- node.resolveBinding().getKey());`
	`1230`	`+ mBinding.getKey());`
`1231`	`1231`	`if (!isReferenced && getJ2SDocTag(node, "@j2sKeep") == null) {`
`1232`	`1232`	`return false;`
`1233`	`1233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,9 @@ public String getTypeStringName(Type type) {`
`230`	`230`	`return getTypeStringName(qualType.getQualifier()) + "." + qualType.getName().getIdentifier();//.getFullyQualifiedName();`
`231`	`231`	`} else if (type instanceof SimpleType) {`
`232`	`232`	`SimpleType simpType = (SimpleType) type;`
`233`		`- if(simpType.resolveBinding() != null){`
`234`		`- return simpType.resolveBinding().getQualifiedName();`
	`233`	`+ ITypeBinding binding = simpType.resolveBinding();`
	`234`	`+ if(binding != null){`
	`235`	`+ return binding.getQualifiedName();`
`235`	`236`	`}`
`236`	`237`	`}`
`237`	`238`	`return null;`