Switches from Java 1.6 to Java 1.7 and fixes numerous warnings

6 files changed, 8 insertions, 8 deletions

diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtWindow.java b/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtWindow.java
index 045324a..49089fc 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtWindow.java
+++ b/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtWindow.java
@@ -75,7 +75,7 @@ public class JoglNewtWindow implements NativeCanvas, NewtWindowContainer {
         // FIXME rather pass the monitor(s) to the constructor, create a screen to get the primary monitor
         _newtWindow = GLWindow.create(capsUtil.getCapsForSettingsWithHints(settings, onscreen, bitmapRequested,
                 pbufferRequested, fboRequested));
-        _monitorDevices = new ArrayList<MonitorDevice>();
+        _monitorDevices = new ArrayList<>();
         // uses the primary monitor by default
         _newtWindow.getScreen().createNative();
         final MonitorDevice primaryMonitor = _newtWindow.getScreen().getPrimaryMonitor();
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/image/util/jogl/JoglImageLoader.java b/ardor3d-jogl/src/main/java/com/ardor3d/image/util/jogl/JoglImageLoader.java
index 3de8a8d..df4ef29 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/image/util/jogl/JoglImageLoader.java
+++ b/ardor3d-jogl/src/main/java/com/ardor3d/image/util/jogl/JoglImageLoader.java
@@ -60,7 +60,7 @@ public class JoglImageLoader implements ImageLoader {
     private static final String[] _supportedFormats = computeSupportedFormats();
 
     private static final String[] computeSupportedFormats() {
-        final List<String> supportedFormatsList = new ArrayList<String>();
+        final List<String> supportedFormatsList = new ArrayList<>();
         if (Platform.AWT_AVAILABLE) {
             supportedFormatsList.add("." + TextureIO.GIF.toUpperCase());
         }
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/image/util/jogl/JoglImageUtil.java b/ardor3d-jogl/src/main/java/com/ardor3d/image/util/jogl/JoglImageUtil.java
index f936f73..c8a5d3d 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/image/util/jogl/JoglImageUtil.java
+++ b/ardor3d-jogl/src/main/java/com/ardor3d/image/util/jogl/JoglImageUtil.java
@@ -56,7 +56,7 @@ public class JoglImageUtil {
         final int width = input.getWidth(), height = input.getHeight();
 
         // create our return list
-        final List<TextureData> rVal = new ArrayList<TextureData>();
+        final List<TextureData> rVal = new ArrayList<>();
 
         // go through each layer
         for (int i = 0; i < size; i++) {
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtKeyboardWrapper.java b/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtKeyboardWrapper.java
index bce6810..bb6f812 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtKeyboardWrapper.java
+++ b/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtKeyboardWrapper.java
@@ -31,7 +31,7 @@ import com.jogamp.newt.opengl.GLWindow;
 public class JoglNewtKeyboardWrapper extends KeyAdapter implements KeyboardWrapper {
 
     @GuardedBy("this")
-    protected final LinkedList<KeyEvent> _upcomingEvents = new LinkedList<KeyEvent>();
+    protected final LinkedList<KeyEvent> _upcomingEvents = new LinkedList<>();
 
     @GuardedBy("this")
     protected JoglNewtKeyboardIterator _currentIterator = null;
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtMouseWrapper.java b/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtMouseWrapper.java
index 23f7e32..af88590 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtMouseWrapper.java
+++ b/ardor3d-jogl/src/main/java/com/ardor3d/input/jogl/JoglNewtMouseWrapper.java
@@ -36,7 +36,7 @@ import com.jogamp.newt.opengl.GLWindow;
 public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
 
     @GuardedBy("this")
-    protected final LinkedList<MouseState> _upcomingEvents = new LinkedList<MouseState>();
+    protected final LinkedList<MouseState> _upcomingEvents = new LinkedList<>();
 
     @GuardedBy("this")
     protected JoglNewtMouseIterator _currentIterator = null;
@@ -53,7 +53,7 @@ public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
     protected boolean _skipAutoRepeatEvents = false;
 
     protected final Multiset<MouseButton> _clicks = EnumMultiset.create(MouseButton.class);
-    protected final EnumMap<MouseButton, Long> _lastClickTime = new EnumMap<MouseButton, Long>(MouseButton.class);
+    protected final EnumMap<MouseButton, Long> _lastClickTime = new EnumMap<>(MouseButton.class);
     protected final EnumSet<MouseButton> _clickArmed = EnumSet.noneOf(MouseButton.class);
 
     protected int _ignoreX = Integer.MAX_VALUE;
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglTextureRenderer.java b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglTextureRenderer.java
index c781f4d..176d8d5 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglTextureRenderer.java
+++ b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglTextureRenderer.java
@@ -179,8 +179,8 @@ public class JoglTextureRenderer extends AbstractFBOTextureRenderer {
 
             // Otherwise, we can streamline this by rendering to multiple textures at once.
             // first determine how many groups we need
-            final LinkedList<Texture> depths = new LinkedList<Texture>();
-            final LinkedList<Texture> colors = new LinkedList<Texture>();
+            final LinkedList<Texture> depths = new LinkedList<>();
+            final LinkedList<Texture> colors = new LinkedList<>();
             for (int i = 0; i < texs.size(); i++) {
                 final Texture tex = texs.get(i);
                 if (tex.getTextureStoreFormat().isDepthFormat()) {