From 606754802fed7086f6b7996b69910b1f085bc3db Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 3 Feb 2015 01:26:49 +0100 Subject: Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.* (Part 2) --- .../main/java/com/io7m/examples/jp4da/MainActivity.java | 4 ++-- .../src/main/java/com/io7m/examples/jp4da/Example.java | 8 ++++---- .../main/java/com/io7m/examples/jp4da/DesktopExample.java | 6 +++--- .../java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/maven/jp4da/jp4da-android/src/main/java/com/io7m/examples/jp4da/MainActivity.java b/maven/jp4da/jp4da-android/src/main/java/com/io7m/examples/jp4da/MainActivity.java index 9a9dd77..245ec2b 100644 --- a/maven/jp4da/jp4da-android/src/main/java/com/io7m/examples/jp4da/MainActivity.java +++ b/maven/jp4da/jp4da-android/src/main/java/com/io7m/examples/jp4da/MainActivity.java @@ -1,7 +1,7 @@ package com.io7m.examples.jp4da; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLProfile; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLProfile; import jogamp.newt.driver.android.NewtBaseActivity; import android.os.Bundle; diff --git a/maven/jp4da/jp4da-core/src/main/java/com/io7m/examples/jp4da/Example.java b/maven/jp4da/jp4da-core/src/main/java/com/io7m/examples/jp4da/Example.java index 5675b95..973bfb1 100644 --- a/maven/jp4da/jp4da-core/src/main/java/com/io7m/examples/jp4da/Example.java +++ b/maven/jp4da/jp4da-core/src/main/java/com/io7m/examples/jp4da/Example.java @@ -1,9 +1,9 @@ package com.io7m.examples.jp4da; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; public class Example implements GLEventListener { diff --git a/maven/jp4da/jp4da-desktop/src/main/java/com/io7m/examples/jp4da/DesktopExample.java b/maven/jp4da/jp4da-desktop/src/main/java/com/io7m/examples/jp4da/DesktopExample.java index d7df081..ce0811a 100644 --- a/maven/jp4da/jp4da-desktop/src/main/java/com/io7m/examples/jp4da/DesktopExample.java +++ b/maven/jp4da/jp4da-desktop/src/main/java/com/io7m/examples/jp4da/DesktopExample.java @@ -1,8 +1,8 @@ package com.io7m.examples.jp4da; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLProfile; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLProfile; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.util.FPSAnimator; diff --git a/maven/trivial-test/src/test/java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java b/maven/trivial-test/src/test/java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java index 54bfe29..6c0754e 100644 --- a/maven/trivial-test/src/test/java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java +++ b/maven/trivial-test/src/test/java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java @@ -1,12 +1,12 @@ package com.io7m.example.jogl_mvn_test_2; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLProfile; -import javax.media.opengl.fixedfunc.GLMatrixFunc; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import org.junit.Test; -- cgit v1.2.3