diff options
| author | Harvey Harrison <[email protected]> | 2011-12-31 14:59:35 -0800 |
|---|---|---|
| committer | Harvey Harrison <[email protected]> | 2011-12-31 14:59:35 -0800 |
| commit | 7e7e7f747ba9e3b851c475dc400b0d118ac1c4ba (patch) | |
| tree | 6db66dc89b1f49afe24ada8d0ed4b297ad994a6b /src | |
| parent | eb264491b0a923610888684fc6134e0f430932f8 (diff) | |
j3dcore: use eclipse organize imports cleanup tool
Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src')
210 files changed, 646 insertions, 376 deletions
diff --git a/src/classes/jogl/javax/media/j3d/JoglCgShaderInfo.java b/src/classes/jogl/javax/media/j3d/JoglCgShaderInfo.java index e7873ee..7ad8a5f 100755 --- a/src/classes/jogl/javax/media/j3d/JoglCgShaderInfo.java +++ b/src/classes/jogl/javax/media/j3d/JoglCgShaderInfo.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import com.sun.opengl.cg.*; +import com.sun.opengl.cg.CGprogram; class JoglCgShaderInfo extends JoglShaderObject { private CGprogram cgShader; diff --git a/src/classes/jogl/javax/media/j3d/JoglCgShaderParameter.java b/src/classes/jogl/javax/media/j3d/JoglCgShaderParameter.java index cf9e927..a0aa4d4 100755 --- a/src/classes/jogl/javax/media/j3d/JoglCgShaderParameter.java +++ b/src/classes/jogl/javax/media/j3d/JoglCgShaderParameter.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import com.sun.opengl.cg.*; +import com.sun.opengl.cg.CGparameter; class JoglCgShaderParameter extends JoglShaderObject { private CGparameter vParam; diff --git a/src/classes/jogl/javax/media/j3d/JoglCgShaderProgramInfo.java b/src/classes/jogl/javax/media/j3d/JoglCgShaderProgramInfo.java index f31b745..ad9b6b5 100755 --- a/src/classes/jogl/javax/media/j3d/JoglCgShaderProgramInfo.java +++ b/src/classes/jogl/javax/media/j3d/JoglCgShaderProgramInfo.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import com.sun.opengl.cg.*; +import com.sun.opengl.cg.CGparameter; class JoglCgShaderProgramInfo extends JoglShaderObject { private JoglCgShaderInfo vShader; // vertex shader diff --git a/src/classes/jogl/javax/media/j3d/JoglContext.java b/src/classes/jogl/javax/media/j3d/JoglContext.java index b25ff19..539bcb0 100644 --- a/src/classes/jogl/javax/media/j3d/JoglContext.java +++ b/src/classes/jogl/javax/media/j3d/JoglContext.java @@ -31,9 +31,14 @@ package javax.media.j3d; -import java.nio.*; -import javax.media.opengl.*; -import com.sun.opengl.cg.*; +import java.nio.Buffer; +import java.nio.FloatBuffer; + +import javax.media.opengl.GL; +import javax.media.opengl.GLContext; + +import com.sun.opengl.cg.CGcontext; +import com.sun.opengl.cg.CgGL; /** * Graphics context objects for Jogl rendering pipeline. diff --git a/src/classes/jogl/javax/media/j3d/JoglDrawable.java b/src/classes/jogl/javax/media/j3d/JoglDrawable.java index 8b7dc57..7adabcb 100755 --- a/src/classes/jogl/javax/media/j3d/JoglDrawable.java +++ b/src/classes/jogl/javax/media/j3d/JoglDrawable.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import javax.media.opengl.*; +import javax.media.opengl.GLDrawable; /** * Drawable class for the Jogl rendering pipeline. diff --git a/src/classes/jogl/javax/media/j3d/JoglGraphicsConfiguration.java b/src/classes/jogl/javax/media/j3d/JoglGraphicsConfiguration.java index 94d62ad..5fab312 100755 --- a/src/classes/jogl/javax/media/j3d/JoglGraphicsConfiguration.java +++ b/src/classes/jogl/javax/media/j3d/JoglGraphicsConfiguration.java @@ -31,10 +31,18 @@ package javax.media.j3d; -import java.awt.*; -import java.awt.geom.*; -import java.awt.image.*; -import javax.media.opengl.*; +import java.awt.AWTException; +import java.awt.DisplayMode; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.awt.ImageCapabilities; +import java.awt.Rectangle; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; +import java.awt.image.VolatileImage; + +import javax.media.opengl.GLCapabilities; /** * Class implementing the GraphicsConfiguration API, but not a "real" diff --git a/src/classes/jogl/javax/media/j3d/JoglPipeline.java b/src/classes/jogl/javax/media/j3d/JoglPipeline.java index b174183..6d06822 100644 --- a/src/classes/jogl/javax/media/j3d/JoglPipeline.java +++ b/src/classes/jogl/javax/media/j3d/JoglPipeline.java @@ -31,18 +31,49 @@ package javax.media.j3d; -import com.sun.j3d.internal.ByteBufferWrapper; -import java.awt.*; -import java.io.*; -import java.lang.reflect.*; -import java.nio.*; -import java.security.*; -import java.util.*; -import java.util.regex.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; -import com.sun.opengl.cg.*; -import com.sun.opengl.util.*; +import java.awt.BorderLayout; +import java.awt.Canvas; +import java.awt.DisplayMode; +import java.awt.EventQueue; +import java.awt.Frame; +import java.awt.GraphicsConfigTemplate; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Method; +import java.nio.Buffer; +import java.nio.ByteBuffer; +import java.nio.DoubleBuffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.ArrayList; +import java.util.StringTokenizer; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.media.opengl.AWTGraphicsConfiguration; +import javax.media.opengl.AWTGraphicsDevice; +import javax.media.opengl.AbstractGraphicsConfiguration; +import javax.media.opengl.DefaultGLCapabilitiesChooser; +import javax.media.opengl.GL; +import javax.media.opengl.GLCapabilities; +import javax.media.opengl.GLCapabilitiesChooser; +import javax.media.opengl.GLContext; +import javax.media.opengl.GLDrawable; +import javax.media.opengl.GLDrawableFactory; +import javax.media.opengl.GLException; +import javax.media.opengl.GLPbuffer; +import javax.media.opengl.Threading; +import javax.media.opengl.glu.GLU; + +import com.sun.opengl.cg.CGcontext; +import com.sun.opengl.cg.CGparameter; +import com.sun.opengl.cg.CGprogram; +import com.sun.opengl.cg.CgGL; +import com.sun.opengl.util.BufferUtil; /** * Concrete implementation of Pipeline class for the JOGL rendering diff --git a/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java b/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java index 10cdfa6..4e360a3 100644 --- a/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java +++ b/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java @@ -32,10 +32,9 @@ package javax.media.j3d; -import javax.vecmath.*; +import java.util.ArrayList; import java.util.Enumeration; import java.util.Vector; -import java.util.ArrayList; class AlternateAppearanceRetained extends LeafRetained { diff --git a/src/classes/share/javax/media/j3d/AmbientLightRetained.java b/src/classes/share/javax/media/j3d/AmbientLightRetained.java index ee76f1d..5a02b0b 100644 --- a/src/classes/share/javax/media/j3d/AmbientLightRetained.java +++ b/src/classes/share/javax/media/j3d/AmbientLightRetained.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * An ambient light source object. diff --git a/src/classes/share/javax/media/j3d/AppearanceRetained.java b/src/classes/share/javax/media/j3d/AppearanceRetained.java index b771957..d03533e 100644 --- a/src/classes/share/javax/media/j3d/AppearanceRetained.java +++ b/src/classes/share/javax/media/j3d/AppearanceRetained.java @@ -31,8 +31,6 @@ package javax.media.j3d; -import java.util.Vector; -import java.util.BitSet; import java.util.ArrayList; diff --git a/src/classes/share/javax/media/j3d/AttributeBin.java b/src/classes/share/javax/media/j3d/AttributeBin.java index 88ca9dd..183d463 100644 --- a/src/classes/share/javax/media/j3d/AttributeBin.java +++ b/src/classes/share/javax/media/j3d/AttributeBin.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; /** diff --git a/src/classes/share/javax/media/j3d/AudioDevice3D.java b/src/classes/share/javax/media/j3d/AudioDevice3D.java index 1b9f4b4..d9f84ab 100644 --- a/src/classes/share/javax/media/j3d/AudioDevice3D.java +++ b/src/classes/share/javax/media/j3d/AudioDevice3D.java @@ -31,7 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point2f; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector3f; /** diff --git a/src/classes/share/javax/media/j3d/AuralAttributesRetained.java b/src/classes/share/javax/media/j3d/AuralAttributesRetained.java index ca35483..eebbc4b 100644 --- a/src/classes/share/javax/media/j3d/AuralAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/AuralAttributesRetained.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.Hashtable; import javax.vecmath.Point2f; /** diff --git a/src/classes/share/javax/media/j3d/BHInsertStructure.java b/src/classes/share/javax/media/j3d/BHInsertStructure.java index b1d7f2c..45fc33b 100644 --- a/src/classes/share/javax/media/j3d/BHInsertStructure.java +++ b/src/classes/share/javax/media/j3d/BHInsertStructure.java @@ -31,7 +31,8 @@ package javax.media.j3d; -import java.util.*; +import java.util.ArrayList; +import java.util.Random; class BHInsertStructure { diff --git a/src/classes/share/javax/media/j3d/BHInternalNode.java b/src/classes/share/javax/media/j3d/BHInternalNode.java index 81ac361..89acde2 100644 --- a/src/classes/share/javax/media/j3d/BHInternalNode.java +++ b/src/classes/share/javax/media/j3d/BHInternalNode.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; class BHInternalNode extends BHNode { diff --git a/src/classes/share/javax/media/j3d/BHLeafNode.java b/src/classes/share/javax/media/j3d/BHLeafNode.java index 7b59d98..c0a210a 100644 --- a/src/classes/share/javax/media/j3d/BHLeafNode.java +++ b/src/classes/share/javax/media/j3d/BHLeafNode.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; class BHLeafNode extends BHNode { diff --git a/src/classes/share/javax/media/j3d/BHNode.java b/src/classes/share/javax/media/j3d/BHNode.java index aa8bd22..9ab41f2 100644 --- a/src/classes/share/javax/media/j3d/BHNode.java +++ b/src/classes/share/javax/media/j3d/BHNode.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; abstract class BHNode { diff --git a/src/classes/share/javax/media/j3d/BHTree.java b/src/classes/share/javax/media/j3d/BHTree.java index 228c5f1..d1dc3a0 100644 --- a/src/classes/share/javax/media/j3d/BHTree.java +++ b/src/classes/share/javax/media/j3d/BHTree.java @@ -33,6 +33,7 @@ package javax.media.j3d; import java.util.ArrayList; import java.util.Vector; + import javax.vecmath.Point4d; class BHTree { diff --git a/src/classes/share/javax/media/j3d/Background.java b/src/classes/share/javax/media/j3d/Background.java index 1a975b6..9f8a73d 100644 --- a/src/classes/share/javax/media/j3d/Background.java +++ b/src/classes/share/javax/media/j3d/Background.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Color3f; /** * The Background leaf node defines a solid background color diff --git a/src/classes/share/javax/media/j3d/BackgroundRetained.java b/src/classes/share/javax/media/j3d/BackgroundRetained.java index fee0094..dc1bb14 100644 --- a/src/classes/share/javax/media/j3d/BackgroundRetained.java +++ b/src/classes/share/javax/media/j3d/BackgroundRetained.java @@ -31,11 +31,9 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; -import java.awt.geom.AffineTransform; -import java.awt.image.AffineTransformOp; -import java.awt.image.BufferedImage; + +import javax.vecmath.Color3f; /** diff --git a/src/classes/share/javax/media/j3d/BehaviorRetained.java b/src/classes/share/javax/media/j3d/BehaviorRetained.java index b39b3af..03e8b0e 100644 --- a/src/classes/share/javax/media/j3d/BehaviorRetained.java +++ b/src/classes/share/javax/media/j3d/BehaviorRetained.java @@ -30,7 +30,6 @@ */ package javax.media.j3d; -import java.util.ArrayList; /** * Behavior is an abstract class that contains the framework for all diff --git a/src/classes/share/javax/media/j3d/BehaviorScheduler.java b/src/classes/share/javax/media/j3d/BehaviorScheduler.java index 91db555..418618e 100644 --- a/src/classes/share/javax/media/j3d/BehaviorScheduler.java +++ b/src/classes/share/javax/media/j3d/BehaviorScheduler.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.ArrayList; import java.util.logging.Level; class BehaviorScheduler extends J3dThread { diff --git a/src/classes/share/javax/media/j3d/BehaviorStructure.java b/src/classes/share/javax/media/j3d/BehaviorStructure.java index 77a58bc..fe02f89 100644 --- a/src/classes/share/javax/media/j3d/BehaviorStructure.java +++ b/src/classes/share/javax/media/j3d/BehaviorStructure.java @@ -31,12 +31,17 @@ package javax.media.j3d; -import javax.vecmath.*; +import java.awt.AWTEvent; +import java.awt.event.ComponentEvent; +import java.awt.event.FocusEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; import java.util.ArrayList; -import java.awt.*; -import java.awt.event.*; import java.util.Arrays; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; + /** * A behavior structure is a object that organizes behaviors, * wakeup conditions, and other behavior scheduler entities. diff --git a/src/classes/share/javax/media/j3d/Billboard.java b/src/classes/share/javax/media/j3d/Billboard.java index 751616a..d6d2045 100644 --- a/src/classes/share/javax/media/j3d/Billboard.java +++ b/src/classes/share/javax/media/j3d/Billboard.java @@ -32,11 +32,12 @@ package javax.media.j3d; import java.util.Enumeration; -import javax.vecmath.Point3f; + +import javax.vecmath.AxisAngle4d; import javax.vecmath.Point3d; +import javax.vecmath.Point3f; import javax.vecmath.Vector3d; import javax.vecmath.Vector3f; -import javax.vecmath.AxisAngle4d; /** * The Billboard behavior node operates on the TransformGroup node diff --git a/src/classes/share/javax/media/j3d/BoundingBox.java b/src/classes/share/javax/media/j3d/BoundingBox.java index 4905406..1aa1fde 100644 --- a/src/classes/share/javax/media/j3d/BoundingBox.java +++ b/src/classes/share/javax/media/j3d/BoundingBox.java @@ -31,7 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector4d; + import com.sun.j3d.internal.HashCodeUtil; /** diff --git a/src/classes/share/javax/media/j3d/BoundingLeaf.java b/src/classes/share/javax/media/j3d/BoundingLeaf.java index 70285e6..0b08d63 100644 --- a/src/classes/share/javax/media/j3d/BoundingLeaf.java +++ b/src/classes/share/javax/media/j3d/BoundingLeaf.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * The BoundingLeaf node defines a bounding region object that can be diff --git a/src/classes/share/javax/media/j3d/BoundingLeafRetained.java b/src/classes/share/javax/media/j3d/BoundingLeafRetained.java index 6935743..82adb76 100644 --- a/src/classes/share/javax/media/j3d/BoundingLeafRetained.java +++ b/src/classes/share/javax/media/j3d/BoundingLeafRetained.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; /** diff --git a/src/classes/share/javax/media/j3d/BoundingPolytope.java b/src/classes/share/javax/media/j3d/BoundingPolytope.java index b6a0e68..e9e62df 100644 --- a/src/classes/share/javax/media/j3d/BoundingPolytope.java +++ b/src/classes/share/javax/media/j3d/BoundingPolytope.java @@ -31,8 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector4d; + import com.sun.j3d.internal.HashCodeUtil; /** diff --git a/src/classes/share/javax/media/j3d/BoundingSphere.java b/src/classes/share/javax/media/j3d/BoundingSphere.java index cf0fe3e..466b2db 100644 --- a/src/classes/share/javax/media/j3d/BoundingSphere.java +++ b/src/classes/share/javax/media/j3d/BoundingSphere.java @@ -31,8 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector4d; + import com.sun.j3d.internal.HashCodeUtil; /** diff --git a/src/classes/share/javax/media/j3d/Bounds.java b/src/classes/share/javax/media/j3d/Bounds.java index 7b6665f..9a0daf6 100644 --- a/src/classes/share/javax/media/j3d/Bounds.java +++ b/src/classes/share/javax/media/j3d/Bounds.java @@ -31,8 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Matrix3d; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector4d; /** * The abstract base class for bounds objects. Bounds objects define diff --git a/src/classes/share/javax/media/j3d/BranchGroupRetained.java b/src/classes/share/javax/media/j3d/BranchGroupRetained.java index 3ab3a0c..5f55764 100644 --- a/src/classes/share/javax/media/j3d/BranchGroupRetained.java +++ b/src/classes/share/javax/media/j3d/BranchGroupRetained.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import java.util.*; +import java.util.ArrayList; /** * The BranchGroup node provides the ability to insert a branch of diff --git a/src/classes/share/javax/media/j3d/CachedFrustum.java b/src/classes/share/javax/media/j3d/CachedFrustum.java index 434d767..1d3311b 100644 --- a/src/classes/share/javax/media/j3d/CachedFrustum.java +++ b/src/classes/share/javax/media/j3d/CachedFrustum.java @@ -31,7 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Vector4d; /** * The CachedFrustum class is used to pre compute data for a set of view diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java index 62ef700..a6d54b5 100644 --- a/src/classes/share/javax/media/j3d/Canvas3D.java +++ b/src/classes/share/javax/media/j3d/Canvas3D.java @@ -31,10 +31,30 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.awt.*; +import java.awt.AWTEvent; +import java.awt.Canvas; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.awt.IllegalComponentStateException; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Window; import java.awt.image.BufferedImage; -import java.util.*; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; + +import javax.vecmath.Color3f; +import javax.vecmath.Point2d; +import javax.vecmath.Point3d; +import javax.vecmath.Vector4d; /** diff --git a/src/classes/share/javax/media/j3d/CanvasViewCache.java b/src/classes/share/javax/media/j3d/CanvasViewCache.java index a0b1449..d1dd4a0 100644 --- a/src/classes/share/javax/media/j3d/CanvasViewCache.java +++ b/src/classes/share/javax/media/j3d/CanvasViewCache.java @@ -31,11 +31,15 @@ package javax.media.j3d; -import java.awt.Point; -import java.awt.Dimension; import java.awt.Rectangle; -import java.awt.IllegalComponentStateException; -import javax.vecmath.*; + +import javax.vecmath.Matrix4d; +import javax.vecmath.Point2d; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.SingularMatrixException; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector4d; /** * The CanvasViewCache class is used to cache all data, both API data diff --git a/src/classes/share/javax/media/j3d/CanvasViewEventCatcher.java b/src/classes/share/javax/media/j3d/CanvasViewEventCatcher.java index 2d0a0ef..882b9b4 100644 --- a/src/classes/share/javax/media/j3d/CanvasViewEventCatcher.java +++ b/src/classes/share/javax/media/j3d/CanvasViewEventCatcher.java @@ -31,9 +31,9 @@ package javax.media.j3d; -import java.util.ArrayList; -import java.awt.*; -import java.awt.event.*; +import java.awt.IllegalComponentStateException; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; /** * The CanvasViewEventCatcher class is used to track events on a Canvas3D that diff --git a/src/classes/share/javax/media/j3d/ClipRetained.java b/src/classes/share/javax/media/j3d/ClipRetained.java index 8a60136..eb42369 100644 --- a/src/classes/share/javax/media/j3d/ClipRetained.java +++ b/src/classes/share/javax/media/j3d/ClipRetained.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; /** diff --git a/src/classes/share/javax/media/j3d/ColorInterpolator.java b/src/classes/share/javax/media/j3d/ColorInterpolator.java index c527e38..8821587 100644 --- a/src/classes/share/javax/media/j3d/ColorInterpolator.java +++ b/src/classes/share/javax/media/j3d/ColorInterpolator.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.Color3f; import java.util.Enumeration; +import javax.vecmath.Color3f; + /** * Color interpolation behavior. This class defines a behavior that * modifies the ambient, emissive, diffuse, or specular color of its diff --git a/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java b/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java index 2e3fc9b..806670d 100644 --- a/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.Color3f; import java.util.ArrayList; +import javax.vecmath.Color3f; + /** * The ColoringAttributesRetained object defines attributes that apply to * to coloring mapping. diff --git a/src/classes/share/javax/media/j3d/CompileState.java b/src/classes/share/javax/media/j3d/CompileState.java index 8063368..6411ef0 100644 --- a/src/classes/share/javax/media/j3d/CompileState.java +++ b/src/classes/share/javax/media/j3d/CompileState.java @@ -31,8 +31,12 @@ package javax.media.j3d; -import java.util.*; -import java.security.*; +import java.security.AccessControlException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Vector; /** * The CompileState holds information used during a compile. It is diff --git a/src/classes/share/javax/media/j3d/CompressedGeometryHeader.java b/src/classes/share/javax/media/j3d/CompressedGeometryHeader.java index 75f6761..12aaed8 100644 --- a/src/classes/share/javax/media/j3d/CompressedGeometryHeader.java +++ b/src/classes/share/javax/media/j3d/CompressedGeometryHeader.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; /** * The CompressedGeometrHeader object is used in conjunction with diff --git a/src/classes/share/javax/media/j3d/CompressedGeometryRetained.java b/src/classes/share/javax/media/j3d/CompressedGeometryRetained.java index 113fd04..9d2bd98 100644 --- a/src/classes/share/javax/media/j3d/CompressedGeometryRetained.java +++ b/src/classes/share/javax/media/j3d/CompressedGeometryRetained.java @@ -30,7 +30,7 @@ */ package javax.media.j3d ; -import javax.vecmath.* ; +import javax.vecmath.Point3d; /** * The compressed geometry object is used to store geometry in a diff --git a/src/classes/share/javax/media/j3d/ConeSound.java b/src/classes/share/javax/media/j3d/ConeSound.java index d4197d6..a66ea5b 100644 --- a/src/classes/share/javax/media/j3d/ConeSound.java +++ b/src/classes/share/javax/media/j3d/ConeSound.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.lang.Math; import javax.vecmath.Point2f; import javax.vecmath.Point3f; import javax.vecmath.Vector3f; diff --git a/src/classes/share/javax/media/j3d/ConeSoundRetained.java b/src/classes/share/javax/media/j3d/ConeSoundRetained.java index a3f4b38..e14e8fd 100644 --- a/src/classes/share/javax/media/j3d/ConeSoundRetained.java +++ b/src/classes/share/javax/media/j3d/ConeSoundRetained.java @@ -31,10 +31,9 @@ package javax.media.j3d; -import javax.vecmath.Vector3f; -import javax.vecmath.Vector3d; import javax.vecmath.Point2f; import javax.vecmath.Point3f; +import javax.vecmath.Vector3f; diff --git a/src/classes/share/javax/media/j3d/DirectionalLightRetained.java b/src/classes/share/javax/media/j3d/DirectionalLightRetained.java index 98bf8a4..5833cf8 100644 --- a/src/classes/share/javax/media/j3d/DirectionalLightRetained.java +++ b/src/classes/share/javax/media/j3d/DirectionalLightRetained.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Vector3f; /** * An infinite directional light source object. diff --git a/src/classes/share/javax/media/j3d/DistanceLOD.java b/src/classes/share/javax/media/j3d/DistanceLOD.java index 59ecb9e..661b44e 100644 --- a/src/classes/share/javax/media/j3d/DistanceLOD.java +++ b/src/classes/share/javax/media/j3d/DistanceLOD.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.Point3f; import java.util.Enumeration; +import javax.vecmath.Point3f; + /** * This class defines a distance-based LOD behavior node that operates on * a Switch group node to select one of the children of that Switch node diff --git a/src/classes/share/javax/media/j3d/DrawingSurfaceObjectAWT.java b/src/classes/share/javax/media/j3d/DrawingSurfaceObjectAWT.java index 4197da2..7c4ae6e 100644 --- a/src/classes/share/javax/media/j3d/DrawingSurfaceObjectAWT.java +++ b/src/classes/share/javax/media/j3d/DrawingSurfaceObjectAWT.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.awt.Point; /** * The DrawingSurfaceObject class is used to manage native drawing surface diff --git a/src/classes/share/javax/media/j3d/EnvironmentSet.java b/src/classes/share/javax/media/j3d/EnvironmentSet.java index 4e495b8..18c6975 100644 --- a/src/classes/share/javax/media/j3d/EnvironmentSet.java +++ b/src/classes/share/javax/media/j3d/EnvironmentSet.java @@ -31,8 +31,9 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.*; +import java.util.ArrayList; + +import javax.vecmath.Color3f; /** * The LightBin manages a collection of EnvironmentSet objects. diff --git a/src/classes/share/javax/media/j3d/EventCatcher.java b/src/classes/share/javax/media/j3d/EventCatcher.java index 86b26dd..017dd04 100644 --- a/src/classes/share/javax/media/j3d/EventCatcher.java +++ b/src/classes/share/javax/media/j3d/EventCatcher.java @@ -31,9 +31,19 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.awt.*; -import java.awt.event.*; +import java.awt.event.ComponentEvent; +import java.awt.event.ComponentListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; /** diff --git a/src/classes/share/javax/media/j3d/ExponentialFogRetained.java b/src/classes/share/javax/media/j3d/ExponentialFogRetained.java index 3588451..dacfde6 100644 --- a/src/classes/share/javax/media/j3d/ExponentialFogRetained.java +++ b/src/classes/share/javax/media/j3d/ExponentialFogRetained.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.Color3f; import java.util.ArrayList; +import javax.vecmath.Color3f; + /** * The ExponentialFog leaf node defines distance parameters for * exponential fog. diff --git a/src/classes/share/javax/media/j3d/Fog.java b/src/classes/share/javax/media/j3d/Fog.java index e4df45c..29017e4 100644 --- a/src/classes/share/javax/media/j3d/Fog.java +++ b/src/classes/share/javax/media/j3d/Fog.java @@ -32,6 +32,7 @@ package javax.media.j3d; import java.util.Enumeration; + import javax.vecmath.Color3f; /** diff --git a/src/classes/share/javax/media/j3d/FogRetained.java b/src/classes/share/javax/media/j3d/FogRetained.java index a8b83e5..147d370 100644 --- a/src/classes/share/javax/media/j3d/FogRetained.java +++ b/src/classes/share/javax/media/j3d/FogRetained.java @@ -31,10 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; +import java.util.ArrayList; import java.util.Enumeration; import java.util.Vector; -import java.util.ArrayList; + +import javax.vecmath.Color3f; /** * The Fog leaf node defines Fog parameters. diff --git a/src/classes/share/javax/media/j3d/Font3D.java b/src/classes/share/javax/media/j3d/Font3D.java index d7372e1..3f8978b 100644 --- a/src/classes/share/javax/media/j3d/Font3D.java +++ b/src/classes/share/javax/media/j3d/Font3D.java @@ -31,16 +31,24 @@ package javax.media.j3d; -import com.sun.j3d.utils.geometry.*; -import com.sun.j3d.internal.FastVector; import java.awt.Font; -import java.awt.font.*; -import java.awt.geom.Rectangle2D; -import java.awt.geom.AffineTransform; -import javax.vecmath.*; import java.awt.Shape; +import java.awt.font.FontRenderContext; +import java.awt.font.GlyphMetrics; +import java.awt.font.GlyphVector; +import java.awt.geom.AffineTransform; import java.awt.geom.PathIterator; -import java.util.*; +import java.awt.geom.Rectangle2D; +import java.util.ArrayList; +import java.util.Hashtable; + +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3f; + +import com.sun.j3d.internal.FastVector; +import com.sun.j3d.utils.geometry.GeometryInfo; +import com.sun.j3d.utils.geometry.NormalGenerator; /** * The Font3D object is used to store extruded 2D glyphs. These diff --git a/src/classes/share/javax/media/j3d/FontExtrusion.java b/src/classes/share/javax/media/j3d/FontExtrusion.java index 5569919..21fc385 100644 --- a/src/classes/share/javax/media/j3d/FontExtrusion.java +++ b/src/classes/share/javax/media/j3d/FontExtrusion.java @@ -30,12 +30,12 @@ */ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; import java.awt.Shape; import java.awt.geom.PathIterator; import java.util.ArrayList; +import javax.vecmath.Point2f; + /** * The FontExtrusion object is used to describe the extrusion path * for a Font3D object. The extrusion path is used in conjunction diff --git a/src/classes/share/javax/media/j3d/GeneralizedStrip.java b/src/classes/share/javax/media/j3d/GeneralizedStrip.java index b870c54..dcdba56 100644 --- a/src/classes/share/javax/media/j3d/GeneralizedStrip.java +++ b/src/classes/share/javax/media/j3d/GeneralizedStrip.java @@ -30,7 +30,6 @@ */ package javax.media.j3d; -import java.util.* ; /** diff --git a/src/classes/share/javax/media/j3d/GeneralizedVertexList.java b/src/classes/share/javax/media/j3d/GeneralizedVertexList.java index 45b5611..1c84eae 100644 --- a/src/classes/share/javax/media/j3d/GeneralizedVertexList.java +++ b/src/classes/share/javax/media/j3d/GeneralizedVertexList.java @@ -30,8 +30,12 @@ */ package javax.media.j3d; -import javax.vecmath.* ; -import java.util.* ; +import java.util.ArrayList; + +import javax.vecmath.Color3f; +import javax.vecmath.Color4f; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3f; /** * The GeneralizedVertexList class is a variable-size list used to diff --git a/src/classes/share/javax/media/j3d/GeometryArray.java b/src/classes/share/javax/media/j3d/GeometryArray.java index a402865..02828ac 100644 --- a/src/classes/share/javax/media/j3d/GeometryArray.java +++ b/src/classes/share/javax/media/j3d/GeometryArray.java @@ -31,7 +31,18 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Color3b; +import javax.vecmath.Color3f; +import javax.vecmath.Color4b; +import javax.vecmath.Color4f; +import javax.vecmath.Point2f; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Point4f; +import javax.vecmath.TexCoord2f; +import javax.vecmath.TexCoord3f; +import javax.vecmath.TexCoord4f; +import javax.vecmath.Vector3f; /** diff --git a/src/classes/share/javax/media/j3d/GeometryArrayRetained.java b/src/classes/share/javax/media/j3d/GeometryArrayRetained.java index 869a208..7b2f666 100644 --- a/src/classes/share/javax/media/j3d/GeometryArrayRetained.java +++ b/src/classes/share/javax/media/j3d/GeometryArrayRetained.java @@ -31,19 +31,33 @@ package javax.media.j3d; -import com.sun.j3d.internal.Distance; -import javax.vecmath.*; -import java.lang.Math; import java.util.ArrayList; -import java.util.Set; -import java.util.HashSet; -import java.util.HashMap; -import java.util.Vector; import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; + +import javax.vecmath.Color3b; +import javax.vecmath.Color3f; +import javax.vecmath.Color4b; +import javax.vecmath.Color4f; +import javax.vecmath.Point2d; +import javax.vecmath.Point2f; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Point4d; +import javax.vecmath.Point4f; +import javax.vecmath.TexCoord2f; +import javax.vecmath.TexCoord3f; +import javax.vecmath.TexCoord4f; +import javax.vecmath.Tuple3d; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector3f; + import com.sun.j3d.internal.ByteBufferWrapper; -import com.sun.j3d.internal.BufferWrapper; -import com.sun.j3d.internal.FloatBufferWrapper; +import com.sun.j3d.internal.Distance; import com.sun.j3d.internal.DoubleBufferWrapper; +import com.sun.j3d.internal.FloatBufferWrapper; /** diff --git a/src/classes/share/javax/media/j3d/GeometryAtom.java b/src/classes/share/javax/media/j3d/GeometryAtom.java index 7891ba1..ce67bd7 100644 --- a/src/classes/share/javax/media/j3d/GeometryAtom.java +++ b/src/classes/share/javax/media/j3d/GeometryAtom.java @@ -31,8 +31,7 @@ package javax.media.j3d; -import java.util.ArrayList; -import javax.vecmath.*; +import javax.vecmath.Point3d; /** * A GeometryAtom is the smallest object representing Geometry. diff --git a/src/classes/share/javax/media/j3d/GeometryDecompressor.java b/src/classes/share/javax/media/j3d/GeometryDecompressor.java index e925f04..92f93a7 100644 --- a/src/classes/share/javax/media/j3d/GeometryDecompressor.java +++ b/src/classes/share/javax/media/j3d/GeometryDecompressor.java @@ -30,7 +30,9 @@ */ package javax.media.j3d; -import javax.vecmath.* ; +import javax.vecmath.Color4f; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3f; /** * This abstract class provides the base methods needed to create a geometry diff --git a/src/classes/share/javax/media/j3d/GeometryDecompressorRetained.java b/src/classes/share/javax/media/j3d/GeometryDecompressorRetained.java index ccf55ca..be85bbf 100644 --- a/src/classes/share/javax/media/j3d/GeometryDecompressorRetained.java +++ b/src/classes/share/javax/media/j3d/GeometryDecompressorRetained.java @@ -30,8 +30,10 @@ */ package javax.media.j3d; -import javax.vecmath.* ; -import java.util.* ; +import javax.vecmath.Color4f; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3f; /** * This class implements a retained geometry backend for the abstract diff --git a/src/classes/share/javax/media/j3d/GeometryDecompressorShape3D.java b/src/classes/share/javax/media/j3d/GeometryDecompressorShape3D.java index e1f3d07..86f4f13 100644 --- a/src/classes/share/javax/media/j3d/GeometryDecompressorShape3D.java +++ b/src/classes/share/javax/media/j3d/GeometryDecompressorShape3D.java @@ -30,8 +30,11 @@ */ package javax.media.j3d; -import javax.vecmath.* ; -import java.util.* ; +import java.util.ArrayList; + +import javax.vecmath.Color4f; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3f; /** * This class implements a Shape3D backend for the abstract diff --git a/src/classes/share/javax/media/j3d/GeometryLock.java b/src/classes/share/javax/media/j3d/GeometryLock.java index 1f5333d..6e68649 100644 --- a/src/classes/share/javax/media/j3d/GeometryLock.java +++ b/src/classes/share/javax/media/j3d/GeometryLock.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.Vector; class GeometryLock { diff --git a/src/classes/share/javax/media/j3d/GeometryRetained.java b/src/classes/share/javax/media/j3d/GeometryRetained.java index fb548f4..a7181c9 100644 --- a/src/classes/share/javax/media/j3d/GeometryRetained.java +++ b/src/classes/share/javax/media/j3d/GeometryRetained.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; +import javax.vecmath.Point3d; + abstract class GeometryRetained extends NodeComponentRetained { static final int GEO_TYPE_NONE = -1; diff --git a/src/classes/share/javax/media/j3d/GeometryStripArrayRetained.java b/src/classes/share/javax/media/j3d/GeometryStripArrayRetained.java index 8078fe1..0396d7a 100644 --- a/src/classes/share/javax/media/j3d/GeometryStripArrayRetained.java +++ b/src/classes/share/javax/media/j3d/GeometryStripArrayRetained.java @@ -31,13 +31,12 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; -import java.util.Vector; -import com.sun.j3d.internal.ByteBufferWrapper; -import com.sun.j3d.internal.BufferWrapper; + +import javax.vecmath.TexCoord2f; +import javax.vecmath.TexCoord3f; + import com.sun.j3d.internal.FloatBufferWrapper; -import com.sun.j3d.internal.DoubleBufferWrapper; /** diff --git a/src/classes/share/javax/media/j3d/GeometryStructure.java b/src/classes/share/javax/media/j3d/GeometryStructure.java index a140491..8a98094 100644 --- a/src/classes/share/javax/media/j3d/GeometryStructure.java +++ b/src/classes/share/javax/media/j3d/GeometryStructure.java @@ -31,10 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; import java.util.Arrays; +import javax.vecmath.Vector3d; + /** * A geometry structure is a object that organizes geometries diff --git a/src/classes/share/javax/media/j3d/GraphicsConfigTemplate3D.java b/src/classes/share/javax/media/j3d/GraphicsConfigTemplate3D.java index 1960eb6..efcac8e 100644 --- a/src/classes/share/javax/media/j3d/GraphicsConfigTemplate3D.java +++ b/src/classes/share/javax/media/j3d/GraphicsConfigTemplate3D.java @@ -31,9 +31,9 @@ package javax.media.j3d; -import java.awt.GraphicsDevice; -import java.awt.GraphicsConfiguration; import java.awt.GraphicsConfigTemplate; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; /** * This class is used to obtain a valid GraphicsConfiguration that can be used by Java 3D. diff --git a/src/classes/share/javax/media/j3d/GraphicsContext3D.java b/src/classes/share/javax/media/j3d/GraphicsContext3D.java index ce8c3d9..61f1803 100644 --- a/src/classes/share/javax/media/j3d/GraphicsContext3D.java +++ b/src/classes/share/javax/media/j3d/GraphicsContext3D.java @@ -31,12 +31,13 @@ package javax.media.j3d; +import java.awt.Dimension; import java.awt.Point; -import java.awt.image.BufferedImage; -import javax.vecmath.*; -import java.util.Vector; import java.util.Enumeration; -import java.awt.Dimension; +import java.util.Vector; + +import javax.vecmath.Color3f; +import javax.vecmath.Vector3d; /** * A GraphicsContext3D object is used for immediate mode rendering into diff --git a/src/classes/share/javax/media/j3d/Group.java b/src/classes/share/javax/media/j3d/Group.java index ccdc4a0..e395c14 100644 --- a/src/classes/share/javax/media/j3d/Group.java +++ b/src/classes/share/javax/media/j3d/Group.java @@ -31,10 +31,8 @@ package javax.media.j3d; -import java.util.BitSet; -import java.util.Vector; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; /** * The Group node object is a general-purpose grouping node. Group diff --git a/src/classes/share/javax/media/j3d/GroupRetained.java b/src/classes/share/javax/media/j3d/GroupRetained.java index 674d650..46c982d 100644 --- a/src/classes/share/javax/media/j3d/GroupRetained.java +++ b/src/classes/share/javax/media/j3d/GroupRetained.java @@ -31,9 +31,9 @@ package javax.media.j3d; -import java.util.Vector; -import java.util.Enumeration; import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Vector; /** * Group node. diff --git a/src/classes/share/javax/media/j3d/HiResCoord.java b/src/classes/share/javax/media/j3d/HiResCoord.java index f9104c6..0bb727c 100644 --- a/src/classes/share/javax/media/j3d/HiResCoord.java +++ b/src/classes/share/javax/media/j3d/HiResCoord.java @@ -31,8 +31,7 @@ package javax.media.j3d; -import java.lang.Integer; -import javax.vecmath.*; +import javax.vecmath.Vector3d; /** * High resolution coordinate object. diff --git a/src/classes/share/javax/media/j3d/ImageComponent2DRetained.java b/src/classes/share/javax/media/j3d/ImageComponent2DRetained.java index 2e145e7..0630af3 100644 --- a/src/classes/share/javax/media/j3d/ImageComponent2DRetained.java +++ b/src/classes/share/javax/media/j3d/ImageComponent2DRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import java.awt.image.*; -import java.awt.color.ColorSpace; +import java.awt.image.BufferedImage; +import java.awt.image.RenderedImage; /** * This class defines a 2D image component. diff --git a/src/classes/share/javax/media/j3d/ImageComponent3DRetained.java b/src/classes/share/javax/media/j3d/ImageComponent3DRetained.java index 0a1a9ea..e1aace8 100644 --- a/src/classes/share/javax/media/j3d/ImageComponent3DRetained.java +++ b/src/classes/share/javax/media/j3d/ImageComponent3DRetained.java @@ -31,7 +31,10 @@ package javax.media.j3d; -import java.awt.image.*; +import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; +import java.awt.image.RenderedImage; +import java.awt.image.WritableRaster; /** * This class defines a 3D array of pixels. diff --git a/src/classes/share/javax/media/j3d/ImageComponentRetained.java b/src/classes/share/javax/media/j3d/ImageComponentRetained.java index 9698bbe..d2e5a14 100644 --- a/src/classes/share/javax/media/j3d/ImageComponentRetained.java +++ b/src/classes/share/javax/media/j3d/ImageComponentRetained.java @@ -31,16 +31,23 @@ package javax.media.j3d; -import java.nio.Buffer; -import java.util.*; -import java.awt.image.*; import java.awt.color.ColorSpace; import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; +import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; +import java.awt.image.ComponentColorModel; +import java.awt.image.DataBuffer; +import java.awt.image.DataBufferByte; +import java.awt.image.DataBufferInt; +import java.awt.image.PixelInterleavedSampleModel; import java.awt.image.RenderedImage; +import java.awt.image.SampleModel; +import java.awt.image.WritableRaster; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; +import java.util.ArrayList; import java.util.logging.Level; diff --git a/src/classes/share/javax/media/j3d/IndexedGeometryArray.java b/src/classes/share/javax/media/j3d/IndexedGeometryArray.java index 73910c0..bc17ff9 100644 --- a/src/classes/share/javax/media/j3d/IndexedGeometryArray.java +++ b/src/classes/share/javax/media/j3d/IndexedGeometryArray.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * The IndexedGeometryArray object contains separate integer arrays diff --git a/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java index 8df03cd..fc93e5a 100644 --- a/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java +++ b/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java @@ -31,8 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; + +import javax.vecmath.TexCoord2f; +import javax.vecmath.TexCoord3f; + import com.sun.j3d.internal.FloatBufferWrapper; /** diff --git a/src/classes/share/javax/media/j3d/IndexedLineArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedLineArrayRetained.java index 8bc049d..06aae6c 100644 --- a/src/classes/share/javax/media/j3d/IndexedLineArrayRetained.java +++ b/src/classes/share/javax/media/j3d/IndexedLineArrayRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The IndexedLineArray object draws the array of vertices as individual diff --git a/src/classes/share/javax/media/j3d/IndexedLineStripArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedLineStripArrayRetained.java index 5280c01..bcfe6d8 100644 --- a/src/classes/share/javax/media/j3d/IndexedLineStripArrayRetained.java +++ b/src/classes/share/javax/media/j3d/IndexedLineStripArrayRetained.java @@ -30,8 +30,8 @@ */ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The IndexedLineStripArray object draws an array of vertices as a set of diff --git a/src/classes/share/javax/media/j3d/IndexedPointArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedPointArrayRetained.java index befe726..b15354e 100644 --- a/src/classes/share/javax/media/j3d/IndexedPointArrayRetained.java +++ b/src/classes/share/javax/media/j3d/IndexedPointArrayRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The IndexedPointArray object draws the array of vertices as individual points. diff --git a/src/classes/share/javax/media/j3d/IndexedQuadArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedQuadArrayRetained.java index 30e29bd..2de6e2f 100644 --- a/src/classes/share/javax/media/j3d/IndexedQuadArrayRetained.java +++ b/src/classes/share/javax/media/j3d/IndexedQuadArrayRetained.java @@ -31,8 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; /** * The IndexedQuadArray object draws the array of vertices as individual diff --git a/src/classes/share/javax/media/j3d/IndexedTriangleArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedTriangleArrayRetained.java index da579a0..1cea3e6 100644 --- a/src/classes/share/javax/media/j3d/IndexedTriangleArrayRetained.java +++ b/src/classes/share/javax/media/j3d/IndexedTriangleArrayRetained.java @@ -31,8 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; /** * The IndexedTriangleArray object draws the array of vertices as individual diff --git a/src/classes/share/javax/media/j3d/IndexedTriangleFanArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedTriangleFanArrayRetained.java index 883a28c..75864d9 100644 --- a/src/classes/share/javax/media/j3d/IndexedTriangleFanArrayRetained.java +++ b/src/classes/share/javax/media/j3d/IndexedTriangleFanArrayRetained.java @@ -31,8 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; /** * The IndexedTriangleFanArray object draws an array of vertices as a set of diff --git a/src/classes/share/javax/media/j3d/IndexedTriangleStripArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedTriangleStripArrayRetained.java index 7742e8c..119ee25 100644 --- a/src/classes/share/javax/media/j3d/IndexedTriangleStripArrayRetained.java +++ b/src/classes/share/javax/media/j3d/IndexedTriangleStripArrayRetained.java @@ -31,8 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; /** * The IndexedTriangleStripArray object draws an array of vertices as a set of diff --git a/src/classes/share/javax/media/j3d/InputDeviceScheduler.java b/src/classes/share/javax/media/j3d/InputDeviceScheduler.java index e3f7773..806eca1 100644 --- a/src/classes/share/javax/media/j3d/InputDeviceScheduler.java +++ b/src/classes/share/javax/media/j3d/InputDeviceScheduler.java @@ -31,7 +31,9 @@ package javax.media.j3d; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Vector; /** * This thread manages all input device scheduling. It monitors and caches diff --git a/src/classes/share/javax/media/j3d/Interpolator.java b/src/classes/share/javax/media/j3d/Interpolator.java index ed6d2f3..ff6f038 100644 --- a/src/classes/share/javax/media/j3d/Interpolator.java +++ b/src/classes/share/javax/media/j3d/Interpolator.java @@ -32,7 +32,6 @@ package javax.media.j3d; -import java.util.Vector; /** * Interpolator is an abstract class that extends Behavior to provide diff --git a/src/classes/share/javax/media/j3d/J3DBuffer.java b/src/classes/share/javax/media/j3d/J3DBuffer.java index ca73627..dd9fdc2 100644 --- a/src/classes/share/javax/media/j3d/J3DBuffer.java +++ b/src/classes/share/javax/media/j3d/J3DBuffer.java @@ -31,11 +31,10 @@ package javax.media.j3d; -import com.sun.j3d.internal.ByteBufferWrapper; import com.sun.j3d.internal.BufferWrapper; -import com.sun.j3d.internal.FloatBufferWrapper; +import com.sun.j3d.internal.ByteBufferWrapper; import com.sun.j3d.internal.DoubleBufferWrapper; -import com.sun.j3d.internal.ByteOrderWrapper; +import com.sun.j3d.internal.FloatBufferWrapper; /** * Java 3D wrapper class for java.nio.Buffer objects. diff --git a/src/classes/share/javax/media/j3d/J3DGraphics2D.java b/src/classes/share/javax/media/j3d/J3DGraphics2D.java index 20bab31..a39c64b 100644 --- a/src/classes/share/javax/media/j3d/J3DGraphics2D.java +++ b/src/classes/share/javax/media/j3d/J3DGraphics2D.java @@ -31,7 +31,9 @@ package javax.media.j3d; -import java.awt.*; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; diff --git a/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java b/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java index 87c480e..da85baa 100644 --- a/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java +++ b/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java @@ -31,16 +31,39 @@ package javax.media.j3d; -import java.io.*; -import java.util.*; -import java.awt.*; -import java.awt.event.*; -import java.text.AttributedCharacterIterator; +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Composite; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics2D; +import java.awt.GraphicsConfiguration; +import java.awt.Image; +import java.awt.Paint; +import java.awt.Point; +import java.awt.Polygon; +import java.awt.Rectangle; +import java.awt.RenderingHints; import java.awt.RenderingHints.Key; -import java.awt.geom.*; -import java.awt.image.*; +import java.awt.Shape; +import java.awt.Stroke; +import java.awt.font.FontRenderContext; +import java.awt.font.GlyphVector; +import java.awt.font.TextLayout; +import java.awt.geom.AffineTransform; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; +import java.awt.image.BufferedImageOp; +import java.awt.image.ColorModel; +import java.awt.image.DataBufferByte; +import java.awt.image.DataBufferInt; +import java.awt.image.ImageObserver; +import java.awt.image.RenderedImage; +import java.awt.image.WritableRaster; import java.awt.image.renderable.RenderableImage; -import java.awt.font.*; +import java.text.AttributedCharacterIterator; +import java.util.Map; /** * Implementation class for J3DGraphics2D diff --git a/src/classes/share/javax/media/j3d/J3dI18N.java b/src/classes/share/javax/media/j3d/J3dI18N.java index 4373b8f..96341af 100644 --- a/src/classes/share/javax/media/j3d/J3dI18N.java +++ b/src/classes/share/javax/media/j3d/J3dI18N.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import java.io.*; -import java.util.*; +import java.util.MissingResourceException; +import java.util.ResourceBundle; class J3dI18N { diff --git a/src/classes/share/javax/media/j3d/J3dNodeTable.java b/src/classes/share/javax/media/j3d/J3dNodeTable.java index 4433b9d..365a60e 100644 --- a/src/classes/share/javax/media/j3d/J3dNodeTable.java +++ b/src/classes/share/javax/media/j3d/J3dNodeTable.java @@ -31,11 +31,7 @@ package javax.media.j3d; -import java.io.DataOutputStream; -import java.io.OutputStream; import java.util.Hashtable; -import javax.vecmath.Color3f; -import javax.vecmath.Tuple3f; /** * The J3dNodeTable object provides utilities for the save/load diff --git a/src/classes/share/javax/media/j3d/J3dQueryProps.java b/src/classes/share/javax/media/j3d/J3dQueryProps.java index 4900767..4d33419 100644 --- a/src/classes/share/javax/media/j3d/J3dQueryProps.java +++ b/src/classes/share/javax/media/j3d/J3dQueryProps.java @@ -31,7 +31,11 @@ package javax.media.j3d; -import java.util.*; +import java.util.AbstractMap; +import java.util.AbstractSet; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Set; /** diff --git a/src/classes/share/javax/media/j3d/J3dStructure.java b/src/classes/share/javax/media/j3d/J3dStructure.java index 2ce0b5c..df48f52 100644 --- a/src/classes/share/javax/media/j3d/J3dStructure.java +++ b/src/classes/share/javax/media/j3d/J3dStructure.java @@ -31,8 +31,6 @@ package javax.media.j3d; -import java.util.ArrayList; -import java.util.Arrays; /** * The J3dStructure is the super class of all structures in Java 3D. diff --git a/src/classes/share/javax/media/j3d/LeafRetained.java b/src/classes/share/javax/media/j3d/LeafRetained.java index 35e1b43..4b4e3d7 100644 --- a/src/classes/share/javax/media/j3d/LeafRetained.java +++ b/src/classes/share/javax/media/j3d/LeafRetained.java @@ -30,8 +30,6 @@ */ package javax.media.j3d; -import java.util.Hashtable; - import java.util.ArrayList; /** diff --git a/src/classes/share/javax/media/j3d/Light.java b/src/classes/share/javax/media/j3d/Light.java index 2e591ad..d533e5d 100644 --- a/src/classes/share/javax/media/j3d/Light.java +++ b/src/classes/share/javax/media/j3d/Light.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.Color3f; import java.util.Enumeration; +import javax.vecmath.Color3f; + /** * The Light leaf node is an abstract class that defines a set of * parameters common to all diff --git a/src/classes/share/javax/media/j3d/LightBin.java b/src/classes/share/javax/media/j3d/LightBin.java index 20b06dc..2342bad 100644 --- a/src/classes/share/javax/media/j3d/LightBin.java +++ b/src/classes/share/javax/media/j3d/LightBin.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; /** diff --git a/src/classes/share/javax/media/j3d/LightRetained.java b/src/classes/share/javax/media/j3d/LightRetained.java index 5b21689..5d1c670 100644 --- a/src/classes/share/javax/media/j3d/LightRetained.java +++ b/src/classes/share/javax/media/j3d/LightRetained.java @@ -31,10 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; +import java.util.ArrayList; import java.util.Enumeration; import java.util.Vector; -import java.util.ArrayList; + +import javax.vecmath.Color3f; /** * LightRetained is an abstract class that contains instance variable common to diff --git a/src/classes/share/javax/media/j3d/LightSet.java b/src/classes/share/javax/media/j3d/LightSet.java index fc8a58d..d870557 100644 --- a/src/classes/share/javax/media/j3d/LightSet.java +++ b/src/classes/share/javax/media/j3d/LightSet.java @@ -31,8 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.Vector; class LightSet extends Object { /** diff --git a/src/classes/share/javax/media/j3d/LineArrayRetained.java b/src/classes/share/javax/media/j3d/LineArrayRetained.java index fcb39c5..ddde3d0 100644 --- a/src/classes/share/javax/media/j3d/LineArrayRetained.java +++ b/src/classes/share/javax/media/j3d/LineArrayRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The LineArray object draws the array of vertices as individual diff --git a/src/classes/share/javax/media/j3d/LineStripArrayRetained.java b/src/classes/share/javax/media/j3d/LineStripArrayRetained.java index cdf6d7a..e6f057b 100644 --- a/src/classes/share/javax/media/j3d/LineStripArrayRetained.java +++ b/src/classes/share/javax/media/j3d/LineStripArrayRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The LineStripArray object draws an array of vertices as a set of diff --git a/src/classes/share/javax/media/j3d/LinearFogRetained.java b/src/classes/share/javax/media/j3d/LinearFogRetained.java index bc7782e..9f24913 100644 --- a/src/classes/share/javax/media/j3d/LinearFogRetained.java +++ b/src/classes/share/javax/media/j3d/LinearFogRetained.java @@ -31,10 +31,10 @@ package javax.media.j3d; -import java.util.Vector; -import javax.vecmath.*; import java.util.ArrayList; +import javax.vecmath.Color3f; + /** * The LinearFog leaf node defines distance parameters for * linear fog. diff --git a/src/classes/share/javax/media/j3d/LinkRetained.java b/src/classes/share/javax/media/j3d/LinkRetained.java index 3564a3c..aa6601d 100644 --- a/src/classes/share/javax/media/j3d/LinkRetained.java +++ b/src/classes/share/javax/media/j3d/LinkRetained.java @@ -30,7 +30,7 @@ */ package javax.media.j3d; -import java.util.*; +import java.util.ArrayList; /** * A Link leaf node consisting of a reference to a SharedGroup node. diff --git a/src/classes/share/javax/media/j3d/Locale.java b/src/classes/share/javax/media/j3d/Locale.java index ab92bd3..8617ad1 100644 --- a/src/classes/share/javax/media/j3d/Locale.java +++ b/src/classes/share/javax/media/j3d/Locale.java @@ -31,10 +31,9 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.Vector; -import java.util.Enumeration; import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Vector; /** * A Locale object defines a high-resolution position within a diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java index 7c50c52..ab91f12 100644 --- a/src/classes/share/javax/media/j3d/MasterControl.java +++ b/src/classes/share/javax/media/j3d/MasterControl.java @@ -37,8 +37,11 @@ package javax.media.j3d; -import java.util.*; -import java.awt.*; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Hashtable; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/classes/share/javax/media/j3d/MaterialRetained.java b/src/classes/share/javax/media/j3d/MaterialRetained.java index 4c36a79..2dbd8bc 100644 --- a/src/classes/share/javax/media/j3d/MaterialRetained.java +++ b/src/classes/share/javax/media/j3d/MaterialRetained.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.Color3f; import java.util.ArrayList; +import javax.vecmath.Color3f; + /** * The MaterialRetained object defines the appearance of an object under * illumination. diff --git a/src/classes/share/javax/media/j3d/MediaContainer.java b/src/classes/share/javax/media/j3d/MediaContainer.java index 0f71376..eeb2553 100644 --- a/src/classes/share/javax/media/j3d/MediaContainer.java +++ b/src/classes/share/javax/media/j3d/MediaContainer.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import java.net.URL; import java.io.InputStream; +import java.net.URL; /** * The MediaContainer object defines all sound data: cached state flag, and diff --git a/src/classes/share/javax/media/j3d/MediaContainerRetained.java b/src/classes/share/javax/media/j3d/MediaContainerRetained.java index dfc816b..61cc4f0 100644 --- a/src/classes/share/javax/media/j3d/MediaContainerRetained.java +++ b/src/classes/share/javax/media/j3d/MediaContainerRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import java.net.URL; import java.io.InputStream; +import java.net.URL; /** * The MediaContainerRetained object defines all rendering state that can diff --git a/src/classes/share/javax/media/j3d/MemoryFreeList.java b/src/classes/share/javax/media/j3d/MemoryFreeList.java index 28deb98..b3e15b2 100644 --- a/src/classes/share/javax/media/j3d/MemoryFreeList.java +++ b/src/classes/share/javax/media/j3d/MemoryFreeList.java @@ -31,7 +31,8 @@ package javax.media.j3d; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; /** * Class for storing various free lists. This class must be diff --git a/src/classes/share/javax/media/j3d/ModelClip.java b/src/classes/share/javax/media/j3d/ModelClip.java index e63bad7..2af941f 100644 --- a/src/classes/share/javax/media/j3d/ModelClip.java +++ b/src/classes/share/javax/media/j3d/ModelClip.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.Enumeration; +import javax.vecmath.Vector4d; + /** * The ModelClip leaf node defines a set of 6 arbitrary clipping * planes in the virtual universe. The planes are specified in the diff --git a/src/classes/share/javax/media/j3d/ModelClipRetained.java b/src/classes/share/javax/media/j3d/ModelClipRetained.java index ff2e3e3..855d834 100644 --- a/src/classes/share/javax/media/j3d/ModelClipRetained.java +++ b/src/classes/share/javax/media/j3d/ModelClipRetained.java @@ -31,10 +31,11 @@ package javax.media.j3d; +import java.util.ArrayList; import java.util.Enumeration; import java.util.Vector; -import java.util.ArrayList; -import javax.vecmath.*; + +import javax.vecmath.Vector4d; /** * The ModelClip retained object. diff --git a/src/classes/share/javax/media/j3d/Morph.java b/src/classes/share/javax/media/j3d/Morph.java index 53d5790..6c52d69 100644 --- a/src/classes/share/javax/media/j3d/Morph.java +++ b/src/classes/share/javax/media/j3d/Morph.java @@ -32,7 +32,6 @@ package javax.media.j3d; import java.util.Hashtable; -import javax.vecmath.*; /** * The Morph leaf node permits an application to morph between diff --git a/src/classes/share/javax/media/j3d/MorphRetained.java b/src/classes/share/javax/media/j3d/MorphRetained.java index ac6ebe7..a459800 100644 --- a/src/classes/share/javax/media/j3d/MorphRetained.java +++ b/src/classes/share/javax/media/j3d/MorphRetained.java @@ -31,9 +31,17 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; -import java.util.Vector; + +import javax.vecmath.Color3b; +import javax.vecmath.Color3f; +import javax.vecmath.Color4b; +import javax.vecmath.Color4f; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.TexCoord2f; +import javax.vecmath.TexCoord3f; +import javax.vecmath.Vector3f; /** * A morph leaf node consisting of geometery and appearance properties. diff --git a/src/classes/share/javax/media/j3d/Node.java b/src/classes/share/javax/media/j3d/Node.java index 56b0044..9facd93 100644 --- a/src/classes/share/javax/media/j3d/Node.java +++ b/src/classes/share/javax/media/j3d/Node.java @@ -31,9 +31,8 @@ package javax.media.j3d; -import java.util.Hashtable; import java.util.Enumeration; -import java.lang.reflect.Constructor; +import java.util.Hashtable; /** * The Node class provides an abstract class for all Group and Leaf Nodes. diff --git a/src/classes/share/javax/media/j3d/NodeRetained.java b/src/classes/share/javax/media/j3d/NodeRetained.java index cd4bbcf..e32abdc 100644 --- a/src/classes/share/javax/media/j3d/NodeRetained.java +++ b/src/classes/share/javax/media/j3d/NodeRetained.java @@ -32,9 +32,8 @@ package javax.media.j3d; -import java.util.Vector; -import java.util.Hashtable; import java.util.ArrayList; +import java.util.Vector; /** * The Node class provides an abstract class for all Group and Leaf diff --git a/src/classes/share/javax/media/j3d/OrderedPathElement.java b/src/classes/share/javax/media/j3d/OrderedPathElement.java index 6ec691c..30278a0 100644 --- a/src/classes/share/javax/media/j3d/OrderedPathElement.java +++ b/src/classes/share/javax/media/j3d/OrderedPathElement.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.ArrayList; class OrderedPathElement extends Object { OrderedGroupRetained orderedGroup; diff --git a/src/classes/share/javax/media/j3d/OrientedShape3D.java b/src/classes/share/javax/media/j3d/OrientedShape3D.java index 2837a23..435640f 100644 --- a/src/classes/share/javax/media/j3d/OrientedShape3D.java +++ b/src/classes/share/javax/media/j3d/OrientedShape3D.java @@ -31,7 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3f; /** * The OrientedShape3D leaf node is a Shape3D node that is oriented diff --git a/src/classes/share/javax/media/j3d/OrientedShape3DRetained.java b/src/classes/share/javax/media/j3d/OrientedShape3DRetained.java index 8d7b7c9..6012000 100644 --- a/src/classes/share/javax/media/j3d/OrientedShape3DRetained.java +++ b/src/classes/share/javax/media/j3d/OrientedShape3DRetained.java @@ -31,8 +31,12 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.ArrayList; +import javax.vecmath.AxisAngle4d; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4d; class OrientedShape3DRetained extends Shape3DRetained { diff --git a/src/classes/share/javax/media/j3d/PathInterpolator.java b/src/classes/share/javax/media/j3d/PathInterpolator.java index 33b5447..4b54fee 100644 --- a/src/classes/share/javax/media/j3d/PathInterpolator.java +++ b/src/classes/share/javax/media/j3d/PathInterpolator.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.Enumeration; /** * PathInterpolator behavior. This class defines the base class for diff --git a/src/classes/share/javax/media/j3d/PhysicalBody.java b/src/classes/share/javax/media/j3d/PhysicalBody.java index b23ee4d..aef6a92 100644 --- a/src/classes/share/javax/media/j3d/PhysicalBody.java +++ b/src/classes/share/javax/media/j3d/PhysicalBody.java @@ -31,9 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; + /** * This object contains a specification of the user's head. * Attributes of this object are defined in the head coordinate system. diff --git a/src/classes/share/javax/media/j3d/PhysicalEnvironment.java b/src/classes/share/javax/media/j3d/PhysicalEnvironment.java index 62125db..9d3e33e 100644 --- a/src/classes/share/javax/media/j3d/PhysicalEnvironment.java +++ b/src/classes/share/javax/media/j3d/PhysicalEnvironment.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.awt.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; /** * This object contains a specification of the physical environment in diff --git a/src/classes/share/javax/media/j3d/PickBounds.java b/src/classes/share/javax/media/j3d/PickBounds.java index ff0f4e6..ac14233 100644 --- a/src/classes/share/javax/media/j3d/PickBounds.java +++ b/src/classes/share/javax/media/j3d/PickBounds.java @@ -31,7 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; /** * PickBounds is a finite pick shape defined with a Bounds object. It can diff --git a/src/classes/share/javax/media/j3d/PickCone.java b/src/classes/share/javax/media/j3d/PickCone.java index c51d5aa..a620668 100644 --- a/src/classes/share/javax/media/j3d/PickCone.java +++ b/src/classes/share/javax/media/j3d/PickCone.java @@ -31,7 +31,9 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; /** * PickCone is the abstract base class of all cone pick shapes. diff --git a/src/classes/share/javax/media/j3d/PickConeRay.java b/src/classes/share/javax/media/j3d/PickConeRay.java index e49239e..dd4f001 100644 --- a/src/classes/share/javax/media/j3d/PickConeRay.java +++ b/src/classes/share/javax/media/j3d/PickConeRay.java @@ -31,7 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; + import com.sun.j3d.internal.Distance; /** diff --git a/src/classes/share/javax/media/j3d/PickConeSegment.java b/src/classes/share/javax/media/j3d/PickConeSegment.java index 70a3176..e2f99a4 100644 --- a/src/classes/share/javax/media/j3d/PickConeSegment.java +++ b/src/classes/share/javax/media/j3d/PickConeSegment.java @@ -31,7 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; + import com.sun.j3d.internal.Distance; /** diff --git a/src/classes/share/javax/media/j3d/PickCylinder.java b/src/classes/share/javax/media/j3d/PickCylinder.java index 03f912d..16a6629 100644 --- a/src/classes/share/javax/media/j3d/PickCylinder.java +++ b/src/classes/share/javax/media/j3d/PickCylinder.java @@ -31,7 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector4d; /** * PickCylinder is the abstract base class of all cylindrical pick shapes. diff --git a/src/classes/share/javax/media/j3d/PickCylinderRay.java b/src/classes/share/javax/media/j3d/PickCylinderRay.java index 326ae3e..9ec0bb2 100644 --- a/src/classes/share/javax/media/j3d/PickCylinderRay.java +++ b/src/classes/share/javax/media/j3d/PickCylinderRay.java @@ -31,7 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; + import com.sun.j3d.internal.Distance; /** diff --git a/src/classes/share/javax/media/j3d/PickCylinderSegment.java b/src/classes/share/javax/media/j3d/PickCylinderSegment.java index 0b97cf6..5bcaff6 100644 --- a/src/classes/share/javax/media/j3d/PickCylinderSegment.java +++ b/src/classes/share/javax/media/j3d/PickCylinderSegment.java @@ -31,7 +31,9 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; + import com.sun.j3d.internal.Distance; /** diff --git a/src/classes/share/javax/media/j3d/PickInfo.java b/src/classes/share/javax/media/j3d/PickInfo.java index 3d5cc76..d96dba1 100644 --- a/src/classes/share/javax/media/j3d/PickInfo.java +++ b/src/classes/share/javax/media/j3d/PickInfo.java @@ -31,8 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Vector; + +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; /** * The PickInfo object contains the computed information about a pick hit. diff --git a/src/classes/share/javax/media/j3d/PickPoint.java b/src/classes/share/javax/media/j3d/PickPoint.java index 9c50b74..eee4846 100644 --- a/src/classes/share/javax/media/j3d/PickPoint.java +++ b/src/classes/share/javax/media/j3d/PickPoint.java @@ -31,7 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; /** * PickPoint is a pick shape defined as a single point. It can diff --git a/src/classes/share/javax/media/j3d/PickRay.java b/src/classes/share/javax/media/j3d/PickRay.java index 7c52831..2d930a3 100644 --- a/src/classes/share/javax/media/j3d/PickRay.java +++ b/src/classes/share/javax/media/j3d/PickRay.java @@ -31,7 +31,9 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; +import javax.vecmath.Vector3d; /** * PickRay is an infinite ray pick shape. It can diff --git a/src/classes/share/javax/media/j3d/PickSegment.java b/src/classes/share/javax/media/j3d/PickSegment.java index 2a449d0..35dbae7 100644 --- a/src/classes/share/javax/media/j3d/PickSegment.java +++ b/src/classes/share/javax/media/j3d/PickSegment.java @@ -31,7 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; /** * PickSegment is a line segment pick shape. It can diff --git a/src/classes/share/javax/media/j3d/PickShape.java b/src/classes/share/javax/media/j3d/PickShape.java index 975f32b..b51638b 100644 --- a/src/classes/share/javax/media/j3d/PickShape.java +++ b/src/classes/share/javax/media/j3d/PickShape.java @@ -30,8 +30,8 @@ */ package javax.media.j3d; -import javax.vecmath.Point4d; import javax.vecmath.Point3d; +import javax.vecmath.Point4d; /** * An abstract class for describing a pick shape that can be used with diff --git a/src/classes/share/javax/media/j3d/PointArrayRetained.java b/src/classes/share/javax/media/j3d/PointArrayRetained.java index 9dd10d3..d51bfce 100644 --- a/src/classes/share/javax/media/j3d/PointArrayRetained.java +++ b/src/classes/share/javax/media/j3d/PointArrayRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The PointArray object draws the array of vertices as individual points. diff --git a/src/classes/share/javax/media/j3d/PointLight.java b/src/classes/share/javax/media/j3d/PointLight.java index 212ca6a..b69bb99 100644 --- a/src/classes/share/javax/media/j3d/PointLight.java +++ b/src/classes/share/javax/media/j3d/PointLight.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.Point3f; import javax.vecmath.Color3f; +import javax.vecmath.Point3f; /** diff --git a/src/classes/share/javax/media/j3d/PointLightRetained.java b/src/classes/share/javax/media/j3d/PointLightRetained.java index d9acad7..1086adf 100644 --- a/src/classes/share/javax/media/j3d/PointLightRetained.java +++ b/src/classes/share/javax/media/j3d/PointLightRetained.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3f; /** * A Retained PointLight source. diff --git a/src/classes/share/javax/media/j3d/PointSoundRetained.java b/src/classes/share/javax/media/j3d/PointSoundRetained.java index 3d7a657..dbbf7b4 100644 --- a/src/classes/share/javax/media/j3d/PointSoundRetained.java +++ b/src/classes/share/javax/media/j3d/PointSoundRetained.java @@ -31,11 +31,8 @@ package javax.media.j3d; -import java.lang.Math; -import java.net.URL; -import javax.vecmath.Point3f; -import javax.vecmath.Point3d; import javax.vecmath.Point2f; +import javax.vecmath.Point3f; /** * The PointSoundRetained node (a sub-class of the SoundRetained node) defines diff --git a/src/classes/share/javax/media/j3d/QuadArrayRetained.java b/src/classes/share/javax/media/j3d/QuadArrayRetained.java index d8b58e9..c2ec440 100644 --- a/src/classes/share/javax/media/j3d/QuadArrayRetained.java +++ b/src/classes/share/javax/media/j3d/QuadArrayRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The QuadArray object draws the array of vertices as individual diff --git a/src/classes/share/javax/media/j3d/Raster.java b/src/classes/share/javax/media/j3d/Raster.java index 70d0fc1..f63460f 100644 --- a/src/classes/share/javax/media/j3d/Raster.java +++ b/src/classes/share/javax/media/j3d/Raster.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.awt.Point; import java.awt.Dimension; +import java.awt.Point; + +import javax.vecmath.Point3f; /** diff --git a/src/classes/share/javax/media/j3d/RasterRetained.java b/src/classes/share/javax/media/j3d/RasterRetained.java index 8e97715..1400f69 100644 --- a/src/classes/share/javax/media/j3d/RasterRetained.java +++ b/src/classes/share/javax/media/j3d/RasterRetained.java @@ -31,13 +31,15 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.awt.Point; import java.awt.Dimension; +import java.awt.Point; import java.util.ArrayList; -import java.awt.image.DataBuffer; -import java.awt.image.DataBufferByte; +import javax.vecmath.Point2d; +import javax.vecmath.Point2i; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Point4d; /** * A Retained Raster. diff --git a/src/classes/share/javax/media/j3d/RenderAtom.java b/src/classes/share/javax/media/j3d/RenderAtom.java index 55eb48d..5a6fc77 100644 --- a/src/classes/share/javax/media/j3d/RenderAtom.java +++ b/src/classes/share/javax/media/j3d/RenderAtom.java @@ -30,7 +30,6 @@ */ package javax.media.j3d; -import javax.vecmath.*; /** * A RenderAtom is a wrapper for a GeometryAtom in a given RenderBin. diff --git a/src/classes/share/javax/media/j3d/RenderBin.java b/src/classes/share/javax/media/j3d/RenderBin.java index 662db84..8564759 100644 --- a/src/classes/share/javax/media/j3d/RenderBin.java +++ b/src/classes/share/javax/media/j3d/RenderBin.java @@ -31,8 +31,18 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; + +import javax.vecmath.Color3f; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The RenderBin is a structure that optimizes rendering by doing efficient diff --git a/src/classes/share/javax/media/j3d/RenderMolecule.java b/src/classes/share/javax/media/j3d/RenderMolecule.java index 629b7b4..8c71c3f 100644 --- a/src/classes/share/javax/media/j3d/RenderMolecule.java +++ b/src/classes/share/javax/media/j3d/RenderMolecule.java @@ -31,8 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.*; +import javax.vecmath.Vector3d; /** * The RenderMolecule manages a collection of RenderAtoms. diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java index 704b132..c57cfa5 100644 --- a/src/classes/share/javax/media/j3d/Renderer.java +++ b/src/classes/share/javax/media/j3d/Renderer.java @@ -37,11 +37,16 @@ package javax.media.j3d; +import java.awt.GraphicsConfiguration; +import java.awt.Point; +import java.awt.image.BufferedImage; +import java.awt.image.ImageObserver; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; import java.util.logging.Level; -import javax.vecmath.*; -import java.awt.*; -import java.awt.image.*; -import java.util.*; + +import javax.vecmath.Color3f; class Renderer extends J3dThread { diff --git a/src/classes/share/javax/media/j3d/RendererStructure.java b/src/classes/share/javax/media/j3d/RendererStructure.java index 189d616..043c0f0 100644 --- a/src/classes/share/javax/media/j3d/RendererStructure.java +++ b/src/classes/share/javax/media/j3d/RendererStructure.java @@ -31,8 +31,6 @@ package javax.media.j3d; -import java.util.ArrayList; -import java.util.Arrays; /** * A renderer structure is an object that organizes messages diff --git a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java index f0b378c..957588c 100644 --- a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java +++ b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java @@ -31,8 +31,11 @@ package javax.media.j3d; -import java.util.*; -import javax.vecmath.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; + +import javax.vecmath.Vector3d; /** * A rendering environment structure is an object that organizes lights, diff --git a/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java b/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java index 870d843..fd99146 100644 --- a/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java +++ b/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java @@ -31,10 +31,10 @@ package javax.media.j3d; -import javax.vecmath.Vector3f; -import javax.vecmath.Quat4f; import javax.vecmath.Matrix4d; import javax.vecmath.Point3f; +import javax.vecmath.Quat4f; +import javax.vecmath.Vector3f; /** diff --git a/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java b/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java index db3cdb4..cc5584c 100644 --- a/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java +++ b/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java @@ -32,9 +32,9 @@ package javax.media.j3d; import javax.vecmath.Matrix4d; +import javax.vecmath.Point3f; import javax.vecmath.Quat4f; import javax.vecmath.Vector3f; -import javax.vecmath.Point3f; /** diff --git a/src/classes/share/javax/media/j3d/SceneGraphObjectRetained.java b/src/classes/share/javax/media/j3d/SceneGraphObjectRetained.java index 1e25cda..94a7dce 100644 --- a/src/classes/share/javax/media/j3d/SceneGraphObjectRetained.java +++ b/src/classes/share/javax/media/j3d/SceneGraphObjectRetained.java @@ -31,8 +31,6 @@ package javax.media.j3d; -import java.util.Vector; -import java.util.Hashtable; /** * SceneGraphObjectRetained is a superclass, which has things that diff --git a/src/classes/share/javax/media/j3d/SceneGraphPath.java b/src/classes/share/javax/media/j3d/SceneGraphPath.java index 11a1e69..da9ccfc 100644 --- a/src/classes/share/javax/media/j3d/SceneGraphPath.java +++ b/src/classes/share/javax/media/j3d/SceneGraphPath.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.Point3d; -import javax.vecmath.Point4d; +import javax.vecmath.Point3d; +import javax.vecmath.Point4d; /** * A SceneGraphPath object represents the path from a Locale to a diff --git a/src/classes/share/javax/media/j3d/Screen3D.java b/src/classes/share/javax/media/j3d/Screen3D.java index 785be48..7d02fcf 100644 --- a/src/classes/share/javax/media/j3d/Screen3D.java +++ b/src/classes/share/javax/media/j3d/Screen3D.java @@ -31,8 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.awt.*; +import java.awt.Dimension; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.awt.Rectangle; import java.util.ArrayList; import java.util.Hashtable; diff --git a/src/classes/share/javax/media/j3d/ScreenViewCache.java b/src/classes/share/javax/media/j3d/ScreenViewCache.java index e686be3..7ae9c0b 100644 --- a/src/classes/share/javax/media/j3d/ScreenViewCache.java +++ b/src/classes/share/javax/media/j3d/ScreenViewCache.java @@ -31,8 +31,6 @@ package javax.media.j3d; -import java.awt.Dimension; -import javax.vecmath.*; /** * The ScreenViewCache class is used to cache all API data diff --git a/src/classes/share/javax/media/j3d/Sensor.java b/src/classes/share/javax/media/j3d/Sensor.java index 9082fa6..bc5fc71 100644 --- a/src/classes/share/javax/media/j3d/Sensor.java +++ b/src/classes/share/javax/media/j3d/Sensor.java @@ -31,7 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Matrix3d; +import javax.vecmath.Point3d; /** * The Sensor Class encapsulates an object that provides real-time diff --git a/src/classes/share/javax/media/j3d/SensorRead.java b/src/classes/share/javax/media/j3d/SensorRead.java index b51a896..d45b4cb 100644 --- a/src/classes/share/javax/media/j3d/SensorRead.java +++ b/src/classes/share/javax/media/j3d/SensorRead.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * A SensorRead encapsulates all the information associated with a single diff --git a/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java b/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java index ac37215..9e35540 100644 --- a/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java @@ -31,8 +31,6 @@ package javax.media.j3d; -import java.util.Vector; -import java.util.BitSet; import java.util.ArrayList; diff --git a/src/classes/share/javax/media/j3d/ShaderAttribute.java b/src/classes/share/javax/media/j3d/ShaderAttribute.java index 50452f2..41a6593 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttribute.java +++ b/src/classes/share/javax/media/j3d/ShaderAttribute.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * The ShaderAttribute object encapsulates a uniform attribute for a diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeArray.java b/src/classes/share/javax/media/j3d/ShaderAttributeArray.java index 2b1889e..7bc5077 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeArray.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeArray.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * The ShaderAttributeArray object encapsulates a uniform shader diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeArrayRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeArrayRetained.java index c852e82..fe1d478 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeArrayRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeArrayRetained.java @@ -31,7 +31,20 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Matrix3f; +import javax.vecmath.Matrix4f; +import javax.vecmath.Point2f; +import javax.vecmath.Point2i; +import javax.vecmath.Point3f; +import javax.vecmath.Point3i; +import javax.vecmath.Point4f; +import javax.vecmath.Point4i; +import javax.vecmath.Tuple2f; +import javax.vecmath.Tuple2i; +import javax.vecmath.Tuple3f; +import javax.vecmath.Tuple3i; +import javax.vecmath.Tuple4f; +import javax.vecmath.Tuple4i; /** * The ShaderAttributeArray object encapsulates a uniform shader diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeBinding.java b/src/classes/share/javax/media/j3d/ShaderAttributeBinding.java index a729d39..73d0ffd 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeBinding.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeBinding.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * The ShaderAttributeBinding object encapsulates a uniform attribute diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeBindingRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeBindingRetained.java index f3e1ef8..ba84aae 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeBindingRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeBindingRetained.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * The ShaderAttributeBinding object encapsulates a uniform attribute diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeObject.java b/src/classes/share/javax/media/j3d/ShaderAttributeObject.java index 604c138..b014358 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeObject.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeObject.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * The ShaderAttributeObject class is an abstract class that diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java index f343d7b..d37583f 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java @@ -32,7 +32,15 @@ package javax.media.j3d; import java.util.ArrayList; -import javax.vecmath.*; + +import javax.vecmath.Matrix3f; +import javax.vecmath.Matrix4f; +import javax.vecmath.Tuple2f; +import javax.vecmath.Tuple2i; +import javax.vecmath.Tuple3f; +import javax.vecmath.Tuple3i; +import javax.vecmath.Tuple4f; +import javax.vecmath.Tuple4i; /** * The ShaderAttributeObjectRetained class is an abstract class that diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeRetained.java index 537437d..94724b6 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeRetained.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * The ShaderAttributeRetained object encapsulates a uniform attribute for a diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeSet.java b/src/classes/share/javax/media/j3d/ShaderAttributeSet.java index 099adb1..c0f5e73 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeSet.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeSet.java @@ -31,10 +31,6 @@ package javax.media.j3d; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; -import javax.vecmath.*; /** * The ShaderAttributeSet object provides uniform attributes to shader diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java index 535de63..ab64feb 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java @@ -32,9 +32,9 @@ package javax.media.j3d; -import java.util.Map; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; /** diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeValue.java b/src/classes/share/javax/media/j3d/ShaderAttributeValue.java index fe900ee..834bb08 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeValue.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeValue.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * The ShaderAttributeValue object encapsulates a uniform shader diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeValueRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeValueRetained.java index 56dc1e9..97413ef 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeValueRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeValueRetained.java @@ -31,7 +31,20 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Matrix3f; +import javax.vecmath.Matrix4f; +import javax.vecmath.Point2f; +import javax.vecmath.Point2i; +import javax.vecmath.Point3f; +import javax.vecmath.Point3i; +import javax.vecmath.Point4f; +import javax.vecmath.Point4i; +import javax.vecmath.Tuple2f; +import javax.vecmath.Tuple2i; +import javax.vecmath.Tuple3f; +import javax.vecmath.Tuple3i; +import javax.vecmath.Tuple4f; +import javax.vecmath.Tuple4i; /** * The ShaderAttributeValueRetained object encapsulates a uniform shader diff --git a/src/classes/share/javax/media/j3d/ShaderBin.java b/src/classes/share/javax/media/j3d/ShaderBin.java index 1143b49..7dba9b4 100644 --- a/src/classes/share/javax/media/j3d/ShaderBin.java +++ b/src/classes/share/javax/media/j3d/ShaderBin.java @@ -31,10 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.Map; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; // XXXX : We should have a common Bin object that all other Bins extend from. diff --git a/src/classes/share/javax/media/j3d/ShaderProgramRetained.java b/src/classes/share/javax/media/j3d/ShaderProgramRetained.java index 84de223..ec30af6 100644 --- a/src/classes/share/javax/media/j3d/ShaderProgramRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderProgramRetained.java @@ -31,8 +31,9 @@ package javax.media.j3d; -import java.util.*; -import javax.vecmath.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; /** * The ShaderProgramRetained object is a component object of an AppearanceRetained diff --git a/src/classes/share/javax/media/j3d/ShaderRetained.java b/src/classes/share/javax/media/j3d/ShaderRetained.java index c6af523..7d3a0ca 100644 --- a/src/classes/share/javax/media/j3d/ShaderRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderRetained.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.*; /** * The ShaderRetained object is the abstract base class for programmable diff --git a/src/classes/share/javax/media/j3d/Shape3DCompileRetained.java b/src/classes/share/javax/media/j3d/Shape3DCompileRetained.java index c87e141..35a8373 100644 --- a/src/classes/share/javax/media/j3d/Shape3DCompileRetained.java +++ b/src/classes/share/javax/media/j3d/Shape3DCompileRetained.java @@ -31,8 +31,11 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Vector; + +import javax.vecmath.Point3d; /** * A leaf node that holds a merged shapes in compile mode diff --git a/src/classes/share/javax/media/j3d/Shape3DRetained.java b/src/classes/share/javax/media/j3d/Shape3DRetained.java index b51f8ba..7502995 100644 --- a/src/classes/share/javax/media/j3d/Shape3DRetained.java +++ b/src/classes/share/javax/media/j3d/Shape3DRetained.java @@ -31,11 +31,12 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; import java.util.Enumeration; import java.util.Vector; +import javax.vecmath.Point3d; + /** * A shape leaf node consisting of geometry and appearance properties. */ diff --git a/src/classes/share/javax/media/j3d/SharedGroupRetained.java b/src/classes/share/javax/media/j3d/SharedGroupRetained.java index d71449f..404e4bb 100644 --- a/src/classes/share/javax/media/j3d/SharedGroupRetained.java +++ b/src/classes/share/javax/media/j3d/SharedGroupRetained.java @@ -31,7 +31,9 @@ package javax.media.j3d; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Vector; /** * The SharedGroup node provides the ability to share a scene graph from diff --git a/src/classes/share/javax/media/j3d/SoundRenderer.java b/src/classes/share/javax/media/j3d/SoundRenderer.java index 9c9f249..b8368dd 100644 --- a/src/classes/share/javax/media/j3d/SoundRenderer.java +++ b/src/classes/share/javax/media/j3d/SoundRenderer.java @@ -31,8 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.Vector; class SoundRenderer extends Object { diff --git a/src/classes/share/javax/media/j3d/SoundRetained.java b/src/classes/share/javax/media/j3d/SoundRetained.java index cf66692..07ee0ec 100644 --- a/src/classes/share/javax/media/j3d/SoundRetained.java +++ b/src/classes/share/javax/media/j3d/SoundRetained.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.Vector; import java.util.ArrayList; diff --git a/src/classes/share/javax/media/j3d/SoundScheduler.java b/src/classes/share/javax/media/j3d/SoundScheduler.java index a66bd99..c66a3ff 100644 --- a/src/classes/share/javax/media/j3d/SoundScheduler.java +++ b/src/classes/share/javax/media/j3d/SoundScheduler.java @@ -31,17 +31,19 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; -import java.util.Vector; -import java.util.ArrayList; -import java.net.URL; +import java.awt.AWTEvent; +import java.awt.event.WindowEvent; import java.io.InputStream; -import java.util.Enumeration; +import java.net.URL; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Enumeration; -import java.awt.*; -import java.awt.event.*; +import javax.vecmath.Point2f; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector3f; /** * This structure parallels the RenderBin structure and diff --git a/src/classes/share/javax/media/j3d/SoundSchedulerAtom.java b/src/classes/share/javax/media/j3d/SoundSchedulerAtom.java index 482c559..77fbe2f 100644 --- a/src/classes/share/javax/media/j3d/SoundSchedulerAtom.java +++ b/src/classes/share/javax/media/j3d/SoundSchedulerAtom.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.ArrayList; /** * A SoundSchedulerAtom is the smallest object representing a Sound within diff --git a/src/classes/share/javax/media/j3d/SoundStructure.java b/src/classes/share/javax/media/j3d/SoundStructure.java index f16a4d3..26f47d5 100644 --- a/src/classes/share/javax/media/j3d/SoundStructure.java +++ b/src/classes/share/javax/media/j3d/SoundStructure.java @@ -31,7 +31,9 @@ package javax.media.j3d; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; /** * A sound structure is a object that organizes Sounds and diff --git a/src/classes/share/javax/media/j3d/SpotLightRetained.java b/src/classes/share/javax/media/j3d/SpotLightRetained.java index 5f76e19..349c6ef 100644 --- a/src/classes/share/javax/media/j3d/SpotLightRetained.java +++ b/src/classes/share/javax/media/j3d/SpotLightRetained.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Vector3f; /** * A local spot light source object. diff --git a/src/classes/share/javax/media/j3d/SwitchRetained.java b/src/classes/share/javax/media/j3d/SwitchRetained.java index 0bbd8d4..5a0b595 100644 --- a/src/classes/share/javax/media/j3d/SwitchRetained.java +++ b/src/classes/share/javax/media/j3d/SwitchRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import java.util.BitSet; import java.util.ArrayList; +import java.util.BitSet; /** * The switch node controls which one of its children will be rendered. diff --git a/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java b/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java index 5e2636e..c5591b1 100644 --- a/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java +++ b/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.Vector4f; import java.util.ArrayList; +import javax.vecmath.Vector4f; + /** * The TexCoordGeneration object contains all parameters needed for texture * coordinate generation. It is included as part of an Appearance diff --git a/src/classes/share/javax/media/j3d/Text3DRetained.java b/src/classes/share/javax/media/j3d/Text3DRetained.java index 50ce513..3496dce 100644 --- a/src/classes/share/javax/media/j3d/Text3DRetained.java +++ b/src/classes/share/javax/media/j3d/Text3DRetained.java @@ -31,12 +31,14 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.awt.font.*; -import java.awt.*; +import java.awt.font.GlyphVector; import java.awt.geom.Rectangle2D; import java.util.ArrayList; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Vector3f; + /** * Implements Text3D class. */ diff --git a/src/classes/share/javax/media/j3d/Texture.java b/src/classes/share/javax/media/j3d/Texture.java index 5ae1280..b14ba2b 100644 --- a/src/classes/share/javax/media/j3d/Texture.java +++ b/src/classes/share/javax/media/j3d/Texture.java @@ -31,9 +31,13 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.Hashtable; +import javax.vecmath.Color4f; +import javax.vecmath.Point2f; +import javax.vecmath.Point3f; +import javax.vecmath.Tuple3f; + /** * The Texture object is a component object of an Appearance object * that defines the texture properties used when texture mapping is diff --git a/src/classes/share/javax/media/j3d/Texture2D.java b/src/classes/share/javax/media/j3d/Texture2D.java index 18d0352..a147f16 100644 --- a/src/classes/share/javax/media/j3d/Texture2D.java +++ b/src/classes/share/javax/media/j3d/Texture2D.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point2f; /** diff --git a/src/classes/share/javax/media/j3d/Texture2DRetained.java b/src/classes/share/javax/media/j3d/Texture2DRetained.java index c7ccd6c..a74388f 100644 --- a/src/classes/share/javax/media/j3d/Texture2DRetained.java +++ b/src/classes/share/javax/media/j3d/Texture2DRetained.java @@ -31,8 +31,7 @@ package javax.media.j3d; -import java.util.*; -import javax.vecmath.*; +import javax.vecmath.Point2f; /** * Texture2D is a subclass of Texture class. It extends Texture diff --git a/src/classes/share/javax/media/j3d/Texture3DRetained.java b/src/classes/share/javax/media/j3d/Texture3DRetained.java index 5fbfa7b..c729a25 100644 --- a/src/classes/share/javax/media/j3d/Texture3DRetained.java +++ b/src/classes/share/javax/media/j3d/Texture3DRetained.java @@ -30,8 +30,6 @@ */ package javax.media.j3d; -import java.util.Enumeration; -import java.util.BitSet; /** * Texture3D is a subclass of Texture class. It extends Texture diff --git a/src/classes/share/javax/media/j3d/TextureAttributesRetained.java b/src/classes/share/javax/media/j3d/TextureAttributesRetained.java index 4bf31ae..265dea6 100644 --- a/src/classes/share/javax/media/j3d/TextureAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/TextureAttributesRetained.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.Color4f; import java.util.ArrayList; +import javax.vecmath.Color4f; + /** * The TextureAttributes object defines attributes that apply to * to texture mapping. diff --git a/src/classes/share/javax/media/j3d/TextureBin.java b/src/classes/share/javax/media/j3d/TextureBin.java index b5d2778..70c6746 100644 --- a/src/classes/share/javax/media/j3d/TextureBin.java +++ b/src/classes/share/javax/media/j3d/TextureBin.java @@ -31,8 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; /** * The TextureBin manages a collection of TextureSetting objects. diff --git a/src/classes/share/javax/media/j3d/TextureCubeMap.java b/src/classes/share/javax/media/j3d/TextureCubeMap.java index 2a36943..6d8ed17 100644 --- a/src/classes/share/javax/media/j3d/TextureCubeMap.java +++ b/src/classes/share/javax/media/j3d/TextureCubeMap.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.*; /** * TextureCubeMap is a subclass of Texture class. It defines diff --git a/src/classes/share/javax/media/j3d/TextureCubeMapRetained.java b/src/classes/share/javax/media/j3d/TextureCubeMapRetained.java index 7d8bb26..e6af34e 100644 --- a/src/classes/share/javax/media/j3d/TextureCubeMapRetained.java +++ b/src/classes/share/javax/media/j3d/TextureCubeMapRetained.java @@ -31,10 +31,6 @@ package javax.media.j3d; -import java.util.*; -import javax.vecmath.Color4f; -import java.awt.image.DataBuffer; -import java.awt.image.DataBufferByte; /** * TextureCubeMap is a subclass of Texture class. diff --git a/src/classes/share/javax/media/j3d/TextureRetained.java b/src/classes/share/javax/media/j3d/TextureRetained.java index ed8e0dc..2b84800 100644 --- a/src/classes/share/javax/media/j3d/TextureRetained.java +++ b/src/classes/share/javax/media/j3d/TextureRetained.java @@ -31,10 +31,15 @@ package javax.media.j3d; -import java.util.*; -import javax.vecmath.*; import java.awt.image.DataBufferByte; import java.awt.image.RenderedImage; +import java.util.ArrayList; +import java.util.HashMap; + +import javax.vecmath.Color4f; +import javax.vecmath.Point2f; +import javax.vecmath.Point3f; +import javax.vecmath.Tuple3f; /** * The Texture object is a component object of an Appearance object diff --git a/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java b/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java index 94847f7..2008d37 100644 --- a/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java +++ b/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import javax.vecmath.Color4f; import java.util.ArrayList; class TextureUnitStateRetained extends NodeComponentRetained { diff --git a/src/classes/share/javax/media/j3d/Transform3D.java b/src/classes/share/javax/media/j3d/Transform3D.java index ddbd26b..bff4073 100644 --- a/src/classes/share/javax/media/j3d/Transform3D.java +++ b/src/classes/share/javax/media/j3d/Transform3D.java @@ -31,7 +31,24 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.AxisAngle4d; +import javax.vecmath.AxisAngle4f; +import javax.vecmath.GMatrix; +import javax.vecmath.Matrix3d; +import javax.vecmath.Matrix3f; +import javax.vecmath.Matrix4d; +import javax.vecmath.Matrix4f; +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; +import javax.vecmath.Point4d; +import javax.vecmath.Quat4d; +import javax.vecmath.Quat4f; +import javax.vecmath.SingularMatrixException; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4d; +import javax.vecmath.Vector4f; + import com.sun.j3d.internal.HashCodeUtil; /** diff --git a/src/classes/share/javax/media/j3d/TransformStructure.java b/src/classes/share/javax/media/j3d/TransformStructure.java index 43009fd..62c3a13 100644 --- a/src/classes/share/javax/media/j3d/TransformStructure.java +++ b/src/classes/share/javax/media/j3d/TransformStructure.java @@ -31,7 +31,10 @@ package javax.media.j3d; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; /** * A transform update is a object that manages TransformGroups diff --git a/src/classes/share/javax/media/j3d/TriangleArrayRetained.java b/src/classes/share/javax/media/j3d/TriangleArrayRetained.java index 392d57c..67e92ad 100644 --- a/src/classes/share/javax/media/j3d/TriangleArrayRetained.java +++ b/src/classes/share/javax/media/j3d/TriangleArrayRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The TriangleArray object draws the array of vertices as individual diff --git a/src/classes/share/javax/media/j3d/TriangleFanArrayRetained.java b/src/classes/share/javax/media/j3d/TriangleFanArrayRetained.java index 33b76c5..d722522 100644 --- a/src/classes/share/javax/media/j3d/TriangleFanArrayRetained.java +++ b/src/classes/share/javax/media/j3d/TriangleFanArrayRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The TriangleFanArray object draws an array of vertices as a set of diff --git a/src/classes/share/javax/media/j3d/TriangleStripArrayRetained.java b/src/classes/share/javax/media/j3d/TriangleStripArrayRetained.java index e11c5fb..6945156 100644 --- a/src/classes/share/javax/media/j3d/TriangleStripArrayRetained.java +++ b/src/classes/share/javax/media/j3d/TriangleStripArrayRetained.java @@ -31,8 +31,8 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.lang.Math; +import javax.vecmath.Point3d; +import javax.vecmath.Vector3d; /** * The TriangleStripArray object draws an array of vertices as a set of diff --git a/src/classes/share/javax/media/j3d/View.java b/src/classes/share/javax/media/j3d/View.java index d64f4ad..edbf680 100644 --- a/src/classes/share/javax/media/j3d/View.java +++ b/src/classes/share/javax/media/j3d/View.java @@ -31,14 +31,17 @@ package javax.media.j3d; -import javax.vecmath.*; -import java.util.Vector; +import java.awt.AWTEvent; import java.util.ArrayList; -import java.util.LinkedList; -import java.util.Iterator; import java.util.Enumeration; -import java.awt.*; -import com.sun.j3d.utils.universe.Viewer; // Needed for Support of DVR. +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Vector; + +import javax.vecmath.Point3d; +import javax.vecmath.Point3f; + +import com.sun.j3d.utils.universe.Viewer; /** * The View object contains all parameters needed in rendering a diff --git a/src/classes/share/javax/media/j3d/ViewCache.java b/src/classes/share/javax/media/j3d/ViewCache.java index 56ad423..a02dd73 100644 --- a/src/classes/share/javax/media/j3d/ViewCache.java +++ b/src/classes/share/javax/media/j3d/ViewCache.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import javax.vecmath.*; +import javax.vecmath.Point3d; /** * The ViewCache class is used to cache all data, both API data and derived diff --git a/src/classes/share/javax/media/j3d/ViewPlatformRetained.java b/src/classes/share/javax/media/j3d/ViewPlatformRetained.java index 86e1797..b705a3c 100644 --- a/src/classes/share/javax/media/j3d/ViewPlatformRetained.java +++ b/src/classes/share/javax/media/j3d/ViewPlatformRetained.java @@ -31,9 +31,10 @@ package javax.media.j3d; -import javax.vecmath.*; import java.util.ArrayList; +import javax.vecmath.Point3d; + /** * ViewPlatform object (retained side) */ diff --git a/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java b/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java index 6e8c54f..902693d 100644 --- a/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java +++ b/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java @@ -31,7 +31,9 @@ package javax.media.j3d; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Vector; /** * The ViewSpecificGroup node retained object. diff --git a/src/classes/share/javax/media/j3d/VirtualUniverse.java b/src/classes/share/javax/media/j3d/VirtualUniverse.java index e7e6ae9..fd5c500 100644 --- a/src/classes/share/javax/media/j3d/VirtualUniverse.java +++ b/src/classes/share/javax/media/j3d/VirtualUniverse.java @@ -31,12 +31,12 @@ package javax.media.j3d; -import java.util.Vector; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/classes/share/javax/media/j3d/WakeupAnd.java b/src/classes/share/javax/media/j3d/WakeupAnd.java index b25c2c2..e443999 100644 --- a/src/classes/share/javax/media/j3d/WakeupAnd.java +++ b/src/classes/share/javax/media/j3d/WakeupAnd.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.Vector; /** * Class specifying any number of wakeup conditions ANDed together. diff --git a/src/classes/share/javax/media/j3d/WakeupAndOfOrs.java b/src/classes/share/javax/media/j3d/WakeupAndOfOrs.java index c1b0fa4..f22eba2 100644 --- a/src/classes/share/javax/media/j3d/WakeupAndOfOrs.java +++ b/src/classes/share/javax/media/j3d/WakeupAndOfOrs.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.Vector; /** * Class specifying any number of OR wakeup conditions ANDed together. diff --git a/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java b/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java index 34a42ad..de85870 100644 --- a/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java +++ b/src/classes/share/javax/media/j3d/WakeupOnAWTEvent.java @@ -32,7 +32,10 @@ package javax.media.j3d; import java.awt.AWTEvent; -import java.awt.event.*; +import java.awt.event.ComponentEvent; +import java.awt.event.FocusEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; import java.util.Vector; /** diff --git a/src/classes/share/javax/media/j3d/WakeupOnCollisionEntry.java b/src/classes/share/javax/media/j3d/WakeupOnCollisionEntry.java index 651f847..bd39186 100644 --- a/src/classes/share/javax/media/j3d/WakeupOnCollisionEntry.java +++ b/src/classes/share/javax/media/j3d/WakeupOnCollisionEntry.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import java.util.*; +import java.util.Vector; /** * Class specifying a wakeup when the specified object diff --git a/src/classes/share/javax/media/j3d/WakeupOnCollisionExit.java b/src/classes/share/javax/media/j3d/WakeupOnCollisionExit.java index cf22d4e..f5a5f55 100644 --- a/src/classes/share/javax/media/j3d/WakeupOnCollisionExit.java +++ b/src/classes/share/javax/media/j3d/WakeupOnCollisionExit.java @@ -30,7 +30,6 @@ */ package javax.media.j3d; -import java.util.*; /** * Class specifying a wakeup when the specified object diff --git a/src/classes/share/javax/media/j3d/WakeupOnCollisionMovement.java b/src/classes/share/javax/media/j3d/WakeupOnCollisionMovement.java index 919966b..de6561b 100644 --- a/src/classes/share/javax/media/j3d/WakeupOnCollisionMovement.java +++ b/src/classes/share/javax/media/j3d/WakeupOnCollisionMovement.java @@ -30,7 +30,6 @@ */ package javax.media.j3d; -import java.util.*; /** * Class specifying a wakeup when the specified object diff --git a/src/classes/share/javax/media/j3d/WakeupOnTransformChange.java b/src/classes/share/javax/media/j3d/WakeupOnTransformChange.java index fd53d17..cc417f7 100644 --- a/src/classes/share/javax/media/j3d/WakeupOnTransformChange.java +++ b/src/classes/share/javax/media/j3d/WakeupOnTransformChange.java @@ -30,7 +30,6 @@ */ package javax.media.j3d; -import java.util.ArrayList; /** * Class specifying a wakeup when the transform within a specified diff --git a/src/classes/share/javax/media/j3d/WakeupOr.java b/src/classes/share/javax/media/j3d/WakeupOr.java index 823d252..52785ab 100644 --- a/src/classes/share/javax/media/j3d/WakeupOr.java +++ b/src/classes/share/javax/media/j3d/WakeupOr.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.Vector; /** * Class specifying any number of wakeup conditions ORed together. diff --git a/src/classes/share/javax/media/j3d/WakeupOrOfAnds.java b/src/classes/share/javax/media/j3d/WakeupOrOfAnds.java index 5caa89a..4c54775 100644 --- a/src/classes/share/javax/media/j3d/WakeupOrOfAnds.java +++ b/src/classes/share/javax/media/j3d/WakeupOrOfAnds.java @@ -31,7 +31,6 @@ package javax.media.j3d; -import java.util.Vector; /** * Class specifying any number of AND wakeup conditions ORed together. diff --git a/src/classes/x11/javax/media/j3d/X11NativeConfigTemplate3D.java b/src/classes/x11/javax/media/j3d/X11NativeConfigTemplate3D.java index 5f7a3b3..4a7360a 100644 --- a/src/classes/x11/javax/media/j3d/X11NativeConfigTemplate3D.java +++ b/src/classes/x11/javax/media/j3d/X11NativeConfigTemplate3D.java @@ -31,12 +31,11 @@ package javax.media.j3d; -import java.awt.GraphicsDevice; import java.awt.GraphicsConfiguration; -import java.awt.GraphicsConfigTemplate; import java.awt.Rectangle; -import sun.awt.X11GraphicsDevice; + import sun.awt.X11GraphicsConfig; +import sun.awt.X11GraphicsDevice; /** * Native config template class. A singleton instance of this class is diff --git a/src/classes/x11/javax/media/j3d/X11NativeScreenInfo.java b/src/classes/x11/javax/media/j3d/X11NativeScreenInfo.java index ce076e2..bfb8f36 100644 --- a/src/classes/x11/javax/media/j3d/X11NativeScreenInfo.java +++ b/src/classes/x11/javax/media/j3d/X11NativeScreenInfo.java @@ -32,6 +32,7 @@ package javax.media.j3d; import java.awt.GraphicsDevice; + import sun.awt.X11GraphicsDevice; /** |