toxiclibs 0.9.2 → 2.1.0

data/src/{toxi → main/java/toxi}/data/feeds/RSSItem.java

@@ -30,12 +30,10 @@ package toxi.data.feeds;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import toxi.data.feeds.util.EntityStripper;
-import toxi.data.feeds.util.Rfc822DateAdapter;
 
 /**
  *
@@ -46,45 +44,45 @@ public class RSSItem {
     /**
      *
      */
-    @XmlElement
+    
     public String title;
 
     /**
      *
      */
-    @XmlElement
+    
     public String description;
 
     /**
      *
      */
-    @XmlElement(required = true)
-    @XmlJavaTypeAdapter(Rfc822DateAdapter.class)
+   
+    
     public XMLGregorianCalendar pubDate;
 
     /**
      *
      */
-    @XmlElement
+    
     public String guid;
 
     /**
      *
      */
-    @XmlElement
+    
     public String link;
 
     /**
      *
      */
-    @XmlElement(name = "category")
-    public List<String> categories = new ArrayList<String>();
+  
+    public List<String> categories = new ArrayList<>();
 
     /**
      *
      */
-    @XmlElement(name = "enclosure")
-    public List<RSSEnclosure> enclosures = new ArrayList<RSSEnclosure>();
+
+    public List<RSSEnclosure> enclosures = new ArrayList<>();
 
     /**
      *

data/src/{toxi → main/java/toxi}/data/feeds/util/Iso8601DateAdapter.java

@@ -32,18 +32,17 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
+//import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
 
 /**
  *
  * @author tux
  */
