Merge pull request #510 from saalfeldlab/fix/1.0.1

refactor,fix: move BundleView to non-overloaded package
saalfeldlab · Oct 18, 2023 · 7b56c09 · 7b56c09
2 parents a39e108 + 6b40984
commit 7b56c09
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 10 deletions.
diff --git a/src/main/java/bdv/fx/viewer/project/VolatileHierarchyProjector.java b/src/main/java/bdv/fx/viewer/project/VolatileHierarchyProjector.java
@@ -44,7 +44,7 @@
 import net.imglib2.type.operators.SetZero;
 import net.imglib2.util.Intervals;
 import net.imglib2.util.StopWatch;
-import net.imglib2.view.BundleView;
+import paintera.net.imglib2.view.BundleView;
 import net.imglib2.view.Views;
 
 import java.util.ArrayList;

diff --git a/src/main/java/bdv/fx/viewer/project/VolatileHierarchyProjectorPreMultiply.java b/src/main/java/bdv/fx/viewer/project/VolatileHierarchyProjectorPreMultiply.java
@@ -9,7 +9,7 @@
 import net.imglib2.parallel.TaskExecutor;
 import net.imglib2.type.numeric.ARGBType;
 import net.imglib2.type.numeric.integer.ByteType;
-import net.imglib2.view.BundleView;
+import paintera.net.imglib2.view.BundleView;
 import net.imglib2.view.Views;
 
 import java.util.List;

diff --git a/src/main/java/org/janelia/saalfeldlab/paintera/data/mask/MaskedSource.java b/src/main/java/org/janelia/saalfeldlab/paintera/data/mask/MaskedSource.java
@@ -86,7 +86,7 @@
 import net.imglib2.util.ConstantUtils;
 import net.imglib2.util.IntervalIndexer;
 import net.imglib2.util.Intervals;
-import net.imglib2.view.BundleView;
+import paintera.net.imglib2.view.BundleView;
 import net.imglib2.view.ExtendedRealRandomAccessibleRealInterval;
 import net.imglib2.view.IntervalView;
 import net.imglib2.view.RealRandomAccessibleTriple;

diff --git a/src/main/java/org/janelia/saalfeldlab/paintera/data/mask/SourceMask.java b/src/main/java/org/janelia/saalfeldlab/paintera/data/mask/SourceMask.java
@@ -8,7 +8,7 @@
 import net.imglib2.type.numeric.IntegerType;
 import net.imglib2.type.numeric.integer.UnsignedLongType;
 import net.imglib2.type.volatiles.VolatileUnsignedLongType;
-import net.imglib2.view.BundleView;
+import paintera.net.imglib2.view.BundleView;
 import net.imglib2.view.IntervalView;
 import net.imglib2.view.Views;
 

diff --git a/src/main/java/org/janelia/saalfeldlab/paintera/meshes/MarchingCubes.java b/src/main/java/org/janelia/saalfeldlab/paintera/meshes/MarchingCubes.java
@@ -8,7 +8,7 @@
 import net.imglib2.loops.LoopBuilder;
 import net.imglib2.type.BooleanType;
 import net.imglib2.util.Intervals;
-import net.imglib2.view.BundleView;
+import paintera.net.imglib2.view.BundleView;
 import net.imglib2.view.IntervalView;
 import net.imglib2.view.Views;
 import org.slf4j.Logger;

diff --git a/...ain/java/net/imglib2/view/BundleView.java → ...paintera/net/imglib2/view/BundleView.java b/...ain/java/net/imglib2/view/BundleView.java → ...paintera/net/imglib2/view/BundleView.java
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imglib2.view;
+package paintera.net.imglib2.view;
 
 import net.imglib2.Interval;
 import net.imglib2.RandomAccess;
@@ -51,6 +51,11 @@
  * {@link RandomAccess RandomAccess&lt;RandomAccess&lt;T&gt;&gt;} will preserve
  * this relative offset while absolute positioning will reset it, so, you can
  * do that, but you should know why :).</p>
+ * <p>
+ * NOTE: Copied from imglib2 to expose as public while
+ * <a href="https://github.com/imglib/imglib2/issues/351">Imglib2 Issue #351</a>
+ * is being resolved.
+ * </p>
  *
  * @param <T>
  * @author Stephan Saalfeld &lt;[email protected]&gt;

diff --git a/src/main/kotlin/org/janelia/saalfeldlab/paintera/control/actions/paint/SmoothAction.kt b/src/main/kotlin/org/janelia/saalfeldlab/paintera/control/actions/paint/SmoothAction.kt
@@ -40,7 +40,7 @@ import net.imglib2.realtransform.AffineTransform3D
 import net.imglib2.type.numeric.integer.UnsignedLongType
 import net.imglib2.type.numeric.real.DoubleType
 import net.imglib2.util.Intervals
-import net.imglib2.view.BundleView
+import paintera.net.imglib2.view.BundleView
 import org.janelia.saalfeldlab.fx.Tasks
 import org.janelia.saalfeldlab.fx.UtilityTask
 import org.janelia.saalfeldlab.fx.actions.Action

diff --git a/src/main/kotlin/org/janelia/saalfeldlab/paintera/control/paint/ViewerMask.kt b/src/main/kotlin/org/janelia/saalfeldlab/paintera/control/paint/ViewerMask.kt
@@ -17,7 +17,7 @@ import net.imglib2.type.numeric.integer.UnsignedLongType
 import net.imglib2.type.volatiles.VolatileUnsignedLongType
 import net.imglib2.util.Intervals
 import net.imglib2.util.LinAlgHelpers
-import net.imglib2.view.BundleView
+import paintera.net.imglib2.view.BundleView
 import net.imglib2.view.Views
 import org.janelia.saalfeldlab.fx.extensions.component1
 import org.janelia.saalfeldlab.fx.extensions.component2

diff --git a/src/main/kotlin/org/janelia/saalfeldlab/paintera/control/tools/paint/SamTool.kt b/src/main/kotlin/org/janelia/saalfeldlab/paintera/control/tools/paint/SamTool.kt
@@ -46,7 +46,7 @@ import net.imglib2.type.numeric.integer.UnsignedLongType
 import net.imglib2.type.numeric.real.FloatType
 import net.imglib2.type.volatiles.VolatileUnsignedLongType
 import net.imglib2.util.Intervals
-import net.imglib2.view.BundleView
+import paintera.net.imglib2.view.BundleView
 import net.imglib2.view.Views
 import org.apache.http.HttpException
 import org.apache.http.client.methods.HttpPost

diff --git a/src/test/java/org/janelia/saalfeldlab/paintera/PainteraBaseViewTest.java b/src/test/java/org/janelia/saalfeldlab/paintera/PainteraBaseViewTest.java
@@ -15,7 +15,7 @@
 import net.imglib2.type.numeric.integer.UnsignedLongType;
 import net.imglib2.util.Intervals;
 import net.imglib2.util.LinAlgHelpers;
-import net.imglib2.view.BundleView;
+import paintera.net.imglib2.view.BundleView;
 import net.imglib2.view.IntervalView;
 import net.imglib2.view.Views;
 import org.janelia.saalfeldlab.fx.util.InvokeOnJavaFXApplicationThread;