toxiclibs 0.9.1 → 0.9.2

data/src/toxi/color/ColorTheme.java

@@ -69,7 +69,7 @@ public class ColorTheme {
     /**
      *
      */
-    protected ArrayList<ThemePart> parts = new ArrayList<>();
+    private final ArrayList<ThemePart> parts = new ArrayList<>();
 
     /**
      *

data/src/toxi/color/Histogram.java

@@ -169,6 +169,7 @@ public class Histogram implements Iterable<HistEntry> {
      * loops processing the entries.
      * @return 
      */
+    @Override
     public Iterator<HistEntry> iterator() {
         return entries.iterator();
     }

data/src/toxi/color/Hue.java

@@ -41,12 +41,12 @@ public class Hue {
     /**
      *
      */
-    protected static final HashMap<String, Hue> namedHues = new HashMap<>();
+    protected static final HashMap<String, Hue> NAMED_HUES = new HashMap<>();
 
     /**
      *
      */
-    protected static final ArrayList<Hue> primaryHues = new ArrayList<>();
+    protected static final ArrayList<Hue> PRIMARY_HUES = new ArrayList<>();
 
     /**
      *
@@ -127,7 +127,7 @@ public class Hue {
         hue %= 1;
         float dist = Float.MAX_VALUE;
         Hue closest = null;
-        Iterable<Hue> hues = (primaryOnly ? primaryHues : namedHues.values());
+        Iterable<Hue> hues = (primaryOnly ? PRIMARY_HUES : NAMED_HUES.values());
         for (Hue h : hues) {
             float d = MathUtils.min(MathUtils.abs(h.hue - hue),
                     MathUtils.abs(1 + h.hue - hue));
@@ -145,7 +145,7 @@ public class Hue {
      * @return
      */
     public static final Hue getForName(String name) {
-        return namedHues.get(name.toLowerCase());
+        return NAMED_HUES.get(name.toLowerCase());
     }
 
     /**
@@ -165,7 +165,7 @@ public class Hue {
      */
     public static boolean isPrimary(float hue, float variance) {
         boolean isPrimary = false;
-        for (Hue h : primaryHues) {
+        for (Hue h : PRIMARY_HUES) {
             if (MathUtils.abs(hue - h.hue) < variance) {
                 isPrimary = true;
                 break;
@@ -208,9 +208,9 @@ public class Hue {
         this.name = name;
         this.hue = hue;
         this.isPrimary = isPrimary;
-        namedHues.put(name, this);
+        NAMED_HUES.put(name, this);
         if (isPrimary) {
-            primaryHues.add(this);
+            PRIMARY_HUES.add(this);
         }
     }
 

data/src/toxi/color/TColor.java

@@ -223,30 +223,37 @@ public class TColor implements ReadonlyTColor {
             float q = v * (1 - s * f);
             float t = v * (1 - s * (1 - f));
 
-            if (i == 0) {
-                rgb[0] = v;
-                rgb[1] = t;
-                rgb[2] = p;
-            } else if (i == 1) {
-                rgb[0] = q;
-                rgb[1] = v;
-                rgb[2] = p;
-            } else if (i == 2) {
-                rgb[0] = p;
-                rgb[1] = v;
-                rgb[2] = t;
-            } else if (i == 3) {
-                rgb[0] = p;
-                rgb[1] = q;
-                rgb[2] = v;
-            } else if (i == 4) {
-                rgb[0] = t;
-                rgb[1] = p;
-                rgb[2] = v;
-            } else {
-                rgb[0] = v;
-                rgb[1] = p;
-                rgb[2] = q;
+            switch (i) {
+                case 0:
+                    rgb[0] = v;
+                    rgb[1] = t;
+                    rgb[2] = p;
+                    break;
+                case 1:
+                    rgb[0] = q;
+                    rgb[1] = v;
+                    rgb[2] = p;
+                    break;
+                case 2:
+                    rgb[0] = p;
+                    rgb[1] = v;
+                    rgb[2] = t;
+                    break;
+                case 3:
+                    rgb[0] = p;
+                    rgb[1] = q;
+                    rgb[2] = v;
+                    break;
+                case 4:
+                    rgb[0] = t;
+                    rgb[1] = p;
+                    rgb[2] = v;
+                    break;
+                default:
+                    rgb[0] = v;
+                    rgb[1] = p;
+                    rgb[2] = q;
+                    break;
             }
         }
         return rgb;

data/src/toxi/geom/AxisAlignedCylinder.java

@@ -73,6 +73,7 @@ public abstract class AxisAlignedCylinder implements Shape3D {
      * @param p
      * @return true, if inside
      */
+    @Override
     public abstract boolean containsPoint(ReadonlyVec3D p);
 
     /**

data/src/toxi/geom/BezierCurve2D.java

@@ -55,7 +55,7 @@ public class BezierCurve2D {
      *
      */
     public BezierCurve2D() {
-        points = new ArrayList<Vec2D>();
+        points = new ArrayList<>();
     }
 
     /**

data/src/toxi/geom/BezierCurve3D.java

@@ -56,7 +56,7 @@ public class BezierCurve3D {
      *
      */
     public BezierCurve3D() {
-        points = new ArrayList<Vec3D>();
+        points = new ArrayList<>();
     }
 
     /**

data/src/toxi/geom/BooleanShapeBuilder.java

@@ -24,17 +24,14 @@ public class BooleanShapeBuilder {
          *
          */
         UNION,
-
         /**
          *
          */
         INTERSECTION,
-
         /**
          *
          */
         DIFFERENCE,
-
         /**
          *
          */
@@ -102,13 +99,14 @@ public class BooleanShapeBuilder {
      * @return
      */
     public List<Polygon2D> computeShapes() {
-        List<Polygon2D> shapes = new ArrayList<Polygon2D>();
+        List<Polygon2D> shapes = new ArrayList<>();
         PathIterator i = area.getPathIterator(null);
         float[] buf = new float[6];
         Vec2D prev = new Vec2D();
         Polygon2D s = null;
         while (!i.isDone()) {
             int id = i.currentSegment(buf);
+
             switch (id) {
                 case PathIterator.SEG_MOVETO:
                     s = new Polygon2D();
@@ -118,15 +116,19 @@ public class BooleanShapeBuilder {
                     break;
                 case PathIterator.SEG_LINETO:
                     prev.set(buf[0], buf[1]);
-                    s.add(prev.copy());
+                    if (s != null) {
+                        s.add(prev.copy());
+                    }
                     break;
                 case PathIterator.SEG_CUBICTO:
                     Vec2D pa = new Vec2D(buf[0], buf[1]);
                     Vec2D pb = new Vec2D(buf[2], buf[3]);
                     Vec2D pc = new Vec2D(buf[4], buf[5]);
                     for (int t = 0; t <= bezierRes; t++) {
-                        s.add(BezierCurve2D.computePointInSegment(prev, pa, pb,
-                                pc, (float) t / bezierRes));
+                        if (s != null) {
+                            s.add(BezierCurve2D.computePointInSegment(prev, pa, 
+                                    pb, pc, (float) t / bezierRes));
+                        }
                     }
                     prev.set(pc);
                     break;

data/src/toxi/geom/Matrix3d.java

@@ -1,34 +1,33 @@
 /*
- * $RCSfile$
- *
- * Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * $Revision: 127 $
- * $Date: 2008-02-28 20:18:51 +0000 (Thu, 28 Feb 2008) $
- * $State$
+* $RCSfile$
+*
+* Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* This code is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License version 2 only, as
+* published by the Free Software Foundation.  Sun designates this
+* particular file as subject to the "Classpath" exception as provided
+* by Sun in the LICENSE file that accompanied this code.
+*
+* This code is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+* version 2 for more details (a copy is included in the LICENSE file that
+* accompanied this code).
+*
+* You should have received a copy of the GNU General Public License version
+* 2 along with this work; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+* CA 95054 USA or visit www.sun.com if you need additional information or
+* have any questions.
+*
+* $Revision: 127 $
+* $Date: 2008-02-28 20:18:51 +0000 (Thu, 28 Feb 2008) $
+* $State$
  */
-
 package toxi.geom;
 
 import toxi.math.MathUtils;
@@ -337,7 +336,6 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
             u[8] = -sinl[1] * utemp + cosl[1] * u[8];
 
             // update v matrices
-
             vtemp = v[0];
             v[0] = cosr[0] * vtemp + sinr[0] * v[1];
             v[1] = -sinr[0] * vtemp + cosr[0] * v[1];
@@ -387,7 +385,6 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
             u[5] = -sinl[0] * utemp + cosl[0] * u[5];
 
             // update v matrices
-
             vtemp = v[0];
             v[0] = cosr[0] * vtemp + sinr[0] * v[1];
             v[1] = -sinr[0] * vtemp + cosr[0] * v[1];
@@ -411,7 +408,6 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
             u[8] = -sinl[0] * utemp + cosl[0] * u[8];
 
             // update v matrices
-
             vtemp = v[1];
             v[1] = cosr[0] * vtemp + sinr[0] * v[2];
             v[2] = -sinr[0] * vtemp + cosr[0] * v[2];
@@ -562,7 +558,6 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
         }
 
         // u1
-
         if (m[3] * m[3] < EPS) {
             u1[0] = 1.0;
             u1[1] = 0.0;
@@ -621,7 +616,6 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
         }
 
         // u2
-
         if (m[6] * m[6] < EPS) {
         } else if (m[0] * m[0] < EPS) {
             tmp[0] = m[0];
@@ -674,7 +668,6 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
         }
 
         // v1
-
         if (m[2] * m[2] < EPS) {
             v1[0] = 1.0;
             v1[1] = 0.0;
@@ -734,7 +727,6 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
         }
 
         // u3
-
         if (m[7] * m[7] < EPS) {
         } else if (m[4] * m[4] < EPS) {
             tmp[3] = m[3];
@@ -839,7 +831,7 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
      * "matrix2" in turn and treats it as the right-hand side of the matrix
      * equation Ax = LUx = b. The solution vector replaces the original column
      * of the matrix.
-     * 
+     *
      * If "matrix2" is the identity matrix, the procedure replaces its contents
      * with the inverse of the matrix from which "matrix1" was originally
      * derived.
@@ -1020,12 +1012,11 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
             }
 
             /*
-             * System.out.println("\nscales="+scales[0]+" "+scales[1]+" "+scales[
-             * 2]); System.out.println("\nrot="+rot[0]+" "+rot[1]+" "+rot[2]);
-             * System.out.println("rot="+rot[3]+" "+rot[4]+" "+rot[5]);
-             * System.out.println("rot="+rot[6]+" "+rot[7]+" "+rot[8]);
+      * System.out.println("\nscales="+scales[0]+" "+scales[1]+" "+scales[
+      * 2]); System.out.println("\nrot="+rot[0]+" "+rot[1]+" "+rot[2]);
+      * System.out.println("rot="+rot[3]+" "+rot[4]+" "+rot[5]);
+      * System.out.println("rot="+rot[6]+" "+rot[7]+" "+rot[8]);
              */
-
             // sort the order of the input matrix
             mag[0] = (m[0] * m[0] + m[1] * m[1] + m[2] * m[2]);
             mag[1] = (m[3] * m[3] + m[4] * m[4] + m[5] * m[5]);
@@ -1197,25 +1188,16 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Constructs and initializes a Matrix3d from the specified nine values.
-     * 
-     * @param m00
-     *            the [0][0] element
-     * @param m01
-     *            the [0][1] element
-     * @param m02
-     *            the [0][2] element
-     * @param m10
-     *            the [1][0] element
-     * @param m11
-     *            the [1][1] element
-     * @param m12
-     *            the [1][2] element
-     * @param m20
-     *            the [2][0] element
-     * @param m21
-     *            the [2][1] element
-     * @param m22
-     *            the [2][2] element
+     *
+     * @param m00 the [0][0] element
+     * @param m01 the [0][1] element
+     * @param m02 the [0][2] element
+     * @param m10 the [1][0] element
+     * @param m11 the [1][1] element
+     * @param m12 the [1][2] element
+     * @param m20 the [2][0] element
+     * @param m21 the [2][1] element
+     * @param m22 the [2][2] element
      */
     public Matrix3d(double m00, double m01, double m02, double m10, double m11,
             double m12, double m20, double m21, double m22) {
@@ -1236,9 +1218,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Constructs and initializes a Matrix3d from the specified nine- element
      * array.
-     * 
-     * @param v
-     *            the array of length 9 containing in order
+     *
+     * @param v the array of length 9 containing in order
      */
     public Matrix3d(double[] v) {
         this.m00 = v[0];
@@ -1257,9 +1238,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Constructs a new matrix with the same values as the Matrix3d parameter.
-     * 
-     * @param m1
-     *            the source matrix
+     *
+     * @param m1 the source matrix
      */
     public Matrix3d(Matrix3d m1) {
         this.m00 = m1.m00;
@@ -1278,9 +1258,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Adds a scalar to each component of this matrix.
-     * 
-     * @param scalar
-     *            the scalar adder
+     *
+     * @param scalar the scalar adder
      */
     public final void add(double scalar) {
         m00 += scalar;
@@ -1300,11 +1279,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Adds a scalar to each component of the matrix m1 and places the result
      * into this. Matrix m1 is not modified.
-     * 
-     * @param scalar
-     *            the scalar adder
-     * @param m1
-     *            the original matrix values
+     *
+     * @param scalar the scalar adder
+     * @param m1 the original matrix values
      */
     public final void add(double scalar, Matrix3d m1) {
         this.m00 = m1.m00 + scalar;
@@ -1322,9 +1299,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the value of this matrix to the sum of itself and matrix m1.
-     * 
-     * @param m1
-     *            the other matrix
+     *
+     * @param m1 the other matrix
      */
     public final void add(Matrix3d m1) {
         this.m00 += m1.m00;
@@ -1342,11 +1318,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the value of this matrix to the matrix sum of matrices m1 and m2.
-     * 
-     * @param m1
-     *            the first matrix
-     * @param m2
-     *            the second matrix
+     *
+     * @param m1 the first matrix
+     * @param m2 the second matrix
      */
     public final void add(Matrix3d m1, Matrix3d m2) {
         this.m00 = m1.m00 + m2.m00;
@@ -1364,29 +1338,26 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Creates a new object of the same class as this object.
-     * 
+     *
      * @return a clone of this instance.
-     * @exception OutOfMemoryError
-     *                if there is not enough memory.
+     * @exception OutOfMemoryError if there is not enough memory.
      * @see java.lang.Cloneable
      * @since vecmath 1.3
      */
-//    public Object clone() {
-//        Matrix3d m1 = null;
-//        try {
-//            m1 = (Matrix3d) super.clone();
-//        } catch (CloneNotSupportedException e) {
-//            // this shouldn't happen, since we are Cloneable
-//            throw new InternalError();
-//        }
-
-        // Also need to create new tmp arrays (no need to actually clone them)
-//       return m1;
-//   }
-
+    //    public Object clone() {
+    //        Matrix3d m1 = null;
+    //        try {
+    //            m1 = (Matrix3d) super.clone();
+    //        } catch (CloneNotSupportedException e) {
+    //            // this shouldn't happen, since we are Cloneable
+    //            throw new InternalError();
+    //        }
+    // Also need to create new tmp arrays (no need to actually clone them)
+    //       return m1;
+    //   }
     /**
      * Computes the determinant of this matrix.
-     * 
+     *
      * @return the determinant of the matrix
      */
     public final double determinant() {
@@ -1403,12 +1374,10 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
      * is less than or equal to the epsilon parameter, otherwise returns false.
      * The L-infinite distance is equal to MAX[i=0,1,2 ; j=0,1,2 ;
      * abs(this.m(i,j) - m1.m(i,j)]
-     * 
-     * @param m1
-     *            the matrix to be compared to this matrix
-     * @param epsilon
-     *            the threshold value
-     * @return 
+     *
+     * @param m1 the matrix to be compared to this matrix
+     * @param epsilon the threshold value
+     * @return
      */
     public boolean epsilonEquals(Matrix3d m1, double epsilon) {
         double diff;
@@ -1460,9 +1429,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Returns true if all of the data members of Matrix3d m1 are equal to the
      * corresponding data members in this Matrix3d.
-     * 
-     * @param m1
-     *            the matrix with which the comparison is made
+     *
+     * @param m1 the matrix with which the comparison is made
      * @return true or false
      */
     public boolean equals(Matrix3d m1) {
@@ -1481,9 +1449,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
      * Returns true if the Object t1 is of type Matrix3d and all of the data
      * members of t1 are equal to the corresponding data members in this
      * Matrix3d.
-     * 
-     * @param t1
-     *            the matrix with which the comparison is made
+     *
+     * @param t1 the matrix with which the comparison is made
      * @return true or false
      */
     @Override
@@ -1501,11 +1468,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Retrieves the value at the specified row and column of the specified
      * matrix.
-     * 
-     * @param row
-     *            the row number to be retrieved (zero indexed)
-     * @param column
-     *            the column number to be retrieved (zero indexed)
+     *
+     * @param row the row number to be retrieved (zero indexed)
+     * @param column the column number to be retrieved (zero indexed)
      * @return the value at the indexed element.
      */
     public final double get(int row, int column) {
@@ -1557,27 +1522,29 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Copies the matrix values in the specified column into the array
      * parameter.
-     * 
-     * @param column
-     *            the matrix column
-     * @param v
-     *            the array into which the matrix row values will be copied
+     *
+     * @param column the matrix column
+     * @param v the array into which the matrix row values will be copied
      */
     public final void getColumn(int column, double v[]) {
-        if (column == 0) {
-            v[0] = m00;
-            v[1] = m10;
-            v[2] = m20;
-        } else if (column == 1) {
-            v[0] = m01;
-            v[1] = m11;
-            v[2] = m21;
-        } else if (column == 2) {
-            v[0] = m02;
-            v[1] = m12;
-            v[2] = m22;
-        } else {
-            throw new ArrayIndexOutOfBoundsException();
+        switch (column) {
+            case 0:
+                v[0] = m00;
+                v[1] = m10;
+                v[2] = m20;
+                break;
+            case 1:
+                v[0] = m01;
+                v[1] = m11;
+                v[2] = m21;
+                break;
+            case 2:
+                v[0] = m02;
+                v[1] = m12;
+                v[2] = m22;
+                break;
+            default:
+                throw new ArrayIndexOutOfBoundsException();
         }
 
     }
@@ -1585,80 +1552,86 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Copies the matrix values in the specified column into the vector
      * parameter.
-     * 
-     * @param column
-     *            the matrix column
-     * @param v
-     *            the vector into which the matrix row values will be copied
+     *
+     * @param column the matrix column
+     * @param v the vector into which the matrix row values will be copied
      */
     public final void getColumn(int column, Vec3D v) {
-        if (column == 0) {
-            v.x = (float) m00;
-            v.y = (float) m10;
-            v.z = (float) m20;
-        } else if (column == 1) {
-            v.x = (float) m01;
-            v.y = (float) m11;
-            v.z = (float) m21;
-        } else if (column == 2) {
-            v.x = (float) m02;
-            v.y = (float) m12;
-            v.z = (float) m22;
-        } else {
-            throw new ArrayIndexOutOfBoundsException();
+        switch (column) {
+            case 0:
+                v.x = (float) m00;
+                v.y = (float) m10;
+                v.z = (float) m20;
+                break;
+            case 1:
+                v.x = (float) m01;
+                v.y = (float) m11;
+                v.z = (float) m21;
+                break;
+            case 2:
+                v.x = (float) m02;
+                v.y = (float) m12;
+                v.z = (float) m22;
+                break;
+            default:
+                throw new ArrayIndexOutOfBoundsException();
         }
 
     }
 
     /**
      * Copies the matrix values in the specified row into the array parameter.
-     * 
-     * @param row
-     *            the matrix row
-     * @param v
-     *            the array into which the matrix row values will be copied
+     *
+     * @param row the matrix row
+     * @param v the array into which the matrix row values will be copied
      */
     public final void getRow(int row, double v[]) {
-        if (row == 0) {
-            v[0] = m00;
-            v[1] = m01;
-            v[2] = m02;
-        } else if (row == 1) {
-            v[0] = m10;
-            v[1] = m11;
-            v[2] = m12;
-        } else if (row == 2) {
-            v[0] = m20;
-            v[1] = m21;
-            v[2] = m22;
-        } else {
-            throw new ArrayIndexOutOfBoundsException();
+        switch (row) {
+            case 0:
+                v[0] = m00;
+                v[1] = m01;
+                v[2] = m02;
+                break;
+            case 1:
+                v[0] = m10;
+                v[1] = m11;
+                v[2] = m12;
+                break;
+            case 2:
+                v[0] = m20;
+                v[1] = m21;
+                v[2] = m22;
+                break;
+            default:
+                throw new ArrayIndexOutOfBoundsException();
         }
     }
 
     /**
      * Copies the matrix values in the specified row into the vector parameter.
-     * 
-     * @param row
-     *            the matrix row
-     * @param v
-     *            the vector into which the matrix row values will be copied
+     *
+     * @param row the matrix row
+     * @param v the vector into which the matrix row values will be copied
      */
     public final void getRow(int row, Vec3D v) {
-        if (row == 0) {
-            v.x = (float) m00;
-            v.y = (float) m01;
-            v.z = (float) m02;
-        } else if (row == 1) {
-            v.x = (float) m10;
-            v.y = (float) m11;
-            v.z = (float) m12;
-        } else if (row == 2) {
-            v.x = (float) m20;
-            v.y = (float) m21;
-            v.z = (float) m22;
-        } else {
-            throw new ArrayIndexOutOfBoundsException();
+        switch (row) {
+            case 0:
+                v.x = (float) m00;
+                v.y = (float) m01;
+                v.z = (float) m02;
+                break;
+            case 1:
+                v.x = (float) m10;
+                v.y = (float) m11;
+                v.z = (float) m12;
+                break;
+            case 2:
+                v.x = (float) m20;
+                v.y = (float) m21;
+                v.z = (float) m22;
+                break;
+            default:
+                throw new ArrayIndexOutOfBoundsException();
         }
 
     }
@@ -1668,7 +1641,7 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
      * uniform scale factor. If the matrix has non-uniform scale factors, the
      * largest of the x, y, and z scale factors will be returned. This matrix is
      * not modified.
-     * 
+     *
      * @return the scale factor of this matrix
      */
     public final double getScale() {
@@ -1703,7 +1676,7 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
      * Matrix3d.equals returns true) will return the same hash code value. Two
      * objects with different data members may return the same hash value,
      * although this is not likely.
-     * 
+     *
      * @return the integer hash code value
      */
     @Override
@@ -1731,9 +1704,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to the matrix inverse of the passed matrix
      * m1.
-     * 
-     * @param m1
-     *            the matrix to be inverted
+     *
+     * @param m1 the matrix to be inverted
      */
     public final void invert(Matrix3d m1) {
         invertGeneral(m1);
@@ -1743,7 +1715,7 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
      * General invert routine. Inverts m1 and places the result in "this". Note
      * that this routine handles both the "this" version and the non-"this"
      * version.
-     * 
+     *
      * Also note that since this routine is slow anyway, we won't worry about
      * allocating a little bit of garbage.
      */
@@ -1755,7 +1727,6 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
         // Use LU decomposition and backsubstitution code specifically
         // for floating-point 3x3 matrices.
-
         // Copy source matrix to t1tmp
         tmp[0] = m1.m00;
         tmp[1] = m1.m01;
@@ -1800,9 +1771,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Multiplies each element of this matrix by a scalar.
-     * 
-     * @param scalar
-     *            The scalar multiplier.
+     *
+     * @param scalar The scalar multiplier.
      */
     public final void mul(double scalar) {
         m00 *= scalar;
@@ -1822,11 +1792,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Multiplies each element of matrix m1 by a scalar and places the result
      * into this. Matrix m1 is not modified.
-     * 
-     * @param scalar
-     *            the scalar multiplier
-     * @param m1
-     *            the original matrix
+     *
+     * @param scalar the scalar multiplier
+     * @param m1 the original matrix
      */
     public final void mul(double scalar, Matrix3d m1) {
         this.m00 = scalar * m1.m00;
@@ -1846,9 +1814,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to the result of multiplying itself with
      * matrix m1.
-     * 
-     * @param m1
-     *            the other matrix
+     *
+     * @param m1 the other matrix
      */
     public final void mul(Matrix3d m1) {
         double tm00, tm01, tm02, tm10, tm11, tm12, tm20, tm21, tm22;
@@ -1879,11 +1846,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to the result of multiplying the two
      * argument matrices together.
-     * 
-     * @param m1
-     *            the first matrix
-     * @param m2
-     *            the second matrix
+     *
+     * @param m1 the first matrix
+     * @param m2 the second matrix
      */
     public final void mul(Matrix3d m1, Matrix3d m2) {
         if (this != m1 && this != m2) {
@@ -1900,7 +1865,7 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
             this.m22 = m1.m20 * m2.m02 + m1.m21 * m2.m12 + m1.m22 * m2.m22;
         } else {
             double tm00, tm01, tm02, tm10, tm11, tm12, tm20, tm21, tm22; // vars for temp
-                                                                // result matrix
+            // result matrix
 
             tm00 = m1.m00 * m2.m00 + m1.m01 * m2.m10 + m1.m02 * m2.m20;
             tm01 = m1.m00 * m2.m01 + m1.m01 * m2.m11 + m1.m02 * m2.m21;
@@ -1930,9 +1895,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
      * Multiplies this matrix by matrix m1, does an SVD normalization of the
      * result, and places the result back into this matrix this =
      * SVDnorm(this*m1).
-     * 
-     * @param m1
-     *            the matrix on the right hand side of the multiplication
+     *
+     * @param m1 the matrix on the right hand side of the multiplication
      */
     public final void mulNormalize(Matrix3d m1) {
 
@@ -1971,11 +1935,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Multiplies matrix m1 by matrix m2, does an SVD normalization of the
      * result, and places the result into this matrix this = SVDnorm(m1*m2).
-     * 
-     * @param m1
-     *            the matrix on the left hand side of the multiplication
-     * @param m2
-     *            the matrix on the right hand side of the multiplication
+     *
+     * @param m1 the matrix on the left hand side of the multiplication
+     * @param m2 the matrix on the right hand side of the multiplication
      */
     public final void mulNormalize(Matrix3d m1, Matrix3d m2) {
 
@@ -2014,11 +1976,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Multiplies the transpose of matrix m1 times the transpose of matrix m2,
      * and places the result into this.
-     * 
-     * @param m1
-     *            the matrix on the left hand side of the multiplication
-     * @param m2
-     *            the matrix on the right hand side of the multiplication
+     *
+     * @param m1 the matrix on the left hand side of the multiplication
+     * @param m2 the matrix on the right hand side of the multiplication
      */
     public final void mulTransposeBoth(Matrix3d m1, Matrix3d m2) {
         if (this != m1 && this != m2) {
@@ -2035,7 +1995,7 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
             this.m22 = m1.m02 * m2.m20 + m1.m12 * m2.m21 + m1.m22 * m2.m22;
         } else {
             double tm00, tm01, tm02, tm10, tm11, tm12, tm20, tm21, tm22; // vars for temp
-                                                                // result matrix
+            // result matrix
 
             tm00 = m1.m00 * m2.m00 + m1.m10 * m2.m01 + m1.m20 * m2.m02;
             tm01 = m1.m00 * m2.m10 + m1.m10 * m2.m11 + m1.m20 * m2.m12;
@@ -2065,11 +2025,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Multiplies the transpose of matrix m1 times matrix m2, and places the
      * result into this.
-     * 
-     * @param m1
-     *            the matrix on the left hand side of the multiplication
-     * @param m2
-     *            the matrix on the right hand side of the multiplication
+     *
+     * @param m1 the matrix on the left hand side of the multiplication
+     * @param m2 the matrix on the right hand side of the multiplication
      */
     public final void mulTransposeLeft(Matrix3d m1, Matrix3d m2) {
         if (this != m1 && this != m2) {
@@ -2086,7 +2044,7 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
             this.m22 = m1.m02 * m2.m02 + m1.m12 * m2.m12 + m1.m22 * m2.m22;
         } else {
             double tm00, tm01, tm02, tm10, tm11, tm12, tm20, tm21, tm22; // vars for temp
-                                                                // result matrix
+            // result matrix
 
             tm00 = m1.m00 * m2.m00 + m1.m10 * m2.m10 + m1.m20 * m2.m20;
             tm01 = m1.m00 * m2.m01 + m1.m10 * m2.m11 + m1.m20 * m2.m21;
@@ -2115,11 +2073,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Multiplies matrix m1 times the transpose of matrix m2, and places the
      * result into this.
-     * 
-     * @param m1
-     *            the matrix on the left hand side of the multiplication
-     * @param m2
-     *            the matrix on the right hand side of the multiplication
+     *
+     * @param m1 the matrix on the left hand side of the multiplication
+     * @param m2 the matrix on the right hand side of the multiplication
      */
     public final void mulTransposeRight(Matrix3d m1, Matrix3d m2) {
         if (this != m1 && this != m2) {
@@ -2136,7 +2092,7 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
             this.m22 = m1.m20 * m2.m20 + m1.m21 * m2.m21 + m1.m22 * m2.m22;
         } else {
             double tm00, tm01, tm02, tm10, tm11, tm12, tm20, tm21, tm22; // vars for temp
-                                                                // result matrix
+            // result matrix
 
             tm00 = m1.m00 * m2.m00 + m1.m01 * m2.m01 + m1.m02 * m2.m02;
             tm01 = m1.m00 * m2.m10 + m1.m01 * m2.m11 + m1.m02 * m2.m12;
@@ -2183,9 +2139,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix equal to the negation of of the Matrix3d
      * parameter.
-     * 
-     * @param m1
-     *            the source matrix
+     *
+     * @param m1 the source matrix
      */
     public final void negate(Matrix3d m1) {
         this.m00 = -m1.m00;
@@ -2228,9 +2183,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Perform singular value decomposition normalization of matrix m1 and place
      * the normalized values into this.
-     * 
-     * @param m1
-     *            Provides the matrix values to be normalized
+     *
+     * @param m1 Provides the matrix values to be normalized
      */
     public final void normalize(Matrix3d m1) {
 
@@ -2268,7 +2222,6 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Perform cross product normalization of this matrix.
      */
-
     public final void normalizeCP() {
         double mag = 1.0 / Math.sqrt(m00 * m00 + m10 * m10 + m20 * m20);
         m00 = m00 * mag;
@@ -2288,9 +2241,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Perform cross product normalization of matrix m1 and place the normalized
      * values into this.
-     * 
-     * @param m1
-     *            Provides the matrix values to be normalized
+     *
+     * @param m1 Provides the matrix values to be normalized
      */
     public final void normalizeCP(Matrix3d m1) {
         double mag = 1.0 / Math.sqrt(m1.m00 * m1.m00 + m1.m10 * m1.m10 + m1.m20
@@ -2313,9 +2265,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to a counter clockwise rotation about the x
      * axis.
-     * 
-     * @param angle
-     *            the angle to rotate about the X axis in radians
+     *
+     * @param angle the angle to rotate about the X axis in radians
      */
     public final void rotX(double angle) {
         double sinAngle, cosAngle;
@@ -2339,9 +2290,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to a counter clockwise rotation about the y
      * axis.
-     * 
-     * @param angle
-     *            the angle to rotate about the Y axis in radians
+     *
+     * @param angle the angle to rotate about the Y axis in radians
      */
     public final void rotY(double angle) {
         double sinAngle, cosAngle;
@@ -2365,9 +2315,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to a counter clockwise rotation about the z
      * axis.
-     * 
-     * @param angle
-     *            the angle to rotate about the Z axis in radians
+     *
+     * @param angle the angle to rotate about the Z axis in radians
      */
     public final void rotZ(double angle) {
         double sinAngle, cosAngle;
@@ -2391,9 +2340,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to a scale matrix with the passed scale
      * amount.
-     * 
-     * @param scale
-     *            the scale factor for the matrix
+     *
+     * @param scale the scale factor for the matrix
      */
     public final void set(double scale) {
         this.m00 = scale;
@@ -2413,9 +2361,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
      * Sets the values in this Matrix3d equal to the row-major array parameter
      * (ie, the first three elements of the array will be copied into the first
      * row of this matrix, etc.).
-     * 
-     * @param m
-     *            the double precision array of length 9
+     *
+     * @param m the double precision array of length 9
      */
     public final void set(double[] m) {
         m00 = m[0];
@@ -2434,9 +2381,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the value of this matrix to the value of the Matrix3d argument.
-     * 
-     * @param m1
-     *            the source matrix3d
+     *
+     * @param m1 the source matrix3d
      */
     public final void set(Matrix3d m1) {
         this.m00 = m1.m00;
@@ -2455,9 +2401,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to the matrix conversion of the single
      * precision quaternion argument.
-     * 
-     * @param q1
-     *            the quaternion to be converted
+     *
+     * @param q1 the quaternion to be converted
      */
     public final void set(Quaternion q1) {
         this.m00 = (1.0 - 2.0 * q1.y * q1.y - 2.0 * q1.z * q1.z);
@@ -2475,11 +2420,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the specified column of this matrix3d to the three values provided.
-     * 
-     * @param column
-     *            the column number to be modified (zero indexed)
-     * @param v
-     *            the replacement column
+     *
+     * @param column the column number to be modified (zero indexed)
+     * @param v the replacement column
      */
     public final void setColumn(int column, double v[]) {
         switch (column) {
@@ -2508,15 +2451,11 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the specified column of this matrix3d to the three values provided.
-     * 
-     * @param column
-     *            the column number to be modified (zero indexed)
-     * @param x
-     *            the first row element
-     * @param y
-     *            the second row element
-     * @param z
-     *            the third row element
+     *
+     * @param column the column number to be modified (zero indexed)
+     * @param x the first row element
+     * @param y the second row element
+     * @param z the third row element
      */
     public final void setColumn(int column, double x, double y, double z) {
         switch (column) {
@@ -2545,11 +2484,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the specified column of this matrix3d to the vector provided.
-     * 
-     * @param column
-     *            the column number to be modified (zero indexed)
-     * @param v
-     *            the replacement column
+     *
+     * @param column the column number to be modified (zero indexed)
+     * @param v the replacement column
      */
     public final void setColumn(int column, Vec3D v) {
         switch (column) {
@@ -2578,13 +2515,10 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the specified element of this matrix3f to the value provided.
-     * 
-     * @param row
-     *            the row number to be modified (zero indexed)
-     * @param column
-     *            the column number to be modified (zero indexed)
-     * @param value
-     *            the new value
+     *
+     * @param row the row number to be modified (zero indexed)
+     * @param column the column number to be modified (zero indexed)
+     * @param value the new value
      */
     public final void setElement(int row, int column, double value) {
         switch (row) {
@@ -2660,10 +2594,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Set the first matrix element in the first row.
-     * 
-     * @param m00
-     *            The m00 to set.
-     * 
+     *
+     * @param m00 The m00 to set.
+     *
      * @since vecmath 1.5
      */
     public final void setM00(double m00) {
@@ -2672,10 +2605,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Set the second matrix element in the first row.
-     * 
-     * @param m01
-     *            The m01 to set.
-     * 
+     *
+     * @param m01 The m01 to set.
+     *
      * @since vecmath 1.5
      */
     public final void setM01(double m01) {
@@ -2684,10 +2616,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Set the third matrix element in the first row.
-     * 
-     * @param m02
-     *            The m02 to set.
-     * 
+     *
+     * @param m02 The m02 to set.
+     *
      * @since vecmath 1.5
      */
     public final void setM02(double m02) {
@@ -2696,10 +2627,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Set first matrix element in the second row.
-     * 
-     * @param m10
-     *            The m10 to set.
-     * 
+     *
+     * @param m10 The m10 to set.
+     *
      * @since vecmath 1.5
      */
     public final void setM10(double m10) {
@@ -2708,10 +2638,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Set the second matrix element in the second row.
-     * 
-     * @param m11
-     *            The m11 to set.
-     * 
+     *
+     * @param m11 The m11 to set.
+     *
      * @since vecmath 1.5
      */
     public final void setM11(double m11) {
@@ -2720,10 +2649,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Set the third matrix element in the second row.
-     * 
-     * @param m12
-     *            The m12 to set.
-     * 
+     *
+     * @param m12 The m12 to set.
+     *
      * @since vecmath 1.5
      */
     public final void setM12(double m12) {
@@ -2732,10 +2660,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Set the first matrix element in the third row.
-     * 
-     * @param m20
-     *            The m20 to set.
-     * 
+     *
+     * @param m20 The m20 to set.
+     *
      * @since vecmath 1.5
      */
     public final void setM20(double m20) {
@@ -2744,10 +2671,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Set the second matrix element in the third row.
-     * 
-     * @param m21
-     *            The m21 to set.
-     * 
+     *
+     * @param m21 The m21 to set.
+     *
      * @since vecmath 1.5
      */
     public final void setM21(double m21) {
@@ -2756,10 +2682,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Set the third matrix element in the third row.
-     * 
-     * @param m22
-     *            The m22 to set.
-     * 
+     *
+     * @param m22 The m22 to set.
+     *
      * @since vecmath 1.5
      */
     public final void setM22(double m22) {
@@ -2768,11 +2693,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the specified row of this matrix3d to the three values provided.
-     * 
-     * @param row
-     *            the row number to be modified (zero indexed)
-     * @param v
-     *            the replacement row
+     *
+     * @param row the row number to be modified (zero indexed)
+     * @param v the replacement row
      */
     public final void setRow(int row, double v[]) {
         switch (row) {
@@ -2801,15 +2724,11 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the specified row of this matrix3d to the 4 values provided.
-     * 
-     * @param row
-     *            the row number to be modified (zero indexed)
-     * @param x
-     *            the first column element
-     * @param y
-     *            the second column element
-     * @param z
-     *            the third column element
+     *
+     * @param row the row number to be modified (zero indexed)
+     * @param x the first column element
+     * @param y the second column element
+     * @param z the third column element
      */
     public final void setRow(int row, double x, double y, double z) {
         switch (row) {
@@ -2838,11 +2757,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the specified row of this matrix3d to the Vector provided.
-     * 
-     * @param row
-     *            the row number to be modified (zero indexed)
-     * @param v
-     *            the replacement row
+     *
+     * @param row the row number to be modified (zero indexed)
+     * @param v the replacement row
      */
     public final void setRow(int row, Vec3D v) {
         switch (row) {
@@ -2872,9 +2789,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the scale component of the current matrix by factoring out the
      * current scale (by doing an SVD) and multiplying by the new scale.
-     * 
-     * @param scale
-     *            the new scale amount
+     *
+     * @param scale the new scale amount
      */
     public final void setScale(double scale) {
 
@@ -2917,9 +2833,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to the matrix difference of itself and
      * matrix m1 (this = this - m1).
-     * 
-     * @param m1
-     *            the other matrix
+     *
+     * @param m1 the other matrix
      */
     public final void sub(Matrix3d m1) {
         this.m00 -= m1.m00;
@@ -2938,11 +2853,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Sets the value of this matrix to the matrix difference of matrices m1 and
      * m2.
-     * 
-     * @param m1
-     *            the first matrix
-     * @param m2
-     *            the second matrix
+     *
+     * @param m1 the first matrix
+     * @param m2 the second matrix
      */
     public final void sub(Matrix3d m1, Matrix3d m2) {
         this.m00 = m1.m00 - m2.m00;
@@ -2960,22 +2873,24 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Returns a string that contains the values of this Matrix3d.
-     * 
+     *
      * @return the String representation
      */
     @Override
     public String toString() {
-        return this.m00 + ", " + this.m01 + ", " + this.m02 + "\n" + this.m10
-                + ", " + this.m11 + ", " + this.m12 + "\n" + this.m20 + ", "
-                + this.m21 + ", " + this.m22 + "\n";
+        return String.join("\n",
+                String.format("%f, %f, %f", this.m00, this.m01, this.m02),
+                String.format("%f, %f, %f", this.m10, this.m11, this.m12),
+                String.format("%f, %f, %f", this.m20, this.m21, this.m22),
+                ""
+        );
     }
 
     /**
      * Multiply this matrix by the tuple t and place the result back into the
      * tuple (t = this*t).
-     * 
-     * @param t
-     *            the tuple to be multiplied by this matrix and then replaced
+     *
+     * @param t the tuple to be multiplied by this matrix and then replaced
      */
     public final void transform(Vec3D t) {
         float x, y, z;
@@ -2988,11 +2903,9 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
     /**
      * Multiply this matrix by the tuple t and and place the result into the
      * tuple "result" (result = this*t).
-     * 
-     * @param t
-     *            the tuple to be multiplied by this matrix
-     * @param result
-     *            the tuple into which the product is placed
+     *
+     * @param t the tuple to be multiplied by this matrix
+     * @param result the tuple into which the product is placed
      */
     public final void transform(Vec3D t, Vec3D result) {
         float x, y, z;
@@ -3024,9 +2937,8 @@ public class Matrix3d implements java.io.Serializable, Cloneable {
 
     /**
      * Sets the value of this matrix to the transpose of the argument matrix.
-     * 
-     * @param m1
-     *            the matrix to be transposed
+     *
+     * @param m1 the matrix to be transposed
      */
     public final void transpose(Matrix3d m1) {
         if (this != m1) {