-public class Iso8601DateAdapter extends
-        XmlAdapter<String, XMLGregorianCalendar> {
+public class Iso8601DateAdapter  {
 
     /**
      *
@@ -58,7 +57,7 @@ public class Iso8601DateAdapter extends
      * @return
      * @throws Exception
      */
-    @Override
+    
     public String marshal(XMLGregorianCalendar date) throws Exception {
         return ISO8601_FORMATS[0].format(date);
     }
@@ -69,11 +68,11 @@ public class Iso8601DateAdapter extends
      * @return
      * @throws Exception
      */
-    @Override
+
     public XMLGregorianCalendar unmarshal(String dateString) throws Exception {
         XMLGregorianCalendar calendar = null;
         GregorianCalendar cal = new GregorianCalendar();
-        DatatypeFactory dataType = DatatypeFactoryImpl.newInstance();
+        DatatypeFactory dataType = DatatypeFactory.newInstance();
         for (SimpleDateFormat f : ISO8601_FORMATS) {
             try {
                 Date d = f.parse(dateString);

data/src/{toxi → main/java/toxi}/data/feeds/util/Rfc822DateAdapter.java

@@ -32,17 +32,16 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
+//import com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl;
 
 /**
  *
  * @author tux
  */
-public class Rfc822DateAdapter extends XmlAdapter<String, XMLGregorianCalendar> {
+public class Rfc822DateAdapter  {
 
     /**
      *
@@ -63,7 +62,7 @@ public class Rfc822DateAdapter extends XmlAdapter<String, XMLGregorianCalendar>
      * @return
      * @throws Exception
      */
-    @Override
+  
     public String marshal(XMLGregorianCalendar date) throws Exception {
         return RFC822_FORMATS[0].format(date);
     }
@@ -74,7 +73,7 @@ public class Rfc822DateAdapter extends XmlAdapter<String, XMLGregorianCalendar>
      * @return
      * @throws Exception
      */
-    @Override
+   
     public XMLGregorianCalendar unmarshal(String dateString) throws Exception {
         XMLGregorianCalendar calendar = null;
         GregorianCalendar cal = new GregorianCalendar();
@@ -82,7 +81,7 @@ public class Rfc822DateAdapter extends XmlAdapter<String, XMLGregorianCalendar>
             try {
                 Date d = f.parse(dateString);
                 cal.setTime(d);
-                DatatypeFactory dataType = DatatypeFactoryImpl.newInstance();
+                DatatypeFactory dataType = DatatypeFactory.newInstance();
                 calendar = dataType.newXMLGregorianCalendar(cal);
                 break;
             } catch (ParseException e) {

data/src/{toxi → main/java/toxi}/geom/AABB.java

@@ -29,10 +29,7 @@ package toxi.geom;
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
+
 
 import toxi.geom.mesh.Mesh3D;
 import toxi.geom.mesh.TriangleMesh;
@@ -42,7 +39,7 @@ import toxi.math.MathUtils;
  * Axis-aligned bounding box with basic intersection features for Ray, AABB and
  * Sphere classes.
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class AABB extends Vec3D implements Shape3D {
 
     /**
@@ -76,20 +73,22 @@ public class AABB extends Vec3D implements Shape3D {
         Vec3D first = points.get(0);
         Vec3D min = first.copy();
         Vec3D max = first.copy();
-        for (Vec3D p : points) {
+        points.stream().map((p) -> {
             min.minSelf(p);
+            return p;
+        }).forEachOrdered((p) -> {
             max.maxSelf(p);
-        }
+        });
         return fromMinMax(min, max);
     }
 
     /**
      *
      */
-    @XmlElement(required = true)
+
     protected Vec3D extent;
 
-    @XmlTransient
+
     protected Vec3D min,
 
     /**

data/src/{toxi → main/java/toxi}/geom/Circle.java

@@ -99,9 +99,9 @@ public class Circle extends Ellipse {
     public static Circle newBoundingCircle(List<Vec2D> vertices) {
         Vec2D origin = new Vec2D();
         float maxD = 0;
-        for (Vec2D v : vertices) {
+        vertices.forEach((v) -> {
             origin.addSelf(v);
-        }
+        });
         origin.scaleSelf(1f / vertices.size());
         for (Vec2D v : vertices) {
             float d = origin.distanceToSquared(v);

data/src/{toxi → main/java/toxi}/geom/Line2D.java

@@ -30,7 +30,6 @@ package toxi.geom;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
 
 import toxi.geom.Line2D.LineIntersection.Type;
 
@@ -182,7 +181,7 @@ public class Line2D {
         return segments;
     }
 
-    @XmlElement
+
     public Vec2D a,
 
     /**

data/src/{toxi → main/java/toxi}/geom/Line3D.java

@@ -27,7 +27,6 @@
 package toxi.geom;
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
 import toxi.geom.Line3D.LineIntersection.Type;
 import toxi.math.MathUtils;
 
@@ -160,7 +159,7 @@ public class Line3D {
         return segments;
     }
 
-    @XmlElement
+
     public Vec3D a,
 
     /**

data/src/{toxi → main/java/toxi}/geom/LineStrip2D.java

@@ -32,7 +32,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
+
 
 import toxi.geom.Line2D.LineIntersection;
 import toxi.geom.Line2D.LineIntersection.Type;
@@ -47,7 +47,7 @@ public class LineStrip2D implements Iterable<Vec2D> {
     /**
      *
      */
-    @XmlElement(name = "v")
+
     protected List<Vec2D> vertices = new ArrayList<>();
 
     /**

data/src/{toxi → main/java/toxi}/geom/LineStrip3D.java

@@ -32,7 +32,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
+
 
 /**
  *
@@ -43,7 +43,7 @@ public class LineStrip3D implements Iterable<Vec3D> {
     /**
      *
      */
-    @XmlElement(name = "v")
+
     protected List<Vec3D> vertices = new ArrayList<>();
 
     /**

data/src/{toxi → main/java/toxi}/geom/Origin3D.java

@@ -108,12 +108,18 @@ public class Origin3D {
         this.zAxis = dir.getNormalized();
         Vec3D av = null;
         Axis a = zAxis.getClosestAxis();
-        if (a == Vec3D.Axis.X) {
-            av = Vec3D.Axis.Z.getVector().getInverted();
-        } else if (a == Vec3D.Axis.Y) {
-            av = Vec3D.Axis.Z.getVector().getInverted();
-        } else if (a == Vec3D.Axis.Z) {
-            av = Vec3D.Axis.X.getVector().getInverted();
+        if (null != a) switch (a) {
+            case X:
+                av = Vec3D.Axis.Z.getVector().getInverted();
+                break;
+            case Y:
+                av = Vec3D.Axis.Z.getVector().getInverted();
+                break;
+            case Z:
+                av = Vec3D.Axis.X.getVector().getInverted();
+                break;
+            default:
+                break;
         }
         if (av == null) {
             throw new IllegalArgumentException(

data/src/{toxi → main/java/toxi}/geom/Plane.java

@@ -27,9 +27,7 @@
 
 package toxi.geom;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+
 
 import toxi.geom.mesh.Mesh3D;
 import toxi.geom.mesh.TriangleMesh;
@@ -39,7 +37,7 @@ import toxi.math.MathUtils;
  * Class to describe and work with infinite generic 3D planes. Useful for
  * intersection problems and classifying points.
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Plane extends Vec3D implements Shape3D {
 
     /**
@@ -81,7 +79,7 @@ public class Plane extends Vec3D implements Shape3D {
     /**
      *
      */
-    @XmlElement(required = true)
+
     public Vec3D normal;
 
     /**

data/src/{toxi → main/java/toxi}/geom/PointCloud3D.java

@@ -87,9 +87,9 @@ public class PointCloud3D implements Iterable<Vec3D> {
      * @return
      */
     public PointCloud3D addAll(List<? extends Vec3D> plist) {
-        for (Vec3D p : plist) {
+        plist.forEach((p) -> {
             addPoint(p);
-        }
+        });
         return this;
     }
 
@@ -116,9 +116,9 @@ public class PointCloud3D implements Iterable<Vec3D> {
      * @return itself
      */
     public PointCloud3D applyMatrix(Matrix4x4 m) {
-        for (Vec3D p : points) {
+        points.forEach((p) -> {
             p.set(m.applyTo(p));
-        }
+        });
         updateBounds();
         return this;
     }
@@ -145,9 +145,9 @@ public class PointCloud3D implements Iterable<Vec3D> {
         getCentroid();
         Vec3D delta = origin != null ? origin.sub(centroid) : centroid
                 .getInverted();
-        for (Vec3D p : points) {
+        points.forEach((p) -> {
             p.addSelf(delta);
-        }
+        });
         min.addSelf(delta);
         max.addSelf(delta);
         centroid.addSelf(delta);
@@ -174,9 +174,9 @@ public class PointCloud3D implements Iterable<Vec3D> {
      */
     public PointCloud3D copy() {
         PointCloud3D c = new PointCloud3D(points.size());
-        for (ReadonlyVec3D p : points) {
+        points.forEach((p) -> {
             c.addPoint(p.copy());
-        }
+        });
         return c;
     }
 
@@ -208,6 +208,7 @@ public class PointCloud3D implements Iterable<Vec3D> {
      * 
      * @see java.lang.Iterable#iterator()
      */
+    @Override
     public Iterator<Vec3D> iterator() {
         return points.iterator();
     }
@@ -238,16 +239,18 @@ public class PointCloud3D implements Iterable<Vec3D> {
     public PointCloud3D updateBounds() {
         min = Vec3D.MAX_VALUE.copy();
         max = Vec3D.NEG_MAX_VALUE.copy();
-        for (Vec3D p : points) {
+        points.stream().map((p) -> {
             min.minSelf(p);
+            return p;
+        }).forEachOrdered((p) -> {
             max.maxSelf(p);
-        }
+        });
         centroid.set(min.add(max).scaleSelf(0.5f));
         radiusSquared = 0;
-        for (ReadonlyVec3D p : points) {
+        points.forEach((p) -> {
             radiusSquared = MathUtils.max(radiusSquared,
                     p.distanceToSquared(centroid));
-        }
+        });
         return this;
     }
 }