Rename method

Treiblesschorle · ctrueden · commit 45d4851d0bb3 · 2019-04-18T12:16:31.000-05:00
diff --git a/src/main/java/org/scijava/ops/OpService.java b/src/main/java/org/scijava/ops/OpService.java
@@ -162,7 +162,7 @@ public <T> StructInstance<T> findOpInstance(final String opName, final Nil<T> sp
 		OpCandidate match = findTypeMatch(ref);
 
 		@SuppressWarnings("unchecked")
-		final StructInstance<T> opInst = (StructInstance<T>) match.createOp();
+		final StructInstance<T> opInst = (StructInstance<T>) match.createOpInstance();
 
 		// Inject the secondary args if there are any
 		if (Inject.Structs.isInjectable(opInst)) {
diff --git a/src/main/java/org/scijava/ops/matcher/DefaultOpTypeMatchingService.java b/src/main/java/org/scijava/ops/matcher/DefaultOpTypeMatchingService.java
@@ -125,7 +125,7 @@ public List<OpCandidate> filterMatches(final List<OpCandidate> candidates) {
 	public StructInstance<?> match(final OpCandidate candidate) {
 		if (checkCandidates(Collections.singletonList(candidate)).isEmpty() || !typesMatch(candidate))
 			return null;
-		return candidate.createOp();
+		return candidate.createOpInstance();
 	}
 
 	/**
diff --git a/src/main/java/org/scijava/ops/matcher/OpCandidate.java b/src/main/java/org/scijava/ops/matcher/OpCandidate.java
@@ -196,12 +196,12 @@ public String toString() {
 		return info.toString();
 	}
 
-	public StructInstance<?> createOp() {
+	public StructInstance<?> createOpInstance() {
 		if (!getStatusCode().equals(StatusCode.MATCH)) {
 			throw new IllegalArgumentException(
 					"Status of candidate to create op " + "from indicates a problem: " + getStatus());
 		}
 
-		return opInfo().createOp();
+		return opInfo().createOpInstance();
 	}
 }
diff --git a/src/main/java/org/scijava/ops/matcher/OpClassInfo.java b/src/main/java/org/scijava/ops/matcher/OpClassInfo.java
@@ -100,7 +100,7 @@ public String implementationName() {
 	}
 
 	@Override
-	public StructInstance<?> createOp() {
+	public StructInstance<?> createOpInstance() {
 		final Object object;
 		try {
 			// TODO: Consider whether this is really the best way to
diff --git a/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java
@@ -109,7 +109,7 @@ public String implementationName() {
 	}
 
 	@Override
-	public StructInstance<?> createOp() {
+	public StructInstance<?> createOpInstance() {
 		// 1. Can we create another instance of the same function by calling
 		// clone()?
 		// 2. _SHOULD_ we do that? Or can we simply reuse the same function
diff --git a/src/main/java/org/scijava/ops/matcher/OpInfo.java b/src/main/java/org/scijava/ops/matcher/OpInfo.java
@@ -41,7 +41,7 @@ default List<Member<?>> outputs() {
 	String implementationName();
 
 	/** Create a StructInstance using the Struct metadata backed by an object of the op itself.  */
-	StructInstance<?> createOp();
+	StructInstance<?> createOpInstance();
 
 	// TODO Consider if we really want to keep the following methods.
 	boolean isValid();

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public List<OpCandidate> filterMatches(final List<OpCandidate> candidates) {`
`125`	`125`	`public StructInstance<?> match(final OpCandidate candidate) {`
`126`	`126`	`if (checkCandidates(Collections.singletonList(candidate)).isEmpty() \|\| !typesMatch(candidate))`
`127`	`127`	`return null;`
`128`		`- return candidate.createOp();`
	`128`	`+ return candidate.createOpInstance();`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -196,12 +196,12 @@ public String toString() {`
`196`	`196`	`return info.toString();`
`197`	`197`	`}`
`198`	`198`
`199`		`- public StructInstance<?> createOp() {`
	`199`	`+ public StructInstance<?> createOpInstance() {`
`200`	`200`	`if (!getStatusCode().equals(StatusCode.MATCH)) {`
`201`	`201`	`throw new IllegalArgumentException(`
`202`	`202`	`"Status of candidate to create op " + "from indicates a problem: " + getStatus());`
`203`	`203`	`}`
`204`	`204`
`205`		`- return opInfo().createOp();`
	`205`	`+ return opInfo().createOpInstance();`
`206`	`206`	`}`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public String implementationName() {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`@Override`
`103`		`- public StructInstance<?> createOp() {`
	`103`	`+ public StructInstance<?> createOpInstance() {`
`104`	`104`	`final Object object;`
`105`	`105`	`try {`
`106`	`106`	`// TODO: Consider whether this is really the best way to`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public String implementationName() {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`@Override`
`112`		`- public StructInstance<?> createOp() {`
	`112`	`+ public StructInstance<?> createOpInstance() {`
`113`	`113`	`// 1. Can we create another instance of the same function by calling`
`114`	`114`	`// clone()?`
`115`	`115`	`// 2. _SHOULD_ we do that? Or can we simply reuse the same function`