Skip to content

Commit 793ab91

Browse files
committed
ScriptProcessor: do not implement SingletonPlugin
These plugins are not singletons; they have state. The ScriptProcessorService creates new instances as needed, and feeds ScriptInfos to them. The ScriptProcessorService service did not implement SingletonService, but DefaultScriptProcessorService extended AbstractSingletonService, so clearly I got my wires crossed when I wrote this.
1 parent 8184f77 commit 793ab91

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
package org.scijava.script.process;
3434

35-
import org.scijava.plugin.AbstractSingletonService;
35+
import org.scijava.plugin.AbstractPTService;
3636
import org.scijava.plugin.Plugin;
3737
import org.scijava.service.Service;
3838

@@ -43,8 +43,7 @@
4343
*/
4444
@Plugin(type = Service.class)
4545
public class DefaultScriptProcessorService extends
46-
AbstractSingletonService<ScriptProcessor> implements
47-
ScriptProcessorService
46+
AbstractPTService<ScriptProcessor> implements ScriptProcessorService
4847
{
4948
// NB: No implementation needed.
5049
}

src/main/java/org/scijava/script/process/ScriptProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
package org.scijava.script.process;
3434

35-
import org.scijava.plugin.SingletonPlugin;
35+
import org.scijava.plugin.SciJavaPlugin;
3636
import org.scijava.script.ScriptInfo;
3737

3838
/**
@@ -46,7 +46,7 @@
4646
*
4747
* @author Curtis Rueden
4848
*/
49-
public interface ScriptProcessor extends SingletonPlugin {
49+
public interface ScriptProcessor extends SciJavaPlugin {
5050

5151
void begin(ScriptInfo info);
5252
String process(String line);

0 commit comments

Comments
 (0)