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

14 files changed, 69 insertions, 72 deletions

diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/atlas/TexturePacker.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/atlas/TexturePacker.java
index 0e6771c..4bf47b5 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/atlas/TexturePacker.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/atlas/TexturePacker.java
@@ -12,6 +12,8 @@ package com.ardor3d.extension.atlas;
 
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -31,8 +33,6 @@ import com.ardor3d.renderer.state.TextureState;
 import com.ardor3d.scenegraph.Mesh;
 import com.ardor3d.util.TextureManager;
 import com.ardor3d.util.geom.BufferUtils;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 /**
  * A tool that uses the AtlasNode/AtlasPacker algorithm to pack textures into texture atlases. It modifies the uv
@@ -69,15 +69,15 @@ public class TexturePacker {
     private final List<AtlasPacker> packers;
     private final List<ByteBuffer> dataBuffers;
 
-    private final List<Texture> textures = Lists.newArrayList();
+    private final List<Texture> textures = new ArrayList<Texture>();
 
     public TexturePacker(final int atlasWidth, final int atlasHeight) {
         this.atlasWidth = atlasWidth;
         this.atlasHeight = atlasHeight;
 
-        cachedAtlases = Maps.newHashMap();
-        packers = Lists.newArrayList();
-        dataBuffers = Lists.newArrayList();
+        cachedAtlases = new HashMap<TextureParameter, List<TextureParameter>>();
+        packers = new ArrayList<AtlasPacker>();
+        dataBuffers = new ArrayList<ByteBuffer>();
 
         addPacker();
     }
@@ -168,7 +168,7 @@ public class TexturePacker {
             return;
         }
 
-        list = Lists.newArrayList();
+        list = new ArrayList<TextureParameter>();
         cachedAtlases.put(parameterObject, list);
         list.add(parameterObject);
 
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/InteractManager.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/InteractManager.java
index bfb1f63..23931c9 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/InteractManager.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/InteractManager.java
@@ -10,6 +10,7 @@
 
 package com.ardor3d.extension.interact;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -28,14 +29,13 @@ import com.ardor3d.renderer.Renderer;
 import com.ardor3d.scenegraph.Spatial;
 import com.ardor3d.util.ReadOnlyTimer;
 import com.google.common.base.Predicate;
-import com.google.common.collect.Lists;
 
 public class InteractManager {
 
     /**
      * List of widgets currently managed by this manager.
      */
-    protected final List<AbstractInteractWidget> _widgets = Lists.newArrayList();
+    protected final List<AbstractInteractWidget> _widgets = new ArrayList<AbstractInteractWidget>();
 
     /**
      * The logical layer used by this manager to receive input events prior to forwarding them to the scene.
@@ -66,7 +66,7 @@ public class InteractManager {
     /**
      * List of filters to modify state prior to applying to a Spatial target.
      */
