aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2003-07-31 22:33:39 +0000
committerKenneth Russel <[email protected]>2003-07-31 22:33:39 +0000
commita73a3eb708cdbee936a5bc6f286c85f68e2c0e5f (patch)
treeef65ca399fc9f4633cd5d51ef351ccda6ca4c527
parent82c7b240ff705dff23daaf843b02aa1796ec9323 (diff)
Fixed bug pointed out by [email protected] where impl classes
weren't obeying the Imports .cfg file directive git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@42 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--make/glu-common.cfg4
-rw-r--r--src/net/java/games/gluegen/JavaEmitter.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/make/glu-common.cfg b/make/glu-common.cfg
index adfba24a4..49290bdd3 100644
--- a/make/glu-common.cfg
+++ b/make/glu-common.cfg
@@ -9,9 +9,11 @@ NativeOutputDir ../build/gensrc/native/jogl
HierarchicalNativeOutput false
#
-# Need to import New IO for Buffer classes
+# Imports needed by all glue code
#
Import java.nio.*
+Import net.java.games.jogl.*
+Import net.java.games.jogl.impl.*
# Raise GLException instead of RuntimeException in glue code
RuntimeExceptionType GLException
diff --git a/src/net/java/games/gluegen/JavaEmitter.java b/src/net/java/games/gluegen/JavaEmitter.java
index 26e2a4f23..824b703b4 100644
--- a/src/net/java/games/gluegen/JavaEmitter.java
+++ b/src/net/java/games/gluegen/JavaEmitter.java
@@ -1095,7 +1095,7 @@ public class JavaEmitter implements GlueEmitter {
cfg.implPackageName(),
cfg.implClassName(),
true,
- new String[] { "java.nio.*", cfg.packageName() + ".*" },
+ (String[]) cfg.imports().toArray(new String[] {}),
new String[] { "public" },
new String[] { cfg.className() },
null,