Fix references to CavalierContours library.

wrandelshofer · Jun 27, 2023 · d218f8f · d218f8f
1 parent 7c548ed
commit d218f8f
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 60 deletions.
diff --git a/...w8.geom/META-INF/CavalierContours-LICENSE → ...hotdraw8.geom/META-INF/thirdparty-LICENSE b/...w8.geom/META-INF/CavalierContours-LICENSE → ...hotdraw8.geom/META-INF/thirdparty-LICENSE
@@ -1,3 +1,9 @@
+----
+Third party license for
+Cavalier Contours
+https://github.com/jbuckmccready/CavalierContours
+https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE
+
 MIT License
 
 Copyright (c) 2019 Jedidiah Buck McCready

diff --git a/...m/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/CoincidentSlicesResult.java b/...m/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/CoincidentSlicesResult.java
@@ -14,7 +14,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...raw8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/ContourBuilder.java b/...raw8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/ContourBuilder.java
@@ -22,39 +22,14 @@
 import org.jhotdraw8.geom.intersect.IntersectionResultEx;
 
 import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.BiPredicate;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.IntPredicate;
-import java.util.function.Predicate;
+import java.util.*;
+import java.util.function.*;
 
 import static org.jhotdraw8.geom.contour.BulgeConversionFunctions.arcRadiusAndCenter;
-import static org.jhotdraw8.geom.contour.ContourIntersections.allSelfIntersects;
-import static org.jhotdraw8.geom.contour.ContourIntersections.findIntersects;
-import static org.jhotdraw8.geom.contour.ContourIntersections.intrCircle2Circle2;
-import static org.jhotdraw8.geom.contour.ContourIntersections.intrLineSeg2Circle2;
-import static org.jhotdraw8.geom.contour.ContourIntersections.intrLineSeg2LineSeg2;
-import static org.jhotdraw8.geom.contour.ContourIntersections.intrPlineSegs;
-import static org.jhotdraw8.geom.contour.PlineVertex.closestPointOnSeg;
-import static org.jhotdraw8.geom.contour.PlineVertex.createFastApproxBoundingBox;
-import static org.jhotdraw8.geom.contour.PlineVertex.segMidpoint;
-import static org.jhotdraw8.geom.contour.PlineVertex.splitAtPoint;
+import static org.jhotdraw8.geom.contour.ContourIntersections.*;
+import static org.jhotdraw8.geom.contour.PlineVertex.*;
 import static org.jhotdraw8.geom.contour.PolyArcPath.createApproxSpatialIndex;
-import static org.jhotdraw8.geom.contour.Utils.angle;
-import static org.jhotdraw8.geom.contour.Utils.deltaAngle;
-import static org.jhotdraw8.geom.contour.Utils.pointFromParametric;
-import static org.jhotdraw8.geom.contour.Utils.pointWithinArcSweepAngle;
-import static org.jhotdraw8.geom.contour.Utils.realPrecision;
-import static org.jhotdraw8.geom.contour.Utils.sliceJoinThreshold;
-import static org.jhotdraw8.geom.contour.Utils.unitPerp;
+import static org.jhotdraw8.geom.contour.Utils.*;
 
 /**
  * ContourBuilder.
@@ -63,7 +38,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...eom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/ContourIntersections.java b/...eom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/ContourIntersections.java
@@ -17,25 +17,14 @@
 import org.jhotdraw8.geom.AABB;
 import org.jhotdraw8.geom.Points;
 import org.jhotdraw8.geom.Rectangles;
-import org.jhotdraw8.geom.intersect.IntersectCircleCircle;
-import org.jhotdraw8.geom.intersect.IntersectCircleLine;
-import org.jhotdraw8.geom.intersect.IntersectLineLine;
-import org.jhotdraw8.geom.intersect.IntersectionPoint;
-import org.jhotdraw8.geom.intersect.IntersectionPointEx;
-import org.jhotdraw8.geom.intersect.IntersectionResult;
-import org.jhotdraw8.geom.intersect.IntersectionResultEx;
+import org.jhotdraw8.geom.intersect.*;
 
 import java.awt.geom.Point2D;
 import java.util.Deque;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.BiPredicate;
-import java.util.function.DoubleFunction;
-import java.util.function.IntConsumer;
-import java.util.function.IntPredicate;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
+import java.util.function.*;
 
 import static org.jhotdraw8.geom.contour.BulgeConversionFunctions.arcRadiusAndCenter;
 import static org.jhotdraw8.geom.contour.PlineVertex.createFastApproxBoundingBox;
@@ -50,7 +39,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/IntrPlineSegsResult.java b/...geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/IntrPlineSegsResult.java
@@ -14,7 +14,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/OpenPolylineSlice.java b/...8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/OpenPolylineSlice.java
@@ -11,7 +11,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineCoincidentIntersect.java b/...src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineCoincidentIntersect.java
@@ -13,7 +13,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...raw8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineIntersect.java b/...raw8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineIntersect.java
@@ -14,7 +14,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...om/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineIntersectsResult.java b/...om/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineIntersectsResult.java
@@ -14,7 +14,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/....geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineOffsetSegment.java b/....geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineOffsetSegment.java
@@ -14,7 +14,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...w8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineSegIntrType.java b/...w8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineSegIntrType.java
@@ -11,7 +11,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...otdraw8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineVertex.java b/...otdraw8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/PlineVertex.java
@@ -25,10 +25,7 @@
 import static java.lang.Math.max;
 import static java.lang.Math.min;
 import static org.jhotdraw8.geom.contour.BulgeConversionFunctions.arcRadiusAndCenter;
-import static org.jhotdraw8.geom.contour.Utils.angle;
-import static org.jhotdraw8.geom.contour.Utils.closestPointOnLineSeg;
-import static org.jhotdraw8.geom.contour.Utils.pointFromParametric;
-import static org.jhotdraw8.geom.contour.Utils.pointWithinArcSweepAngle;
+import static org.jhotdraw8.geom.contour.Utils.*;
 
 /**
  * PlineVertex.
@@ -37,7 +34,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/...otdraw8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/SplitResult.java b/...otdraw8.geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/SplitResult.java
@@ -11,7 +11,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>

diff --git a/....geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/StaticSpatialIndex.java b/....geom/src/main/java/org.jhotdraw8.geom/org/jhotdraw8/geom/contour/StaticSpatialIndex.java
@@ -19,7 +19,7 @@
  * <p>
  * This code has been derived from CavalierContours.
  * <dl>
- *     <dt>CavalierCoutours. Copyright (c) 2019 Jedidiah Buck McCready.
+ *     <dt>CavalierContours. Copyright (c) 2019 Jedidiah Buck McCready.
  *    <a href="https://github.com/jbuckmccready/CavalierContours/blob/7a35376eb4c2d5f917d3e0564ea630c94137255e/LICENSE">MIT License.</a></dt>
  *     <dd><a href="https://github.com/jbuckmccready/CavalierContours">github.com</a></dd>
  * </dl>