diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-08-16 01:23:59 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-08-16 01:24:11 +0200 |
| commit | 39d447d6ff70064a9957ee790b36bb63aeefdbe5 (patch) | |
| tree | 7b5b6fc8cb406b85c657000b8c4603062823c057 /src/core/lombok/javac/handlers | |
| parent | af9ac60c6ff42c53b21f09b029383fdcd545dedf (diff) | |
| download | lombok-39d447d6ff70064a9957ee790b36bb63aeefdbe5.tar.gz lombok-39d447d6ff70064a9957ee790b36bb63aeefdbe5.tar.bz2 lombok-39d447d6ff70064a9957ee790b36bb63aeefdbe5.zip | |
This fixes 'val' not working in javac7. The LogDisabler used to simply suppress writes to standard out, but javac7 has a redesigned error system where errors are cached. Now the LogDisabler also wipes out any cached errors added in between a 'disable' and 'enable' session. Ironically we actually whined to Joe Darcy about javac6 emitting errors 'too early' and this caching system is the result. Heh.
This was already the case, but a disableLoggers() call HAS to be paired with an enableLoggers() call, so use try/finally.
Fixes issue #259.
Diffstat (limited to 'src/core/lombok/javac/handlers')
| -rw-r--r-- | src/core/lombok/javac/handlers/HandleVal.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lombok/javac/handlers/HandleVal.java b/src/core/lombok/javac/handlers/HandleVal.java index 4dafa360..bc70899d 100644 --- a/src/core/lombok/javac/handlers/HandleVal.java +++ b/src/core/lombok/javac/handlers/HandleVal.java @@ -72,7 +72,7 @@ public class HandleVal extends JavacASTAdapter { return; } - JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, "lombok.val"); + if (localNode.shouldDeleteLombokAnnotations()) JavacHandlerUtil.deleteImportFromCompilationUnit(localNode, "lombok.val"); local.mods.flags |= Flags.FINAL; @@ -115,7 +115,7 @@ public class HandleVal extends JavacASTAdapter { if (replacement != null) { local.vartype = replacement; } else { - local.vartype = JavacResolution.createJavaLangObject(localNode.getTreeMaker(), localNode.getAst());; + local.vartype = JavacResolution.createJavaLangObject(localNode.getTreeMaker(), localNode.getAst()); } localNode.getAst().setChanged(); } catch (JavacResolution.TypeNotConvertibleException e) { |