Skip to content

Commit d533fbc

Browse files
committed
Remove AdaptedOpCandidate
This class was entirely unnecessary once I realized that I could use StatusCode outside of the OpCandidate classes.
1 parent bf9f838 commit d533fbc

2 files changed

Lines changed: 5 additions & 45 deletions

File tree

‎scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/AdaptedOpCandidate.java‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656
import org.scijava.ops.OpField;
5757
import org.scijava.ops.OpInfo;
5858
import org.scijava.ops.OpUtils;
59-
import org.scijava.ops.adapt.AdaptedOpCandidate;
6059
import org.scijava.ops.core.Op;
6160
import org.scijava.ops.core.OpCollection;
6261
import org.scijava.ops.matcher.DefaultOpMatcher;
6362
import org.scijava.ops.matcher.MatchingUtils;
6463
import org.scijava.ops.matcher.OpAdaptationInfo;
6564
import org.scijava.ops.matcher.OpCandidate;
65+
import org.scijava.ops.matcher.OpCandidate.StatusCode;
6666
import org.scijava.ops.matcher.OpClassInfo;
6767
import org.scijava.ops.matcher.OpFieldInfo;
6868
import org.scijava.ops.matcher.OpMatcher;
@@ -345,7 +345,7 @@ private List<Object> resolveOpDependencies(OpInfo info, Map<TypeVariable<?>, Typ
345345
* </ul>
346346
*
347347
* @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
349349
* the the ref type (if one exists).
350350
* @throws OpMatchingException
351351
*/
@@ -383,7 +383,9 @@ private OpCandidate adaptOp(OpRef ref) throws OpMatchingException {
383383
.getType(), map);
384384
OpAdaptationInfo adaptedInfo = new OpAdaptationInfo(srcCandidate
385385
.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;
387389
}
388390
catch (OpMatchingException e1) {
389391
log.trace(e1);

0 commit comments

Comments
 (0)