Fixed bug on methods stack error while compiling classes which are extending SimplePipeRunnable

zhourenjian · zhourenjian · commit 3dcd0e1b2816 · 2008-09-20T20:41:45.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -47,7 +47,6 @@
 import org.eclipse.jdt.core.dom.SimpleType;
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.Statement;
-import org.eclipse.jdt.core.dom.StringLiteral;
 import org.eclipse.jdt.core.dom.SuperConstructorInvocation;
 import org.eclipse.jdt.core.dom.SuperFieldAccess;
 import org.eclipse.jdt.core.dom.SuperMethodInvocation;
@@ -1145,17 +1144,12 @@ public void endVisit(MethodDeclaration node) {
 			}
 		}
 		String[] pipeMethods = new String[] {
-				"isPipeLive", 
-				"keepPipeLive", 
-				"pipeDestroy", 
 				"pipeSetup", 
 				"pipeThrough", 
 				"through",
-				"pipeInit",
 				"pipeMonitoring",
 				"pipeMonitoringInterval",
-				"setPipeHelper",
-				"updateStatus"
+				"setPipeHelper"
 		};
 		for (int i = 0; i < pipeMethods.length; i++) {
 			if (Bindings.isMethodInvoking(mBinding, "net.sf.j2s.ajax.SimplePipeRunnable", pipeMethods[i])) {
@@ -1164,6 +1158,11 @@ public void endVisit(MethodDeclaration node) {
 				}
 			}
 		}
+		if (Bindings.isMethodInvoking(mBinding, "net.sf.j2s.ajax.CompoundPipeSession", "convert")) {
+			if (getJ2SDocTag(node, "@j2sKeep") == null) {
+				return;
+			}
+		}
 		if (mBinding != null) {
 			methodDeclareStack.pop();
 		}
@@ -1186,17 +1185,12 @@ public boolean visit(MethodDeclaration node) {
 			}
 		}
 		String[] pipeMethods = new String[] {
-				"isPipeLive", 
-				"keepPipeLive", 
-				"pipeDestroy", 
 				"pipeSetup", 
 				"pipeThrough", 
 				"through",
-				"pipeInit",
 				"pipeMonitoring",
 				"pipeMonitoringInterval",
-				"setPipeHelper",
-				"updateStatus"
+				"setPipeHelper"
 		};
 		for (int i = 0; i < pipeMethods.length; i++) {
 			if (Bindings.isMethodInvoking(mBinding, "net.sf.j2s.ajax.SimplePipeRunnable", pipeMethods[i])) {
@@ -1205,6 +1199,11 @@ public boolean visit(MethodDeclaration node) {
 				}
 			}
 		}
+		if (Bindings.isMethodInvoking(mBinding, "net.sf.j2s.ajax.CompoundPipeSession", "convert")) {
+			if (getJ2SDocTag(node, "@j2sKeep") == null) {
+				return false;
+			}
+		}
 		if (mBinding != null) {
 			methodDeclareStack.push(mBinding.getKey());
 		}
