mirror of
https://github.com/tiennm99/lombok.git
synced 2026-10-12 16:15:29 +00:00
Refactored to use Javac/Eclipse utility function
This commit is contained in:
1 parent
c1f7f660c5
commit
492011df4f
2 files changed
+2
-21
No files matched your search
@@ -39,8 +39,6 @@ import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
|
||||
import org.eclipse.jdt.internal.compiler.ast.TypeReference;
|
||||
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
|
||||
|
||||
import com.sun.tools.javac.code.Flags;
|
||||
|
||||
import lombok.AccessLevel;
|
||||
import lombok.ConfigurationKeys;
|
||||
import lombok.core.AnnotationValues;
|
||||
@@ -138,15 +136,6 @@ public class HandleLog {
|
||||
return result;
|
||||
}
|
||||
|
||||
private static int toFlags(AccessLevel level) {
|
||||
switch (level) {
|
||||
case PUBLIC: return Flags.PUBLIC;
|
||||
case PROTECTED: return Flags.PROTECTED;
|
||||
case PRIVATE: return Flags.PRIVATE;
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
|
||||
private static FieldDeclaration createField(LoggingFramework framework, AccessLevel access, Annotation source, ClassLiteralAccess loggingType, String logFieldName, boolean useStatic, Expression loggerTopic) {
|
||||
int pS = source.sourceStart, pE = source.sourceEnd;
|
||||
long p = (long) pS << 32 | pE;
|
||||
@@ -155,7 +144,7 @@ public class HandleLog {
|
||||
FieldDeclaration fieldDecl = new FieldDeclaration(logFieldName.toCharArray(), 0, -1);
|
||||
setGeneratedBy(fieldDecl, source);
|
||||
fieldDecl.declarationSourceEnd = -1;
|
||||
fieldDecl.modifiers = toFlags(access) | (useStatic ? Modifier.STATIC : 0) | Modifier.FINAL;
|
||||
fieldDecl.modifiers = toEclipseModifier(access) | (useStatic ? Modifier.STATIC : 0) | Modifier.FINAL;
|
||||
|
||||
LogDeclaration logDeclaration = framework.getDeclaration();
|
||||
fieldDecl.type = createTypeReference(logDeclaration.getLoggerType().getName(), source);
|
||||
|
||||
@@ -117,14 +117,6 @@ public class HandleLog {
|
||||
return maker.Select(maker.Ident(name), typeNode.toName("class"));
|
||||
}
|
||||
|
||||
private static int toFlags(AccessLevel level) {
|
||||
switch (level) {
|
||||
case PUBLIC: return Flags.PUBLIC;
|
||||
case PROTECTED: return Flags.PROTECTED;
|
||||
case PRIVATE: return Flags.PRIVATE;
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean createField(LoggingFramework framework, AccessLevel access, JavacNode typeNode, JCFieldAccess loggingType, JavacNode source, String logFieldName, boolean useStatic, JCExpression loggerTopic) {
|
||||
JavacTreeMaker maker = typeNode.getTreeMaker();
|
||||
@@ -139,7 +131,7 @@ public class HandleLog {
|
||||
JCMethodInvocation factoryMethodCall = maker.Apply(List.<JCExpression>nil(), factoryMethod, List.<JCExpression>from(factoryParameters));
|
||||
|
||||
JCVariableDecl fieldDecl = recursiveSetGeneratedBy(maker.VarDef(
|
||||
maker.Modifiers(toFlags(access) | Flags.FINAL | (useStatic ? Flags.STATIC : 0)),
|
||||
maker.Modifiers(toJavacModifier(access) | Flags.FINAL | (useStatic ? Flags.STATIC : 0)),
|
||||
typeNode.toName(logFieldName), loggerType, factoryMethodCall), source);
|
||||
|
||||
if (isRecord(typeNode) && Javac.getJavaCompilerVersion() < 16) {
|
||||
|
||||
Reference in new issue
Block a user