Skip to content

Commit 6ed7003

Browse files
gselzergselzer
committed
Remove transformation framework
Now unnecessary since we have the adapt framework We also remove obsolete tests (usually non-code-generated) that were used to ensure proper transformation. They still run here, but they are obsolete.
1 parent eb0196d commit 6ed7003

23 files changed

Lines changed: 4 additions & 2140 deletions

‎src/main/java/org/scijava/ops/OpService.java‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848

4949
import org.scijava.InstantiableException;
5050
import org.scijava.log.LogService;
51+
import org.scijava.ops.adapt.AdaptedOp;
5152
import org.scijava.ops.core.Op;
5253
import org.scijava.ops.core.OpCollection;
5354
import org.scijava.ops.matcher.DefaultOpMatcher;
@@ -59,9 +60,6 @@
5960
import org.scijava.ops.matcher.OpMatcher;
6061
import org.scijava.ops.matcher.OpMatchingException;
6162
import org.scijava.ops.matcher.OpRef;
62-
import org.scijava.ops.transform.AdaptedOp;
63-
import org.scijava.ops.transform.OpTransformationMatcher;
64-
import org.scijava.ops.transform.OpTransformer;
6563
import org.scijava.ops.types.Nil;
6664
import org.scijava.ops.types.TypeService;
6765
import org.scijava.ops.util.OpWrapper;
@@ -95,8 +93,6 @@ public class OpService extends AbstractService implements SciJavaService, OpEnvi
9593
@Parameter
9694
private LogService log;
9795

98-
private OpTransformationMatcher transformationMatcher;
99-
10096
@Parameter
10197
private TypeService typeService;
10298

@@ -111,8 +107,6 @@ public class OpService extends AbstractService implements SciJavaService, OpEnvi
111107
*/
112108
private Map<String, List<OpInfo>> opCache;
113109

114-
private List<OpTransformer> transformerIndex;
115-
116110
private Map<Class<?>, OpWrapper<?>> wrappers;
117111

118112
private void initOpCache() {
@@ -173,10 +167,6 @@ private void addToOpIndex(final OpInfo opInfo, final String opNames) {
173167
}
174168
}
175169

176-
public synchronized void initTransformerIndex() {
177-
transformerIndex = pluginService.createInstancesOfType(OpTransformer.class);
178-
}
179-
180170
@Override
181171
public Iterable<OpInfo> infos() {
182172
if (opCache == null) {
@@ -206,20 +196,6 @@ private OpMatcher getOpMatcher() {
206196
return opMatcher;
207197
}
208198

209-
private synchronized List<OpTransformer> getTransformerIndex() {
210-
if (transformerIndex == null) {
211-
initTransformerIndex();
212-
}
213-
return transformerIndex;
214-
}
215-
216-
// private OpTransformationMatcher getTransformationMatcher() {
217-
// if (transformationMatcher == null) {
218-
// transformationMatcher = new DefaultOpTransformationMatcher(getOpMatcher());
219-
// }
220-
// return transformationMatcher;
221-
// }
222-
223199
/**
224200
* Attempts to inject {@link OpDependency} annotated fields of the specified
225201
* object by looking for Ops matching the field type and the name specified in

src/main/java/org/scijava/ops/transform/AdaptedOp.java renamed to src/main/java/org/scijava/ops/adapt/AdaptedOp.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11

2-
package org.scijava.ops.transform;
2+
package org.scijava.ops.adapt;
33

44
import java.lang.reflect.Type;
55

66
import org.scijava.ops.matcher.OpAdaptationInfo;
7-
import org.scijava.ops.matcher.OpCandidate;
87
import org.scijava.ops.matcher.OpInfo;
98

109
/**
11-
* Wrapper class to match a {@link OpTransformation} with a matching
12-
* {@link OpCandidate}.
10+
* Wrapper class combining an adapted Op with its adapted type and associated
11+
* {@link OpInfo}s
1312
*
1413
* @author Gabriel Selzer
1514
*/

‎src/main/java/org/scijava/ops/transform/DefaultOpTransformationMatcher.java‎

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

‎src/main/java/org/scijava/ops/transform/KnowsTypes.java‎

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

‎src/main/java/org/scijava/ops/transform/OpMapper.java‎

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

‎src/main/java/org/scijava/ops/transform/OpRefTransformUtils.java‎

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

0 commit comments

Comments
 (0)