Update to JogAmp JOGL 2.3.2 released on 2015 10 10

port was done using git grep -lz 'javax.media.opengl' | xargs -0 perl -i'' -pE "s/javax.media.opengl/com.jogamp.opengl/g" git grep -lz 'javax.media.nativewindow' | xargs -0 perl -i'' -pE "s/javax.media.nativewindow/com.jogamp.nativewindow/g" Signed-off-by: Xerxes Rånby <xerxes@gudinna.com>
NASAWorldWind · caller · Jan 14, 2016 · Jan 14, 2016 · Jan 14, 2016 · Nov 19, 2016
commit 109d8e199ea805fb59b2c0c974901b939dfad1be
diff --git a/src/com/zebraimaging/ZebraInputHandler.java b/src/com/zebraimaging/ZebraInputHandler.java
@@ -3,7 +3,7 @@
 import gov.nasa.worldwind.WorldWindow;
 import gov.nasa.worldwind.awt.*;
 
-import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.awt.GLCanvas;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;

diff --git a/src/gov/nasa/worldwind/AbstractSceneController.java b/src/gov/nasa/worldwind/AbstractSceneController.java
@@ -15,7 +15,7 @@
 import gov.nasa.worldwind.terrain.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.util.*;
 import java.util.List;

diff --git a/src/gov/nasa/worldwind/Configuration.java b/src/gov/nasa/worldwind/Configuration.java
@@ -11,7 +11,7 @@
 import gov.nasa.worldwind.util.*;
 import org.w3c.dom.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import javax.xml.xpath.*;
 import java.io.*;
 import java.util.*;
@@ -659,7 +659,7 @@ public static GLProfile getMaxCompatibleGLProfile()
     }
 
     /**
-     * Returns a {@link javax.media.opengl.GLCapabilities} identifying graphics features required by World Wind. The
+     * Returns a {@link com.jogamp.opengl.GLCapabilities} identifying graphics features required by World Wind. The
      * capabilities instance returned requests the maximum OpenGL profile supporting GL fixed function operations, a
      * frame buffer with 8 bits each of red, green, blue and alpha, a 24-bit depth buffer, double buffering, and if the
      * Java property "gov.nasa.worldwind.stereo.mode" is set to "device", device supported stereo.

diff --git a/src/gov/nasa/worldwind/StereoOptionSceneController.java b/src/gov/nasa/worldwind/StereoOptionSceneController.java
@@ -10,7 +10,7 @@
 import gov.nasa.worldwind.geom.Angle;
 import gov.nasa.worldwind.render.DrawContext;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 
 /**
  * TODO: This file needs to be updated to implement "correct" stereo, as described at:

diff --git a/src/gov/nasa/worldwind/WorldWind.java b/src/gov/nasa/worldwind/WorldWind.java
@@ -14,7 +14,7 @@
 import gov.nasa.worldwind.util.*;
 
 import javax.imageio.spi.IIORegistry;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 import java.beans.PropertyChangeListener;
 import java.util.logging.Level;
 

diff --git a/src/gov/nasa/worldwind/WorldWindow.java b/src/gov/nasa/worldwind/WorldWindow.java
@@ -13,7 +13,7 @@
 import gov.nasa.worldwind.pick.PickedObjectList;
 import gov.nasa.worldwind.util.PerformanceStatistic;
 
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GLContext;
 import java.util.*;
 
 /**

diff --git a/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java b/src/gov/nasa/worldwind/WorldWindowGLAutoDrawable.java
@@ -16,8 +16,8 @@
 import gov.nasa.worldwind.util.*;
 import gov.nasa.worldwind.util.dashboard.DashboardController;
 
-import javax.media.opengl.*;
-import javax.media.opengl.awt.AWTGLAutoDrawable;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.AWTGLAutoDrawable;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;

diff --git a/src/gov/nasa/worldwind/WorldWindowGLDrawable.java b/src/gov/nasa/worldwind/WorldWindowGLDrawable.java
@@ -8,7 +8,7 @@
 
 import gov.nasa.worldwind.cache.*;
 
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLAutoDrawable;
 
 /**
  * @author tag

diff --git a/src/gov/nasa/worldwind/awt/AWTInputHandler.java b/src/gov/nasa/worldwind/awt/AWTInputHandler.java
@@ -11,7 +11,7 @@
 import gov.nasa.worldwind.pick.*;
 import gov.nasa.worldwind.util.Logging;
 
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.awt.GLJPanel;
 import javax.swing.event.*;
 import java.awt.*;
 import java.awt.event.*;

diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java b/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java
@@ -14,8 +14,8 @@
 import gov.nasa.worldwind.pick.PickedObjectList;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLCanvas;
 import java.awt.*;
 import java.beans.*;
 import java.util.*;
@@ -87,8 +87,8 @@ public WorldWindowGLCanvas()
      *
      * @param shareWith a <code>WorldWindow</code> with which to share graphics resources.
      *
-     * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
-     *      javax.media.opengl.GLContext, java.awt.GraphicsDevice)
+     * @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+     *      com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
      */
     public WorldWindowGLCanvas(WorldWindow shareWith)
     {
@@ -126,8 +126,8 @@ public WorldWindowGLCanvas(WorldWindow shareWith)
      * @param device    the <code>GraphicsDevice</code> on which to create the window. May be null, in which case the
      *                  default screen device of the local {@link GraphicsEnvironment} is used.
      *
-     * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
-     *      javax.media.opengl.GLContext, java.awt.GraphicsDevice)
+     * @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+     *      com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
      */
     public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device)
     {
@@ -169,8 +169,8 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device
      * @param chooser      a chooser object that customizes the specified capabilities. May be null, in which case a
      *                     default chooser is used.
      *
-     * @see GLCanvas#GLCanvas(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
-     *      javax.media.opengl.GLContext, java.awt.GraphicsDevice)
+     * @see GLCanvas#GLCanvas(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+     *      com.jogamp.opengl.GLContext, java.awt.GraphicsDevice)
      */
     public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device,
         GLCapabilities capabilities, GLCapabilitiesChooser chooser)

diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java b/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
@@ -14,8 +14,8 @@
 import gov.nasa.worldwind.pick.PickedObjectList;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.awt.GLJPanel;
 import java.beans.*;
 import java.util.*;
 
@@ -86,8 +86,8 @@ public WorldWindowGLJPanel()
      *
      * @param shareWith a <code>WorldWindow</code> with which to share graphics resources.
      *
-     * @see GLJPanel#GLJPanel(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
-     *      javax.media.opengl.GLContext)
+     * @see GLJPanel#GLJPanel(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+     *      com.jogamp.opengl.GLContext)
      */
     public WorldWindowGLJPanel(WorldWindow shareWith)
     {
@@ -128,8 +128,8 @@ public WorldWindowGLJPanel(WorldWindow shareWith)
      * @param chooser      a chooser object that customizes the specified capabilities. May be null, in which case a
      *                     default chooser is used.
      *
-     * @see GLJPanel#GLJPanel(javax.media.opengl.GLCapabilitiesImmutable, javax.media.opengl.GLCapabilitiesChooser,
-     *      javax.media.opengl.GLContext)
+     * @see GLJPanel#GLJPanel(com.jogamp.opengl.GLCapabilitiesImmutable, com.jogamp.opengl.GLCapabilitiesChooser,
+     *      com.jogamp.opengl.GLContext)
      */
     public WorldWindowGLJPanel(WorldWindow shareWith, GLCapabilities capabilities,
         GLCapabilitiesChooser chooser)

