Repository: commons-math Updated Branches: refs/heads/master 046e3a2f5 -> 0802df0f7
Reactivated method commented out during development. The method has been deprecated and replaced by a new method. It is not used at all in the library, but is public so should be preserved. Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/0802df0f Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/0802df0f Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/0802df0f Branch: refs/heads/master Commit: 0802df0f7376ca7aaffa7a23b2cc1f2c4c0c8aa9 Parents: 046e3a2 Author: Luc Maisonobe <l...@apache.org> Authored: Sun Nov 23 21:51:10 2014 +0100 Committer: Luc Maisonobe <l...@apache.org> Committed: Sun Nov 23 21:51:10 2014 +0100 ---------------------------------------------------------------------- .../math3/geometry/partitioning/BSPTree.java | 42 ++++++++++---------- 1 file changed, 22 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/0802df0f/src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTree.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTree.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTree.java index b059904..26ae45f 100644 --- a/src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTree.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTree.java @@ -19,7 +19,9 @@ package org.apache.commons.math3.geometry.partitioning; import java.util.ArrayList; import java.util.List; +import org.apache.commons.math3.exception.MathIllegalStateException; import org.apache.commons.math3.exception.MathInternalError; +import org.apache.commons.math3.exception.util.LocalizedFormats; import org.apache.commons.math3.geometry.Point; import org.apache.commons.math3.geometry.Space; import org.apache.commons.math3.geometry.Vector; @@ -631,26 +633,26 @@ public class BSPTree<S extends Space> { } -// /** Insert the instance into another tree. -// * <p>The instance itself is modified so its former parent should -// * not be used anymore.</p> -// * @param parentTree parent tree to connect to (may be null) -// * @param isPlusChild if true and if parentTree is not null, the -// * resulting tree should be the plus child of its parent, ignored if -// * parentTree is null -// * @see LeafMerger -// * @deprecated as of 3.4, replaced with {@link #insertInTree(BSPTree, boolean, VanishingCutHandler)} -// */ -// @Deprecated -// public void insertInTree(final BSPTree<S> parentTree, final boolean isPlusChild) { -// insertInTree(parentTree, isPlusChild, new VanishingCutHandler<S>() { -// /** {@inheritDoc} */ -// public BSPTree<S> fixNode(BSPTree<S> node) { -// // the cut should not be null -// throw new MathIllegalStateException(LocalizedFormats.NULL_NOT_ALLOWED); -// } -// }); -// } + /** Insert the instance into another tree. + * <p>The instance itself is modified so its former parent should + * not be used anymore.</p> + * @param parentTree parent tree to connect to (may be null) + * @param isPlusChild if true and if parentTree is not null, the + * resulting tree should be the plus child of its parent, ignored if + * parentTree is null + * @see LeafMerger + * @deprecated as of 3.4, replaced with {@link #insertInTree(BSPTree, boolean, VanishingCutHandler)} + */ + @Deprecated + public void insertInTree(final BSPTree<S> parentTree, final boolean isPlusChild) { + insertInTree(parentTree, isPlusChild, new VanishingCutHandler<S>() { + /** {@inheritDoc} */ + public BSPTree<S> fixNode(BSPTree<S> node) { + // the cut should not be null + throw new MathIllegalStateException(LocalizedFormats.NULL_NOT_ALLOWED); + } + }); + } /** Insert the instance into another tree. * <p>The instance itself is modified so its former parent should
