From 8ee9681488e814d663dda14ebfc2af515eb6c167 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 7 Nov 2010 03:37:35 +0100 Subject: Fix imports .. --- .../gluegen/opengl/BuildComposablePipeline.java | 18 +++++++++++---- .../jogamp/gluegen/opengl/BuildStaticGLInfo.java | 20 +++++++++++++--- .../com/jogamp/gluegen/opengl/GLConfiguration.java | 19 +++++++++++---- .../com/jogamp/gluegen/opengl/GLEmitter.java | 27 ++++++++++++++++++---- .../gluegen/opengl/GLJavaMethodBindingEmitter.java | 11 +++++---- .../NativeSignatureJavaMethodBindingEmitter.java | 14 ++++++----- .../gluegen/runtime/opengl/GLExtensionNames.java | 5 +--- 7 files changed, 82 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java index 1bc5df959..7acba95e6 100644 --- a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java @@ -39,13 +39,21 @@ */ package com.jogamp.gluegen.opengl; -import com.jogamp.gluegen.*; - -import java.lang.reflect.*; -import java.io.*; +import com.jogamp.gluegen.CodeGenUtils; +import com.jogamp.gluegen.JavaType; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.lang.reflect.Method; import java.nio.Buffer; -import java.util.*; import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; public class BuildComposablePipeline { diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java index 9946c9df1..3131267cc 100644 --- a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java @@ -40,9 +40,23 @@ package com.jogamp.gluegen.opengl; -import java.io.*; -import java.util.*; -import java.util.regex.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Builds the StaticGLInfo class from the OpenGL header files (i.e., gl.h diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java index 010ca1069..d03e1bd9c 100755 --- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java @@ -39,12 +39,21 @@ */ package com.jogamp.gluegen.opengl; -import java.io.*; -import java.util.*; - -import com.jogamp.gluegen.*; -import com.jogamp.gluegen.procaddress.*; +import com.jogamp.gluegen.GlueEmitterControls; +import com.jogamp.gluegen.MethodBinding; +import com.jogamp.gluegen.procaddress.ProcAddressConfiguration; import com.jogamp.gluegen.runtime.opengl.GLExtensionNames; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.StringTokenizer; public class GLConfiguration extends ProcAddressConfiguration { diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java index ad9e47011..530e6fe76 100644 --- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java @@ -39,12 +39,29 @@ */ package com.jogamp.gluegen.opengl; -import java.io.*; -import java.util.*; -import com.jogamp.gluegen.*; -import com.jogamp.gluegen.cgram.types.*; -import com.jogamp.gluegen.procaddress.*; +import com.jogamp.gluegen.ConstantDefinition; +import com.jogamp.gluegen.FunctionEmitter; +import com.jogamp.gluegen.GlueEmitterControls; +import com.jogamp.gluegen.JavaConfiguration; +import com.jogamp.gluegen.JavaEmitter; +import com.jogamp.gluegen.JavaMethodBindingEmitter; +import com.jogamp.gluegen.JavaType; +import com.jogamp.gluegen.MethodBinding; +import com.jogamp.gluegen.SymbolFilter; +import com.jogamp.gluegen.cgram.types.FunctionSymbol; +import com.jogamp.gluegen.procaddress.ProcAddressEmitter; +import com.jogamp.gluegen.procaddress.ProcAddressJavaMethodBindingEmitter; import com.jogamp.gluegen.runtime.opengl.GLExtensionNames; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * A subclass of ProcAddressEmitter with special OpenGL-specific diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java index be9b7b442..4d8c14985 100755 --- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java @@ -39,10 +39,13 @@ */ package com.jogamp.gluegen.opengl; -import java.io.*; -import com.jogamp.gluegen.*; -import com.jogamp.gluegen.cgram.types.*; -import com.jogamp.gluegen.procaddress.*; +import com.jogamp.gluegen.CommentEmitter; +import com.jogamp.gluegen.JavaEmitter; +import com.jogamp.gluegen.JavaMethodBindingEmitter; +import com.jogamp.gluegen.MethodBinding; +import com.jogamp.gluegen.cgram.types.Type; +import com.jogamp.gluegen.procaddress.ProcAddressJavaMethodBindingEmitter; +import java.io.PrintWriter; /** A specialization of the proc address emitter which knows how to change argument names to take into account Vertex Buffer Object / diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java index a39145739..c0c66a4b3 100755 --- a/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java +++ b/src/jogl/classes/com/jogamp/gluegen/opengl/nativesig/NativeSignatureJavaMethodBindingEmitter.java @@ -40,12 +40,14 @@ package com.jogamp.gluegen.opengl.nativesig; -import java.io.*; - -import com.jogamp.gluegen.*; -import com.jogamp.gluegen.cgram.types.*; -import com.jogamp.gluegen.opengl.*; -import com.jogamp.gluegen.procaddress.*; +import com.jogamp.gluegen.JavaMethodBindingEmitter; +import com.jogamp.gluegen.JavaType; +import com.jogamp.gluegen.MethodBinding; +import com.jogamp.gluegen.cgram.types.Type; +import com.jogamp.gluegen.opengl.GLEmitter; +import com.jogamp.gluegen.opengl.GLJavaMethodBindingEmitter; +import com.jogamp.gluegen.procaddress.ProcAddressJavaMethodBindingEmitter; +import java.io.PrintWriter; public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBindingEmitter { diff --git a/src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java b/src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java index 914036312..426333034 100644 --- a/src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java +++ b/src/jogl/classes/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2010 JogAmp Community. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -34,12 +35,8 @@ * facility. * */ - package com.jogamp.gluegen.runtime.opengl; -import java.util.*; -import com.jogamp.gluegen.runtime.*; - public class GLExtensionNames { //GL_XYZ : GL_XYZ, GL_XYZ_GL2, GL_XYZ_ARB, GL_XYZ_OES, GL_XYZ_OML //GL_XYZ : GL_XYZ, GL_GL2_XYZ, GL_ARB_XYZ, GL_OES_XYZ, GL_OML_XYZ -- cgit v1.2.3