Skip to content

Commit 49da829

Browse files
gselzerctrueden
gselzer
and
ctrueden
committed
Purge imagej-common dependency
We need to purge imagej-common as a prerequisite to purging scijava-common usage, since imagej-common depends on scijava-common. We were barely using ImgPlus, and are not using Dataset. We *are* using BigComplex and UnboundedIntegerType though, so those have migrated into imagej-ops2 from imagej-common. Ideally, these classes would become part of the imglib2 library layer somewhere, so their presence in imagej-ops2 might be temporary. Co-authored-by: Curtis Rueden <ctrueden@wisc.edu>
1 parent e136721 commit 49da829

File tree

12 files changed

+1470
-152
lines changed

12 files changed

+1470
-152
lines changed

‎imagej/imagej-ops2/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,6 @@
236236

237237
<dependencies>
238238
<!-- ImageJ dependencies -->
239-
<dependency>
240-
<groupId>net.imagej</groupId>
241-
<artifactId>imagej-common</artifactId>
242-
</dependency>
243239
<dependency>
244240
<groupId>net.imagej</groupId>
245241
<artifactId>imagej-mesh</artifactId>

‎imagej/imagej-ops2/src/main/java/module-info.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118

119119
requires java.xml; // TEMP: for org.scijava:scijava-common org.scijava.util.POM
120120
requires java.scripting;
121-
requires net.imagej;
122121
requires net.imagej.mesh;
123122
requires net.imglib2;
124123
requires net.imglib2.algorithm;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import java.util.function.BiFunction;
55
import java.util.function.Function;
66

7-
import net.imagej.ImgPlus;
8-
import net.imagej.ImgPlusMetadata;
97
import net.imglib2.Cursor;
108
import net.imglib2.Dimensions;
119
import net.imglib2.FinalDimensions;
@@ -228,23 +226,6 @@ public class Creators<N extends NativeType<N>, L, I extends IntegerType<I>, T ex
228226
public final BiFunction<Dimensions, I, ImgLabeling<L, I>> imgLabelingFromDimsAndType = (dims,
229227
type) -> imgLabelingFromDimsTypeAndFactory.apply(dims, type, Util.getSuitableImgFactory(dims, type));
230228

231-
/* ImgPlus */
232-
233-
/**
234-
* @input img
235-
* @output imgPlus
236-
* @implNote op names='create, create.imgPlus'
237-
*/
238-
public final Function<Img<T>, ImgPlus<T>> imgPlusFromImg = ImgPlus::new;
239-
240-
/**
241-
* @input img
242-
* @input imgPlugMetadata
243-
* @output imgPlus
244-
* @implNote op names='create, create.imgPlus'
245-
*/
246-
public final BiFunction<Img<T>, ImgPlusMetadata, ImgPlus<T>> imgPlusFromImgAndMetadata = ImgPlus::new;
247-
248229
/* Kernel */
249230

250231
/**

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
package net.imagej.ops2.features.zernike;
3030

31-
import net.imagej.types.BigComplex;
31+
import net.imagej.ops2.util.BigComplex;
3232
import net.imglib2.Cursor;
3333
import net.imglib2.IterableInterval;
3434
import net.imglib2.type.numeric.RealType;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeMoment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
package net.imagej.ops2.features.zernike;
3030

31-
import net.imagej.types.BigComplex;
31+
import net.imagej.ops2.util.BigComplex;
3232

3333
/**
3434
* Class to hold a zernike moment, including its polynom, order, repition and

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
//
3232
//import java.math.BigInteger;
3333
//
34-
//import net.imagej.types.UnboundedIntegerType;
34+
//import net.imagej.ops2.util.UnboundedIntegerType;
3535
//import net.imglib2.IterableInterval;
3636
//import net.imglib2.type.numeric.IntegerType;
3737
//import net.imglib2.type.numeric.RealType;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.math.BigInteger;
44

5-
import net.imagej.types.UnboundedIntegerType;
5+
import net.imagej.ops2.util.UnboundedIntegerType;
66
import net.imglib2.RandomAccessibleInterval;
77
import net.imglib2.loops.LoopBuilder;
88
import net.imglib2.type.numeric.IntegerType;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceUtils.java‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)