From 93121714758f89a394993f0740c6929f48fb887b Mon Sep 17 00:00:00 2001 From: Wade Walker Date: Wed, 26 Dec 2018 11:04:16 -0600 Subject: Fixed CStruct annotation processor to not use dummy Java variable types When annotations were placed on dummy Java variables, the annotation processor was emitting a RenameJavaType directive into the gluegen config file that caused the emitted file to be named boolean.java instead of RenderingConfig.java or Pixel.java. Turned off this behavior when jname is given in the @CStruct annotation. I'm uncertain how much this processor is even used, since I can't find any occurrences of @CStruct outside the test code for it in gluegen. --- src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/java/com') diff --git a/src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java b/src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java index 2fc0766..45293f8 100644 --- a/src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java +++ b/src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java @@ -249,7 +249,7 @@ public class CStructAnnotationProcessor extends AbstractProcessor { writer = new FileWriter(configFile); writer.write("Package "+pakage+"\n"); writer.write("EmitStruct "+structName+"\n"); - if( finalType != structName ) { + if( !useJavaName && (finalType != structName) ) { // We allow renaming the structType to the element's declaredType (FIELD annotation only) writer.write("RenameJavaType " + struct.name()+" " + declaredType +"\n"); } -- cgit v1.2.3