Support @j2sIgnore for fields and initializer blocks

zhourenjian · zhourenjian · commit 05f375eb6e9a · 2009-03-26T14:57:10.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -2253,9 +2253,15 @@ public void endVisit(TypeDeclaration node) {
 			for (Iterator iter = node.bodyDeclarations().iterator(); iter.hasNext();) {
 				ASTNode element = (ASTNode) iter.next();
 				if (element instanceof Initializer) {
+					if (getJ2STag((Initializer) element, "@j2sIgnore") != null) {
+						continue;
+					}
 					needReturn = true;
 				} else if (element instanceof FieldDeclaration) {
 					FieldDeclaration field = (FieldDeclaration) element;
+					if (getJ2STag(field, "@j2sIgnore") != null) {
+						continue;
+					}
 					if ((field.getModifiers() & Modifier.STATIC) != 0) {
 						needReturn = true;
 					} else if (node.isInterface()) {
@@ -2371,12 +2377,18 @@ public void endVisit(TypeDeclaration node) {
 			ASTNode element = (ASTNode) iter.next();
 			if (element instanceof FieldDeclaration) {
 				FieldDeclaration field = (FieldDeclaration) element;
+				if (getJ2STag(field, "@j2sIgnore") != null) {
+					continue;
+				}
 				needPreparation = isFieldNeedPreparation(field);
 				if (needPreparation) {
 					break;
 				}
 			} else if (element instanceof Initializer) {
 				Initializer init = (Initializer) element;
+				if (getJ2STag(init, "@j2sIgnore") != null) {
+					continue;
+				}
 				if ((init.getModifiers() & Modifier.STATIC) == 0) {
 					needPreparation = true;
 					break;
@@ -2389,12 +2401,18 @@ public void endVisit(TypeDeclaration node) {
 				ASTNode element = (ASTNode) iter.next();
 				if (element instanceof FieldDeclaration) {
 					FieldDeclaration field = (FieldDeclaration) element;
+					if (getJ2STag(field, "@j2sIgnore") != null) {
+						continue;
+					}
 					if (node.isInterface() || !isFieldNeedPreparation(field)) {
 						continue;
 					}
 					element.accept(this);
 				} else if (element instanceof Initializer) {
 					Initializer init = (Initializer) element;
+					if (getJ2STag(init, "@j2sIgnore") != null) {
+						continue;
+					}
 					if ((init.getModifiers() & Modifier.STATIC) == 0) {
 						element.accept(this);
 					}
@@ -2430,6 +2448,9 @@ public void endVisit(TypeDeclaration node) {
 					element.accept(this);
 				}
 			} else if (element instanceof Initializer) {
+				if (getJ2STag((Initializer) element, "@j2sIgnore") != null) {
+					continue;
+				}
 				if (staticCount != -1) {
 					buffer.append(");\r\n");
 					staticCount = -1;
@@ -2441,6 +2462,9 @@ public void endVisit(TypeDeclaration node) {
 				}
 			} else if (element instanceof FieldDeclaration) {
 				FieldDeclaration field = (FieldDeclaration) element;
+				if (getJ2STag(field, "@j2sIgnore") != null) {
+					continue;
+				}
 			if ((field.getModifiers() & Modifier.STATIC) != 0) {
 				List fragments = field.fragments();
 				for (int j = 0; j < fragments.size(); j++) {
@@ -2786,6 +2810,9 @@ public static void main(String[] args) {
 					continue;
 				}
 				FieldDeclaration fieldDeclaration = (FieldDeclaration) element;
+				if (getJ2STag(fieldDeclaration, "@j2sIgnore") != null) {
+					continue;
+				}
 				if (isFieldNeedPreparation(fieldDeclaration)) {
 					visitWith(fieldDeclaration, true);
 					continue;
diff --git a/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -446,6 +446,20 @@ public boolean visit(TypeDeclaration node) {
 		return super.visit(node);
 	}
 
+	public boolean visit(FieldDeclaration node) {
+		if (getJ2STag(node, "@j2sIgnore") != null) {
+			return false;
+		}
+		return super.visit(node);
+	}
+
+	public boolean visit(Initializer node) {
+		if (getJ2STag(node, "@j2sIgnore") != null) {
+			return false;
+		}
+		return super.visit(node);
+	}
+
 	private void readTags(AbstractTypeDeclaration node) {
 		Javadoc javadoc = node.getJavadoc();
 		if (javadoc != null) {
@@ -653,13 +667,19 @@ protected void visitForRequires(AbstractTypeDeclaration node) {
 					requires.addAll(visitor.optionals);
 				}
 			} else if (element instanceof Initializer) {
+				if (getJ2STag((Initializer) element, "@j2sIgnore") != null) {
+					continue;
+				}
 				DependencyASTVisitor visitor = getSelfVisitor();
 				element.accept(this);
 				requires.addAll(visitor.musts);
 				requires.addAll(visitor.requires);
 				requires.addAll(visitor.optionals);
 			} else if (element instanceof FieldDeclaration) {
 				FieldDeclaration field = (FieldDeclaration) element;
+				if (getJ2STag(field, "@j2sIgnore") != null) {
+					continue;
+				}
 					List fragments = field.fragments();
 					for (int j = 0; j < fragments.size(); j++) {
 						VariableDeclarationFragment vdf = (VariableDeclarationFragment) fragments
