diff options
| -rw-r--r-- | make/build.xml | 8 | ||||
| -rwxr-xr-x | src/classes/com/sun/opengl/impl/awt/Java2D.java (renamed from src/classes/com/sun/opengl/impl/j2d/Java2D.java) | 2 | ||||
| -rw-r--r-- | src/classes/com/sun/opengl/impl/awt/Java2DGLContext.java (renamed from src/classes/com/sun/opengl/impl/j2d/Java2DGLContext.java) | 2 | ||||
| -rw-r--r-- | src/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java | 1 | ||||
| -rwxr-xr-x | src/classes/com/sun/opengl/util/awt/gl2/GL2Overlay.java (renamed from src/classes/com/sun/opengl/util/j2d/gl2/GL2Overlay.java) | 2 | ||||
| -rwxr-xr-x | src/classes/com/sun/opengl/util/awt/gl2/GL2TextRenderer.java (renamed from src/classes/com/sun/opengl/util/j2d/gl2/GL2TextRenderer.java) | 4 | ||||
| -rwxr-xr-x | src/classes/com/sun/opengl/util/awt/gl2/GL2TextureRenderer.java (renamed from src/classes/com/sun/opengl/util/j2d/gl2/GL2TextureRenderer.java) | 2 | ||||
| -rw-r--r-- | src/classes/javax/media/opengl/awt/gl2/GL2JPanel.java (renamed from src/classes/javax/media/opengl/j2d/gl2/GL2JPanel.java) | 3 | ||||
| -rwxr-xr-x | src/classes/javax/media/opengl/util/awt/JAnimator.java (renamed from src/classes/javax/media/opengl/util/swing/JAnimator.java) | 2 | ||||
| -rwxr-xr-x | src/classes/javax/media/opengl/util/awt/JOGLAppletLauncher.java (renamed from src/classes/javax/media/opengl/util/swing/JOGLAppletLauncher.java) | 2 |
10 files changed, 13 insertions, 15 deletions
diff --git a/make/build.xml b/make/build.xml index 7a0b4fc5d..fd289da1d 100644 --- a/make/build.xml +++ b/make/build.xml @@ -161,13 +161,13 @@ value="javax/media/opengl/TraceGLES2.*, javax/media/opengl/DebugGLES2.*"/> <property name="java.part.awt" - value="javax/media/opengl/awt/**, javax/media/opengl/j2d/**, javax/media/opengl/util/swing/**, com/sun/opengl/impl/j2d/**, com/sun/opengl/impl/awt/**"/> + value="javax/media/opengl/awt/**, javax/media/opengl/util/awt/**, com/sun/opengl/impl/awt/**"/> <property name="java.part.util" value="com/sun/opengl/util/io/**, com/sun/opengl/util/texture/**"/> <property name="java.part.util.awt" - value="com/sun/opengl/util/**/awt/**, com/sun/opengl/util/**/j2d/**"/> + value="com/sun/opengl/util/**/awt/**"/> <property name="java.part.util.gl2" value="com/sun/opengl/util/glut/**, com/sun/opengl/util/**/gl2/**"/> @@ -1653,12 +1653,12 @@ <jar manifest="tempversion" destfile="${jogl.util.jar}"> <fileset dir="${classes}" includes="${java.part.util}" - excludes="com/sun/opengl/**/awt/**, com/sun/opengl/**/j2d/**, com/sun/opengl/**/gl2/**"/> + excludes="com/sun/opengl/**/awt/**, com/sun/opengl/**/gl2/**"/> </jar> <jar manifest="tempversion" destfile="${jogl.util.gl2.jar}"> <fileset dir="${classes}" includes="${java.part.util.gl2}" - excludes="com/sun/opengl/**/awt/**, com/sun/opengl/**/j2d/**"/> + excludes="com/sun/opengl/**/awt/**"/> </jar> <jar manifest="tempversion" destfile="${jogl.util.awt.jar}"> <fileset dir="${classes}" diff --git a/src/classes/com/sun/opengl/impl/j2d/Java2D.java b/src/classes/com/sun/opengl/impl/awt/Java2D.java index 749978467..0595dbed7 100755 --- a/src/classes/com/sun/opengl/impl/j2d/Java2D.java +++ b/src/classes/com/sun/opengl/impl/awt/Java2D.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.opengl.impl.j2d; +package com.sun.opengl.impl.awt; import com.sun.opengl.impl.*; diff --git a/src/classes/com/sun/opengl/impl/j2d/Java2DGLContext.java b/src/classes/com/sun/opengl/impl/awt/Java2DGLContext.java index ee7d4e586..48461c116 100644 --- a/src/classes/com/sun/opengl/impl/j2d/Java2DGLContext.java +++ b/src/classes/com/sun/opengl/impl/awt/Java2DGLContext.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.opengl.impl.j2d; +package com.sun.opengl.impl.awt; import com.sun.opengl.impl.*; import java.awt.Graphics; diff --git a/src/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java b/src/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java index f1ef212cb..707d28ea8 100644 --- a/src/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java +++ b/src/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java @@ -45,7 +45,6 @@ import java.awt.Graphics; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.awt.*; -import com.sun.opengl.impl.j2d.*; import com.sun.opengl.impl.macosx.cgl.*; /** MacOSXCGLContext implementation supporting the Java2D/JOGL bridge diff --git a/src/classes/com/sun/opengl/util/j2d/gl2/GL2Overlay.java b/src/classes/com/sun/opengl/util/awt/gl2/GL2Overlay.java index 6ba14abe5..1302f62ea 100755 --- a/src/classes/com/sun/opengl/util/j2d/gl2/GL2Overlay.java +++ b/src/classes/com/sun/opengl/util/awt/gl2/GL2Overlay.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.opengl.util.j2d.gl2; +package com.sun.opengl.util.awt.gl2; import java.awt.Graphics2D; diff --git a/src/classes/com/sun/opengl/util/j2d/gl2/GL2TextRenderer.java b/src/classes/com/sun/opengl/util/awt/gl2/GL2TextRenderer.java index 96fe865fd..3527936b8 100755 --- a/src/classes/com/sun/opengl/util/j2d/gl2/GL2TextRenderer.java +++ b/src/classes/com/sun/opengl/util/awt/gl2/GL2TextRenderer.java @@ -36,7 +36,7 @@ * Sun gratefully acknowledges that this software was originally authored * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.opengl.util.j2d.gl2; +package com.sun.opengl.util.awt.gl2; import com.sun.opengl.impl.*; import com.sun.opengl.impl.awt.packrect.*; @@ -119,7 +119,7 @@ import javax.media.opengl.util.*; pack both glyphs and full Strings' rendering results (which are variable size) onto a larger OpenGL texture. The internal backing store is maintained using a {@link - com.sun.opengl.util.j2d.TextureRenderer TextureRenderer}. A least + com.sun.opengl.util.awt.gl2.GL2TextureRenderer TextureRenderer}. A least recently used (LRU) algorithm is used to discard previously rendered strings; the specific algorithm is undefined, but is currently implemented by flushing unused Strings' rendering diff --git a/src/classes/com/sun/opengl/util/j2d/gl2/GL2TextureRenderer.java b/src/classes/com/sun/opengl/util/awt/gl2/GL2TextureRenderer.java index 50877194a..54ff96648 100755 --- a/src/classes/com/sun/opengl/util/j2d/gl2/GL2TextureRenderer.java +++ b/src/classes/com/sun/opengl/util/awt/gl2/GL2TextureRenderer.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.sun.opengl.util.j2d.gl2; +package com.sun.opengl.util.awt.gl2; import java.awt.Color; import java.awt.Dimension; diff --git a/src/classes/javax/media/opengl/j2d/gl2/GL2JPanel.java b/src/classes/javax/media/opengl/awt/gl2/GL2JPanel.java index ca21c7777..951bee66c 100644 --- a/src/classes/javax/media/opengl/j2d/gl2/GL2JPanel.java +++ b/src/classes/javax/media/opengl/awt/gl2/GL2JPanel.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package javax.media.opengl.j2d.gl2; +package javax.media.opengl.awt.gl2; import javax.media.opengl.*; import javax.media.opengl.awt.*; @@ -53,7 +53,6 @@ import javax.swing.JComponent; import javax.swing.JPanel; import com.sun.opengl.impl.*; import com.sun.opengl.impl.awt.*; -import com.sun.opengl.impl.j2d.*; // FIXME: Subclasses need to call resetGLFunctionAvailability() on their // context whenever the displayChanged() function is called on their diff --git a/src/classes/javax/media/opengl/util/swing/JAnimator.java b/src/classes/javax/media/opengl/util/awt/JAnimator.java index 2b759814d..2dade9a5b 100755 --- a/src/classes/javax/media/opengl/util/swing/JAnimator.java +++ b/src/classes/javax/media/opengl/util/awt/JAnimator.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package javax.media.opengl.util.swing; +package javax.media.opengl.util.awt; import java.awt.Component; import java.awt.EventQueue; diff --git a/src/classes/javax/media/opengl/util/swing/JOGLAppletLauncher.java b/src/classes/javax/media/opengl/util/awt/JOGLAppletLauncher.java index 7a5e29174..c639f5e8f 100755 --- a/src/classes/javax/media/opengl/util/swing/JOGLAppletLauncher.java +++ b/src/classes/javax/media/opengl/util/awt/JOGLAppletLauncher.java @@ -40,7 +40,7 @@ * facility. */ -package javax.media.opengl.util.swing; +package javax.media.opengl.util.awt; import java.awt.BorderLayout; import java.awt.Color; |