Skip to content

Commit 436fa5a

Browse files
committed
Clean up usage of infoChain
Because we have an InfoTree, infoChain is wrong
1 parent 31aedfa commit 436fa5a

6 files changed

Lines changed: 11 additions & 13 deletions

File tree

‎scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/InfoTree.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* {@link RichOp}s.
2727
*
2828
* @author Gabriel Selzer
29-
* @see RichOp#infoChain()
29+
* @see RichOp#infoTree()
3030
*/
3131
public class InfoTree {
3232

‎scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/RichOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ default Type getType() {
3131
return instance().getType();
3232
}
3333

34-
default InfoTree infoChain() {
34+
default InfoTree infoTree() {
3535
return instance().infoTree();
3636
}
3737

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public InfoTree infoTree(String opName, Nil<?> specialType,
248248
public InfoTree infoTree(String opName, Nil<?> specialType,
249249
Nil<?>[] inTypes, Nil<?> outType, Hints hints)
250250
{
251-
return findOp(opName, specialType, inTypes, outType, hints).infoChain();
251+
return findOp(opName, specialType, inTypes, outType, hints).infoTree();
252252
}
253253

254254
@Override

‎scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpHistory.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33

44
import java.util.ArrayList;
55
import java.util.Collections;
6-
import java.util.HashSet;
76
import java.util.List;
87
import java.util.Map;
9-
import java.util.Set;
108
import java.util.WeakHashMap;
119

1210
import org.scijava.ops.api.InfoTree;
@@ -75,7 +73,7 @@ public InfoTree infoTree(Object op) {
7573

7674
@Override
7775
public void logOp(RichOp<?> op) {
78-
dependencyChain.put(op, op.infoChain());
76+
dependencyChain.put(op, op.infoTree());
7977
}
8078

8179
@Override

‎scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DependencyRichOpInfoTree.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected Object generateOp() {
2929
}
3030

3131
private static List<InfoTree> treesFrom(List<RichOp<?>> dependencies) {
32-
return dependencies.stream().map(RichOp::infoChain).collect(Collectors.toList());
32+
return dependencies.stream().map(RichOp::infoTree).collect(Collectors.toList());
3333
}
3434

3535
}

‎scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/InfoTreeTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ public static void addNeededOps() {
3232

3333
public static final String S = "this Op is cool";
3434

35-
@OpField(names = "test.infoChain")
35+
@OpField(names = "test.infoTree")
3636
public final Producer<String> foo = () -> S;
3737

3838
@Test
3939
public void testInfoChainInstantiation() {
40-
OpInfo info = singularInfoOfName("test.infoChain");
40+
OpInfo info = singularInfoOfName("test.infoTree");
4141
InfoTree tree = new InfoTree(info);
4242
Nil<Producer<String>> nil = new Nil<>() {};
4343
Producer<String> op = ops.opFromInfoChain(tree, nil);
@@ -47,11 +47,11 @@ public void testInfoChainInstantiation() {
4747
@Test
4848
public void testInfoChainWithDependenciesInstantiation() {
4949
// Find dependency
50-
OpInfo info = singularInfoOfName("test.infoChain");
50+
OpInfo info = singularInfoOfName("test.infoTree");
5151
InfoTree dependencyChain = new InfoTree(info);
5252

5353
// Find dependent Op
54-
OpInfo baseInfo = singularInfoOfName("test.infoChainBase");
54+
OpInfo baseInfo = singularInfoOfName("test.infoTreeBase");
5555
InfoTree tree = new InfoTree(baseInfo, Collections.singletonList(
5656
dependencyChain));
5757

@@ -70,10 +70,10 @@ private OpInfo singularInfoOfName(String name) {
7070

7171
}
7272

73-
@OpClass(names = "test.infoChainBase")
73+
@OpClass(names = "test.infoTreeBase")
7474
class ComplexOp implements Producer<String>, Op {
7575

76-
@OpDependency(name = "test.infoChain")
76+
@OpDependency(name = "test.infoTree")
7777
private Producer<String> op;
7878

7979
@Override

0 commit comments

Comments
 (0)