|
35 | 35 | import org.scijava.meta.Versions; |
36 | 36 | import org.scijava.ops.api.*; |
37 | 37 | import org.scijava.ops.engine.*; |
38 | | -import org.scijava.ops.engine.BaseOpHints.Adaptation; |
39 | | -import org.scijava.ops.engine.BaseOpHints.DependencyMatching; |
40 | | -import org.scijava.ops.engine.BaseOpHints.Conversion; |
| 38 | +import org.scijava.ops.engine.BaseOpHints; |
41 | 39 | import org.scijava.ops.engine.matcher.MatchingRoutine; |
42 | 40 | import org.scijava.ops.engine.matcher.OpMatcher; |
43 | 41 | import org.scijava.ops.engine.matcher.impl.DefaultOpMatcher; |
@@ -183,21 +181,22 @@ public void discoverEverything() { |
183 | 181 | } |
184 | 182 |
|
185 | 183 | private SortedSet<OpInfo> filterInfos(SortedSet<OpInfo> infos, Hints hints) { |
186 | | - boolean adapting = hints.contains(Adaptation.IN_PROGRESS); |
187 | | - boolean converting = hints.contains(Conversion.IN_PROGRESS); |
188 | | - boolean depMatching = hints.contains(DependencyMatching.IN_PROGRESS); |
| 184 | + boolean adapting = hints.contains(BaseOpHints.Adaptation.IN_PROGRESS); |
| 185 | + boolean converting = hints.contains(BaseOpHints.Conversion.IN_PROGRESS); |
| 186 | + boolean depMatching = hints.contains( |
| 187 | + BaseOpHints.DependencyMatching.IN_PROGRESS); |
189 | 188 | // if we aren't doing any |
190 | 189 | if (!(adapting || converting || depMatching)) return infos; |
191 | 190 | return infos.stream() // |
192 | 191 | // filter out unadaptable ops |
193 | 192 | .filter(info -> !adapting || !info.declaredHints().contains( |
194 | | - Adaptation.FORBIDDEN)) // |
| 193 | + BaseOpHints.Adaptation.FORBIDDEN)) // |
195 | 194 | // filter out unadaptable ops |
196 | 195 | .filter(info -> !converting || !info.declaredHints().contains( |
197 | | - Conversion.FORBIDDEN)) // |
| 196 | + BaseOpHints.Conversion.FORBIDDEN)) // |
198 | 197 | // filter out unadaptable ops |
199 | 198 | .filter(info -> !depMatching || !info.declaredHints().contains( |
200 | | - DependencyMatching.FORBIDDEN)) // |
| 199 | + BaseOpHints.DependencyMatching.FORBIDDEN)) // |
201 | 200 | .collect(Collectors.toCollection(TreeSet::new)); |
202 | 201 | } |
203 | 202 |
|
@@ -587,7 +586,7 @@ private List<RichOp<?>> resolveOpDependencies(OpInfo info, |
587 | 586 | Hints baseDepHints = hints // |
588 | 587 | .plus( // |
589 | 588 | BaseOpHints.DependencyMatching.IN_PROGRESS, // |
590 | | - Conversion.FORBIDDEN, // |
| 589 | + BaseOpHints.Conversion.FORBIDDEN, // |
591 | 590 | BaseOpHints.History.IGNORE // |
592 | 591 | ).minus(BaseOpHints.Progress.TRACK); |
593 | 592 | // Then, match dependencies |
|
0 commit comments