toxiclibs 0.9.2 → 2.1.0

data/pom.xml

@@ -2,28 +2,18 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>toxiclibs</artifactId>
-  <version>0.9.2</version>
+  <version>2.1.0</version>
   <name>toxiclibs</name>
   <description>toxiclibs-library for JRubyArt</description>
-  <organization>
-    <name>ruby-processing</name>
-    <url>https://ruby-processing.github.io</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>LGPL 2</name>
-      <url>http://www.gnu.org/licenses/lgpl-2.1-standalone.html</url>
-    </license>
-  </licenses>
   <developers>
     <developer>
       <id>monkstone</id>
@@ -44,69 +34,53 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/ruby-processing/toxiclibs/issues</url>
   </issueManagement>
   <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <source.directory>src</source.directory>
+    <target.release>11</target.release>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>args4j</groupId>
-      <artifactId>args4j</artifactId>
-      <version>2.0.31</version>
-    </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.3.0</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
   <build>
-    <sourceDirectory>src</sourceDirectory>
+    <sourceDirectory>${source.directory}/main/java</sourceDirectory>
     <defaultGoal>package</defaultGoal>
     <finalName>toxiclibs</finalName>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.0.2</version>
-        <configuration>
-          <archive>
-            <manifestFile>MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.10</version>
-        <executions>
-          <execution>
-            <id>default-cli</id>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>args4j</groupId>
-                  <artifactId>args4j</artifactId>
-                  <version>2.0.31</version>
-                  <type>jar</type>
-                  <outputDirectory>lib</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
+          <configuration>
+            <release>11</release>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.10.4</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jdeps-plugin</artifactId>
+          <version>3.1.2</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>jdkinternals</goal>
+                <goal>test-jdkinternals</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 </project>

data/src/main/java/module-info.java

@@ -0,0 +1,22 @@
+module toxiclibs{
+  exports toxi.color;
+  exports toxi.data.csv;
+  exports toxi.data.feeds;
+  exports toxi.geom;
+  exports toxi.image.util;
+  exports toxi.music.scale;
+  exports toxi.newmesh;
+  exports toxi.physics2d;
+  exports toxi.physics3d;
+  exports toxi.processing;
+  exports toxi.sim.automata;
+  exports toxi.sim.dla;
+  exports toxi.sim.erosion;
+  exports toxi.sim.fluids;
+  exports toxi.sim.grayscott;
+  exports toxi.util;
+  exports toxi.volume;
+  requires org.processing.core;
+  requires java.desktop;
+  requires java.logging;
+}

data/src/{toxi → main/java/toxi}/color/ColorList.java

@@ -33,8 +33,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 
 import toxi.color.theory.ColorTheoryRegistry;
 import toxi.color.theory.ColorTheoryStrategy;
@@ -160,8 +159,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      *
      */
-    @XmlElement(name = "col")
-    @XmlJavaTypeAdapter(TColorAdapter.class)
+
     protected List<TColor> colors;
 
     /**

data/src/{toxi → main/java/toxi}/color/TColorAdapter.java

@@ -27,13 +27,13 @@
 
 package toxi.color;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+
 
 /**
  *
  * @author tux
  */