-    protected List<UpdateFilter> _filters = Lists.newArrayList();
+    protected List<UpdateFilter> _filters = new ArrayList<UpdateFilter>();
 
     public InteractManager() {
         setupLogicalLayer();
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/widget/AbstractInteractWidget.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/widget/AbstractInteractWidget.java
index af00b28..0e97fac 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/widget/AbstractInteractWidget.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/widget/AbstractInteractWidget.java
@@ -10,6 +10,7 @@
 
 package com.ardor3d.extension.interact.widget;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -27,7 +28,6 @@ import com.ardor3d.renderer.Camera;
 import com.ardor3d.renderer.Renderer;
 import com.ardor3d.scenegraph.Node;
 import com.ardor3d.util.ReadOnlyTimer;
-import com.google.common.collect.Lists;
 
 public abstract class AbstractInteractWidget {
 
@@ -51,7 +51,7 @@ public abstract class AbstractInteractWidget {
     /**
      * List of filters to modify state after applying input.
      */
-    protected List<UpdateFilter> _filters = Lists.newArrayList();
+    protected List<UpdateFilter> _filters = new ArrayList<UpdateFilter>();
 
     public AbstractInteractWidget() {
         _results.setCheckDistance(true);
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/widget/CompoundInteractWidget.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/widget/CompoundInteractWidget.java
index ea41735..00d64ac 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/widget/CompoundInteractWidget.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/interact/widget/CompoundInteractWidget.java
@@ -10,6 +10,7 @@
 
 package com.ardor3d.extension.interact.widget;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -28,7 +29,6 @@ import com.ardor3d.renderer.Renderer;
 import com.ardor3d.scenegraph.Node;
 import com.ardor3d.scenegraph.Spatial;
 import com.ardor3d.util.ReadOnlyTimer;
-import com.google.common.collect.Maps;
 
 public class CompoundInteractWidget extends AbstractInteractWidget {
     private static final String MOVE_KEY = "Move";
@@ -38,7 +38,7 @@ public class CompoundInteractWidget extends AbstractInteractWidget {
 
     public static double MIN_SCALE = 0.000001;
 
-    protected Map<String, AbstractInteractWidget> _widgets = Maps.newHashMap();
+    protected Map<String, AbstractInteractWidget> _widgets = new HashMap<String, AbstractInteractWidget>();
 
     protected AbstractInteractWidget _lastInputWidget = null;
 
@@ -50,7 +50,7 @@ public class CompoundInteractWidget extends AbstractInteractWidget {
 
     @Override
     public void addFilter(final UpdateFilter filter) {
-        for(final AbstractInteractWidget widget : _widgets.values()) {
+        for (final AbstractInteractWidget widget : _widgets.values()) {
             widget.addFilter(filter);
         }
         super.addFilter(filter);
@@ -58,7 +58,7 @@ public class CompoundInteractWidget extends AbstractInteractWidget {
 
     @Override
     public void removeFilter(final UpdateFilter filter) {
-        for(final AbstractInteractWidget widget : _widgets.values()) {
+        for (final AbstractInteractWidget widget : _widgets.values()) {
             widget.removeFilter(filter);
         }
         super.removeFilter(filter);
@@ -66,7 +66,7 @@ public class CompoundInteractWidget extends AbstractInteractWidget {
 
     @Override
     public void clearFilters() {
-        for(final AbstractInteractWidget widget : _widgets.values()) {
+        for (final AbstractInteractWidget widget : _widgets.values()) {
             widget.clearFilters();
         }
         super.clearFilters();
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md2/Md2DataStore.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md2/Md2DataStore.java
index a2c12b1..2a4be59 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md2/Md2DataStore.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md2/Md2DataStore.java
@@ -10,20 +10,20 @@
 
 package com.ardor3d.extension.model.md2;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.ardor3d.extension.model.util.KeyframeController;
 import com.ardor3d.scenegraph.Mesh;
-import com.google.common.collect.Lists;
 
 public class Md2DataStore {
 
     private final Mesh _mainMesh;
     private final KeyframeController<Mesh> _controller;
 
-    private final List<String> _frameNames = Lists.newArrayList();
+    private final List<String> _frameNames = new ArrayList<String>();
 
-    private final List<String> _skinNames = Lists.newArrayList();
+    private final List<String> _skinNames = new ArrayList<String>();
 
     public Md2DataStore(final Mesh mainMesh, final KeyframeController<Mesh> controller) {
         _mainMesh = mainMesh;
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md2/Md2Importer.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md2/Md2Importer.java
index 23b14f1..6f0e762 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md2/Md2Importer.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md2/Md2Importer.java
@@ -11,6 +11,7 @@
 package com.ardor3d.extension.model.md2;
 
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 
 import com.ardor3d.bounding.BoundingBox;
@@ -30,7 +31,6 @@ import com.ardor3d.util.TextureManager;
 import com.ardor3d.util.resource.ResourceLocator;
 import com.ardor3d.util.resource.ResourceLocatorTool;
 import com.ardor3d.util.resource.ResourceSource;
-import com.google.common.collect.Lists;
 
 public class Md2Importer {
 
@@ -159,8 +159,8 @@ public class Md2Importer {
             bis.seek(header.offsetGlCommands);
             int length, absLength;
             Md2GlCommand cmd;
-            final List<Integer> fanIndices = Lists.newArrayList();
-            final List<Integer> stripIndices = Lists.newArrayList();
+            final List<Integer> fanIndices = new ArrayList<Integer>();
+            final List<Integer> stripIndices = new ArrayList<Integer>();
             for (int i = 0; i < header.numGlCommands; i++) {
                 length = bis.readInt();
                 if (length == 0) {
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md3/Md3DataStore.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md3/Md3DataStore.java
index 3e1f985..3ca598a 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md3/Md3DataStore.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/md3/Md3DataStore.java
@@ -10,18 +10,18 @@
 
 package com.ardor3d.extension.model.md3;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.ardor3d.scenegraph.Node;
-import com.google.common.collect.Lists;
 
 public class Md3DataStore {
 
     private final Node _mainNode;
 
-    private final List<String> _frameNames = Lists.newArrayList();
+    private final List<String> _frameNames = new ArrayList<String>();
 
-    private final List<String> _skinNames = Lists.newArrayList();
+    private final List<String> _skinNames = new ArrayList<String>();
 
     public Md3DataStore(final Node mainNode) {
         super();
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjDataStore.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjDataStore.java
index 0c9fa91..bad7afe 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjDataStore.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjDataStore.java
@@ -10,16 +10,16 @@
 
 package com.ardor3d.extension.model.obj;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.ardor3d.math.Vector3;
-import com.google.common.collect.Lists;
 
 public class ObjDataStore {
-    private final List<Vector3> _vertices = Lists.newArrayList();
-    private final List<Vector3> _normals = Lists.newArrayList();
-    private final List<Vector3> _generatedNormals = Lists.newArrayList();
-    private final List<Vector3> _uvs = Lists.newArrayList();
+    private final List<Vector3> _vertices = new ArrayList<Vector3>();
+    private final List<Vector3> _normals = new ArrayList<Vector3>();
+    private final List<Vector3> _generatedNormals = new ArrayList<Vector3>();
+    private final List<Vector3> _uvs = new ArrayList<Vector3>();
 
     public List<Vector3> getVertices() {
         return _vertices;
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjGeometryStore.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjGeometryStore.java
index cac72f6..42b1f98 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjGeometryStore.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjGeometryStore.java
@@ -12,7 +12,9 @@ package com.ardor3d.extension.model.obj;
 
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
+import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -33,8 +35,6 @@ import com.ardor3d.util.geom.BufferUtils;
 import com.ardor3d.util.geom.GeometryTool;
 import com.ardor3d.util.geom.GeometryTool.MatchCondition;
 import com.ardor3d.util.geom.VertGroupData;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 public class ObjGeometryStore {
     private static final String DEFAULT_GROUP = "_default_";
@@ -45,7 +45,7 @@ public class ObjGeometryStore {
     private int _totalLines = 0;
     private int _totalMeshes = 0;
     private final Node _root = new Node();
-    private final Map<String, Spatial> _groupMap = Maps.newHashMap();
+    private final Map<String, Spatial> _groupMap = new HashMap<String, Spatial>();
 
     private ObjMaterial _currentMaterial = new ObjMaterial("default");
     private String _currentObjectName;
@@ -55,8 +55,8 @@ public class ObjGeometryStore {
     private ObjSetManager _lineManager;
     private ObjSetManager _pointManager;
 
-    private final Map<String, ObjMaterial> materialLibrary = Maps.newHashMap();
-    private final Map<Spatial, String> _materialMap = Maps.newHashMap();
+    private final Map<String, ObjMaterial> materialLibrary = new HashMap<String, ObjMaterial>();
+    private final Map<Spatial, String> _materialMap = new HashMap<Spatial, String>();
 
     private final GeometryTool _geometryTool;
 
@@ -274,7 +274,7 @@ public class ObjGeometryStore {
 
             int j = 0;
             final long[] vertGroups = new long[_meshManager.getStore().size()];
-            final List<Long> groups = Lists.newArrayList();
+            final List<Long> groups = new ArrayList<Long>();
             Vector3 vector;
             for (final ObjIndexSet set : _meshManager.getStore().keySet()) {
                 vertGroups[j] = set.getSmoothGroup();
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjImporter.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjImporter.java
index c42564a..8e0107f 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjImporter.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjImporter.java
@@ -12,6 +12,7 @@ package com.ardor3d.extension.model.obj;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -25,7 +26,6 @@ import com.ardor3d.util.geom.GeometryTool;
 import com.ardor3d.util.resource.ResourceLocator;
 import com.ardor3d.util.resource.ResourceLocatorTool;
 import com.ardor3d.util.resource.ResourceSource;
-import com.google.common.collect.Lists;
 
 /**
  * Wavefront OBJ importer. See <a href="http://local.wasp.uwa.edu.au/~pbourke/dataformats/obj/">the format spec</a>
@@ -332,7 +332,7 @@ public class ObjImporter {
                     }
 
                     // Each token corresponds to 1 vertex entry
-                    final List<ObjIndexSet> indices = Lists.newArrayList();
+                    final List<ObjIndexSet> indices = new ArrayList<ObjIndexSet>();
                     for (int i = 1; i < tokens.length; i++) {
                         indices.add(new ObjIndexSet(tokens[i], store.getDataStore(), currentSmoothGroup));
                     }
@@ -347,7 +347,7 @@ public class ObjImporter {
                     }
 
                     // Each token corresponds to 1 vertex entry and possibly one texture entry
-                    final List<ObjIndexSet> indices = Lists.newArrayList();
+                    final List<ObjIndexSet> indices = new ArrayList<ObjIndexSet>();
                     for (int i = 1; i < tokens.length; i++) {
                         indices.add(new ObjIndexSet(tokens[i], store.getDataStore(), currentSmoothGroup));
                     }
@@ -362,7 +362,7 @@ public class ObjImporter {
                     }
 
                     // Each token corresponds to 1 vertex entry and possibly one texture entry and normal entry.
-                    final List<ObjIndexSet> indices = Lists.newArrayList();
+                    final List<ObjIndexSet> indices = new ArrayList<ObjIndexSet>();
                     for (int i = 1; i < tokens.length; i++) {
                         indices.add(new ObjIndexSet(tokens[i], store.getDataStore(), currentSmoothGroup));
                     }
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjSetManager.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjSetManager.java
index 116371d..e070e0b 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjSetManager.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/obj/ObjSetManager.java
@@ -10,16 +10,15 @@
 
 package com.ardor3d.extension.model.obj;
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
 public class ObjSetManager {
-    private final Map<ObjIndexSet, Integer> _store = Maps.newLinkedHashMap();
-    private final List<Integer> _indices = Lists.newArrayList();
-    private final List<Integer> _lengths = Lists.newArrayList();
+    private final Map<ObjIndexSet, Integer> _store = new LinkedHashMap<ObjIndexSet, Integer>();
+    private final List<Integer> _indices = new ArrayList<Integer>();
+    private final List<Integer> _lengths = new ArrayList<Integer>();
 
     public int findSet(final ObjIndexSet set) {
         if (_store.containsKey(set)) {
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvStripInfo.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvStripInfo.java
index 2cf0e18..dd341ca 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvStripInfo.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvStripInfo.java
@@ -10,13 +10,12 @@
 
 package com.ardor3d.extension.model.util.nvtristrip;
 
+import java.util.ArrayList;
 import java.util.List;
 
-import com.google.common.collect.Lists;
-
 final class NvStripInfo {
     NvStripStartInfo _startInfo;
-    List<NvFaceInfo> _faces = Lists.newArrayList();
+    List<NvFaceInfo> _faces = new ArrayList<NvFaceInfo>();
     int _stripId;
     int _experimentId;
 
@@ -177,11 +176,11 @@ final class NvStripInfo {
      */
     void build(final List<NvEdgeInfo> edgeInfos, final List<NvFaceInfo> faceInfos) {
         // used in building the strips forward and backward
-        final List<Integer> scratchIndices = Lists.newArrayList();
+        final List<Integer> scratchIndices = new ArrayList<Integer>();
 
         // build forward... start with the initial face
-        final List<NvFaceInfo> forwardFaces = Lists.newArrayList();
-        final List<NvFaceInfo> backwardFaces = Lists.newArrayList();
+        final List<NvFaceInfo> forwardFaces = new ArrayList<NvFaceInfo>();
+        final List<NvFaceInfo> backwardFaces = new ArrayList<NvFaceInfo>();
         forwardFaces.add(_startInfo._startFace);
 
         markTriangle(_startInfo._startFace);
@@ -251,7 +250,7 @@ final class NvStripInfo {
 
         // tempAllFaces is going to be forwardFaces + backwardFaces
         // it's used for Unique()
-        final List<NvFaceInfo> tempAllFaces = Lists.newArrayList();
+        final List<NvFaceInfo> tempAllFaces = new ArrayList<NvFaceInfo>();
         for (int i = 0; i < forwardFaces.size(); i++) {
             tempAllFaces.add(forwardFaces.get(i));
         }
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvStripifier.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvStripifier.java
index 8779e5e..a872493 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvStripifier.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvStripifier.java
@@ -10,13 +10,12 @@
 
 package com.ardor3d.extension.model.util.nvtristrip;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
 /**
  * Ported from <a href="http://developer.nvidia.com/object/nvtristrip_library.html">NVIDIA's NvTriStrip Library</a>
  */
@@ -25,7 +24,7 @@ final class NvStripifier {
 
     public static int CACHE_INEFFICIENCY = 6;
 
-    protected List<Integer> _indices = Lists.newArrayList();
+    protected List<Integer> _indices = new ArrayList<Integer>();
     protected int _cacheSize;
     protected int _minStripLength;
     protected float _meshJump;
@@ -59,12 +58,12 @@ final class NvStripifier {
         _indices = in_indices;
 
         // build the stripification info
-        final List<NvFaceInfo> allFaceInfos = Lists.newArrayList();
-        final List<NvEdgeInfo> allEdgeInfos = Lists.newArrayList();
+        final List<NvFaceInfo> allFaceInfos = new ArrayList<NvFaceInfo>();
+        final List<NvEdgeInfo> allEdgeInfos = new ArrayList<NvEdgeInfo>();
 
         buildStripifyInfo(allFaceInfos, allEdgeInfos, maxIndex);
 
-        final List<NvStripInfo> allStrips = Lists.newArrayList();
+        final List<NvStripInfo> allStrips = new ArrayList<NvStripInfo>();
 
         // stripify
         findAllStrips(allStrips, allFaceInfos, allEdgeInfos, numSamples);
@@ -519,11 +518,11 @@ final class NvStripifier {
             //
             final List<NvStripInfo>[] experiments = new List[numSamples * 6];
             for (int i = 0; i < experiments.length; i++) {
-                experiments[i] = Lists.newArrayList();
+                experiments[i] = new ArrayList<NvStripInfo>();
             }
 
             int experimentIndex = 0;
-            final Set<NvFaceInfo> resetPoints = Sets.newHashSet();
+            final Set<NvFaceInfo> resetPoints = new HashSet<NvFaceInfo>();
             for (int i = 0; i < numSamples; i++) {
 
                 // Try to find another good reset point.
@@ -650,7 +649,7 @@ final class NvStripifier {
     void splitUpStripsAndOptimize(final List<NvStripInfo> allStrips, final List<NvStripInfo> outStrips,
             final List<NvEdgeInfo> edgeInfos, final List<NvFaceInfo> outFaceList) {
         final int threshold = _cacheSize;
-        final List<NvStripInfo> tempStrips = Lists.newArrayList();
+        final List<NvStripInfo> tempStrips = new ArrayList<NvStripInfo>();
 
         // split up strips into threshold-sized pieces
         for (int i = 0; i < allStrips.size(); i++) {
@@ -747,7 +746,7 @@ final class NvStripifier {
         }
 
         // add small strips to face list
-        final List<NvStripInfo> tempStrips2 = Lists.newArrayList();
+        final List<NvStripInfo> tempStrips2 = new ArrayList<NvStripInfo>();
         removeSmallStrips(tempStrips, tempStrips2, outFaceList);
 
         outStrips.clear();
@@ -868,7 +867,7 @@ final class NvStripifier {
             final List<NvFaceInfo> faceList) {
         faceList.clear();
         allBigStrips.clear(); // make sure these are empty
-        final List<NvFaceInfo> tempFaceList = Lists.newArrayList();
+        final List<NvFaceInfo> tempFaceList = new ArrayList<NvFaceInfo>();
 
         for (int i = 0; i < allStrips.size(); i++) {
             final NvStripInfo allStripI = allStrips.get(i);
diff --git a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvTriangleStripper.java b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvTriangleStripper.java
index c12d86d..2ae9059 100644
--- a/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvTriangleStripper.java
+++ b/ardor3d-extras/src/main/java/com/ardor3d/extension/model/util/nvtristrip/NvTriangleStripper.java
@@ -10,6 +10,7 @@
 
 package com.ardor3d.extension.model.util.nvtristrip;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
@@ -22,7 +23,6 @@ import com.ardor3d.scenegraph.MeshData;
 import com.ardor3d.scenegraph.Spatial;
 import com.ardor3d.scenegraph.visitor.Visitor;
 import com.ardor3d.util.geom.BufferUtils;
-import com.google.common.collect.Lists;
 
 /**
  * Ported from <a href="http://developer.nvidia.com/object/nvtristrip_library.html">NVIDIA's NvTriStrip Library</a>
@@ -241,7 +241,7 @@ public class NvTriangleStripper implements Visitor {
         PrimitiveGroup[] primGroups;
 
         // put data in format that the stripifier likes
-        final List<Integer> tempIndices = Lists.newArrayList();
+        final List<Integer> tempIndices = new ArrayList<Integer>();
         int maxIndex = 0;
         for (int i = 0; i < in_indices.length; i++) {
             tempIndices.add(in_indices[i]);
@@ -249,8 +249,8 @@ public class NvTriangleStripper implements Visitor {
                 maxIndex = in_indices[i];
             }
         }
-        final List<NvStripInfo> tempStrips = Lists.newArrayList();
-        final List<NvFaceInfo> tempFaces = Lists.newArrayList();
+        final List<NvStripInfo> tempStrips = new ArrayList<NvStripInfo>();
+        final List<NvFaceInfo> tempFaces = new ArrayList<NvFaceInfo>();
 
         final NvStripifier stripifier = new NvStripifier();
 
@@ -258,7 +258,7 @@ public class NvTriangleStripper implements Visitor {
         stripifier.stripify(tempIndices, _cacheSize, _minStripSize, maxIndex, tempStrips, tempFaces);
 
         // stitch strips together
-        final List<Integer> stripIndices = Lists.newArrayList();
+        final List<Integer> stripIndices = new ArrayList<Integer>();
         int numSeparateStrips = 0;
 
         if (_listsOnly) {
@@ -374,7 +374,7 @@ public class NvTriangleStripper implements Visitor {
 
             final List<NvFaceInfo> in_bins[] = new List[NUMBINS];
             for (int i = 0; i < NUMBINS; i++) {
-                in_bins[i] = Lists.newArrayList();
+                in_bins[i] = new ArrayList<NvFaceInfo>();
             }
 
             // hash input indices on first index