Merge remote-tracking branch 'hharrison/master'

1 files changed, 19 insertions, 19 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/GLStateKeeper.java b/src/jogl/classes/com/jogamp/opengl/GLStateKeeper.java
index 321d4ee57..b98c4431d 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLStateKeeper.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLStateKeeper.java
@@ -3,14 +3,14 @@
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
+ *
  *    1. Redistributions of source code must retain the above copyright notice, this list of
  *       conditions and the following disclaimer.
- * 
+ *
  *    2. Redistributions in binary form must reproduce the above copyright notice, this list
  *       of conditions and the following disclaimer in the documentation and/or other materials
  *       provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
@@ -20,7 +20,7 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those of the
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
@@ -31,12 +31,12 @@ package com.jogamp.opengl;
  * Interface adding a {@link GLEventListenerState} protocol to {@link GLAutoDrawable}s
  * or other self-contained compound types combining {@link GLDrawable}, {@link GLContext} and {@link GLEventListener}.
  * <p>
- * Implementing classes {@link #isGLStatePreservationSupported() may support} preservation 
- * of the {@link GLContext} state and it's associated {@link GLEventListener}. 
- * </p> 
+ * Implementing classes {@link #isGLStatePreservationSupported() may support} preservation
+ * of the {@link GLContext} state and it's associated {@link GLEventListener}.
+ * </p>
  */
 public interface GLStateKeeper {
-    
+
     /** Listener for preserve and restore notifications. */
     public static interface Listener {
         /** Invoked before preservation. */
@@ -44,14 +44,14 @@ public interface GLStateKeeper {
         /** Invoked after restoration. */
         void glStateRestored(GLStateKeeper glsk);
     }
-    
-    /** 
+
+    /**
      * Sets a {@link Listener}, overriding the old one.
      * @param l the new {@link Listener}.
      * @return the previous {@link Listener}.
      */
     public Listener setGLStateKeeperListener(Listener l);
-    
+
     /**
      * @return <code>true</code> if GL state preservation is supported in implementation and on current platform, <code>false</code> otherwise.
      * @see #preserveGLStateAtDestroy(boolean)
@@ -59,7 +59,7 @@ public interface GLStateKeeper {
      * @see #clearPreservedGLState()
      */
     public boolean isGLStatePreservationSupported();
-    
+
     /**
      * If set to <code>true</code>, the next {@link GLAutoDrawable#destroy()} operation will
      * {@link #pullGLEventListenerState() pull} to preserve the {@link GLEventListenerState}.
@@ -68,8 +68,8 @@ public interface GLStateKeeper {
      * the flag is cleared.
      * </p>
      * <p>
-     * A preserved {@link GLEventListenerState} will be {@link #pushGLEventListenerState() pushed} 
-     * if realized again. 
+     * A preserved {@link GLEventListenerState} will be {@link #pushGLEventListenerState() pushed}
+     * if realized again.
      * </p>
      * @return <code>true</code> if supported and successful, <code>false</code> otherwise.
      * @see #isGLStatePreservationSupported()
@@ -77,21 +77,21 @@ public interface GLStateKeeper {
      * @see #clearPreservedGLState()
      */
     public boolean preserveGLStateAtDestroy(boolean value);
-    
+
     /**
      * Returns the preserved {@link GLEventListenerState} if preservation was performed,
-     * otherwise <code>null</code>. 
+     * otherwise <code>null</code>.
      * @see #isGLStatePreservationSupported()
      * @see #preserveGLStateAtDestroy(boolean)
      * @see #clearPreservedGLState()
      */
     public GLEventListenerState getPreservedGLState();
-    
+
     /**
      * Clears the preserved {@link GLEventListenerState} from this {@link GLStateKeeper}, without destroying it.
-     *  
+     *
      * @return the preserved and cleared {@link GLEventListenerState} if preservation was performed,
-     *         otherwise <code>null</code>. 
+     *         otherwise <code>null</code>.
      * @see #isGLStatePreservationSupported()
      * @see #preserveGLStateAtDestroy(boolean)
      * @see #getPreservedGLState()