aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2010-11-09 20:37:25 +0100
committerReinier Zwitserloot <reinier@zwitserloot.com>2010-11-09 20:37:25 +0100
commit46d471e9c3dc32b03c34804df1819739a4dffc50 (patch)
tree9c31d75426bf8fdb1943bef2a996485640f7bf5e
parent92b7efac48c18f22b81098cf1d844a891bb71648 (diff)
parent98d8a9f63b3183005174abb7691a1692347b9a2e (diff)
downloadlombok-46d471e9c3dc32b03c34804df1819739a4dffc50.tar.gz
lombok-46d471e9c3dc32b03c34804df1819739a4dffc50.tar.bz2
lombok-46d471e9c3dc32b03c34804df1819739a4dffc50.zip
Merge branch 'master' into annoGetSet
-rw-r--r--buildScripts/ivy-repo/projectlombok.org-lombok.patcher-0.4.xml (renamed from buildScripts/ivy-repo/projectlombok.org-lombok.patcher-0.3.xml)4
-rw-r--r--buildScripts/ivy.xml5
-rw-r--r--buildScripts/website.ant.xml7
-rw-r--r--doc/changelog.markdown5
-rw-r--r--src/core/lombok/core/AST.java2
-rw-r--r--src/core/lombok/core/AnnotationValues.java39
-rw-r--r--src/core/lombok/core/LombokNode.java4
-rw-r--r--src/core/lombok/core/handlers/SneakyThrowsAndCleanupDependencyInfo.java45
-rw-r--r--src/core/lombok/eclipse/Eclipse.java193
-rw-r--r--src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java60
-rw-r--r--src/core/lombok/eclipse/handlers/HandleCleanup.java28
-rw-r--r--src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java202
-rw-r--r--src/core/lombok/eclipse/handlers/HandleLog.java284
-rw-r--r--src/core/lombok/eclipse/handlers/HandleSynchronized.java2
-rw-r--r--src/core/lombok/eclipse/handlers/HandleVal.java61
-rw-r--r--src/core/lombok/extern/apachecommons/Log.java75
-rw-r--r--src/core/lombok/extern/jul/Log.java75
-rw-r--r--src/core/lombok/extern/log4j/Log.java75
-rw-r--r--src/core/lombok/extern/slf4j/Log.java74
-rw-r--r--src/core/lombok/javac/HandlerLibrary.java8
-rw-r--r--src/core/lombok/javac/Javac.java5
-rw-r--r--src/core/lombok/javac/JavacASTAdapter.java5
-rw-r--r--src/core/lombok/javac/JavacASTVisitor.java10
-rw-r--r--src/core/lombok/javac/JavacResolution.java414
-rw-r--r--src/core/lombok/javac/TreeMirrorMaker.java50
-rw-r--r--src/core/lombok/javac/apt/Processor.java2
-rw-r--r--src/core/lombok/javac/handlers/HandleCleanup.java16
-rw-r--r--src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java86
-rw-r--r--src/core/lombok/javac/handlers/HandleLog.java203
-rw-r--r--src/core/lombok/javac/handlers/HandleSynchronized.java2
-rw-r--r--src/core/lombok/javac/handlers/HandleVal.java113
-rw-r--r--src/core/lombok/javac/handlers/JavacHandlerUtil.java30
-rw-r--r--src/delombok/lombok/delombok/CommentCollectingScanner.java2
-rw-r--r--src/delombok/lombok/delombok/CommentPreservingParser.java170
-rw-r--r--src/delombok/lombok/delombok/Delombok.java190
-rw-r--r--src/delombok/lombok/delombok/DelombokResult.java62
-rw-r--r--src/delombok/lombok/delombok/PrettyCommentsPrinter.java38
-rw-r--r--src/delombok/lombok/delombok/ant/DelombokTask.java51
-rw-r--r--src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java75
-rw-r--r--src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java196
-rw-r--r--test/core/src/lombok/AbstractRunTests.java9
-rw-r--r--test/core/src/lombok/RunTestsViaDelombok.java5
-rw-r--r--test/pretty/resource/after/Interfaces.java4
-rw-r--r--test/pretty/resource/before/Annotation.java1
-rw-r--r--test/transform/resource/after-delombok/CleanupName.java8
-rw-r--r--test/transform/resource/after-delombok/CleanupPlain.java8
-rw-r--r--test/transform/resource/after-delombok/DataExtended.java8
-rw-r--r--test/transform/resource/after-delombok/DataIgnore.java10
-rw-r--r--test/transform/resource/after-delombok/DataOnLocalClass.java24
-rw-r--r--test/transform/resource/after-delombok/DataPlain.java100
-rw-r--r--test/transform/resource/after-delombok/DataWithGetter.java8
-rw-r--r--test/transform/resource/after-delombok/DataWithGetterNone.java8
-rw-r--r--test/transform/resource/after-delombok/LoggerCommons.java9
-rw-r--r--test/transform/resource/after-delombok/LoggerJul.java9
-rw-r--r--test/transform/resource/after-delombok/LoggerLog4j.java9
-rw-r--r--test/transform/resource/after-delombok/LoggerSlf4j.java8
-rw-r--r--test/transform/resource/after-delombok/LoggerSlf4jAlreadyExists.java3
-rw-r--r--test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java6
-rw-r--r--test/transform/resource/after-delombok/LoggerSlf4jOnNonType.java4
-rw-r--r--test/transform/resource/after-delombok/LoggerSlf4jTypes.java17
-rw-r--r--test/transform/resource/after-delombok/LoggerSlf4jWithClass.java12
-rw-r--r--test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java9
-rw-r--r--test/transform/resource/after-delombok/ValComplex.java20
-rw-r--r--test/transform/resource/after-delombok/ValErrors.java8
-rw-r--r--test/transform/resource/after-delombok/ValInFor.java19
-rw-r--r--test/transform/resource/after-delombok/ValLessSimple.java26
-rw-r--r--test/transform/resource/after-delombok/ValSimple.java24
-rw-r--r--test/transform/resource/after-delombok/ValWeirdTypes.java47
-rw-r--r--test/transform/resource/after-ecj/ClassNamedAfterGetter.java6
-rw-r--r--test/transform/resource/after-ecj/CleanupName.java10
-rw-r--r--test/transform/resource/after-ecj/CleanupPlain.java10
-rw-r--r--test/transform/resource/after-ecj/CommentsInterspersed.java6
-rw-r--r--test/transform/resource/after-ecj/DataExtended.java9
-rw-r--r--test/transform/resource/after-ecj/DataIgnore.java9
-rw-r--r--test/transform/resource/after-ecj/DataOnLocalClass.java27
-rw-r--r--test/transform/resource/after-ecj/DataPlain.java93
-rw-r--r--test/transform/resource/after-ecj/DataWithGetter.java9
-rw-r--r--test/transform/resource/after-ecj/DataWithGetterNone.java9
-rw-r--r--test/transform/resource/after-ecj/GetterAccessLevel.java6
-rw-r--r--test/transform/resource/after-ecj/GetterAlreadyExists.java48
-rw-r--r--test/transform/resource/after-ecj/GetterBoolean.java6
-rw-r--r--test/transform/resource/after-ecj/GetterOnClass.java39
-rw-r--r--test/transform/resource/after-ecj/GetterOnStatic.java6
-rw-r--r--test/transform/resource/after-ecj/GetterPlain.java6
-rw-r--r--test/transform/resource/after-ecj/GetterWithDollar.java12
-rw-r--r--test/transform/resource/after-ecj/LoggerCommons.java24
-rw-r--r--test/transform/resource/after-ecj/LoggerJul.java24
-rw-r--r--test/transform/resource/after-ecj/LoggerLog4j.java24
-rw-r--r--test/transform/resource/after-ecj/LoggerSlf4j.java21
-rw-r--r--test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java6
-rw-r--r--test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java16
-rw-r--r--test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java7
-rw-r--r--test/transform/resource/after-ecj/LoggerSlf4jTypes.java31
-rw-r--r--test/transform/resource/after-ecj/LoggerSlf4jWithClass.java32
-rw-r--r--test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java22
-rw-r--r--test/transform/resource/after-ecj/MultiFieldGetter.java12
-rw-r--r--test/transform/resource/after-ecj/NonNullPlain.java6
-rw-r--r--test/transform/resource/after-ecj/SetterAccessLevel.java6
-rw-r--r--test/transform/resource/after-ecj/SetterOnClass.java36
-rw-r--r--test/transform/resource/after-ecj/SetterOnStatic.java6
-rw-r--r--test/transform/resource/after-ecj/SetterPlain.java6
-rw-r--r--test/transform/resource/after-ecj/SetterWithDollar.java12
-rw-r--r--test/transform/resource/after-ecj/SynchronizedPlain.java2
-rw-r--r--test/transform/resource/after-ecj/ToStringInner.java24
-rw-r--r--test/transform/resource/after-ecj/ToStringPlain.java12
-rw-r--r--test/transform/resource/before/DataPlain.java14
-rw-r--r--test/transform/resource/before/LoggerCommons.java11
-rw-r--r--test/transform/resource/before/LoggerJul.java11
-rw-r--r--test/transform/resource/before/LoggerLog4j.java11
-rw-r--r--test/transform/resource/before/LoggerSlf4j.java9
-rw-r--r--test/transform/resource/before/LoggerSlf4jAlreadyExists.java4
-rw-r--r--test/transform/resource/before/LoggerSlf4jClassOfArray.java6
-rw-r--r--test/transform/resource/before/LoggerSlf4jOnNonType.java5
-rw-r--r--test/transform/resource/before/LoggerSlf4jTypes.java18
-rw-r--r--test/transform/resource/before/LoggerSlf4jWithClass.java12
-rw-r--r--test/transform/resource/before/LoggerSlf4jWithPackage.java9
-rw-r--r--test/transform/resource/before/ValComplex.java20
-rw-r--r--test/transform/resource/before/ValErrors.java9
-rw-r--r--test/transform/resource/before/ValInFor.java20
-rw-r--r--test/transform/resource/before/ValLessSimple.java31