From 844b36b47c9fec02473b5d27c74c10f10d5c5fc2 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 16 Aug 2011 00:18:32 +0200 Subject: Renamed Javac.getCTCint to getCtcInt Made delombok work with multiple JavaCompiler's on the classpath Made @Getter(lazy=true) work on javac7 (fixes issue#223) --- src/core/lombok/javac/handlers/HandleGetter.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/core/lombok/javac/handlers/HandleGetter.java') diff --git a/src/core/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java index 0be00d89..a7e357ad 100644 --- a/src/core/lombok/javac/handlers/HandleGetter.java +++ b/src/core/lombok/javac/handlers/HandleGetter.java @@ -260,14 +260,14 @@ public class HandleGetter extends JavacAnnotationHandler { private static final java.util.Map TYPE_MAP; static { Map m = new HashMap(); - m.put(Javac.getCTCint(TypeTags.class, "INT"), "java.lang.Integer"); - m.put(Javac.getCTCint(TypeTags.class, "DOUBLE"), "java.lang.Double"); - m.put(Javac.getCTCint(TypeTags.class, "FLOAT"), "java.lang.Float"); - m.put(Javac.getCTCint(TypeTags.class, "SHORT"), "java.lang.Short"); - m.put(Javac.getCTCint(TypeTags.class, "BYTE"), "java.lang.Byte"); - m.put(Javac.getCTCint(TypeTags.class, "LONG"), "java.lang.Long"); - m.put(Javac.getCTCint(TypeTags.class, "BOOLEAN"), "java.lang.Boolean"); - m.put(Javac.getCTCint(TypeTags.class, "CHAR"), "java.lang.Character"); + m.put(Javac.getCtcInt(TypeTags.class, "INT"), "java.lang.Integer"); + m.put(Javac.getCtcInt(TypeTags.class, "DOUBLE"), "java.lang.Double"); + m.put(Javac.getCtcInt(TypeTags.class, "FLOAT"), "java.lang.Float"); + m.put(Javac.getCtcInt(TypeTags.class, "SHORT"), "java.lang.Short"); + m.put(Javac.getCtcInt(TypeTags.class, "BYTE"), "java.lang.Byte"); + m.put(Javac.getCtcInt(TypeTags.class, "LONG"), "java.lang.Long"); + m.put(Javac.getCtcInt(TypeTags.class, "BOOLEAN"), "java.lang.Boolean"); + m.put(Javac.getCtcInt(TypeTags.class, "CHAR"), "java.lang.Character"); TYPE_MAP = Collections.unmodifiableMap(m); } @@ -327,7 +327,7 @@ public class HandleGetter extends JavacAnnotationHandler { innerIfStatements.append(statement); } - JCBinary isNull = maker.Binary(JCTree.EQ, maker.Ident(valueName), maker.Literal(Javac.getCTCint(TypeTags.class, "BOT"), null)); + JCBinary isNull = maker.Binary(Javac.getCtcInt(JCTree.class, "EQ"), maker.Ident(valueName), maker.Literal(Javac.getCtcInt(TypeTags.class, "BOT"), null)); JCIf ifStatement = maker.If(isNull, maker.Block(0, innerIfStatements.toList()), null); synchronizedStatements.append(ifStatement); } @@ -335,7 +335,7 @@ public class HandleGetter extends JavacAnnotationHandler { synchronizedStatement = maker.Synchronized(createFieldAccessor(maker, fieldNode, FieldAccess.ALWAYS_FIELD), maker.Block(0, synchronizedStatements.toList())); } - JCBinary isNull = maker.Binary(JCTree.EQ, maker.Ident(valueName), maker.Literal(Javac.getCTCint(TypeTags.class, "BOT"), null)); + JCBinary isNull = maker.Binary(Javac.getCtcInt(JCTree.class, "EQ"), maker.Ident(valueName), maker.Literal(Javac.getCtcInt(TypeTags.class, "BOT"), null)); JCIf ifStatement = maker.If(isNull, maker.Block(0, List.of(synchronizedStatement)), null); statements.append(ifStatement); } -- cgit