diff --git a/src/java/org/lwjgl/generator/ALTypeMap.java b/src/java/org/lwjgl/generator/ALTypeMap.java index 84a38aa4..e14779ad 100644 --- a/src/java/org/lwjgl/generator/ALTypeMap.java +++ b/src/java/org/lwjgl/generator/ALTypeMap.java @@ -41,17 +41,15 @@ package org.lwjgl.generator; * @version $Revision$ */ -import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; -import com.sun.mirror.util.*; import java.io.*; import java.util.*; import java.nio.*; public class ALTypeMap implements TypeMap { - private final static Map native_types_to_primitive; + private static final Map native_types_to_primitive; static { native_types_to_primitive = new HashMap(); @@ -173,7 +171,7 @@ public class ALTypeMap implements TypeMap { public String getTypedefPrefix() { return "ALAPIENTRY"; } - + public void printNativeIncludes(PrintWriter writer) { writer.println("#include \"checkALerror.h\""); writer.println("#include \"extal.h\""); @@ -182,7 +180,7 @@ public class ALTypeMap implements TypeMap { public Class getStringElementType() { return ALubyte.class; } - + public Class[] getValidAnnotationTypes(Class type) { Class[] valid_types; if (Buffer.class.isAssignableFrom(type)) diff --git a/src/java/org/lwjgl/generator/ALboolean.java b/src/java/org/lwjgl/generator/ALboolean.java index ccf0cab6..659c42ad 100644 --- a/src/java/org/lwjgl/generator/ALboolean.java +++ b/src/java/org/lwjgl/generator/ALboolean.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/ALbyte.java b/src/java/org/lwjgl/generator/ALbyte.java index b9361417..c7894a20 100644 --- a/src/java/org/lwjgl/generator/ALbyte.java +++ b/src/java/org/lwjgl/generator/ALbyte.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/ALenum.java b/src/java/org/lwjgl/generator/ALenum.java index d12626d5..1a375f54 100644 --- a/src/java/org/lwjgl/generator/ALenum.java +++ b/src/java/org/lwjgl/generator/ALenum.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/ALfloat.java b/src/java/org/lwjgl/generator/ALfloat.java index 995cc7ce..5a34c1b5 100644 --- a/src/java/org/lwjgl/generator/ALfloat.java +++ b/src/java/org/lwjgl/generator/ALfloat.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/ALint.java b/src/java/org/lwjgl/generator/ALint.java index 21bd321d..8b0a2a46 100644 --- a/src/java/org/lwjgl/generator/ALint.java +++ b/src/java/org/lwjgl/generator/ALint.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/ALshort.java b/src/java/org/lwjgl/generator/ALshort.java index aeda90b8..156eaa50 100644 --- a/src/java/org/lwjgl/generator/ALshort.java +++ b/src/java/org/lwjgl/generator/ALshort.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/ALsizei.java b/src/java/org/lwjgl/generator/ALsizei.java index 25b4e0d0..9680453b 100644 --- a/src/java/org/lwjgl/generator/ALsizei.java +++ b/src/java/org/lwjgl/generator/ALsizei.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/ALubyte.java b/src/java/org/lwjgl/generator/ALubyte.java index 7675fa98..b0675651 100644 --- a/src/java/org/lwjgl/generator/ALubyte.java +++ b/src/java/org/lwjgl/generator/ALubyte.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/ALuint.java b/src/java/org/lwjgl/generator/ALuint.java index 790bcf4a..d4c23710 100644 --- a/src/java/org/lwjgl/generator/ALuint.java +++ b/src/java/org/lwjgl/generator/ALuint.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/ALvoid.java b/src/java/org/lwjgl/generator/ALvoid.java index 848c4562..f06c3e83 100644 --- a/src/java/org/lwjgl/generator/ALvoid.java +++ b/src/java/org/lwjgl/generator/ALvoid.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/AutoSize.java b/src/java/org/lwjgl/generator/AutoSize.java index 9b0ecb00..9b51de73 100644 --- a/src/java/org/lwjgl/generator/AutoSize.java +++ b/src/java/org/lwjgl/generator/AutoSize.java @@ -34,7 +34,7 @@ package org.lwjgl.generator; /** * $Id$ * - * @AutoSize specifies that a parameter should be pre-computed + * AutoSize specifies that a parameter should be pre-computed * according to the remaining() of a Buffer parameter. * * @author elias_naur diff --git a/src/java/org/lwjgl/generator/FieldsGenerator.java b/src/java/org/lwjgl/generator/FieldsGenerator.java index 8a8c75e6..0157bb22 100644 --- a/src/java/org/lwjgl/generator/FieldsGenerator.java +++ b/src/java/org/lwjgl/generator/FieldsGenerator.java @@ -32,14 +32,11 @@ package org.lwjgl.generator; -import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; -import com.sun.mirror.util.*; import java.io.*; import java.util.*; -import java.nio.*; public class FieldsGenerator { private static void validateField(FieldDeclaration field) { @@ -61,7 +58,7 @@ public class FieldsGenerator { private static void generateField(PrintWriter writer, FieldDeclaration field) { Integer field_value = (Integer)field.getConstantValue(); validateField(field); - String field_value_string = Integer.toHexString(field_value.intValue()); + String field_value_string = Integer.toHexString(field_value); Utils.printDocComment(writer, field); // Print field declaration writer.println("\tpublic static final " + field.getType().toString() + " " + field.getSimpleName() + " = 0x" + field_value_string + ";"); diff --git a/src/java/org/lwjgl/generator/GLTypeMap.java b/src/java/org/lwjgl/generator/GLTypeMap.java index acdd5b33..2171fbc6 100644 --- a/src/java/org/lwjgl/generator/GLTypeMap.java +++ b/src/java/org/lwjgl/generator/GLTypeMap.java @@ -41,17 +41,15 @@ package org.lwjgl.generator; * @version $Revision$ */ -import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; -import com.sun.mirror.util.*; import java.io.*; import java.util.*; import java.nio.*; public class GLTypeMap implements TypeMap { - private final static Map native_types_to_primitive; + private static final Map native_types_to_primitive; static { native_types_to_primitive = new HashMap(); @@ -209,7 +207,7 @@ public class GLTypeMap implements TypeMap { public String getTypedefPrefix() { return "APIENTRY"; } - + public void printNativeIncludes(PrintWriter writer) { writer.println("#include \"extgl.h\""); } diff --git a/src/java/org/lwjgl/generator/GLbitfield.java b/src/java/org/lwjgl/generator/GLbitfield.java index b975434a..5d03e474 100644 --- a/src/java/org/lwjgl/generator/GLbitfield.java +++ b/src/java/org/lwjgl/generator/GLbitfield.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLboolean.java b/src/java/org/lwjgl/generator/GLboolean.java index f721c40f..55e1bd80 100644 --- a/src/java/org/lwjgl/generator/GLboolean.java +++ b/src/java/org/lwjgl/generator/GLboolean.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLbyte.java b/src/java/org/lwjgl/generator/GLbyte.java index 551a6daa..d9afa296 100644 --- a/src/java/org/lwjgl/generator/GLbyte.java +++ b/src/java/org/lwjgl/generator/GLbyte.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLchar.java b/src/java/org/lwjgl/generator/GLchar.java index 6bee2431..79e9317c 100644 --- a/src/java/org/lwjgl/generator/GLchar.java +++ b/src/java/org/lwjgl/generator/GLchar.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLcharARB.java b/src/java/org/lwjgl/generator/GLcharARB.java index 4fea867b..37928e0b 100644 --- a/src/java/org/lwjgl/generator/GLcharARB.java +++ b/src/java/org/lwjgl/generator/GLcharARB.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLclampd.java b/src/java/org/lwjgl/generator/GLclampd.java index e1d80687..ee072ecb 100644 --- a/src/java/org/lwjgl/generator/GLclampd.java +++ b/src/java/org/lwjgl/generator/GLclampd.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLclampf.java b/src/java/org/lwjgl/generator/GLclampf.java index 103a312e..67030491 100644 --- a/src/java/org/lwjgl/generator/GLclampf.java +++ b/src/java/org/lwjgl/generator/GLclampf.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLdouble.java b/src/java/org/lwjgl/generator/GLdouble.java index 04efe124..496f7112 100644 --- a/src/java/org/lwjgl/generator/GLdouble.java +++ b/src/java/org/lwjgl/generator/GLdouble.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLenum.java b/src/java/org/lwjgl/generator/GLenum.java index 12c424dd..f3d1ffbc 100644 --- a/src/java/org/lwjgl/generator/GLenum.java +++ b/src/java/org/lwjgl/generator/GLenum.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLfloat.java b/src/java/org/lwjgl/generator/GLfloat.java index c6df9511..d9f2daaa 100644 --- a/src/java/org/lwjgl/generator/GLfloat.java +++ b/src/java/org/lwjgl/generator/GLfloat.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLhalf.java b/src/java/org/lwjgl/generator/GLhalf.java index bd16b3ad..a1eec92f 100644 --- a/src/java/org/lwjgl/generator/GLhalf.java +++ b/src/java/org/lwjgl/generator/GLhalf.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLhandleARB.java b/src/java/org/lwjgl/generator/GLhandleARB.java index 4fcb91b2..fd23ec11 100644 --- a/src/java/org/lwjgl/generator/GLhandleARB.java +++ b/src/java/org/lwjgl/generator/GLhandleARB.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLint.java b/src/java/org/lwjgl/generator/GLint.java index a56433f9..bd6a9997 100644 --- a/src/java/org/lwjgl/generator/GLint.java +++ b/src/java/org/lwjgl/generator/GLint.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLintptr.java b/src/java/org/lwjgl/generator/GLintptr.java index 8c60f560..d199a80a 100644 --- a/src/java/org/lwjgl/generator/GLintptr.java +++ b/src/java/org/lwjgl/generator/GLintptr.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLintptrARB.java b/src/java/org/lwjgl/generator/GLintptrARB.java index 6b0629d4..e46986e7 100644 --- a/src/java/org/lwjgl/generator/GLintptrARB.java +++ b/src/java/org/lwjgl/generator/GLintptrARB.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLshort.java b/src/java/org/lwjgl/generator/GLshort.java index b1ae19c3..2e27a183 100644 --- a/src/java/org/lwjgl/generator/GLshort.java +++ b/src/java/org/lwjgl/generator/GLshort.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLsizei.java b/src/java/org/lwjgl/generator/GLsizei.java index 5967c2c1..c29bcaa9 100644 --- a/src/java/org/lwjgl/generator/GLsizei.java +++ b/src/java/org/lwjgl/generator/GLsizei.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLsizeiptr.java b/src/java/org/lwjgl/generator/GLsizeiptr.java index f6c2eaf0..973a8ebc 100644 --- a/src/java/org/lwjgl/generator/GLsizeiptr.java +++ b/src/java/org/lwjgl/generator/GLsizeiptr.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLsizeiptrARB.java b/src/java/org/lwjgl/generator/GLsizeiptrARB.java index 915b69af..cf81112a 100644 --- a/src/java/org/lwjgl/generator/GLsizeiptrARB.java +++ b/src/java/org/lwjgl/generator/GLsizeiptrARB.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLubyte.java b/src/java/org/lwjgl/generator/GLubyte.java index 95190e0f..2af1edf7 100644 --- a/src/java/org/lwjgl/generator/GLubyte.java +++ b/src/java/org/lwjgl/generator/GLubyte.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLuint.java b/src/java/org/lwjgl/generator/GLuint.java index 4042ceee..d835d68a 100644 --- a/src/java/org/lwjgl/generator/GLuint.java +++ b/src/java/org/lwjgl/generator/GLuint.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLushort.java b/src/java/org/lwjgl/generator/GLushort.java index fd01ea97..17b5ca0e 100644 --- a/src/java/org/lwjgl/generator/GLushort.java +++ b/src/java/org/lwjgl/generator/GLushort.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GLvoid.java b/src/java/org/lwjgl/generator/GLvoid.java index 7fee92ca..89a59bcb 100644 --- a/src/java/org/lwjgl/generator/GLvoid.java +++ b/src/java/org/lwjgl/generator/GLvoid.java @@ -40,7 +40,6 @@ package org.lwjgl.generator; import java.lang.annotation.Target; import java.lang.annotation.ElementType; -import com.sun.mirror.type.PrimitiveType; @NativeType @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/src/java/org/lwjgl/generator/GeneratorProcessorFactory.java b/src/java/org/lwjgl/generator/GeneratorProcessorFactory.java index badc45c8..fb0eaf1a 100644 --- a/src/java/org/lwjgl/generator/GeneratorProcessorFactory.java +++ b/src/java/org/lwjgl/generator/GeneratorProcessorFactory.java @@ -34,19 +34,12 @@ package org.lwjgl.generator; import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; -import com.sun.mirror.type.*; -import com.sun.mirror.util.*; import java.util.Collection; import java.util.Set; -import java.util.Iterator; import java.util.Map; import java.util.Arrays; -import java.io.PrintWriter; -import java.io.IOException; -import java.io.File; - import static java.util.Collections.*; import static com.sun.mirror.util.DeclarationVisitors.*; @@ -61,7 +54,7 @@ import static com.sun.mirror.util.DeclarationVisitors.*; */ public class GeneratorProcessorFactory implements AnnotationProcessorFactory, RoundCompleteListener { private static boolean first_round = true; - + // Process any set of annotations private static final Collection supportedAnnotations = unmodifiableCollection(Arrays.asList("*")); @@ -108,7 +101,7 @@ public class GeneratorProcessorFactory implements AnnotationProcessorFactory, Ro if (k.startsWith("-Atypemap")) { typemap_classname = k.substring(delimiter + 1); } - } else if (k.equals("-Ageneratechecks")) { + } else if ( "-Ageneratechecks".equals(k)) { generate_error_checks = true; } } diff --git a/src/java/org/lwjgl/generator/GeneratorVisitor.java b/src/java/org/lwjgl/generator/GeneratorVisitor.java index 0e0793ab..4c184208 100644 --- a/src/java/org/lwjgl/generator/GeneratorVisitor.java +++ b/src/java/org/lwjgl/generator/GeneratorVisitor.java @@ -44,7 +44,6 @@ import java.io.IOException; import java.io.File; import java.nio.*; -import java.lang.annotation.Annotation; /** * $Id$ @@ -55,7 +54,7 @@ import java.lang.annotation.Annotation; * @version $Revision$ */ public class GeneratorVisitor extends SimpleDeclarationVisitor { - private final static String STUB_INITIALIZER_NAME = "initNativeStubs"; + private static final String STUB_INITIALIZER_NAME = "initNativeStubs"; private final AnnotationProcessorEnvironment env; private final TypeMap type_map; @@ -66,12 +65,12 @@ public class GeneratorVisitor extends SimpleDeclarationVisitor { this.type_map = type_map; this.generate_error_checks = generate_error_checks; } - + private void validateMethods(InterfaceDeclaration d) { for (MethodDeclaration method : d.getMethods()) validateMethod(method); } - + private void validateMethod(MethodDeclaration method) { if (method.isVarArgs()) throw new RuntimeException("Method " + method.getSimpleName() + " is variadic"); @@ -102,7 +101,7 @@ public class GeneratorVisitor extends SimpleDeclarationVisitor { for (int i = 0; i < valid_types.length; i++) if (valid_types[i].equals(annotation_type)) return; - throw new RuntimeException(type + " is annotated with invalid native type " + annotation_type + + throw new RuntimeException(type + " is annotated with invalid native type " + annotation_type + " in method " + method); } @@ -129,7 +128,7 @@ public class GeneratorVisitor extends SimpleDeclarationVisitor { boolean found_auto_size_param = false; for (ParameterDeclaration inner_param : method.getParameters()) { AutoSize auto_size_annotation = inner_param.getAnnotation(AutoSize.class); - if (auto_size_annotation != null && + if (auto_size_annotation != null && auto_size_annotation.value().equals(param.getSimpleName())) { found_auto_size_param = true; break; @@ -150,7 +149,7 @@ public class GeneratorVisitor extends SimpleDeclarationVisitor { } } - private void generateMethodsNativePointers(PrintWriter writer, Collection methods) { + private static void generateMethodsNativePointers(PrintWriter writer, Collection methods) { for (MethodDeclaration method : methods) generateMethodNativePointers(writer, method); } diff --git a/src/java/org/lwjgl/generator/JNITypeTranslator.java b/src/java/org/lwjgl/generator/JNITypeTranslator.java index 38a2a553..557510c2 100644 --- a/src/java/org/lwjgl/generator/JNITypeTranslator.java +++ b/src/java/org/lwjgl/generator/JNITypeTranslator.java @@ -32,20 +32,9 @@ package org.lwjgl.generator; -import com.sun.mirror.apt.*; -import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; import com.sun.mirror.util.*; -import java.util.Collection; -import java.util.Iterator; - -import java.io.PrintWriter; -import java.io.IOException; -import java.io.File; - -import java.lang.annotation.Annotation; - /** * $Id$ * @@ -69,23 +58,23 @@ public class JNITypeTranslator implements TypeVisitor { public void visitArrayType(ArrayType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitClassType(ClassType t) { signature.append("jobject"); } - + public void visitDeclaredType(DeclaredType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitEnumType(EnumType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitInterfaceType(InterfaceType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitPrimitiveType(PrimitiveType t) { String type; switch (t.getKind()) { @@ -112,23 +101,23 @@ public class JNITypeTranslator implements TypeVisitor { } signature.append(type); } - + public void visitReferenceType(ReferenceType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitTypeMirror(TypeMirror t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitTypeVariable(TypeVariable t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitVoidType(VoidType t) { signature.append(t.toString()); } - + public void visitWildcardType(WildcardType t) { throw new RuntimeException(t + " is not allowed"); } diff --git a/src/java/org/lwjgl/generator/JavaMethodsGenerator.java b/src/java/org/lwjgl/generator/JavaMethodsGenerator.java index e8beff75..19e8c956 100644 --- a/src/java/org/lwjgl/generator/JavaMethodsGenerator.java +++ b/src/java/org/lwjgl/generator/JavaMethodsGenerator.java @@ -44,7 +44,6 @@ package org.lwjgl.generator; import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; -import com.sun.mirror.util.*; import java.io.*; import java.util.*; @@ -170,6 +169,7 @@ public class JavaMethodsGenerator { StripPostfix strip_annotation = method.getAnnotation(StripPostfix.class); String method_name = method.getSimpleName(); if (strip_annotation != null) { + // TODO: This is not used, is it necessary? (keep Utils.findParameter only?) ParameterDeclaration postfix_parameter = Utils.findParameter(method, strip_annotation.value()); if (mode == Mode.NORMAL) method_name = getPostfixStrippedName(type_map, interface_decl, method); @@ -233,7 +233,7 @@ public class JavaMethodsGenerator { } return null; } - + private static boolean hasAnyParameterAutoTypeAnnotation(MethodDeclaration method, ParameterDeclaration target_param) { for (ParameterDeclaration param : method.getParameters()) { AutoType auto_type_annotation = param.getAnnotation(AutoType.class); @@ -354,7 +354,6 @@ public class JavaMethodsGenerator { } private static void printMethodCallArguments(PrintWriter writer, MethodDeclaration method, Map typeinfos_instance, Mode mode) { - Collection params = method.getParameters(); boolean first_parameter = true; for (ParameterDeclaration param : method.getParameters()) if (param.getAnnotation(Result.class) == null) { @@ -369,7 +368,7 @@ public class JavaMethodsGenerator { private static void printParameterChecks(PrintWriter writer, MethodDeclaration method, Mode mode) { for (ParameterDeclaration param : method.getParameters()) { Class java_type = Utils.getJavaType(param.getType()); - if (Utils.isAddressableType(java_type) && + if (Utils.isAddressableType(java_type) && (mode != Mode.BUFFEROBJECT || param.getAnnotation(BufferObject.class) == null) && (mode != Mode.AUTOS || getAutoTypeParameter(method, param) == null) && param.getAnnotation(Result.class) == null) { @@ -399,7 +398,7 @@ public class JavaMethodsGenerator { writer.print("\t"); } writer.print("\t\tBufferChecks.check"); - if (check_value != null && !check_value.equals("")) { + if (check_value != null && !"".equals(check_value) ) { writer.print("Buffer(" + name + ", " + check_value); } else { writer.print("Direct"); diff --git a/src/java/org/lwjgl/generator/JavaTypeTranslator.java b/src/java/org/lwjgl/generator/JavaTypeTranslator.java index 90411621..7265fecd 100644 --- a/src/java/org/lwjgl/generator/JavaTypeTranslator.java +++ b/src/java/org/lwjgl/generator/JavaTypeTranslator.java @@ -32,23 +32,9 @@ package org.lwjgl.generator; -import com.sun.mirror.apt.*; -import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; import com.sun.mirror.util.*; -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; - -import java.io.PrintWriter; -import java.io.IOException; -import java.io.File; - -import java.nio.*; - -import java.lang.annotation.Annotation; - /** * $Id$ * @@ -64,7 +50,7 @@ public class JavaTypeTranslator implements TypeVisitor { public Class getType() { return type; } - + public void visitAnnotationType(AnnotationType t) { throw new RuntimeException(t + " is not allowed"); } @@ -72,7 +58,7 @@ public class JavaTypeTranslator implements TypeVisitor { public void visitArrayType(ArrayType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitPrimitiveType(PrimitiveType t) { switch (t.getKind()) { case INT: @@ -101,35 +87,35 @@ public class JavaTypeTranslator implements TypeVisitor { public void visitDeclaredType(DeclaredType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitEnumType(EnumType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitClassType(ClassType t) { type = NativeTypeTranslator.getClassFromType(t); } - + public void visitInterfaceType(InterfaceType t) { type = NativeTypeTranslator.getClassFromType(t); } - + public void visitReferenceType(ReferenceType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitTypeMirror(TypeMirror t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitTypeVariable(TypeVariable t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitVoidType(VoidType t) { type = void.class; } - + public void visitWildcardType(WildcardType t) { throw new RuntimeException(t + " is not allowed"); } diff --git a/src/java/org/lwjgl/generator/Mode.java b/src/java/org/lwjgl/generator/Mode.java index 925f9e41..a042ff8e 100644 --- a/src/java/org/lwjgl/generator/Mode.java +++ b/src/java/org/lwjgl/generator/Mode.java @@ -32,14 +32,6 @@ package org.lwjgl.generator; -import com.sun.mirror.apt.*; -import com.sun.mirror.declaration.*; -import com.sun.mirror.type.*; -import com.sun.mirror.util.*; - -import java.io.*; -import java.util.*; - public enum Mode { BUFFEROBJECT, AUTOS, diff --git a/src/java/org/lwjgl/generator/NativeMethodStubsGenerator.java b/src/java/org/lwjgl/generator/NativeMethodStubsGenerator.java index e561d0b0..31f6497b 100644 --- a/src/java/org/lwjgl/generator/NativeMethodStubsGenerator.java +++ b/src/java/org/lwjgl/generator/NativeMethodStubsGenerator.java @@ -44,15 +44,14 @@ package org.lwjgl.generator; import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; -import com.sun.mirror.util.*; import java.io.*; import java.util.*; import java.nio.*; public class NativeMethodStubsGenerator { - private final static String BUFFER_ADDRESS_POSTFIX = "_address"; - public final static String BUFFER_POSITION_POSTFIX = "_position"; + private static final String BUFFER_ADDRESS_POSTFIX = "_address"; + public static final String BUFFER_POSITION_POSTFIX = "_position"; public static void generateNativeMethodStubs(AnnotationProcessorEnvironment env, TypeMap type_map, PrintWriter writer, InterfaceDeclaration d, boolean generate_error_checks) { for (MethodDeclaration method : d.getMethods()) { @@ -61,7 +60,7 @@ public class NativeMethodStubsGenerator { generateMethodStub(env, type_map, writer, Utils.getQualifiedClassName(d), method, Mode.BUFFEROBJECT, generate_error_checks); } } - + private static void generateParameters(PrintWriter writer, Collection params, Mode mode) { for (ParameterDeclaration param : params) if (param.getAnnotation(Result.class) == null) diff --git a/src/java/org/lwjgl/generator/NativeType.java b/src/java/org/lwjgl/generator/NativeType.java index 696e9af3..593ef44d 100644 --- a/src/java/org/lwjgl/generator/NativeType.java +++ b/src/java/org/lwjgl/generator/NativeType.java @@ -41,7 +41,6 @@ package org.lwjgl.generator; * @version $Revision$ */ -import com.sun.mirror.type.PrimitiveType; import java.lang.annotation.Target; import java.lang.annotation.ElementType; diff --git a/src/java/org/lwjgl/generator/NativeTypeTranslator.java b/src/java/org/lwjgl/generator/NativeTypeTranslator.java index c666bfb8..8c75c3cd 100644 --- a/src/java/org/lwjgl/generator/NativeTypeTranslator.java +++ b/src/java/org/lwjgl/generator/NativeTypeTranslator.java @@ -35,25 +35,19 @@ package org.lwjgl.generator; /** * $Id$ * - * A TypeVisitor that translates types (and optional native type + * A TypeVisitor that translates types (and optional native type * annotations) to the native type string. * * @author elias_naur * @version $Revision$ */ -import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; import com.sun.mirror.util.*; import java.util.Collection; import java.util.ArrayList; -import java.util.Iterator; - -import java.io.PrintWriter; -import java.io.IOException; -import java.io.File; import java.nio.*; @@ -73,7 +67,7 @@ public class NativeTypeTranslator implements TypeVisitor { private boolean is_indirect; private final Declaration declaration; private final TypeMap type_map; - + public NativeTypeTranslator(TypeMap type_map, Declaration declaration) { this.declaration = declaration; this.type_map = type_map; @@ -100,7 +94,7 @@ public class NativeTypeTranslator implements TypeVisitor { public void visitArrayType(ArrayType t) { throw new RuntimeException(t + " is not allowed"); } - + public static PrimitiveType.Kind getPrimitiveKindFromBufferClass(Class c) { if (IntBuffer.class.equals(c)) return PrimitiveType.Kind.INT; @@ -145,7 +139,7 @@ public class NativeTypeTranslator implements TypeVisitor { throw new RuntimeException(t + " is not allowed"); is_indirect = true; } - + public void visitPrimitiveType(PrimitiveType t) { getNativeTypeFromAnnotatedPrimitiveType(t.getKind()); } @@ -153,21 +147,21 @@ public class NativeTypeTranslator implements TypeVisitor { public void visitDeclaredType(DeclaredType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitEnumType(EnumType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitInterfaceType(InterfaceType t) { throw new RuntimeException(t + " is not allowed"); } - + // Check if the annotation is itself annotated with a certain annotation type public static T getAnnotation(AnnotationMirror annotation, Class type) { return annotation.getAnnotationType().getDeclaration().getAnnotation(type); } - private Class translateAnnotation(AnnotationMirror annotation) { + private static Class translateAnnotation(AnnotationMirror annotation) { NativeType native_type = getAnnotation(annotation, NativeType.class); if (native_type != null) { return getClassFromType(annotation.getAnnotationType()); @@ -193,17 +187,17 @@ public class NativeTypeTranslator implements TypeVisitor { public void visitTypeMirror(TypeMirror t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitTypeVariable(TypeVariable t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitVoidType(VoidType t) { native_types = translateAnnotations(); if (native_types.size() == 0) native_types.add(void.class); } - + public void visitWildcardType(WildcardType t) { throw new RuntimeException(t + " is not allowed"); } diff --git a/src/java/org/lwjgl/generator/PostfixTranslator.java b/src/java/org/lwjgl/generator/PostfixTranslator.java index 6f847c2b..516463fb 100644 --- a/src/java/org/lwjgl/generator/PostfixTranslator.java +++ b/src/java/org/lwjgl/generator/PostfixTranslator.java @@ -42,27 +42,17 @@ package org.lwjgl.generator; * @version $Revision$ */ -import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; import com.sun.mirror.util.*; -import java.util.Collection; -import java.util.Iterator; - -import java.io.PrintWriter; -import java.io.IOException; -import java.io.File; - import java.nio.*; -import java.lang.annotation.Annotation; - public class PostfixTranslator implements TypeVisitor { private final StringBuilder signature = new StringBuilder(); private final Declaration declaration; private final TypeMap type_map; - + public PostfixTranslator(TypeMap type_map, Declaration declaration) { this.declaration = declaration; this.type_map = type_map; @@ -79,7 +69,7 @@ public class PostfixTranslator implements TypeVisitor { public void visitArrayType(ArrayType t) { throw new RuntimeException(t + " is not allowed"); } - + private static PrimitiveType.Kind getPrimitiveKindFromBufferClass(Class c) { if (IntBuffer.class.equals(c)) return PrimitiveType.Kind.INT; @@ -100,19 +90,19 @@ public class PostfixTranslator implements TypeVisitor { PrimitiveType.Kind kind = getPrimitiveKindFromBufferClass(c); visitPrimitiveTypeKind(kind); } - + public void visitDeclaredType(DeclaredType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitEnumType(EnumType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitInterfaceType(InterfaceType t) { throw new RuntimeException(t + " is not allowed"); } - + private boolean translateAnnotation(AnnotationMirror annotation) { NativeType native_type = NativeTypeTranslator.getAnnotation(annotation, NativeType.class); if (native_type != null) { @@ -165,22 +155,22 @@ public class PostfixTranslator implements TypeVisitor { } signature.append(type); } - + public void visitReferenceType(ReferenceType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitTypeMirror(TypeMirror t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitTypeVariable(TypeVariable t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitVoidType(VoidType t) { } - + public void visitWildcardType(WildcardType t) { throw new RuntimeException(t + " is not allowed"); } diff --git a/src/java/org/lwjgl/generator/RegisterStubsGenerator.java b/src/java/org/lwjgl/generator/RegisterStubsGenerator.java index ba8e753a..debe0ad7 100644 --- a/src/java/org/lwjgl/generator/RegisterStubsGenerator.java +++ b/src/java/org/lwjgl/generator/RegisterStubsGenerator.java @@ -41,14 +41,11 @@ package org.lwjgl.generator; * @version $Revision$ */ -import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; -import com.sun.mirror.util.*; import java.io.*; import java.util.*; -import java.nio.*; public class RegisterStubsGenerator { public static void generateMethodsNativeStubBind(PrintWriter writer, InterfaceDeclaration d, boolean generate_error_checks) { @@ -79,7 +76,7 @@ public class RegisterStubsGenerator { type.accept(v); return v.getSignature(); } - + private static String getMethodSignature(MethodDeclaration method, Mode mode) { Collection params = method.getParameters(); String signature = "("; diff --git a/src/java/org/lwjgl/generator/SignatureTranslator.java b/src/java/org/lwjgl/generator/SignatureTranslator.java index c5ba7467..172e608a 100644 --- a/src/java/org/lwjgl/generator/SignatureTranslator.java +++ b/src/java/org/lwjgl/generator/SignatureTranslator.java @@ -41,8 +41,6 @@ package org.lwjgl.generator; * @version $Revision$ */ -import com.sun.mirror.apt.*; -import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; import com.sun.mirror.util.*; @@ -52,7 +50,7 @@ class SignatureTranslator implements TypeVisitor { private final boolean add_position_signature; private final StringBuilder signature = new StringBuilder(); - public SignatureTranslator(boolean add_position_signature) { + SignatureTranslator(boolean add_position_signature) { this.add_position_signature = add_position_signature; } @@ -71,7 +69,7 @@ class SignatureTranslator implements TypeVisitor { public void visitArrayType(ArrayType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitClassType(ClassType t) { String type_name = getNativeNameFromClassName(t.getDeclaration().getQualifiedName()); signature.append("L"); @@ -81,21 +79,20 @@ class SignatureTranslator implements TypeVisitor { signature.append("I"); } } - + public void visitDeclaredType(DeclaredType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitEnumType(EnumType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitInterfaceType(InterfaceType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitPrimitiveType(PrimitiveType t) { - String type; switch (t.getKind()) { case BOOLEAN: signature.append("Z"); @@ -122,23 +119,23 @@ class SignatureTranslator implements TypeVisitor { throw new RuntimeException("Unsupported type " + t); } } - + public void visitReferenceType(ReferenceType t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitTypeMirror(TypeMirror t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitTypeVariable(TypeVariable t) { throw new RuntimeException(t + " is not allowed"); } - + public void visitVoidType(VoidType t) { signature.append("V"); } - + public void visitWildcardType(WildcardType t) { throw new RuntimeException(t + " is not allowed"); } diff --git a/src/java/org/lwjgl/generator/TypeInfo.java b/src/java/org/lwjgl/generator/TypeInfo.java index 75ccbb10..c070ab8b 100644 --- a/src/java/org/lwjgl/generator/TypeInfo.java +++ b/src/java/org/lwjgl/generator/TypeInfo.java @@ -48,7 +48,7 @@ import java.util.*; import java.nio.*; public class TypeInfo { - public final static String UNSIGNED_PARAMETER_NAME = "unsigned"; + public static final String UNSIGNED_PARAMETER_NAME = "unsigned"; private final Signedness signedness; private final Class type; @@ -67,7 +67,7 @@ public class TypeInfo { public Signedness getSignedness() { return signedness; } - + public String getAutoType() { if (auto_type == null) throw new RuntimeException("No auto type assigned"); diff --git a/src/java/org/lwjgl/generator/TypeMap.java b/src/java/org/lwjgl/generator/TypeMap.java index 14380a72..cd14fb71 100644 --- a/src/java/org/lwjgl/generator/TypeMap.java +++ b/src/java/org/lwjgl/generator/TypeMap.java @@ -41,27 +41,23 @@ package org.lwjgl.generator; * @version $Revision$ */ -import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; -import com.sun.mirror.util.*; import java.io.*; -import java.util.*; -import java.nio.*; public interface TypeMap { - public String getErrorCheckMethodName(); - public String getRegisterNativesFunctionName(); - public PrimitiveType.Kind getPrimitiveTypeFromNativeType(Class native_type); - public String getTypedefPrefix(); - public void printNativeIncludes(PrintWriter writer); - public Class getStringElementType(); - public Class[] getValidAnnotationTypes(Class type); - public Class getVoidType(); - public String translateAnnotation(Class annotation_type); - public Class getNativeTypeFromPrimitiveType(PrimitiveType.Kind kind); - public String getAutoTypeFromAnnotation(AnnotationMirror annotation); - public Class getInverseType(Class type); - public Signedness getSignednessFromType(Class type); + String getErrorCheckMethodName(); + String getRegisterNativesFunctionName(); + PrimitiveType.Kind getPrimitiveTypeFromNativeType(Class native_type); + String getTypedefPrefix(); + void printNativeIncludes(PrintWriter writer); + Class getStringElementType(); + Class[] getValidAnnotationTypes(Class type); + Class getVoidType(); + String translateAnnotation(Class annotation_type); + Class getNativeTypeFromPrimitiveType(PrimitiveType.Kind kind); + String getAutoTypeFromAnnotation(AnnotationMirror annotation); + Class getInverseType(Class type); + Signedness getSignednessFromType(Class type); } diff --git a/src/java/org/lwjgl/generator/TypedefsGenerator.java b/src/java/org/lwjgl/generator/TypedefsGenerator.java index 63cbc019..2c2328dd 100644 --- a/src/java/org/lwjgl/generator/TypedefsGenerator.java +++ b/src/java/org/lwjgl/generator/TypedefsGenerator.java @@ -41,16 +41,14 @@ package org.lwjgl.generator; * @version $Revision$ */ -import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; import com.sun.mirror.type.*; -import com.sun.mirror.util.*; import java.io.*; import java.util.*; public class TypedefsGenerator { - public final static String TYPEDEF_POSTFIX = "PROC"; + public static final String TYPEDEF_POSTFIX = "PROC"; private static void generateNativeTypedefs(TypeMap type_map, PrintWriter writer, MethodDeclaration method) { TypeMirror return_type = method.getReturnType(); diff --git a/src/java/org/lwjgl/generator/Utils.java b/src/java/org/lwjgl/generator/Utils.java index 90ff6052..dd28c0ba 100644 --- a/src/java/org/lwjgl/generator/Utils.java +++ b/src/java/org/lwjgl/generator/Utils.java @@ -45,18 +45,15 @@ import java.nio.Buffer; import java.io.*; import java.util.*; -import com.sun.mirror.apt.*; import com.sun.mirror.declaration.*; -import com.sun.mirror.type.*; -import com.sun.mirror.util.*; public class Utils { - public final static String BUFFER_OBJECT_METHOD_POSTFIX = "BO"; - public final static String BUFFER_OBJECT_PARAMETER_POSTFIX = "_buffer_offset"; - public final static String RESULT_SIZE_NAME = "result_size"; - public final static String RESULT_VAR_NAME = "__result"; - public final static String CACHED_BUFFER_NAME = "old_buffer"; - private final static String OVERLOADED_METHOD_PREFIX = "n"; + public static final String BUFFER_OBJECT_METHOD_POSTFIX = "BO"; + public static final String BUFFER_OBJECT_PARAMETER_POSTFIX = "_buffer_offset"; + public static final String RESULT_SIZE_NAME = "result_size"; + public static final String RESULT_VAR_NAME = "__result"; + public static final String CACHED_BUFFER_NAME = "old_buffer"; + private static final String OVERLOADED_METHOD_PREFIX = "n"; private static class AnnotationMirrorComparator implements Comparator { public int compare(AnnotationMirror a1, AnnotationMirror a2) { @@ -80,11 +77,11 @@ public class Utils { public static boolean isAddressableType(TypeMirror type) { return isAddressableType(getJavaType(type)); } - + public static boolean isAddressableType(Class type) { return Buffer.class.isAssignableFrom(type) || String.class.equals(type); } - + public static Class getJavaType(TypeMirror type_mirror) { JavaTypeTranslator translator = new JavaTypeTranslator(); type_mirror.accept(translator); @@ -105,7 +102,7 @@ public class Utils { throw new RuntimeException(param + " not defined as java.nio.Buffer but has multiple types"); return result; } - + public static ParameterDeclaration findParameter(MethodDeclaration method, String name) { for (ParameterDeclaration param : method.getParameters()) if (param.getSimpleName().equals(name)) @@ -176,7 +173,7 @@ public class Utils { result_type = method.getReturnType(); return result_type; } - + public static void printExtraCallArguments(PrintWriter writer, MethodDeclaration method) { writer.print(", " + RESULT_SIZE_NAME); if (method.getAnnotation(CachedResult.class) != null) { @@ -186,7 +183,7 @@ public class Utils { private static String getClassName(InterfaceDeclaration interface_decl, String opengl_name) { Extension extension_annotation = interface_decl.getAnnotation(Extension.class); - if (extension_annotation != null && !extension_annotation.className().equals("")) { + if (extension_annotation != null && !"".equals(extension_annotation.className())) { return extension_annotation.className(); } StringBuilder result = new StringBuilder();