Skip to content

Commit 3e2526f

Browse files
ctruedenctrueden
committed
Unify package prefix to net.imglib2.imagej
In preparation for JPMS modularization.
1 parent b283017 commit 3e2526f

File tree

57 files changed

+115
-129
lines changed

Some content is hidden

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

57 files changed

+115
-129
lines changed

‎.github/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
2+
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh
33
sh ci-build.sh

‎.github/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh
2+
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh
33
sh ci-setup-github-actions.sh

‎.github/workflows/build-pr.yml

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

‎.github/workflows/build-main.yml renamed to ‎.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ name: build
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
tags:
88
- "*-[0-9]+.*"
9+
pull_request:
10+
branches:
11+
- main
912

1013
jobs:
1114
build:
@@ -28,5 +31,6 @@ jobs:
2831
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
2932
MAVEN_USER: ${{ secrets.MAVEN_USER }}
3033
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
34+
OSSRH_USER: ${{ secrets.OSSRH_USER }}
3135
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
3236
SIGNING_ASC: ${{ secrets.SIGNING_ASC }}

‎README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
[![](https://github.com/imglib/imglib2-ij/actions/workflows/build-main.yml/badge.svg)](https://github.com/imglib/imglib2-ij/actions/workflows/build-main.yml)
1+
[![Build Status](https://github.com/imglib/imglib2-imagej/actions/workflows/build.yml/badge.svg)](https://github.com/imglib/imglib2-imagej/actions/workflows/build.yml)
22

3+
## imglib2-imagej
4+
5+
This library provides conversion and wrapping between
6+
ImgLib2 data structures and ImageJ's `ImagePlus` and friends.
7+
8+
It supersedes the previous library,
9+
[imglib2-ij](https://github.com/imglib2/imglib2-ij),
10+
unifying the package prefix to `net.imglib2.imagej`.

‎pom.xml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>38.0.1</version>
8+
<version>40.0.0</version>
99
<relativePath />
1010
</parent>
1111

1212
<groupId>net.imglib2</groupId>
13-
<artifactId>imglib2-ij</artifactId>
14-
<version>2.0.4-SNAPSHOT</version>
13+
<artifactId>imglib2-imagej</artifactId>
14+
<version>1.0.0-SNAPSHOT</version>
1515

1616
<name>ImgLib2 ImageJ</name>
1717
<description>ImgLib2 display logic using ImageJ.</description>
18-
<url>https://github.com/imglib/imglib2-ij</url>
19-
<inceptionYear>2009</inceptionYear>
18+
<url>https://github.com/imglib/imglib2-imagej</url>
19+
<inceptionYear>2025</inceptionYear>
2020
<organization>
2121
<name>ImgLib2</name>
2222
<url>http://imglib2.net/</url>
@@ -32,7 +32,7 @@
3232
<developer>
3333
<id>tpietzsch</id>
3434
<name>Tobias Pietzsch</name>
35-
<url>https://imagej.net/User:Pietzsch</url>
35+
<url>https://imagej.net/people/tpietzsch</url>
3636
<roles>
3737
<role>lead</role>
3838
<role>developer</role>
@@ -45,7 +45,7 @@
4545
<developer>
4646
<id>StephanPreibisch</id>
4747
<name>Stephan Preibisch</name>
48-
<url>https://imagej.net/User:StephanP</url>
48+
<url>https://imagej.net/people/StephanPreibisch</url>
4949
<roles>
5050
<role>founder</role>
5151
<role>lead</role>
@@ -59,7 +59,7 @@
5959
<developer>
6060
<id>axtimwalde</id>
6161
<name>Stephan Saalfeld</name>
62-
<url>https://imagej.net/User:Saalfeld</url>
62+
<url>https://imagej.net/people/axtimwalde</url>
6363
<roles>
6464
<role>founder</role>
6565
<role>lead</role>
@@ -73,7 +73,7 @@
7373
<developer>
7474
<id>ctrueden</id>
7575
<name>Curtis Rueden</name>
76-
<url>https://imagej.net/User:Rueden</url>
76+
<url>https://imagej.net/people/ctrueden</url>
7777
<roles>
7878
<role>maintainer</role>
7979
</roles>
@@ -130,22 +130,22 @@
130130
</mailingLists>
131131

132132
<scm>
133-
<connection>scm:git:https://github.com/imglib/imglib2-ij</connection>
134-
<developerConnection>scm:git:[email protected]:imglib/imglib2-ij</developerConnection>
133+
<connection>scm:git:https://github.com/imglib/imglib2-imagej</connection>
134+
<developerConnection>scm:git:[email protected]:imglib/imglib2-imagej</developerConnection>
135135
<tag>HEAD</tag>
136-
<url>https://github.com/imglib/imglib2-ij</url>
136+
<url>https://github.com/imglib/imglib2-imagej</url>
137137
</scm>
138138
<issueManagement>
139139
<system>GitHub</system>
140-
<url>https://github.com/imglib/imglib2-ij/issues</url>
140+
<url>https://github.com/imglib/imglib2-imagej/issues</url>
141141
</issueManagement>
142142
<ciManagement>
143143
<system>GitHub Actions</system>
144-
<url>https://github.com/imglib/imglib2-ij/actions</url>
144+
<url>https://github.com/imglib/imglib2-imagej/actions</url>
145145
</ciManagement>
146146

147147
<properties>
148-
<package-name>net.imglib2.img</package-name>
148+
<package-name>net.imglib2.imagej</package-name>
149149

150150
<license.licenseName>bsd_2</license.licenseName>
151151
<license.projectName>ImgLib2: a general-purpose, multidimensional image processing library.</license.projectName>
@@ -159,9 +159,6 @@ Jean-Yves Tinevez and Michael Zinsmaier.</license.copyrightOwners>
159159

160160
<!-- NB: Deploy releases to the SciJava Maven repository. -->
161161
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
162-
163-
<imglib2.version>7.1.1</imglib2.version>
164-
<imglib2-cache.version>1.0.0-beta-18</imglib2-cache.version>
165162
</properties>
166163

167164
<repositories>

‎src/main/java/net/imglib2/img/display/imagej/ImageJFunctions.java renamed to ‎src/main/java/net/imglib2/imagej/ImageJFunctions.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* #L%
3333
*/
3434

35-
package net.imglib2.img.display.imagej;
35+
package net.imglib2.imagej;
3636

3737
import java.util.concurrent.ExecutorService;
3838
import java.util.concurrent.atomic.AtomicInteger;
@@ -44,7 +44,13 @@
4444
import net.imglib2.converter.Converter;
4545
import net.imglib2.converter.Converters;
4646
import net.imglib2.converter.RealUnsignedByteConverter;
47-
import net.imglib2.img.ImagePlusAdapter;
47+
import net.imglib2.imagej.display.CalibrationUtils;
48+
import net.imglib2.imagej.display.ImageJVirtualStack;
49+
import net.imglib2.imagej.display.ImageJVirtualStackARGB;
50+
import net.imglib2.imagej.display.ImageJVirtualStackFloat;
51+
import net.imglib2.imagej.display.ImageJVirtualStackUnsignedByte;
52+
import net.imglib2.imagej.display.ImageJVirtualStackUnsignedShort;
53+
import net.imglib2.imagej.imageplus.ImagePlusAdapter;
4854
import net.imglib2.img.Img;
4955
import net.imglib2.type.NativeType;
5056
import net.imglib2.type.logic.BitType;

‎src/main/java/net/imglib2/img/display/imagej/AbstractVirtualStack.java renamed to ‎src/main/java/net/imglib2/imagej/display/AbstractVirtualStack.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* #L%
3333
*/
3434

35-
package net.imglib2.img.display.imagej;
35+
package net.imglib2.imagej.display;
3636

3737
import java.awt.Rectangle;
3838
import java.awt.image.ColorModel;

‎src/main/java/net/imglib2/img/display/imagej/ArrayImgToVirtualStack.java renamed to ‎src/main/java/net/imglib2/imagej/display/ArrayImgToVirtualStack.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* #L%
3333
*/
3434

35-
package net.imglib2.img.display.imagej;
35+
package net.imglib2.imagej.display;
3636

3737
import java.util.List;
3838
import java.util.stream.Collectors;

‎src/main/java/net/imglib2/img/display/imagej/CalibrationUtils.java renamed to ‎src/main/java/net/imglib2/imagej/display/CalibrationUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* POSSIBILITY OF SUCH DAMAGE.
3232
* #L%
3333
*/
34-
package net.imglib2.img.display.imagej;
34+
package net.imglib2.imagej.display;
3535

3636
import java.util.ArrayList;
3737
import java.util.List;

0 commit comments

Comments
 (0)