Bug 741 HiDPI: [Core API Change] Bring back get[Width|Height]() in NativeWindow, i.e. getWindow[Width|Height]() -> get[Width|Height]()

We have distinguished pixel- and window units in commit f9a00b91dcd146c72a50237b62270f33bd0da98e
and introduced NativeWindow.getWindow[Width|Height]() and NativeSurface.getSurface[Width|Height]().

To have a unique naming scheme, we could rename all method using 'Window',
but for simplicity and since there will be no 'semantic override'
just use the simple version.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeSurface.java b/src/nativewindow/classes/javax/media/nativewindow/NativeSurface.java
index 8131ee283..733f12d49 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeSurface.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeSurface.java
@@ -180,7 +180,7 @@ public interface NativeSurface extends SurfaceUpdatedListener {
   /**
    * Returns the width of the client area excluding insets (window decorations) in pixel units.
    * @return width of the client area in pixel units
-   * @see NativeWindow#getWindowWidth()
+   * @see NativeWindow#getWidth()
    * @see #convertToWindowUnits(int[])
    */
   public int getSurfaceWidth();
@@ -188,7 +188,7 @@ public interface NativeSurface extends SurfaceUpdatedListener {
   /**
    * Returns the height of the client area excluding insets (window decorations) in pixel units.
    * @return height of the client area in pixel units
-   * @see NativeWindow#getWindowHeight()
+   * @see NativeWindow#getHeight()
    * @see #convertToWindowUnits(int[])
    */
   public int getSurfaceHeight();
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java
index 63a643f3c..5e5f99aac 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java
@@ -46,7 +46,7 @@ import javax.media.nativewindow.util.Point;
 /**
  * Extend the {@link NativeSurface} interface with windowing
  * information such as {@link #getWindowHandle() window-handle},
- * {@link #getWindowWidth() window-size} and {@link #getX() window-position}.
+ * {@link #getWidth() window-size} and {@link #getX() window-position}.
  * <p>
  * All values of this interface are represented in window units, if not stated otherwise.
  * See {@link NativeSurface}.
@@ -110,8 +110,8 @@ public interface NativeWindow extends NativeSurface {
    *
    * The top-level window size is
    * <pre>
-   *   {@link #getWindowWidth()}  + getInsets().{@link InsetsImmutable#getTotalWidth() getTotalWidth()}
-   *   {@link #getWindowHeight()} + getInsets().{@link InsetsImmutable#getTotalHeight() getTotalHeight()}
+   *   {@link #getWidth()}  + getInsets().{@link InsetsImmutable#getTotalWidth() getTotalWidth()}
+   *   {@link #getHeight()} + getInsets().{@link InsetsImmutable#getTotalHeight() getTotalHeight()}
    * </pre>
    *
    * @return insets
@@ -159,14 +159,14 @@ public interface NativeWindow extends NativeSurface {
    * @return width of the client area in window units
    * @see NativeSurface#getSurfaceWidth()
    */
-  public int getWindowWidth();
+  public int getWidth();
 
   /**
    * Returns the height of the client area excluding insets (window decorations) in window units.
    * @return height of the client area in window units
    * @see NativeSurface#getSurfaceHeight()
    */
-  public int getWindowHeight();
+  public int getHeight();
 
   /**
    * Returns the window's top-left client-area position in the screen.