-public class TColorAdapter extends XmlAdapter<String, TColor> {
+public class TColorAdapter  {
 
     /**
      *
@@ -41,7 +41,7 @@ public class TColorAdapter extends XmlAdapter<String, TColor> {
      * @return
      * @throws Exception
      */
-    @Override
+
     public String marshal(TColor col) throws Exception {
         if (col != null) {
             return col.toHex();
@@ -56,7 +56,7 @@ public class TColorAdapter extends XmlAdapter<String, TColor> {
      * @return
      * @throws Exception
      */
-    @Override
+
     public TColor unmarshal(String hex) throws Exception {
         int len = hex.length();
         if (len > 0 && len <= 8) {

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

@@ -27,7 +27,7 @@
 
 package toxi.data.feeds;
 
-import javax.xml.bind.annotation.XmlElement;
+
 
 /**
  *
@@ -35,7 +35,7 @@ import javax.xml.bind.annotation.XmlElement;
  */
 public class AtomAuthor {
 
-    @XmlElement(namespace = AtomFeed.NS)
+
     public String name,
 
     /**

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

@@ -27,8 +27,7 @@
 
 package toxi.data.feeds;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlValue;
+
 
 /**
  *
@@ -39,12 +38,12 @@ public class AtomContent {
     /**
      *
      */
-    @XmlAttribute(namespace = AtomFeed.NS)
+
     public String type;
 
     /**
      *
      */
-    @XmlValue
+
     public String value;
 }

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

@@ -30,11 +30,9 @@ 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.Iso8601DateAdapter;
 
 /**
  *
@@ -42,7 +40,7 @@ import toxi.data.feeds.util.Iso8601DateAdapter;
  */
 public class AtomEntry {
 
-    @XmlElement(namespace = AtomFeed.NS)
+  
     public String title,
 
     /**
@@ -57,34 +55,32 @@ public class AtomEntry {
     /**
      *
      */
-    @XmlElement(namespace = AtomFeed.NS)
+ 
     public AtomAuthor author;
 
     /**
      *
      */
-    @XmlElement(namespace = AtomFeed.NS)
+ 
     public AtomContent content;
 
     /**
      *
      */
-    @XmlElement(name = "published", namespace = AtomFeed.NS)
-    @XmlJavaTypeAdapter(Iso8601DateAdapter.class)
+ 
     public XMLGregorianCalendar timePublished;
 
     /**
      *
      */
-    @XmlElement(name = "updated", namespace = AtomFeed.NS)
-    @XmlJavaTypeAdapter(Iso8601DateAdapter.class)
+
     public XMLGregorianCalendar timeUpdated;
 
     /**
      *
      */
-    @XmlElement(name = "link", namespace = AtomFeed.NS)
-    public List<AtomLink> links = new ArrayList<AtomLink>();
+ 
+    public List<AtomLink> links = new ArrayList<>();
 
     /**
      * Returns a list of {@link AtomLink}s to enclosed items of the given MIME
@@ -100,7 +96,7 @@ public class AtomEntry {
             if (l.rel.equalsIgnoreCase("enclosure")) {
                 if (type == null || l.type.equalsIgnoreCase(type)) {
                     if (enc == null) {
-                        enc = new ArrayList<AtomLink>();
+                        enc = new ArrayList<>();
                     }
                     enc.add(l);
                 }

data/src/main/java/toxi/data/feeds/AtomFeed.java

@@ -0,0 +1,91 @@
+/*
+ *   __               .__       .__  ._____.           
+ * _/  |_  _______  __|__| ____ |  | |__\_ |__   ______
+ * \   __\/  _ \  \/  /  |/ ___\|  | |  || __ \ /  ___/
+ *  |  | (  <_> >    <|  \  \___|  |_|  || \_\ \\___ \ 
+ *  |__|  \____/__/\_ \__|\___  >____/__||___  /____  >
+ *                   \/       \/             \/     \/ 
+ *
+ * Copyright (c) 2006-2011 Karsten Schmidt
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ * 
+ * This library 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package toxi.data.feeds;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+
+/**
+ *
+ * @author tux
+ */
+
+public class AtomFeed implements Iterable<AtomEntry> {
+
+    /**
+     *
+     */
+    public static final String NS = "http://www.w3.org/2005/Atom";
+
+    /**
+     *
+     * @param stream
+     * @return
+     */
+
+
+    public String id,
+
+    /**
+     *
+     */
+
+    /**
+     *
+     */
+    title;
+
+    /**
+     *
+     */
+  
+    public XMLGregorianCalendar lastUpdated;
+
+    /**
+     *
+     */
+    public ArrayList<AtomLink> links = new ArrayList<>();
+
+    /**
+     *
+     */
+
+    public ArrayList<AtomEntry> entries = new ArrayList<>();
+
+    /**
+     *
+     * @return
+     */
+    @Override
+    public Iterator<AtomEntry> iterator() {
+        return entries.iterator();
+    }
+}

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

@@ -27,7 +27,7 @@
 
 package toxi.data.feeds;
 
-import javax.xml.bind.annotation.XmlAttribute;
+
 
 /**
  *
@@ -35,7 +35,7 @@ import javax.xml.bind.annotation.XmlAttribute;
  */
 public class AtomLink {
 
-    @XmlAttribute
+  
     public String type,
 
     /**
@@ -56,6 +56,7 @@ public class AtomLink {
      *
      * @return
      */
+    @Override
     public String toString() {
         return href + " (" + type + ")";
     }

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

@@ -29,8 +29,7 @@ package toxi.data.feeds;
 
 import java.util.ArrayList;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import toxi.data.feeds.util.Rfc822DateAdapter;
@@ -44,35 +43,35 @@ public class RSSChannel {
     /**
      *
      */
-    @XmlElement
+    
     public String title;
 
     /**
      *
      */
-    @XmlElement
+    
     public String link;
 
     /**
      *
      */
-    @XmlElement
+    
     public String description;
 
     /**
      *
      */
-    @XmlElement
+    
     public String language;
 
     /**
      *
      */
-    @XmlElement
+    
     public String generator;
 
-    @XmlElement
-    @XmlJavaTypeAdapter(Rfc822DateAdapter.class)
+    
+
     public XMLGregorianCalendar pubDate,
 
     /**
@@ -83,6 +82,6 @@ public class RSSChannel {
     /**
      *
      */
-    @XmlElement(name = "item")
-    public ArrayList<RSSItem> items = new ArrayList<RSSItem>();
+   
+    public ArrayList<RSSItem> items = new ArrayList<>();
 }

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

@@ -27,7 +27,7 @@
 
 package toxi.data.feeds;
 
-import javax.xml.bind.annotation.XmlAttribute;
+
 
 /**
  *
@@ -35,7 +35,7 @@ import javax.xml.bind.annotation.XmlAttribute;
  */
 public class RSSEnclosure {
 
-    @XmlAttribute
+
     public String url,
 
     /**
@@ -46,7 +46,7 @@ public class RSSEnclosure {
     /**
      *
      */
-    @XmlAttribute
+  
     public int length;
 
     /**