Skip to content

Commit 2f0fa65

Browse files
gselzergselzer
committed
Remove remaining imagej references
1 parent a681d1e commit 2f0fa65

File tree

56 files changed

+179
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+179
-131
lines changed

‎bin/generate-meta-inf.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ format_inner_class () {
1313
}
1414

1515
# Ensure running in basedir
16-
if [[ ! -d "scijava" || ! -d "imagej" ]];
16+
dir=${PWD##*/} # Credit: https://stackoverflow.com/a/1371283
17+
if [[ "$dir" != "incubator" ]]
1718
then
18-
echo "SciJava and/or ImageJ directories not found. Please run this script from the incubator base directory."
19+
echo "Please run this script from the incubator base directory."
1920
exit 0
2021
fi
2122

‎scijava-ops-image/src/main/java/org/scijava/ops/image/About.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ private static String about(final Class<?> c, final String groupId,
6666
}
6767

6868
public static void main(String... args) {
69-
System.out.println(about(About.class, "net.imagej", "imagej-ops2"));
69+
System.out.println(about(About.class, "org.scijava", "scijava-ops-image"));
7070
}
7171
}

‎scijava-ops-image/src/test/java/org/scijava/ops/image/AbstractFeatureTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
public class AbstractFeatureTest extends AbstractOpTest {
7777

7878
protected static final boolean expensiveTestsEnabled =
79-
"enabled".equals(System.getProperty("imagej.ops.expensive.tests"));
79+
"enabled".equals(System.getProperty("scijava.ops.image.expensive.tests"));
8080

8181
/**
8282
* Really small number, used for assertEquals with floating or double values.

‎scijava-ops-image/src/test/java/org/scijava/ops/image/adapt/LiftFunctionsToImgTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.function.Function;
44

55
import org.scijava.ops.image.AbstractOpTest;
6-
import org.scijava.ops.image.TestImgGeneration;
6+
import org.scijava.ops.image.util.TestImgGeneration;
77
import net.imglib2.Cursor;
88
import net.imglib2.RandomAccess;
99
import net.imglib2.img.Img;

‎scijava-ops-image/src/test/java/org/scijava/ops/image/coloc/icq/LiICQTest.java‎

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

3737
import org.scijava.ops.image.AbstractColocalisationTest;
3838
import org.scijava.ops.image.coloc.pValue.PValueResult;
39-
import org.scijava.ops.image.TestImgGeneration;
39+
import org.scijava.ops.image.util.TestImgGeneration;
4040
import net.imglib2.RandomAccessibleInterval;
4141
import net.imglib2.img.Img;
4242
import net.imglib2.type.numeric.integer.ByteType;

‎scijava-ops-image/src/test/java/org/scijava/ops/image/create/CreateKernelDiffractionTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ public void testKernelDiffraction2D() {
117117
* <p>
118118
* It is worth noting that results are only comparable between the two when
119119
* using a particle position relative to the coverslip of 0. This is because
120-
* imagej-ops automatically crops and centers kernels produced by the Fast
121-
* Gibson-Lanni implementation in {@link DefaultCreateKernelGibsonLanni} while
122-
* the Gibson &amp; Lanni kernels produced by PSFGenerator are not. See this
123-
* github issue
124-
* <a href="https://github.com/imagej/imagej-ops/issues/550">thread</a> for more
125-
* details.
120+
* scijava-ops-image automatically crops and centers kernels produced by the
121+
* Fast Gibson-Lanni implementation in {@link DefaultCreateKernelGibsonLanni}
122+
* while the Gibson &amp; Lanni kernels produced by PSFGenerator are not.
123+
* See this github issue
124+
* <a href="https://github.com/imagej/imagej-ops/issues/550">thread</a> for
125+
* more details.
126126
* </p>
127127
* <p>
128128
* It is also worth noting that when using a particle position of 0, the model

‎scijava-ops-image/src/test/java/org/scijava/ops/image/filter/FFTTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333

3434
import org.scijava.ops.image.AbstractOpTest;
35-
import org.scijava.ops.image.TestImgGeneration;
35+
import org.scijava.ops.image.util.TestImgGeneration;
3636
import net.imglib2.Cursor;
3737
import net.imglib2.FinalDimensions;
3838
import net.imglib2.IterableInterval;
@@ -56,7 +56,7 @@
5656
*/
5757
public class FFTTest extends AbstractOpTest {
5858

59-
private final boolean expensiveTestsEnabled = "enabled".equals(System.getProperty("imagej.ops.expensive.tests"));
59+
private final boolean expensiveTestsEnabled = "enabled".equals(System.getProperty("scijava.ops.image.expensive.tests"));
6060

6161
/**
6262
* test that a forward transform followed by an inverse transform gives us back

‎scijava-ops-image/src/test/java/org/scijava/ops/image/filter/NonLinearFiltersTest.java‎

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

3737
import org.scijava.ops.image.AbstractOpTest;
3838
import org.scijava.ops.image.filter.sigma.DefaultSigmaFilter;
39-
import org.scijava.ops.image.TestImgGeneration;
39+
import org.scijava.ops.image.util.TestImgGeneration;
4040
import net.imglib2.algorithm.neighborhood.Neighborhood;
4141
import net.imglib2.algorithm.neighborhood.RectangleShape;
4242
import net.imglib2.algorithm.neighborhood.RectangleShape.NeighborhoodsIterableInterval;

‎scijava-ops-image/src/test/java/org/scijava/ops/image/filter/bilateral/DefaultBilateralTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import static org.junit.jupiter.api.Assertions.assertEquals;
3232

3333
import org.scijava.ops.image.AbstractOpTest;
34-
import org.scijava.ops.image.TestImgGeneration;
34+
import org.scijava.ops.image.util.TestImgGeneration;
3535
import net.imglib2.Cursor;
3636
import net.imglib2.img.Img;
3737
import net.imglib2.img.array.ArrayImgs;

‎scijava-ops-image/src/test/java/org/scijava/ops/image/filter/derivative/PartialDerivativeFilterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import static org.junit.jupiter.api.Assertions.assertEquals;
3232

3333
import org.scijava.ops.image.AbstractOpTest;
34-
import org.scijava.ops.image.TestImgGeneration;
34+
import org.scijava.ops.image.util.TestImgGeneration;
3535
import net.imglib2.Cursor;
3636
import net.imglib2.RandomAccess;
3737
import net.imglib2.RandomAccessibleInterval;

0 commit comments

Comments
 (0)