Skip to content

Commit e1acdd9

Browse files
committed
scijava-types: use org.scijava.priority.Priority
We have this lightweight module specifically to unify these constants... let's use it.
1 parent 2cf57a5 commit e1acdd9

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎scijava/scijava-types/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@
107107
<artifactId>scijava-log2</artifactId>
108108
<version>${project.version}</version>
109109
</dependency>
110+
<dependency>
111+
<groupId>org.scijava</groupId>
112+
<artifactId>scijava-priority</artifactId>
113+
<version>${project.version}</version>
114+
</dependency>
110115

111116
<!-- Third-party dependencies -->
112117
<dependency>

‎scijava/scijava-types/src/main/java/module-info.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
requires transitive org.scijava.common3;
1111
requires transitive org.scijava.discovery;
1212
requires transitive org.scijava.log2;
13+
requires org.scijava.priority;
1314

1415
uses org.scijava.types.TypeExtractor;
1516

‎scijava/scijava-types/src/main/java/org/scijava/types/extractors/IterableTypeExtractor.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.Iterator;
3434
import java.util.stream.StreamSupport;
3535

36+
import org.scijava.priority.Priority;
3637
import org.scijava.types.TypeExtractor;
3738
import org.scijava.types.TypeReifier;
3839
import org.scijava.types.Types;
@@ -74,12 +75,9 @@ public Class<Iterable<?>> getRawType() {
7475
return (Class) Iterable.class;
7576
}
7677

77-
/**
78-
* Corresponds to org.scijava.Priority.LOW_PRIORITY
79-
*/
8078
@Override
8179
public double priority() {
82-
return -100;
80+
return Priority.LOW;
8381
}
8482

8583
}

‎scijava/scijava-types/src/main/java/org/scijava/types/extractors/MapTypeExtractor.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.Map;
3434
import java.util.Map.Entry;
3535

36+
import org.scijava.priority.Priority;
3637
import org.scijava.types.TypeExtractor;
3738
import org.scijava.types.TypeReifier;
3839

@@ -67,12 +68,9 @@ public Type reify(final TypeReifier t, final Map<?, ?> o, final int n) {
6768
return (Class) Map.class;
6869
}
6970

70-
/**
71-
* Corresponds to org.scijava.Priority.LOW_PRIORITY
72-
*/
7371
@Override
7472
public double priority() {
75-
return -100;
73+
return Priority.LOW;
7674
}
7775

7876
}

0 commit comments

Comments
 (0)