1 files changed, 12 insertions, 6 deletions
diff --git a/src/java/com/jogamp/gluegen/JavaEmitter.java b/src/java/com/jogamp/gluegen/JavaEmitter.java
index 1a6c313..18b2636 100644
--- a/src/java/com/jogamp/gluegen/JavaEmitter.java
+++ b/src/java/com/jogamp/gluegen/JavaEmitter.java
@@ -811,14 +811,14 @@ public class JavaEmitter implements GlueEmitter {
       writer = openFile(
         cfg.javaOutputDir() + File.separator +
         CodeGenUtils.packageAsPath(structClassPkg) +
-        File.separator + containingTypeName + ".java");
+        File.separator + containingTypeName + ".java", containingTypeName);
       CodeGenUtils.emitAutogeneratedWarning(writer, this);
       if (needsNativeCode) {
         String nRoot = cfg.nativeOutputDir();
         if (cfg.nativeOutputUsesJavaHierarchy()) {
           nRoot += File.separator + CodeGenUtils.packageAsPath(cfg.packageName());
         }
-        newWriter = openFile(nRoot + File.separator + containingTypeName + "_JNI.c");
+        newWriter = openFile(nRoot + File.separator + containingTypeName + "_JNI.c", containingTypeName);
         CodeGenUtils.emitAutogeneratedWarning(newWriter, this);
         emitCHeader(newWriter, containingTypeName);
       }
@@ -1379,7 +1379,13 @@ public class JavaEmitter implements GlueEmitter {
     return layout;
   }
 
-  protected PrintWriter openFile(String filename) throws IOException {
+  /**
+   * @param filename the class's full filename to open w/ write access
+   * @param simpleClassName the simple class name, i.e. w/o package name
+   * @return a {@link PrintWriter} instance to write the class source file
+   * @throws IOException
+   */
+  protected PrintWriter openFile(String filename, String simpleClassName) throws IOException {
     //System.out.println("Trying to open: " + filename);
     File file = new File(filename);
     String parentDir = file.getParent();
@@ -1432,13 +1438,13 @@ public class JavaEmitter implements GlueEmitter {
     }
 
     if (cfg.allStatic() || cfg.emitInterface()) {
-      javaWriter = openFile(jRoot + File.separator + cfg.className() + ".java");
+      javaWriter = openFile(jRoot + File.separator + cfg.className() + ".java", cfg.className());
     }
     if (!cfg.allStatic() && cfg.emitImpl()) {
-      javaImplWriter = openFile(jImplRoot + File.separator + cfg.implClassName() + ".java");
+      javaImplWriter = openFile(jImplRoot + File.separator + cfg.implClassName() + ".java", cfg.implClassName());
     }
     if (cfg.emitImpl()) {
-      cWriter = openFile(nRoot + File.separator + cfg.implClassName() + "_JNI.c");
+      cWriter = openFile(nRoot + File.separator + cfg.implClassName() + "_JNI.c", cfg.implClassName());
     }
 
     if (javaWriter != null) {