Skip to content

Commit 82dafab

Browse files
gselzerhinerm
gselzer
authored and
hinerm
committed
Expose hints package
This allows users to access Hints. This commit also adds a hints.impl package to prevent the exposure of the implementations
1 parent a09a20f commit 82dafab

12 files changed

Lines changed: 29 additions & 17 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
exports org.scijava.ops.function; // contains functional inferfaces
66
exports org.scijava.ops.core; // contains OpCollection, Op interfaces
77
exports org.scijava.ops.core.builder; // contains OpBuilder classes
8+
exports org.scijava.ops.hints;
89
exports org.scijava.ops.matcher;
910
exports org.scijava.ops.simplify;
1011
exports org.scijava.ops.conversionLoss;

‎scijava/scijava-ops/src/main/java/org/scijava/ops/hints/Hints.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33

44
import java.util.Map;
55

6+
/**
7+
* A basic interface for storing and accessing Hints.
8+
*
9+
* @author Gabriel Selzer
10+
*/
611
public interface Hints {
712

813
public String setHint(String hint);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
package org.scijava.ops.hints;
1+
package org.scijava.ops.hints.impl;
22

33
import java.util.HashMap;
44
import java.util.Map;
55
import java.util.NoSuchElementException;
66

7+
import org.scijava.ops.hints.Hints;
8+
79
/**
810
* Default Implementation of
911
* @author G

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

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

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

44
import java.util.HashMap;
55
import java.util.Map;
66

7-
import org.scijava.ops.hints.DefaultOpHints.Adaptation;
7+
import org.scijava.ops.hints.Hints;
8+
import org.scijava.ops.hints.impl.DefaultOpHints.Adaptation;
89

910
/**
1011
* A set of {@link Hints} governing Adaptation procedures.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package org.scijava.ops.hints;
1+
package org.scijava.ops.hints.impl;
22

33
import java.util.HashMap;
44
import java.util.Map;
55

6-
import org.scijava.ops.hints.DefaultOpHints.Adaptation;
7-
import org.scijava.ops.hints.DefaultOpHints.Simplification;
6+
import org.scijava.ops.hints.Hints;
7+
import org.scijava.ops.hints.impl.DefaultOpHints.Adaptation;
8+
import org.scijava.ops.hints.impl.DefaultOpHints.Simplification;
89

910
/**
1011
* Default Implementation of

scijava/scijava-ops/src/main/java/org/scijava/ops/hints/DefaultOpHints.java renamed to scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/DefaultOpHints.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.hints.impl;
22

33
import java.lang.annotation.Annotation;
44

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

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

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

44
import java.util.HashMap;
55
import java.util.Map;
66

7-
import org.scijava.ops.hints.DefaultOpHints.Simplification;
7+
import org.scijava.ops.hints.Hints;
8+
import org.scijava.ops.hints.impl.DefaultOpHints.Simplification;
89

910
public class SimplificationHints extends AbstractHints {
1011

‎scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
import org.scijava.ops.core.OpCollection;
6767
import org.scijava.ops.function.Computers;
6868
import org.scijava.ops.function.Computers.Arity1;
69-
import org.scijava.ops.hints.DefaultOpHints.Adaptation;
70-
import org.scijava.ops.hints.DefaultOpHints.Simplification;
71-
import org.scijava.ops.hints.AdaptationHints;
72-
import org.scijava.ops.hints.DefaultHints;
7369
import org.scijava.ops.hints.Hints;
70+
import org.scijava.ops.hints.impl.AdaptationHints;
71+
import org.scijava.ops.hints.impl.DefaultHints;
72+
import org.scijava.ops.hints.impl.DefaultOpHints.Adaptation;
73+
import org.scijava.ops.hints.impl.DefaultOpHints.Simplification;
7474
import org.scijava.ops.matcher.DefaultOpMatcher;
7575
import org.scijava.ops.matcher.MatchingResult;
7676
import org.scijava.ops.matcher.DependencyMatchingException;

‎scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
import org.scijava.ops.OpEnvironment;
4646
import org.scijava.ops.OpInfo;
4747
import org.scijava.ops.OpUtils;
48-
import org.scijava.ops.hints.DefaultHints;
4948
import org.scijava.ops.hints.Hints;
49+
import org.scijava.ops.hints.impl.DefaultHints;
5050
import org.scijava.ops.matcher.OpCandidate.StatusCode;
5151
import org.scijava.service.AbstractService;
5252
import org.scijava.struct.Member;

‎scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.scijava.ops.OpDependencyMember;
1010
import org.scijava.ops.OpInfo;
1111
import org.scijava.ops.OpUtils;
12-
import org.scijava.ops.hints.DefaultOpHints.Adaptation;
12+
import org.scijava.ops.hints.impl.DefaultOpHints.Adaptation;
1313
import org.scijava.param.ParameterStructs;
1414
import org.scijava.param.ValidityException;
1515
import org.scijava.struct.Struct;

0 commit comments

Comments
 (0)