Skip to content

Commit 511892c

Browse files
imagejanctrueden
authored andcommitted
Use org.scijava.table instead of net.imagej.table
1 parent d5e1b3c commit 511892c

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

pom.xml

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

1212
<artifactId>batch-processor</artifactId>
13-
<version>0.2.1-SNAPSHOT</version>
13+
<version>0.3.0-SNAPSHOT</version>
1414

1515
<name>Batch Processor</name>
1616
<description>A Batch Processor for SciJava Modules and Scripts</description>
@@ -98,9 +98,8 @@
9898
<artifactId>scijava-common</artifactId>
9999
</dependency>
100100
<dependency>
101-
<!-- TODO: remove this dependency when table support moved to SciJava -->
102-
<groupId>net.imagej</groupId>
103-
<artifactId>imagej-common</artifactId>
101+
<groupId>org.scijava</groupId>
102+
<artifactId>scijava-table</artifactId>
104103
</dependency>
105104
<dependency>
106105
<groupId>org.scijava</groupId>

src/main/java/org/scijava/batch/ModuleBatchProcessor.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
import java.util.concurrent.Future;
3838
import java.util.stream.Collectors;
3939

40-
import net.imagej.table.Column;
41-
import net.imagej.table.DefaultGenericTable;
42-
import net.imagej.table.Table;
43-
4440
import org.scijava.ItemIO;
4541
import org.scijava.command.Command;
4642
import org.scijava.command.DynamicCommand;
@@ -52,7 +48,10 @@
5248
import org.scijava.module.MutableModuleItem;
5349
import org.scijava.plugin.Parameter;
5450
import org.scijava.plugin.Plugin;
55-
import org.scijava.widget.FileWidget;
51+
import org.scijava.table.Column;
52+
import org.scijava.table.DefaultGenericTable;
53+
import org.scijava.table.Table;
54+
//import org.scijava.widget.FileWidget;
5655

5756
@Plugin(type = Command.class, label = "Choose batch processing parameters", initializer = "initInputChoice")
5857
public class ModuleBatchProcessor<T> extends DynamicCommand {

src/test/java/org/scijava/batch/BatchServiceTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
import java.util.List;
4040
import java.util.concurrent.ExecutionException;
4141

42-
import net.imagej.table.Table;
43-
4442
import org.junit.After;
4543
import org.junit.Before;
4644
import org.junit.Test;
@@ -53,6 +51,7 @@
5351
import org.scijava.module.ModuleService;
5452
import org.scijava.script.ScriptInfo;
5553
import org.scijava.service.SciJavaService;
54+
import org.scijava.table.Table;
5655

5756
public class BatchServiceTest {
5857

0 commit comments

Comments
 (0)