Merge with /trunk

jossonsmith · jossonsmith · commit 06ed6759ace5 · 2006-08-01T16:08:45.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -1397,7 +1397,22 @@ public boolean visit(MethodDeclaration node) {
 					}
 				}
 				if (isOnlySuper) {
-					return false;
+					boolean isForced2Keep = false;
+					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())) {
+									isForced2Keep = true;
+									break;
+								}
+							}
+						}
+					}
+					if (!isForced2Keep) {
+						return false;
+					}
 				}
 			}
 		}
diff --git a/src/net/sf/j2s/core/astvisitors/SWTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/SWTScriptVisitor.java
@@ -354,6 +354,19 @@ protected String[] getFilterMethods() {
 	 */
 	public boolean visit(MethodInvocation node) {
 		IMethodBinding methodBinding = node.resolveMethodBinding();
+		if ("net.sf.j2s.ajax.junit.AsyncSWT".equals(methodBinding.getDeclaringClass().getQualifiedName())
+				&& "waitLayout".equals(methodBinding.getName())) {
+			metSWTBlockWhile = true;
+			node.getExpression().accept(this);
+			buffer.append(".waitLayout (");
+			Expression shellExp = (Expression) node.arguments().get(0);
+			shellExp.accept(this);
+			buffer.append(", ");
+			Expression runnableExp = (Expression) node.arguments().get(1);
+			runnableExp.accept(this);
+			buffer.append(", this, function () {\r\n//");
+			return false;
+		}
 		String[] filterMethods = getFilterMethods();
 		for (int i = 0; i < filterMethods.length; i += 2) {
 			if (isMethodInvoking(methodBinding, filterMethods[i], filterMethods[i + 1])) {

Original file line number	Diff line number	Diff line change
`@@ -1397,7 +1397,22 @@ public boolean visit(MethodDeclaration node) {`
`1397`	`1397`	`}`
`1398`	`1398`	`}`
`1399`	`1399`	`if (isOnlySuper) {`
`1400`		`- return false;`
	`1400`	`+ boolean isForced2Keep = false;`
	`1401`	`+ if (javadoc != null) {`
	`1402`	`+ List tags = javadoc.tags();`
	`1403`	`+ if (tags.size() != 0) {`
	`1404`	`+ for (Iterator iter = tags.iterator(); iter.hasNext();) {`
	`1405`	`+ TagElement tagEl = (TagElement) iter.next();`
	`1406`	`+ if ("@j2sKeep".equals(tagEl.getTagName())) {`
	`1407`	`+ isForced2Keep = true;`
	`1408`	`+ break;`
	`1409`	`+ }`
	`1410`	`+ }`
	`1411`	`+ }`
	`1412`	`+ }`
	`1413`	`+ if (!isForced2Keep) {`
	`1414`	`+ return false;`
	`1415`	`+ }`
`1401`	`1416`	`}`
`1402`	`1417`	`}`
`1403`	`1418`	`}`