|
56 | 56 | import org.scijava.ops.OpField; |
57 | 57 | import org.scijava.ops.OpInfo; |
58 | 58 | import org.scijava.ops.OpUtils; |
59 | | -import org.scijava.ops.adapt.AdaptedOpCandidate; |
60 | 59 | import org.scijava.ops.core.Op; |
61 | 60 | import org.scijava.ops.core.OpCollection; |
62 | 61 | import org.scijava.ops.matcher.DefaultOpMatcher; |
63 | 62 | import org.scijava.ops.matcher.MatchingUtils; |
64 | 63 | import org.scijava.ops.matcher.OpAdaptationInfo; |
65 | 64 | import org.scijava.ops.matcher.OpCandidate; |
| 65 | +import org.scijava.ops.matcher.OpCandidate.StatusCode; |
66 | 66 | import org.scijava.ops.matcher.OpClassInfo; |
67 | 67 | import org.scijava.ops.matcher.OpFieldInfo; |
68 | 68 | import org.scijava.ops.matcher.OpMatcher; |
@@ -345,7 +345,7 @@ private List<Object> resolveOpDependencies(OpInfo info, Map<TypeVariable<?>, Typ |
345 | 345 | * </ul> |
346 | 346 | * |
347 | 347 | * @param ref - the type of Op that we are looking to adapt to. |
348 | | - * @return {@link AdaptedOpCandidate} - an Op that has been adapted to conform |
| 348 | + * @return {@link OpCandidate} - an Op that has been adapted to conform |
349 | 349 | * the the ref type (if one exists). |
350 | 350 | * @throws OpMatchingException |
351 | 351 | */ |
@@ -383,7 +383,9 @@ private OpCandidate adaptOp(OpRef ref) throws OpMatchingException { |
383 | 383 | .getType(), map); |
384 | 384 | OpAdaptationInfo adaptedInfo = new OpAdaptationInfo(srcCandidate |
385 | 385 | .opInfo(), adapterOpType, adaptorOp); |
386 | | - return new AdaptedOpCandidate(this, log, ref, adaptedInfo, map); |
| 386 | + OpCandidate adaptedCandidate = new OpCandidate(this, log, ref, adaptedInfo, map); |
| 387 | + adaptedCandidate.setStatus(StatusCode.MATCH); |
| 388 | + return adaptedCandidate; |
387 | 389 | } |
388 | 390 | catch (OpMatchingException e1) { |
389 | 391 | log.trace(e1); |
|
0 commit comments