Fixed bug on failing to compile SimpleRPCRunnable classes with #ajaxRun.

zhourenjian · zhourenjian · commit 4943d4889964 · 2007-02-04T10:22:52.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -1098,19 +1098,16 @@ public boolean visit(Initializer node) {
 	}
 
 	public void endVisit(MethodDeclaration node) {
-		Javadoc javadoc = node.getJavadoc();
-		if (javadoc != null) {
-			List tags = javadoc.tags();
-			if (tags.size() != 0) {
-				for (Iterator iter = tags.iterator(); iter.hasNext();) {
-					TagElement tagEl = (TagElement) iter.next();
-					if ("@j2sIgnore".equals(tagEl.getTagName())) {
-						return ;
-					}
-				}
-			}
+		if (getJ2SDocTag(node, "@j2sIgnore") != null) {
+			return;
 		}
+
 		IMethodBinding mBinding = node.resolveBinding();
+		if (Bindings.isMethodInvoking(mBinding, "net.sf.j2s.ajax.SimpleRPCRunnable", "ajaxRun")) {
+			if (getJ2SDocTag(node, "@j2sKeep") == null) {
+				return;
+			}
+		}
 		if (mBinding != null) {
 			methodDeclareStack.pop();
 		}
@@ -1124,7 +1121,9 @@ public boolean visit(MethodDeclaration node) {
 
 		IMethodBinding mBinding = node.resolveBinding();
 		if (Bindings.isMethodInvoking(mBinding, "net.sf.j2s.ajax.SimpleRPCRunnable", "ajaxRun")) {
-			return false;
+			if (getJ2SDocTag(node, "@j2sKeep") == null) {
+				return false;
+			}
 		}
 		if (mBinding != null) {
 			methodDeclareStack.push(mBinding.getKey());
diff --git a/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -797,7 +797,23 @@ public void setToCompileVariableName(boolean toCompileVariableName) {
 	public boolean visit(MethodDeclaration node) {
 		IMethodBinding mBinding = node.resolveBinding();
 		if (Bindings.isMethodInvoking(mBinding, "net.sf.j2s.ajax.SimpleRPCRunnable", "ajaxRun")) {
-			return false;
+			boolean toKeep = false;
+			Javadoc javadoc = node.getJavadoc();
+			if (javadoc != null) {
+				List tags = javadoc.tags();
+				if (tags.size() != 0) {
+					for (Iterator iter = tags.iterator(); iter.hasNext();) {
+						TagElement tagEl = (TagElement) iter.next();
+						if ("@j2sKeep".equals(tagEl.getTagName())) {
+							toKeep = true;
+							break;
+						}
+					}
+				}
+			}
+			if (!toKeep) {
+				return false;
+			}
 		}
 		
 		Javadoc javadoc = node.getJavadoc();
