Merges Renanse's commit 9e9c406384a5ef51fd777d936932382f8dde0dc4

4 files changed, 36 insertions, 36 deletions

diff --git a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaAnimUtils.java b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaAnimUtils.java
index d0a96ce..c4c4365 100644
--- a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaAnimUtils.java
+++ b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaAnimUtils.java
@@ -89,7 +89,7 @@ public class ColladaAnimUtils {
 
     /**
      * Retrieve a name to use for the skin node based on the element names.
-     * 
+     *
      * @param ic
      *            instance_controller element.
      * @param controller
@@ -100,17 +100,17 @@ public class ColladaAnimUtils {
     private String getSkinStoreName(final Element ic, final Element controller) {
         final String controllerName = controller.getAttributeValue("name", (String) null) != null ? controller
                 .getAttributeValue("name", (String) null) : controller.getAttributeValue("id", (String) null);
-        final String instanceControllerName = ic.getAttributeValue("name", (String) null) != null ? ic
-                .getAttributeValue("name", (String) null) : ic.getAttributeValue("sid", (String) null);
-        final String storeName = (controllerName != null ? controllerName : "")
-                + (controllerName != null && instanceControllerName != null ? " : " : "")
-                + (instanceControllerName != null ? instanceControllerName : "");
-        return storeName;
+                final String instanceControllerName = ic.getAttributeValue("name", (String) null) != null ? ic
+                        .getAttributeValue("name", (String) null) : ic.getAttributeValue("sid", (String) null);
+                        final String storeName = (controllerName != null ? controllerName : "")
+                                + (controllerName != null && instanceControllerName != null ? " : " : "")
+                                + (instanceControllerName != null ? instanceControllerName : "");
+                        return storeName;
     }
 
     /**
      * Copy the render states from our source Spatial to the destination Spatial. Does not recurse.
-     * 
+     *
      * @param source
      * @param target
      */
@@ -123,7 +123,7 @@ public class ColladaAnimUtils {
 
     /**
      * Clone the given MeshData object via deep copy using the Ardor3D BinaryExporter and BinaryImporter.
-     * 
+     *
      * @param meshData
      *            the source to clone.
      * @return the clone.
@@ -143,7 +143,7 @@ public class ColladaAnimUtils {
 
     /**
      * Builds data based on an instance controller element.
-     * 
+     *
      * @param node
      *            Ardor3D parent Node
      * @param instanceController
@@ -170,7 +170,7 @@ public class ColladaAnimUtils {
 
     /**
      * Construct skin mesh(es) from the skin element and attach them (under a single new Node) to the given parent Node.
-     * 
+     *
      * @param ardorParentNode
      *            Ardor3D Node to attach our skin node to.
      * @param instanceController
@@ -577,10 +577,10 @@ public class ColladaAnimUtils {
     /**
      * Construct morph mesh(es) from the <morph> element and attach them (under a single new Node) to the given parent
      * Node.
-     * 
+     *
      * Note: This method current does not do anything but attach the referenced mesh since Ardor3D does not yet support
      * morph target animation.
-     * 
+     *
      * @param ardorParentNode
      *            Ardor3D Node to attach our morph mesh to.
      * @param controller
@@ -614,7 +614,7 @@ public class ColladaAnimUtils {
 
     /**
      * Parse all animations in library_animations
-     * 
+     *
      * @param colladaRoot
      */
     public void parseLibraryAnimations(final Element colladaRoot) {
@@ -641,7 +641,7 @@ public class ColladaAnimUtils {
 
     /**
      * Merge all animation channels into Ardor jointchannels
-     * 
+     *
      * @param entry
      */
     private void buildAnimations(final Element parentElement, final Collection<TargetChannel> targetList) {
@@ -831,7 +831,7 @@ public class ColladaAnimUtils {
 
     /**
      * Gather up all animation channels based on what nodes they affect.
-     * 
+     *
      * @param channelMap
      * @param animationRoot
      * @param animationItemRoot
@@ -888,7 +888,7 @@ public class ColladaAnimUtils {
 
     /**
      * Find a target node based on collada target format.
-     * 
+     *
      * @param target
      * @return
      */
@@ -953,7 +953,7 @@ public class ColladaAnimUtils {
 
     /**
      * Break up a target uri string into id, sids and accessors
-     * 
+     *
      * @param targetString
      * @return
      */
@@ -1018,7 +1018,7 @@ public class ColladaAnimUtils {
 
     /**
      * Convert a list of collada elements into a list of TransformElements
-     * 
+     *
      * @param transforms
      * @return
      */
@@ -1050,7 +1050,7 @@ public class ColladaAnimUtils {
 
     /**
      * Bake a list of TransformElements into an Ardor3D Transform object.
-     * 
+     *
      * @param transforms
      * @return
      */
@@ -1100,7 +1100,7 @@ public class ColladaAnimUtils {
 
     /**
      * Util for making a readable string out of a xml element hierarchy
-     * 
+     *
      * @param e
      * @param maxDepth
      * @return
@@ -1182,7 +1182,7 @@ public class ColladaAnimUtils {
                 return "Target [accessorType=" + accessorType + ", id=" + id + ", sids=" + sids + "]";
             }
             return "Target [accessorType=" + accessorType + ", accessorIndexX=" + accessorIndexX + ", accessorIndexY="
-                    + accessorIndexY + ", id=" + id + ", sids=" + sids + "]";
+            + accessorIndexY + ", id=" + id + ", sids=" + sids + "]";
         }
     }
 }
diff --git a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaInputPipe.java b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaInputPipe.java
index 7f99e07..ff99c48 100644
--- a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaInputPipe.java
+++ b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaInputPipe.java
@@ -3,7 +3,7 @@
  *
  * This file is part of Ardor3D.
  *
- * Ardor3D is free software: you can redistribute it and/or modify it 
+ * Ardor3D is free software: you can redistribute it and/or modify it
  * under the terms of its license which may be found in the accompanying
  * LICENSE file or at <http://www.ardor3d.com/LICENSE>.
  */
@@ -200,10 +200,10 @@ public class ColladaInputPipe {
                 _buffer = BufferUtils.createFloatBuffer(size);
                 meshData.setTangentCoords(new FloatBufferData(_buffer, _paramCount));
                 break;
-            // case TEXBINORMAL:
-            // _buffer = BufferUtils.createFloatBuffer(size);
-            // meshData.setTangentBuffer(_buffer);
-            // break;
+                // case TEXBINORMAL:
+                // _buffer = BufferUtils.createFloatBuffer(size);
+                // meshData.setTangentBuffer(_buffer);
+                // break;
             default:
         }
     }
diff --git a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaMaterialUtils.java b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaMaterialUtils.java
index 1c76a5b..fdd3720 100644
--- a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaMaterialUtils.java
+++ b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaMaterialUtils.java
@@ -3,7 +3,7 @@
  *
  * This file is part of Ardor3D.
  *
- * Ardor3D is free software: you can redistribute it and/or modify it 
+ * Ardor3D is free software: you can redistribute it and/or modify it
  * under the terms of its license which may be found in the accompanying
  * LICENSE file or at <http://www.ardor3d.com/LICENSE>.
  */
@@ -60,7 +60,7 @@ public class ColladaMaterialUtils {
 
     /**
      * Find and apply the given material to the given Mesh.
-     * 
+     *
      * @param materialName
      *            our material name
      * @param mesh
@@ -345,7 +345,7 @@ public class ColladaMaterialUtils {
 
     /**
      * Function to searches an xml node for <texture> elements and adds them to the texture state of the mesh.
-     * 
+     *
      * @param mesh
      *            the Ardor3D Mesh to add the Texture to.
      * @param element
@@ -370,7 +370,7 @@ public class ColladaMaterialUtils {
 
     /**
      * Convert a <texture> element to an Ardor3D representation and store in the given state.
-     * 
+     *
      * @param mesh
      *            the Ardor3D Mesh to add the Texture to.
      * @param daeTexture
diff --git a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaNodeUtils.java b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaNodeUtils.java
index 1f8a13b..fcf94c4 100644
--- a/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaNodeUtils.java
+++ b/ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/ColladaNodeUtils.java
@@ -3,7 +3,7 @@
  *
  * This file is part of Ardor3D.
  *
- * Ardor3D is free software: you can redistribute it and/or modify it 
+ * Ardor3D is free software: you can redistribute it and/or modify it
  * under the terms of its license which may be found in the accompanying
  * LICENSE file or at <http://www.ardor3d.com/LICENSE>.
  */
@@ -60,7 +60,7 @@ public class ColladaNodeUtils {
 
     /**
      * Retrieves the scene and returns it as an Ardor3D Node.
-     * 
+     *
      * @param colladaRoot
      *            The collada root element
      * @return Scene as an Node or null if not found
@@ -155,7 +155,7 @@ public class ColladaNodeUtils {
 
     /**
      * Parse an asset element into an AssetData object.
-     * 
+     *
      * @param asset
      * @return
      */
@@ -234,7 +234,7 @@ public class ColladaNodeUtils {
 
     /**
      * Recursively parse the node hierarcy.
-     * 
+     *
      * @param dNode
      * @return a new Ardor3D node, created from the given <node> element
      */
@@ -355,7 +355,7 @@ public class ColladaNodeUtils {
 
     /**
      * Combines a list of transform elements into an Ardor3D Transform object.
-     * 
+     *
      * @param transforms
      *            List of transform elements
      * @return an Ardor3D Transform object