Skip to content

Commit d10e453

Browse files
committed
Use "noAlias" attr to avoid script aliases
1 parent 6919fbd commit d10e453

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

docs/ops/doc/ScriptingInImageJ2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Using SciJava Ops and ImageJ Ops2 within scripts provide the most powerful aspec
77
To run Ops, scripts require an `OpEnvironment`. The easiest way to obtain an `OpEnvironment` with all available Ops is to declare an `OpEnvironment` as a script parameter:
88

99
```text
10-
#@ org.scijava.ops.api.OpEnvironment ops
10+
#@ OpEnvironment ops
1111
```
1212

1313
## Obtaining inputs
@@ -34,7 +34,7 @@ out = ops.op("filter.gauss").arity2().input(imgInput, new Double(3.0)).apply()
3434
The below script can be pasted into the Script Editor. **Ensure that the Script Editor is configured to run a Groovy script**.
3535

3636
```text
37-
#@ org.scijava.ops.api.OpEnvironment ops
37+
#@ OpEnvironment ops
3838
#@ ThreadService ts
3939
#@ Img imgInput
4040
#@output Img out

scijava-ops-legacy/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@
190190
<dependency>
191191
<groupId>org.scijava</groupId>
192192
<artifactId>scijava-ops-api</artifactId>
193-
<version>0-SNAPSHOT</version>
193+
<version>${project.version}</version>
194194
<scope>compile</scope>
195195
</dependency>
196196
<dependency>
197197
<groupId>org.scijava</groupId>
198198
<artifactId>scijava-ops-engine</artifactId>
199-
<version>0-SNAPSHOT</version>
199+
<version>${project.version}</version>
200200
<scope>test</scope>
201201
</dependency>
202202
</dependencies>

scijava-ops-legacy/src/main/java/org/scijava/legacy/service/DefaultOpEnvironmentService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package org.scijava.legacy.service;
22

33
import org.scijava.ops.api.OpEnvironment;
4+
import org.scijava.plugin.Attr;
45
import org.scijava.plugin.Parameter;
56
import org.scijava.plugin.Plugin;
67
import org.scijava.script.ScriptService;
78
import org.scijava.service.AbstractService;
89
import org.scijava.service.Service;
910

10-
@Plugin(type= Service.class)
11+
@Plugin(type= Service.class, attrs = { @Attr(name="noAlias") })
1112
public class DefaultOpEnvironmentService extends AbstractService implements
1213
OpEnvironmentService
1314
{

scijava-ops-legacy/src/test/java/org/scijava/legacy/service/OpEnvironmentServiceTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ public void testOpService() {
3232
public void testOpEnvironmentAlias() {
3333
Context ctx = new Context(OpEnvironmentService.class, ScriptService.class);
3434
ScriptService script = ctx.getService(ScriptService.class);
35+
// Assert the correct alias for OpEnvironment
3536
Assertions.assertEquals( //
3637
OpEnvironment.class, //
3738
script.getAliases().get("OpEnvironment") //
3839
);
40+
// Assert no alias for OpEnvironmentService
41+
Assertions.assertNull(script.getAliases().get("OpEnvironmentService"));
3942
ctx.dispose();
4043
}
4144

0 commit comments

Comments
 (0)