Misc cleanup: add @Override

3 files changed, 45 insertions, 34 deletions

diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/WrappedSurface.java b/src/nativewindow/classes/com/jogamp/nativewindow/WrappedSurface.java
index f2993abab..04f616daf 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/WrappedSurface.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/WrappedSurface.java
@@ -44,30 +44,36 @@ public class WrappedSurface extends ProxySurface implements SurfaceChangeable {
     super(cfg);
     surfaceHandle=handle;
   }
-  
+
+  @Override
   protected final void invalidateImpl() {
     surfaceHandle = 0;
   }
 
+  @Override
   final public long getSurfaceHandle() {
     return surfaceHandle;
   }
 
+  @Override
   final public void setSurfaceHandle(long surfaceHandle) {
     this.surfaceHandle=surfaceHandle;
   }
 
+  @Override
   final protected int lockSurfaceImpl() {
       return LOCK_SUCCESS;
   }
 
+  @Override
   final protected void unlockSurfaceImpl() {
   }
 
+  @Override
   public String toString() {
-    return "WrappedSurface[config " + getPrivateGraphicsConfiguration()+ 
-           ", displayHandle 0x" + Long.toHexString(getDisplayHandle()) + 
-           ", surfaceHandle 0x" + Long.toHexString(getSurfaceHandle()) + 
+    return "WrappedSurface[config " + getPrivateGraphicsConfiguration()+
+           ", displayHandle 0x" + Long.toHexString(getDisplayHandle()) +
+           ", surfaceHandle 0x" + Long.toHexString(getSurfaceHandle()) +
            ", size " + getWidth() + "x" + getHeight() +
            ", surfaceLock "+surfaceLock+"]";
   }
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java
index 2bc352116..12e202975 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java
@@ -1,22 +1,22 @@
 /*
  * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
  * Copyright (c) 2010 JogAmp Community. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  * - Redistribution of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
- * 
+ *
  * - Redistribution 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.
- * 
+ *
  * Neither the name of Sun Microsystems, Inc. or the names of
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * This software is provided "AS IS," without a warranty of any kind. ALL
  * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
  * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
@@ -29,11 +29,11 @@
  * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
  * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
+ *
  * You acknowledge that this software is not designed or intended for use
  * in the design, construction, operation or maintenance of any nuclear
  * facility.
- * 
+ *
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
@@ -52,8 +52,8 @@ import javax.media.nativewindow.util.Point;
     which can create NativeWindow objects for its components. <P>
 */
 public interface NativeWindow extends NativeSurface {
- 
-  /** 
+
+  /**
    * destroys the window and releases
    * windowing related resources.
    */
@@ -67,63 +67,63 @@ public interface NativeWindow extends NativeSurface {
   /**
    * Returns the window handle for this NativeWindow. <P>
    *
-   * The window handle shall reflect the platform one 
+   * The window handle shall reflect the platform one
    * for all window related operations, e.g. open, close, resize. <P>
    *
    * On X11 this returns an entity of type Window. <BR>
-   * On Microsoft Windows this returns an entity of type HWND. 
+   * On Microsoft Windows this returns an entity of type HWND.
    */
   public long getWindowHandle();
 
-  /** 
+  /**
    * Returns the insets defined as the width and height of the window decoration
    * on the left, right, top and bottom.<br>
    * Insets are zero if the window is undecorated, including child windows.
-   * 
+   *
    * <p>
    * Insets are available only after the native window has been created,
    * ie. the native window has been made visible.<br>
-   *   
+   *
    * The top-level window area's top-left corner is located at
    * <pre>
    *   getX() - getInsets().{@link InsetsImmutable#getLeftWidth() getLeftWidth()}
    *   getY() - getInsets().{@link InsetsImmutable#getTopHeight() getTopHeight()}
-   * </pre> 
-   * 
+   * </pre>
+   *
    * The top-level window size is
    * <pre>
-   *   getWidth()  + getInsets().{@link InsetsImmutable#getTotalWidth() getTotalWidth()} 
+   *   getWidth()  + getInsets().{@link InsetsImmutable#getTotalWidth() getTotalWidth()}
    *   getHeight() + getInsets().{@link InsetsImmutable#getTotalHeight() getTotalHeight()}
-   * </pre> 
-   * 
+   * </pre>
+   *
    * @return insets
    */
   public InsetsImmutable getInsets();
-  
+
   /** Returns the current x position of this window, relative to it's parent. */
-  
-  /** 
+
+  /**
    * @return the current x position of the top-left corner
-   *         of the client area relative to it's parent. 
+   *         of the client area relative to it's parent.
    *         Since the position reflects the client area, it does not include the insets.
    * @see #getInsets()
    */
   public int getX();
 
-  /** 
+  /**
    * @return the current y position of the top-left corner
-   *         of the client area relative to it's parent. 
+   *         of the client area relative to it's parent.
    *         Since the position reflects the client area, it does not include the insets.
    * @see #getInsets()
    */
   public int getY();
 
-  /** 
-   * Returns the current position of the top-left corner 
+  /**
+   * Returns the current position of the top-left corner
    * of the client area in screen coordinates.
    * <p>
    * Since the position reflects the client area, it does not include the insets.
-   * </p> 
+   * </p>
    * @param point if not null,
    *        {@link javax.media.nativewindow.util.Point#translate(javax.media.nativewindow.util.Point)}
    *        the passed {@link javax.media.nativewindow.util.Point} by this location on the screen and return it.
@@ -131,8 +131,8 @@ public interface NativeWindow extends NativeSurface {
    *         or a new instance with the screen location of this NativeWindow.
    */
   public Point getLocationOnScreen(Point point);
-  
+
   /** Returns true if this native window owns the focus, otherwise false. */
   boolean hasFocus();
-  
+
 }
diff --git a/src/nativewindow/classes/jogamp/nativewindow/windows/GDISurface.java b/src/nativewindow/classes/jogamp/nativewindow/windows/GDISurface.java
index bc02ac5dc..4da48bdae 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/windows/GDISurface.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/windows/GDISurface.java
@@ -51,11 +51,13 @@ public class GDISurface extends ProxySurface {
     this.windowHandle=windowHandle;
   }
 
+  @Override
   protected final void invalidateImpl() {
     windowHandle=0;
     surfaceHandle=0;
   }
 
+  @Override
   final protected int lockSurfaceImpl() {
     if (0 != surfaceHandle) {
         throw new InternalError("surface not released");
@@ -70,6 +72,7 @@ public class GDISurface extends ProxySurface {
     return (0 != surfaceHandle) ? LOCK_SUCCESS : LOCK_SURFACE_NOT_READY;
   }
 
+  @Override
   final protected void unlockSurfaceImpl() {
     if (0 == surfaceHandle) {
         throw new InternalError("surface not acquired: "+this+", thread: "+Thread.currentThread().getName());
@@ -80,10 +83,12 @@ public class GDISurface extends ProxySurface {
     surfaceHandle=0;
   }
 
+  @Override
   final public long getSurfaceHandle() {
     return surfaceHandle;
   }
 
+  @Override
   final public String toString() {
     return "GDISurface[config "+getPrivateGraphicsConfiguration()+
                 ", displayHandle 0x"+Long.toHexString(getDisplayHandle())+