Incorporated patch from Michael Bien fixing roughly 80% of compilation errors

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JOGL_2_SANDBOX@287 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

3 files changed, 33 insertions, 17 deletions

diff --git a/src/demos/fullscreen/GearsFullscreen.java b/src/demos/fullscreen/GearsFullscreen.java
index f71dd77..5e574be 100755
--- a/src/demos/fullscreen/GearsFullscreen.java
+++ b/src/demos/fullscreen/GearsFullscreen.java
@@ -3,10 +3,10 @@ package demos.fullscreen;
 import java.awt.*;
 import java.awt.event.*;
 
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
 import demos.gears.Gears;
 import demos.util.*;
+import javax.media.opengl.awt.GLCanvas;
+import javax.media.opengl.util.Animator;
 
 /**
  * GearsFullscreen.java <BR>
diff --git a/src/demos/fullscreen/GearsFullscreen2.java b/src/demos/fullscreen/GearsFullscreen2.java
index eea7869..9b08cba 100755
--- a/src/demos/fullscreen/GearsFullscreen2.java
+++ b/src/demos/fullscreen/GearsFullscreen2.java
@@ -1,13 +1,21 @@
 package demos.fullscreen;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
 import demos.gears.Gears;
-import demos.util.*;
+import demos.util.ScreenResSelector;
+import java.awt.BorderLayout;
+import java.awt.DisplayMode;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.media.opengl.awt.GLCanvas;
+import javax.media.opengl.util.Animator;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.ToolTipManager;
+
 
 /**
  * GearsFullscreen2.java <BR>
diff --git a/src/demos/fullscreen/JGearsFullscreen.java b/src/demos/fullscreen/JGearsFullscreen.java
index 465c566..d9d1134 100755
--- a/src/demos/fullscreen/JGearsFullscreen.java
+++ b/src/demos/fullscreen/JGearsFullscreen.java
@@ -1,13 +1,21 @@
 package demos.fullscreen;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
 import demos.jgears.JGears;
-import demos.util.*;
+import demos.util.ScreenResSelector;
+import java.awt.BorderLayout;
+import java.awt.DisplayMode;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.media.opengl.awt.gl2.GL2JPanel;
+import javax.media.opengl.util.Animator;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+
+
 
 /**
  * JGearsFullscreen.java <BR>
@@ -53,7 +61,7 @@ public class JGearsFullscreen {
     if (newMode != null) {
       frame.setUndecorated(true);
     }
-    GLJPanel drawable = new JGears();
+    JGears drawable = new JGears();
     drawable.addGLEventListener(new FullscreenWorkaround(initWidth, initHeight));
 
     frame.getContentPane().setLayout(new BorderLayout());