tiennm99/lombok
1
0
Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-09-12 16:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:rzwitserloot/lombok

Browse Source
This commit is contained in:
Reinier Zwitserloot
2010-11-03 00:43:05 +01:00
parent f1cf083890 17bcfda43b
commit fcf39d88b4
10 changed files with 89 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/lombok/eclipse/handlers/HandleCleanup.java
+27 -1
View File
@@ -37,9 +37,13 @@ import org.eclipse.jdt.internal.compiler.ast.Assignment;
import org.eclipse.jdt.internal.compiler.ast.Block;
import org.eclipse.jdt.internal.compiler.ast.CaseStatement;
import org.eclipse.jdt.internal.compiler.ast.CastExpression;
import org.eclipse.jdt.internal.compiler.ast.EqualExpression;
import org.eclipse.jdt.internal.compiler.ast.IfStatement;
import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration;
import org.eclipse.jdt.internal.compiler.ast.MemberValuePair;
import org.eclipse.jdt.internal.compiler.ast.MessageSend;
import org.eclipse.jdt.internal.compiler.ast.NullLiteral;
import org.eclipse.jdt.internal.compiler.ast.OperatorIds;
import org.eclipse.jdt.internal.compiler.ast.SingleNameReference;
import org.eclipse.jdt.internal.compiler.ast.Statement;
import org.eclipse.jdt.internal.compiler.ast.SwitchStatement;
@@ -157,7 +161,29 @@ public class HandleCleanup implements EclipseAnnotationHandler<Cleanup> {
}
unsafeClose.nameSourcePosition = nameSourcePosition;
unsafeClose.selector = cleanupName.toCharArray();
finallyBlock[0] = unsafeClose;
int pS = ast.sourceStart, pE = ast.sourceEnd;
long p = (long)pS << 32 | pE;
SingleNameReference varName = new SingleNameReference(decl.name, p);
Eclipse.setGeneratedBy(varName, ast);
NullLiteral nullLiteral = new NullLiteral(pS, pE);
Eclipse.setGeneratedBy(nullLiteral, ast);
EqualExpression equalExpression = new EqualExpression(varName, nullLiteral, OperatorIds.NOT_EQUAL);
equalExpression.sourceStart = pS; equalExpression.sourceEnd = pE;
Eclipse.setGeneratedBy(equalExpression, ast);
Block closeBlock = new Block(0);
closeBlock.statements = new Statement[1];
closeBlock.statements[0] = unsafeClose;
Eclipse.setGeneratedBy(closeBlock, ast);
IfStatement ifStatement = new IfStatement(equalExpression, closeBlock, 0, 0);
Eclipse.setGeneratedBy(ifStatement, ast);
finallyBlock[0] = ifStatement;
tryStatement.finallyBlock = new Block(0);
Eclipse.setGeneratedBy(tryStatement.finallyBlock, ast);
tryStatement.finallyBlock.statements = finallyBlock;
src/core/lombok/javac/handlers/HandleCleanup.java
+12 -4
View File
@@ -30,10 +30,12 @@ import lombok.javac.JavacNode;
import org.mangosdk.spi.ProviderFor;
import com.sun.tools.javac.code.TypeTags;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.TreeMaker;
import com.sun.tools.javac.tree.JCTree.JCAnnotation;
import com.sun.tools.javac.tree.JCTree.JCAssign;
import com.sun.tools.javac.tree.JCTree.JCBinary;
import com.sun.tools.javac.tree.JCTree.JCBlock;
import com.sun.tools.javac.tree.JCTree.JCCase;
import com.sun.tools.javac.tree.JCTree.JCCatch;
@@ -41,6 +43,7 @@ import com.sun.tools.javac.tree.JCTree.JCExpression;
import com.sun.tools.javac.tree.JCTree.JCExpressionStatement;
import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
import com.sun.tools.javac.tree.JCTree.JCIdent;
import com.sun.tools.javac.tree.JCTree.JCIf;
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.tree.JCTree.JCStatement;
import com.sun.tools.javac.tree.JCTree.JCTypeCast;
@@ -108,11 +111,16 @@ public class HandleCleanup implements JavacAnnotationHandler<Cleanup> {
doAssignmentCheck(annotationNode, tryBlock, decl.name);
TreeMaker maker = annotationNode.getTreeMaker();
JCFieldAccess cleanupCall = maker.Select(maker.Ident(decl.name), annotationNode.toName(cleanupName));
List<JCStatement> finalizerBlock = List.<JCStatement>of(maker.Exec(
maker.Apply(List.<JCExpression>nil(), cleanupCall, List.<JCExpression>nil())));
JCFieldAccess cleanupMethod = maker.Select(maker.Ident(decl.name), annotationNode.toName(cleanupName));
List<JCStatement> cleanupCall = List.<JCStatement>of(maker.Exec(
maker.Apply(List.<JCExpression>nil(), cleanupMethod, List.<JCExpression>nil())));
JCBinary isNull = maker.Binary(JCTree.NE, maker.Ident(decl.name), maker.Literal(TypeTags.BOT, null));
JCIf ifNotNullCleanup = maker.If(isNull, maker.Block(0, cleanupCall), null);
JCBlock finalizer = maker.Block(0, List.<JCStatement>of(ifNotNullCleanup));
JCBlock finalizer = maker.Block(0, finalizerBlock);
newStatements = newStatements.append(maker.Try(maker.Block(0, tryBlock), List.<JCCatch>nil(), finalizer));
if (blockNode instanceof JCBlock) {
test/transform/resource/after-delombok/CleanupName.java
+6 -2
View File
@@ -4,7 +4,9 @@ class CleanupName {
try {
System.out.println(o);
} finally {
o.toString();
if (o != null) {
o.toString();
}
}
}
void test2() {
@@ -12,7 +14,9 @@ class CleanupName {
try {
System.out.println(o);
} finally {
o.toString();
if (o != null) {
o.toString();
}
}
}
}
test/transform/resource/after-delombok/CleanupPlain.java
+6 -2
View File
@@ -9,10 +9,14 @@ class CleanupPlain {
out.flush();
}
} finally {
out.close();
if (out != null) {
out.close();
}
}
} finally {
in.close();
if (in != null) {
in.close();
}
}
}
}
test/transform/resource/after-delombok/LoggerCommons.java
+6
View File
@@ -0,0 +1,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
class LoggerCommons {
private static final Log log = LogFactory.getLog(LoggerCommons.class);
}
test/transform/resource/after-delombok/LoggerJul.java
+5
View File
@@ -0,0 +1,5 @@
import java.util.logging.Logger;
class LoggerJul {
private static final Logger log = Logger.getLogger("LoggerJul");
}
test/transform/resource/after-delombok/LoggerLog4j.java
+5
View File
@@ -0,0 +1,5 @@
import org.apache.log4j.Logger;
class LoggerLog4j {
private static final Logger log = Logger.getLogger(LoggerLog4j.class);
}
test/transform/resource/after-delombok/LoggerSlf4j.java
+6
View File
@@ -0,0 +1,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class LoggerLog4j {
private static final Logger log = LoggerFactory.getLogger(LoggerLog4j.class);
}
test/transform/resource/after-ecj/CleanupName.java
+8 -2
View File
@@ -10,7 +10,10 @@ class CleanupName {
}
finally
{
o.toString();
if ((o != null))
{
o.toString();
}
}
}
void test2() {
@@ -21,7 +24,10 @@ class CleanupName {
}
finally
{
o.toString();
if ((o != null))
{
o.toString();
}
}
}
}
test/transform/resource/after-ecj/CleanupPlain.java
+8 -2
View File
@@ -18,12 +18,18 @@ class CleanupPlain {
}
finally
{
out.close();
if ((out != null))
{
out.close();
}
}
}
finally
{
in.close();
if ((in != null))
{
in.close();
}
}
}
}