Revert "renamed monitor data into generic form of Display for compatibility for other devices."

This reverts commit 7050d7a6068a3aadd9fb7dbc202050829b4eb292.

jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java

@@ -557,13 +557,13 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
     }
 
     @Override
-    public Displays getDisplays() {
+    public Monitors getMonitors() {
       // TODO Auto-generated method stub
       return null;
     }
 
     @Override
-    public int getPrimaryDisplay() {
+    public int getPrimaryMonitor() {
       // TODO Auto-generated method stub
       return 0;
     }

jme3-core/src/main/java/com/jme3/app/LegacyApplication.java

@@ -820,22 +820,22 @@ public class LegacyApplication implements Application, SystemListener {
   }
 
   /**
-   * This call will return a list of Displays that glfwGetMonitors() returns and information about
+   * This call will return a list of Monitors that glfwGetMonitors() returns and information about
    * the monitor, like width, height, and refresh rate.
    * 
-   * @return returns a list of Displays and their information.
+   * @return returns a list of monitors and their information.
    */
-  public Displays getDisplays() {
-    return context.getDisplays();
+  public Monitors getMonitors() {
+    return context.getMonitors();
   }
 
   /**
-   * Use this to get the positional number of the primary Displays from the glfwGetMonitors()
+   * Use this to get the positional number of the primary monitor from the glfwGetMonitors()
    * function call.
    * 
-   * @return the position of the value in the arraylist of the primary Displays.
+   * @return the position of the value in the arraylist of the primary monitor.
    */
-  public int getPrimaryDisplay() {
-    return context.getPrimaryDisplay();
+  public int getPrimaryMonitor() {
+    return context.getPrimaryMonitor();
   }
 }

jme3-core/src/main/java/com/jme3/system/JmeContext.java

@@ -232,7 +232,7 @@ public interface JmeContext {
      * 
      * @return returns a list of monitors and their information.
      */
-    public Displays getDisplays();
+    public Monitors getMonitors();
 
     /**
      * Use this to get the positional number of the primary monitor from the glfwGetMonitors()
@@ -240,5 +240,5 @@ public interface JmeContext {
      * 
      * @return the position of the value in the arraylist of the primary monitor.
      */
-    public int getPrimaryDisplay();
+    public int getPrimaryMonitor();
   }

jme3-core/src/main/java/com/jme3/system/DisplayInfo.java → jme3-core/src/main/java/com/jme3/system/MonitorInfo.java

@@ -31,12 +31,12 @@ package com.jme3.system;
  * 
  * @author Kevin Bales
  */
-public class DisplayInfo {
+public class MonitorInfo {
 
   /**
    * monitorID - monitor id that was return from Lwjgl3.
    */
-  public long displayID = 0;
+  public long monitorID = 0;
 
   /**
    * width - width that was return from Lwjgl3.

jme3-core/src/main/java/com/jme3/system/Displays.java → jme3-core/src/main/java/com/jme3/system/Monitors.java

@@ -33,13 +33,13 @@ import java.util.ArrayList;
  * 
  * @author Kevin Bales
  */
-public class Displays {
+public class Monitors {
 
-  private ArrayList<DisplayInfo> monitors = new ArrayList<DisplayInfo>();
+  private ArrayList<MonitorInfo> monitors = new ArrayList<MonitorInfo>();
 
   public int addNewMonitor(long monitorID) {
-    DisplayInfo info = new DisplayInfo();
-    info.displayID = monitorID;
+    MonitorInfo info = new MonitorInfo();
+    info.monitorID = monitorID;
     monitors.add(info);
     return monitors.size() - 1;
   }
@@ -59,7 +59,7 @@ public class Displays {
    * @param pos the position in the arraylist of the monitor information that you want to get.
    * @return returns the MonitorInfo data for the monitor called for.
    */
-  public DisplayInfo get(int pos) {
+  public MonitorInfo get(int pos) {
     if (pos < monitors.size())
       return monitors.get(pos);
 
@@ -76,7 +76,7 @@ public class Displays {
    */
   public void setInfo(int monPos, String name, int width, int height, int rate) {
     if (monPos < monitors.size()) {
-      DisplayInfo info = monitors.get(monPos);
+      MonitorInfo info = monitors.get(monPos);
       if (info != null) {
         info.width = width;
         info.height = height;
@@ -93,7 +93,7 @@ public class Displays {
    */
   public void setPrimaryMonitor(int monPos) {
     if (monPos < monitors.size()) {
-      DisplayInfo info = monitors.get(monPos);
+      MonitorInfo info = monitors.get(monPos);
       if (info != null)
         info.primary = true;
     }

jme3-core/src/main/java/com/jme3/system/NullContext.java

@@ -308,13 +308,13 @@ public class NullContext implements JmeContext, Runnable {
     }
 
     @Override
-    public Displays getDisplays() {
+    public Monitors getMonitors() {
       // TODO Auto-generated method stub
       return null;
     }
 
     @Override
-    public int getPrimaryDisplay() {
+    public int getPrimaryMonitor() {
       // TODO Auto-generated method stub
       return 0;
     }

jme3-desktop/src/main/java/com/jme3/system/AWTContext.java

@@ -277,13 +277,13 @@ public class AWTContext implements JmeContext {
     }
 
    @Override
-   public Displays getDisplays() {
+   public Monitors getMonitors() {
       // TODO Auto-generated method stub
       return null;
    }
 
    @Override
-   public int getPrimaryDisplay() {
+   public int getPrimaryMonitor() {
       // TODO Auto-generated method stub
       return 0;
    }

jme3-desktop/src/main/java/com/jme3/system/awt/AwtPanelsContext.java

@@ -330,13 +330,13 @@ public class AwtPanelsContext implements JmeContext {
     }
 
     @Override
-    public Displays getDisplays() {
+    public Monitors getMonitors() {
        // TODO Auto-generated method stub
        return null;
     }
 
     @Override
-    public int getPrimaryDisplay() {
+    public int getPrimaryMonitor() {
        // TODO Auto-generated method stub
        return 0;
     }

jme3-examples/src/main/java/jme3test/app/TestMonitorApp.java

@@ -49,8 +49,8 @@ import com.jme3.material.Material;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Box;
 import com.jme3.system.AppSettings;
-import com.jme3.system.DisplayInfo;
-import com.jme3.system.Displays;
+import com.jme3.system.MonitorInfo;
+import com.jme3.system.Monitors;
 
 /**
  * Tests the capability to change which monitor the window will be created on.
@@ -67,7 +67,7 @@ public class TestMonitorApp extends SimpleApplication
    private BitmapText selectedMonitorTxt;
    private BitmapText fullScreenTxt;
    private int monitorSelected = 0;
-   private Displays monitors = null;
+   private Monitors monitors = null;
 
    public static void main(String[] args) {
       TestMonitorApp app = new TestMonitorApp();
@@ -116,7 +116,7 @@ public class TestMonitorApp extends SimpleApplication
 
       // Get the selected monitor
       monitorSelected = settings.getMonitor();
-      monitors = context.getDisplays();
+      monitors = context.getMonitors();
       if (monitors != null)
          numMonitors = monitors.size();
 
@@ -155,7 +155,7 @@ public class TestMonitorApp extends SimpleApplication
 
          // Let's loop through all the monitors and display on the screen
          for (int i = 0; i < monitors.size(); i++) {
-            DisplayInfo monitor = monitors.get(i);
+            MonitorInfo monitor = monitors.get(i);
             labelValue = "Mon : " + i + " " + monitor.name + " " + monitor.width
                      + "," + monitor.height + " refresh: " + monitor.rate;
             txt = new BitmapText(loadGuiFont());

jme3-ios/src/main/java/com/jme3/system/ios/IGLESContext.java

@@ -269,13 +269,13 @@ public class IGLESContext implements JmeContext {
     }
 
     @Override
-    public Displays getDisplays() {
+    public Monitors getMonitors() {
       // TODO Auto-generated method stub
       return null;
     }
 
     @Override
-    public int getPrimaryDisplay() {
+    public int getPrimaryMonitor() {
       // TODO Auto-generated method stub
       return 0;
     }

jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglCanvas.java

@@ -30,7 +30,7 @@ import com.jme3.system.AppSettings;
 import com.jme3.system.JmeCanvasContext;
 import com.jme3.system.JmeContext.Type;
 import com.jme3.system.JmeSystem;
-import com.jme3.system.Displays;
+import com.jme3.system.Monitors;
 import com.jme3.system.Platform;
 import java.awt.Canvas;
 import java.util.logging.Level;
@@ -484,13 +484,13 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex
   }
 
   @Override
-  public Displays getDisplays() {
+  public Monitors getMonitors() {
     // TODO Auto-generated method stub
     return null;
   }
 
   @Override
-  public int getPrimaryDisplay() {
+  public int getPrimaryMonitor() {
     // TODO Auto-generated method stub
     return 0;
   }

jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java

@@ -34,7 +34,7 @@ package com.jme3.system.lwjgl;
 
 import com.jme3.system.AppSettings;
 import com.jme3.system.JmeContext.Type;
-import com.jme3.system.Displays;
+import com.jme3.system.Monitors;
 
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
@@ -285,13 +285,13 @@ public class LwjglDisplay extends LwjglAbstractDisplay {
     }
 
     @Override
-    public Displays getDisplays() {
+    public Monitors getMonitors() {
       // TODO Auto-generated method stub
       return null;
     }
 
     @Override
-    public int getPrimaryDisplay() {
+    public int getPrimaryMonitor() {
       // TODO Auto-generated method stub
       return 0;
     }

jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java

@@ -38,7 +38,7 @@ import com.jme3.input.MouseInput;
 import com.jme3.input.TouchInput;
 import com.jme3.input.dummy.DummyKeyInput;
 import com.jme3.input.dummy.DummyMouseInput;
-import com.jme3.system.Displays;
+import com.jme3.system.Monitors;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
@@ -221,13 +221,13 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable {
     }
 
     @Override
-    public Displays getDisplays() {
+    public Monitors getMonitors() {
       // TODO Auto-generated method stub
       return null;
     }
 
     @Override
-    public int getPrimaryDisplay() {
+    public int getPrimaryMonitor() {
       // TODO Auto-generated method stub
       return 0;
     }

jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java

@@ -43,7 +43,7 @@ import com.jme3.math.Vector2f;
 import com.jme3.system.AppSettings;
 import com.jme3.system.JmeContext;
 import com.jme3.system.JmeSystem;
-import com.jme3.system.Displays;
+import com.jme3.system.Monitors;
 import com.jme3.system.NanoTimer;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.SafeArrayList;
@@ -882,12 +882,12 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
      * @return returns the Primary Monitor Position.
      */
     @Override
-    public int getPrimaryDisplay()
+    public int getPrimaryMonitor()
     {
        long prim = glfwGetPrimaryMonitor();
-       Displays monitors = getDisplays();
+       Monitors monitors = getMonitors();
        for ( int i = 0; i < monitors.size(); i++ ) {
-          long monitorI = monitors.get(i).displayID;
+          long monitorI = monitors.get(i).monitorID;
           if (monitorI == prim)
              return i;
        }
@@ -905,9 +905,9 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
      * @return return the monitorID if found otherwise return Primary Monitor
      */
     private long getMonitor(int pos) {
-       Displays monitors = getDisplays();
+       Monitors monitors = getMonitors();
        if (pos < monitors.size())
-          return monitors.get(pos).displayID;
+          return monitors.get(pos).monitorID;
        
        LOGGER.log(Level.SEVERE,"Couldn't locate Monitor requested in the list of Monitors. pos:"+pos+" size: "+ monitors.size());
        return glfwGetPrimaryMonitor();
@@ -922,10 +922,10 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
      */
     
     @Override
-    public Displays getDisplays()  {
+    public Monitors getMonitors()  {
        PointerBuffer monitors = glfwGetMonitors();
        long primary = glfwGetPrimaryMonitor();
-       Displays monitorList = new Displays();
+       Monitors monitorList = new Monitors();
        
        for ( int i = 0; i < monitors.limit(); i++ ) {
            long monitorI = monitors.get(i);

jme3-vr/src/main/java/com/jme3/system/lwjgl/LwjglDisplayVR.java

@@ -32,7 +32,7 @@
 package com.jme3.system.lwjgl;
 
 import com.jme3.opencl.Context;
-import com.jme3.system.Displays;
+import com.jme3.system.Monitors;
 
 /**
  * A VR oriented LWJGL display.
@@ -54,13 +54,13 @@ public class LwjglDisplayVR extends LwjglWindowVR {
     }
 
     @Override
-    public Displays getDisplays() {
+    public Monitors getMonitors() {
       // TODO Auto-generated method stub
       return null;
     }
 
     @Override
-    public int getPrimaryDisplay() {
+    public int getPrimaryMonitor() {
       // TODO Auto-generated method stub
       return 0;
     }