Skip to content

Commit 1079163

Browse files
committed
Rename ClassRunner to CodeRunner
The name CodeRunner is more suitably general. See next commit.
1 parent 5bd5a43 commit 1079163

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

src/main/java/org/scijava/command/run/CommandRunner.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,24 @@
3636
import org.scijava.plugin.Parameter;
3737
import org.scijava.plugin.Plugin;
3838
import org.scijava.plugin.PluginService;
39-
import org.scijava.run.AbstractClassRunner;
40-
import org.scijava.run.ClassRunner;
39+
import org.scijava.run.AbstractCodeRunner;
40+
import org.scijava.run.CodeRunner;
4141

4242
/**
4343
* Runs the given {@link Command} class.
4444
*
4545
* @author Curtis Rueden
4646
*/
47-
@Plugin(type = ClassRunner.class)
48-
public class CommandRunner extends AbstractClassRunner {
47+
@Plugin(type = CodeRunner.class)
48+
public class CommandRunner extends AbstractCodeRunner {
4949

5050
@Parameter
5151
private PluginService pluginService;
5252

5353
@Parameter
5454
private CommandService commandService;
5555

56-
// -- ClassRunner methods --
56+
// -- CodeRunner methods --
5757

5858
@Override
5959
public void run(final Class<?> c, final Object... args) {

src/main/java/org/scijava/main/run/MainRunner.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@
3838
import org.scijava.log.LogService;
3939
import org.scijava.plugin.Parameter;
4040
import org.scijava.plugin.Plugin;
41-
import org.scijava.run.AbstractClassRunner;
42-
import org.scijava.run.ClassRunner;
41+
import org.scijava.run.AbstractCodeRunner;
42+
import org.scijava.run.CodeRunner;
4343

4444
/**
4545
* Executes the given class's {@code main} method.
4646
*
4747
* @author Curtis Rueden
4848
*/
49-
@Plugin(type = ClassRunner.class, priority = Priority.LOW_PRIORITY)
50-
public class MainRunner extends AbstractClassRunner {
49+
@Plugin(type = CodeRunner.class, priority = Priority.LOW_PRIORITY)
50+
public class MainRunner extends AbstractCodeRunner {
5151

5252
@Parameter(required = false)
5353
private LogService log;
5454

55-
// -- ClassRunner methods --
55+
// -- CodeRunner methods --
5656

5757
@Override
5858
public void run(final Class<?> c, final Object... args)

src/main/java/org/scijava/run/AbstractClassRunner.java renamed to src/main/java/org/scijava/run/AbstractCodeRunner.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
import org.scijava.plugin.AbstractHandlerPlugin;
3535

3636
/**
37-
* Abstract superclass of {@link ClassRunner} implementations.
37+
* Abstract superclass of {@link CodeRunner} implementations.
3838
*
3939
* @author Curtis Rueden
4040
*/
41-
public abstract class AbstractClassRunner extends
42-
AbstractHandlerPlugin<Class<?>> implements ClassRunner
41+
public abstract class AbstractCodeRunner extends
42+
AbstractHandlerPlugin<Class<?>> implements CodeRunner
4343
{
4444

4545
// -- Typed methods --

src/main/java/org/scijava/run/ClassRunner.java renamed to src/main/java/org/scijava/run/CodeRunner.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@
3838

3939
/**
4040
* A plugin which extends the {@link RunService}'s execution handling. A
41-
* {@link ClassRunner} knows how to execute certain classes, beyond just Java's
41+
* {@link CodeRunner} knows how to execute certain classes, beyond just Java's
4242
* usual {@code main} method.
4343
* <p>
4444
* Class runner plugins discoverable at runtime must implement this interface
4545
* and be annotated with @{@link Plugin} with attribute {@link Plugin#type()} =
46-
* {@link ClassRunner}.class. While it possible to create a class runner plugin
46+
* {@link CodeRunner}.class. While it possible to create a class runner plugin
4747
* merely by implementing this interface, it is encouraged to instead extend
48-
* {@link AbstractClassRunner}, for convenience.
48+
* {@link AbstractCodeRunner}, for convenience.
4949
* </p>
5050
*
5151
* @author Curtis Rueden
5252
*/
53-
public interface ClassRunner extends HandlerPlugin<Class<?>> {
53+
public interface CodeRunner extends HandlerPlugin<Class<?>> {
5454

5555
/** Executes the given class, with the specified arguments. */
5656
void run(Class<?> c, Object... args) throws InvocationTargetException;

src/main/java/org/scijava/run/DefaultRunService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
import org.scijava.service.Service;
4141

4242
/**
43-
* Default service for managing available {@link ClassRunner} plugins.
43+
* Default service for managing available {@link CodeRunner} plugins.
4444
*
4545
* @author Curtis Rueden
4646
*/
4747
@Plugin(type = Service.class)
4848
public class DefaultRunService extends
49-
AbstractHandlerService<Class<?>, ClassRunner> implements RunService
49+
AbstractHandlerService<Class<?>, CodeRunner> implements RunService
5050
{
5151

5252
@Parameter
@@ -58,7 +58,7 @@ public class DefaultRunService extends
5858
public void run(final Class<?> c, final Object... args)
5959
throws InvocationTargetException
6060
{
61-
for (final ClassRunner runner : getInstances()) {
61+
for (final CodeRunner runner : getInstances()) {
6262
if (runner.supports(c)) {
6363
runner.run(c);
6464
return;
@@ -70,8 +70,8 @@ public void run(final Class<?> c, final Object... args)
7070
// -- PTService methods --
7171

7272
@Override
73-
public Class<ClassRunner> getPluginType() {
74-
return ClassRunner.class;
73+
public Class<CodeRunner> getPluginType() {
74+
return CodeRunner.class;
7575
}
7676

7777
// -- Typed methods --

src/main/java/org/scijava/run/RunService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
import org.scijava.service.SciJavaService;
3838

3939
/**
40-
* Interface for service that manages available {@link ClassRunner} plugins.
40+
* Interface for service that manages available {@link CodeRunner} plugins.
4141
*
4242
* @author Curtis Rueden
4343
*/
4444
public interface RunService extends
45-
HandlerService<Class<?>, ClassRunner>, SciJavaService
45+
HandlerService<Class<?>, CodeRunner>, SciJavaService
4646
{
4747

4848
/**

0 commit comments

Comments
 (0)