Move class LabelImageUtils and LabelImageUtilsTest to package org.mastodon.mamut.util

Author: Stefan Hahmann

src/main/java/org/mastodon/mamut/io/importer/labelimage/ui/ImportSpotsFromBdvChannelView.java

@@ -30,7 +30,7 @@
 
 import bdv.viewer.SourceAndConverter;
 import org.mastodon.mamut.ProjectModel;
-import org.mastodon.mamut.io.importer.labelimage.LabelImageUtils;
+import org.mastodon.mamut.util.LabelImageUtils;
 import org.scijava.ItemVisibility;
 import org.scijava.command.Command;
 import org.scijava.command.DynamicCommand;

src/main/java/org/mastodon/mamut/io/importer/labelimage/ui/ImportSpotsFromImgPlusView.java

@@ -30,7 +30,7 @@
 
 import net.imagej.ImgPlus;
 import org.mastodon.mamut.ProjectModel;
-import org.mastodon.mamut.io.importer.labelimage.LabelImageUtils;
+import org.mastodon.mamut.util.LabelImageUtils;
 import org.scijava.ItemIO;
 import org.scijava.ItemVisibility;
 import org.scijava.command.Command;

…importer/labelimage/LabelImageUtils.java …mastodon/mamut/util/LabelImageUtils.javasrc/main/java/org/mastodon/mamut/io/importer/labelimage/LabelImageUtils.java renamed to src/main/java/org/mastodon/mamut/util/LabelImageUtils.java src/main/java/org/mastodon/mamut/io/importer/labelimage/LabelImageUtils.java renamed to src/main/java/org/mastodon/mamut/util/LabelImageUtils.java

@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package org.mastodon.mamut.io.importer.labelimage;
+package org.mastodon.mamut.util;
 
 import bdv.viewer.Source;
 import bdv.viewer.SourceAndConverter;
@@ -48,7 +48,6 @@
 import org.mastodon.mamut.model.Model;
 import org.mastodon.mamut.model.ModelGraph;
 import org.mastodon.mamut.model.Spot;
-import org.mastodon.mamut.util.LineageTreeUtils;
 import org.mastodon.views.bdv.SharedBigDataViewerData;
 import org.scijava.app.StatusService;
 import org.slf4j.Logger;

src/test/java/org/mastodon/mamut/io/importer/labelimage/util/ComputeMeanAndVarianceDemo.java

@@ -38,7 +38,7 @@
 import net.imglib2.util.Pair;
 import net.imglib2.util.StopWatch;
 import org.mastodon.mamut.ProjectModel;
-import org.mastodon.mamut.io.importer.labelimage.LabelImageUtils;
+import org.mastodon.mamut.util.LabelImageUtils;
 import org.mastodon.mamut.model.Model;
 import org.scijava.Context;
 

src/test/java/org/mastodon/mamut/io/importer/labelimage/util/DemoUtils.java

@@ -45,7 +45,7 @@
 import net.imglib2.view.Views;
 import org.mastodon.mamut.ProjectModel;
 import org.mastodon.mamut.io.ProjectSaver;
-import org.mastodon.mamut.io.importer.labelimage.LabelImageUtils;
+import org.mastodon.mamut.util.LabelImageUtils;
 import org.mastodon.mamut.io.importer.labelimage.math.CovarianceMatrix;
 import org.mastodon.mamut.io.importer.labelimage.math.MeansVector;
 import org.mastodon.mamut.io.project.MamutProject;

src/test/java/org/mastodon/mamut/io/importer/labelimage/util/SmallLabelDemo.java

@@ -34,7 +34,7 @@
 import net.imglib2.img.array.ArrayImgs;
 import net.imglib2.type.numeric.real.FloatType;
 import org.mastodon.mamut.ProjectModel;
-import org.mastodon.mamut.io.importer.labelimage.LabelImageUtils;
+import org.mastodon.mamut.util.LabelImageUtils;
 import org.mastodon.mamut.model.Model;
 import org.scijava.Context;
 

…rter/labelimage/LabelImageUtilsTest.java …odon/mamut/util/LabelImageUtilsTest.javasrc/test/java/org/mastodon/mamut/io/importer/labelimage/LabelImageUtilsTest.java renamed to src/test/java/org/mastodon/mamut/util/LabelImageUtilsTest.java src/test/java/org/mastodon/mamut/io/importer/labelimage/LabelImageUtilsTest.java renamed to src/test/java/org/mastodon/mamut/util/LabelImageUtilsTest.java

@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package org.mastodon.mamut.io.importer.labelimage;
+package org.mastodon.mamut.util;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;