diff --git a/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java b/src/gov/nasa/worldwind/cache/BasicGpuResourceCache.java
@@ -9,7 +9,7 @@
 import com.jogamp.opengl.util.texture.Texture;
 import gov.nasa.worldwind.util.Logging;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.util.logging.Level;
 
 /**

diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefileExtrudedPolygons.java
@@ -14,7 +14,7 @@
 import gov.nasa.worldwind.terrain.Terrain;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.nio.*;
 import java.util.*;

diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolygons.java
@@ -16,8 +16,8 @@
 import gov.nasa.worldwind.util.*;
 import gov.nasa.worldwind.util.combine.*;
 
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.*;
 import java.awt.*;
 import java.beans.*;
 import java.nio.*;

diff --git a/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java b/src/gov/nasa/worldwind/formats/shapefile/ShapefilePolylines.java
@@ -15,7 +15,7 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.nio.*;
 import java.util.*;

diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceArea.java
@@ -11,8 +11,8 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.*;
 import java.nio.IntBuffer;
 import java.util.*;
 

diff --git a/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java b/src/gov/nasa/worldwind/formats/vpf/VPFSurfaceLine.java
@@ -10,7 +10,7 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.util.*;
 
 /**

diff --git a/src/gov/nasa/worldwind/geom/Box.java b/src/gov/nasa/worldwind/geom/Box.java
@@ -10,7 +10,7 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.util.*;
 
 /**

diff --git a/src/gov/nasa/worldwind/geom/Cylinder.java b/src/gov/nasa/worldwind/geom/Cylinder.java
@@ -10,8 +10,8 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.*;
+import com.jogamp.opengl.glu.*;
 import java.util.*;
 
 /**

diff --git a/src/gov/nasa/worldwind/geom/Sphere.java b/src/gov/nasa/worldwind/geom/Sphere.java
@@ -9,8 +9,8 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.*;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.glu.*;
 
 /**
  * Represents a sphere in three dimensional space. <p/> Instances of <code>Sphere</code> are immutable. </p>

diff --git a/src/gov/nasa/worldwind/geom/Triangle.java b/src/gov/nasa/worldwind/geom/Triangle.java
@@ -7,7 +7,7 @@
 
 import gov.nasa.worldwind.util.Logging;
 
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
 import java.nio.*;
 import java.util.*;
 

diff --git a/src/gov/nasa/worldwind/layers/CachedRenderableLayer.java b/src/gov/nasa/worldwind/layers/CachedRenderableLayer.java
@@ -12,7 +12,7 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.util.Collection;
 
 /**

diff --git a/src/gov/nasa/worldwind/layers/CompassLayer.java b/src/gov/nasa/worldwind/layers/CompassLayer.java
@@ -15,7 +15,7 @@
 import gov.nasa.worldwind.util.*;
 import gov.nasa.worldwind.view.orbit.OrbitView;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.io.*;
 

diff --git a/src/gov/nasa/worldwind/layers/CrosshairLayer.java b/src/gov/nasa/worldwind/layers/CrosshairLayer.java
@@ -12,7 +12,7 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.io.*;
 

diff --git a/src/gov/nasa/worldwind/layers/RenderableLayer.java b/src/gov/nasa/worldwind/layers/RenderableLayer.java
@@ -12,7 +12,7 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.Logging;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 

diff --git a/src/gov/nasa/worldwind/layers/ScalebarLayer.java b/src/gov/nasa/worldwind/layers/ScalebarLayer.java
@@ -11,7 +11,7 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.awt.geom.*;
 

diff --git a/src/gov/nasa/worldwind/layers/SkyColorLayer.java b/src/gov/nasa/worldwind/layers/SkyColorLayer.java
@@ -9,7 +9,7 @@
 import gov.nasa.worldwind.render.DrawContext;
 import gov.nasa.worldwind.util.Logging;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 
 /**

diff --git a/src/gov/nasa/worldwind/layers/SkyGradientLayer.java b/src/gov/nasa/worldwind/layers/SkyGradientLayer.java
@@ -10,7 +10,7 @@
 import gov.nasa.worldwind.render.DrawContext;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 
 /**

diff --git a/src/gov/nasa/worldwind/layers/StarsLayer.java b/src/gov/nasa/worldwind/layers/StarsLayer.java
@@ -11,7 +11,7 @@
 import gov.nasa.worldwind.render.DrawContext;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.io.*;
 import java.nio.*;
 

diff --git a/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java b/src/gov/nasa/worldwind/layers/TerrainProfileLayer.java
@@ -14,7 +14,7 @@
 import gov.nasa.worldwind.util.*;
 import gov.nasa.worldwind.view.orbit.OrbitView;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.awt.geom.*;
 import java.beans.PropertyChangeEvent;

diff --git a/src/gov/nasa/worldwind/layers/TextureTile.java b/src/gov/nasa/worldwind/layers/TextureTile.java
@@ -14,7 +14,7 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 

diff --git a/src/gov/nasa/worldwind/layers/TiledImageLayer.java b/src/gov/nasa/worldwind/layers/TiledImageLayer.java
@@ -16,7 +16,7 @@
 import org.w3c.dom.*;
 
 import javax.imageio.ImageIO;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import javax.xml.xpath.XPath;
 import java.awt.image.*;
 import java.io.*;

diff --git a/src/gov/nasa/worldwind/layers/WorldMapLayer.java b/src/gov/nasa/worldwind/layers/WorldMapLayer.java
@@ -14,7 +14,7 @@
 import gov.nasa.worldwind.render.*;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.io.*;
 import java.util.ArrayList;

diff --git a/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java b/src/gov/nasa/worldwind/layers/mercator/MercatorTiledImageLayer.java
@@ -15,7 +15,7 @@
 import gov.nasa.worldwind.util.*;
 
 import javax.imageio.ImageIO;
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.awt.geom.*;
 import java.awt.image.*;

diff --git a/src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java b/src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java
@@ -17,7 +17,7 @@
 import gov.nasa.worldwind.terrain.Terrain;
 import gov.nasa.worldwind.util.*;
 
-import javax.media.opengl.*;
+import com.jogamp.opengl.*;
 import java.awt.*;
 import java.nio.FloatBuffer;
 import java.util.*;