Stops using Guava to create the lists, the sets and the maps except when it is really necessary

3 files changed, 7 insertions, 10 deletions

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 0e9a2de..6cb21a7 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
@@ -11,6 +11,7 @@
 package com.ardor3d.image.util.jogl;
 
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.media.nativewindow.util.PixelFormat;
@@ -18,7 +19,6 @@ import javax.media.nativewindow.util.PixelFormat;
 import com.ardor3d.framework.jogl.CapsUtil;
 import com.ardor3d.image.Image;
 import com.ardor3d.scene.state.jogl.util.JoglTextureUtil;
-import com.google.common.collect.Lists;
 import com.jogamp.common.nio.Buffers;
 import com.jogamp.opengl.util.GLPixelBuffer.GLPixelAttributes;
 import com.jogamp.opengl.util.texture.TextureData;
@@ -57,7 +57,7 @@ public class JoglImageUtil {
         final int width = input.getWidth(), height = input.getHeight();
 
         // create our return list
-        final List<TextureData> rVal = Lists.newArrayList();
+        final List<TextureData> rVal = new ArrayList<TextureData>();
 
         // go through each layer
         for (int i = 0; i < size; i++) {
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java b/ardor3d-jogl/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java
index 45e062a..52ab50a 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java
+++ b/ardor3d-jogl/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java
@@ -26,7 +26,6 @@ import com.ardor3d.input.ControllerInfo;
 import com.ardor3d.input.ControllerState;
 import com.ardor3d.input.ControllerWrapper;
 import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Lists;
 import com.google.common.collect.PeekingIterator;
 
 public class JInputControllerWrapper implements ControllerWrapper {
@@ -34,7 +33,7 @@ public class JInputControllerWrapper implements ControllerWrapper {
     protected final Event _event = new Event();
     protected final List<ControllerEvent> _events = Collections.synchronizedList(new ArrayList<ControllerEvent>());
     protected JInputControllerEventIterator _eventsIt = new JInputControllerEventIterator();
-    protected final List<ControllerInfo> _controllers = Lists.newArrayList();
+    protected final List<ControllerInfo> _controllers = new ArrayList<ControllerInfo>();
     protected static boolean _inited = false;
 
     @Override
@@ -92,8 +91,8 @@ public class JInputControllerWrapper implements ControllerWrapper {
     }
 
     protected ControllerInfo getControllerInfo(final Controller controller) {
-        final List<String> axisNames = Lists.newArrayList();
-        final List<String> buttonNames = Lists.newArrayList();
+        final List<String> axisNames = new ArrayList<String>();
+        final List<String> buttonNames = new ArrayList<String>();
 
         for (final Component comp : controller.getComponents()) {
             if (comp.getIdentifier() instanceof Identifier.Axis) {
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 a82bb1a..5f64b46 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
@@ -26,8 +26,6 @@ import com.ardor3d.input.MouseState;
 import com.ardor3d.input.MouseWrapper;
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.EnumMultiset;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.PeekingIterator;
 import com.jogamp.newt.event.MouseEvent;
@@ -38,7 +36,7 @@ import com.jogamp.newt.opengl.GLWindow;
 public class JoglNewtMouseWrapper implements MouseWrapper, MouseListener {
 
     @GuardedBy("this")
-    protected final LinkedList<MouseState> _upcomingEvents = Lists.newLinkedList();
+    protected final LinkedList<MouseState> _upcomingEvents = new LinkedList<MouseState>();
 
     @GuardedBy("this")
     protected JoglNewtMouseIterator _currentIterator = null;
@@ -55,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 = Maps.newEnumMap(MouseButton.class);
+    protected final EnumMap<MouseButton, Long> _lastClickTime = new EnumMap<MouseButton, Long>(MouseButton.class);
     protected final EnumSet<MouseButton> _clickArmed = EnumSet.noneOf(MouseButton.class);
 
     protected int _ignoreX = Integer.MAX_VALUE;