Skip to content

Commit 078f56a

Browse files
gselzerctrueden
gselzer
authored and
ctrueden
committed
Move Hints/OpHints to org.scijava.ops
Since OpEnvironments have Hints, the Hints need to be in the base package.
1 parent d3121a0 commit 078f56a

Some content is hidden

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

47 files changed

+101
-107
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc;
2020
opens org.scijava.ops.log to therapi.runtime.javadoc;
2121
opens org.scijava.ops.copy to therapi.runtime.javadoc;
22-
opens org.scijava.ops.hints to therapi.runtime.javadoc;
22+
opens org.scijava.ops.hint to therapi.runtime.javadoc;
2323
opens org.scijava.ops.adapt.complexLift to therapi.runtime.javadoc;
2424
opens org.scijava.ops.math to therapi.runtime.javadoc;
2525
opens org.scijava.ops.adapt.lift to therapi.runtime.javadoc;
2626
opens org.scijava.ops.create to therapi.runtime.javadoc;
2727
opens org.scijava.ops.impl to therapi.runtime.javadoc, org.scijava;
2828
opens org.scijava.ops.monitor to therapi.runtime.javadoc;
2929
opens org.scijava.ops.provenance to therapi.runtime.javadoc;
30-
opens org.scijava.ops.hints.impl to therapi.runtime.javadoc;
3130
opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc;
3231
opens org.scijava.ops to therapi.runtime.javadoc, org.scijava;
3332
opens org.scijava.ops.util to therapi.runtime.javadoc;

scijava/scijava-ops/src/main/java/org/scijava/ops/hints/BaseOpHints.java renamed to scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scijava.ops.hints;
1+
package org.scijava.ops;
22

33
import java.lang.annotation.Annotation;
44

scijava/scijava-ops/src/main/java/org/scijava/ops/hints/Hints.java renamed to scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
package org.scijava.ops.hints;
2+
package org.scijava.ops;
33

44
import java.util.Deque;
55
import java.util.Map;
66
import java.util.UUID;
77

8-
import org.scijava.ops.hints.BaseOpHints.Simplification;
8+
import org.scijava.ops.BaseOpHints.Simplification;
99
import org.scijava.ops.provenance.OpHistory;
1010

1111
/**

‎scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.scijava.function.Inplaces;
4444
import org.scijava.function.Producer;
4545
import org.scijava.ops.OpEnvironment;
46-
import org.scijava.ops.hints.Hints;
46+
import org.scijava.ops.Hints;
4747
import org.scijava.ops.util.ComputerUtils;
4848
import org.scijava.ops.util.FunctionUtils;
4949
import org.scijava.ops.util.InplaceUtils;

‎scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java‎

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

3232
import java.lang.reflect.Type;
3333

34-
import org.scijava.ops.hints.Hints;
3534
import org.scijava.ops.matcher.OpRef;
3635
import org.scijava.types.Nil;
3736

scijava/scijava-ops/src/main/java/org/scijava/ops/hints/OpHints.java renamed to scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
package org.scijava.ops.hints;
2+
package org.scijava.ops;
33

44
import java.lang.annotation.ElementType;
55
import java.lang.annotation.Retention;

‎scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import java.util.Map;
99

1010
import org.scijava.log.Logger;
11-
import org.scijava.ops.hints.Hints;
12-
import org.scijava.ops.hints.OpHints;
13-
import org.scijava.ops.hints.impl.ImmutableHints;
11+
import org.scijava.ops.hint.ImmutableHints;
1412
import org.scijava.ops.matcher.OpCandidate;
1513
import org.scijava.ops.matcher.OpRef;
1614
import org.scijava.param.ValidityException;

‎scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
package org.scijava.ops.conversionLoss;
33

4-
import org.scijava.ops.hints.BaseOpHints.Simplification;
54
import org.scijava.ops.Op;
6-
import org.scijava.ops.hints.OpHints;
5+
import org.scijava.ops.OpHints;
6+
import org.scijava.ops.BaseOpHints.Simplification;
77
import org.scijava.plugin.Plugin;
88
import org.scijava.types.Nil;
99

‎scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.lang.reflect.Type;
44
import java.util.UUID;
55

6+
import org.scijava.ops.BaseOpHints.DependencyMatching;
7+
import org.scijava.ops.Hints;
68
import org.scijava.ops.OpInfo;
7-
import org.scijava.ops.hints.BaseOpHints.DependencyMatching;
8-
import org.scijava.ops.hints.Hints;
99
import org.scijava.ops.provenance.OpExecutionSummary;
1010
import org.scijava.ops.provenance.OpHistory;
1111
import org.scijava.ops.util.OpWrapper;

‎scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import org.scijava.ops.OpCollection;
44
import org.scijava.ops.OpField;
5-
import org.scijava.ops.hints.OpHints;
6-
import org.scijava.ops.hints.BaseOpHints.Simplification;
5+
import org.scijava.ops.OpHints;
6+
import org.scijava.ops.BaseOpHints.Simplification;
77
import org.scijava.plugin.Plugin;
88

99
@Plugin(type = OpCollection.class)

0 commit comments

Comments
 (0)