Skip to content

Commit c7412b8

Browse files
committed
ScriptService: fix the base directory FIXME
We should ask the AppService's primary app for its base directory, rather than calling a static method.
1 parent 7540fa6 commit c7412b8

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/main/java/org/scijava/script/DefaultScriptService.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.scijava.InstantiableException;
5252
import org.scijava.MenuPath;
5353
import org.scijava.Priority;
54+
import org.scijava.app.AppService;
5455
import org.scijava.command.CommandService;
5556
import org.scijava.event.EventHandler;
5657
import org.scijava.log.LogService;
@@ -65,7 +66,6 @@
6566
import org.scijava.plugin.PluginService;
6667
import org.scijava.service.Service;
6768
import org.scijava.service.event.ServicesLoadedEvent;
68-
import org.scijava.util.AppUtils;
6969
import org.scijava.util.ClassUtils;
7070
import org.scijava.util.ColorRGB;
7171
import org.scijava.util.ColorRGBA;
@@ -90,6 +90,9 @@ public class DefaultScriptService extends
9090
@Parameter
9191
private CommandService commandService;
9292

93+
@Parameter
94+
private AppService appService;
95+
9396
@Parameter
9497
private ParseService parser;
9598

@@ -361,7 +364,7 @@ private synchronized void initScriptDirs() {
361364
final ArrayList<File> dirs = new ArrayList<>();
362365

363366
// append default script directories
364-
final File baseDir = AppUtils.getBaseDirectory(getClass()); //FIXME
367+
final File baseDir = appService.getApp().getBaseDirectory();
365368
dirs.add(new File(baseDir, "scripts"));
366369

367370
// append additional script directories from system property

0 commit comments

Comments
 (0)