Procházet zdrojové kódy

Stop using objects before they exist in script plugin.

Change-Id: Ib061fc14d5bfebfb6b7499efc7851066b5ca97ea
Fixes-Issue: CLIENT-467
Reviewed-on: http://gerrit.dmdirc.com/3226
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.8
Greg Holmes před 10 roky
rodič
revize
0e1356489c

+ 2
- 4
src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java Zobrazit soubor

@@ -35,7 +35,6 @@ import dagger.ObjectGraph;
35 35
  */
36 36
 public class ScriptPlugin extends BaseCommandPlugin {
37 37
 
38
-    private ScriptEngineManager scriptEngineManager;
39 38
     private ScriptPluginManager scriptPluginManager;
40 39
 
41 40
     @Override
@@ -45,7 +44,6 @@ public class ScriptPlugin extends BaseCommandPlugin {
45 44
         setObjectGraph(graph.plus(new ScriptModule(pluginInfo)));
46 45
         registerCommand(ScriptCommand.class, ScriptCommand.INFO);
47 46
 
48
-        scriptEngineManager = getObjectGraph().get(ScriptEngineManager.class);
49 47
         scriptPluginManager = getObjectGraph().get(ScriptPluginManager.class);
50 48
     }
51 49
 
@@ -64,7 +62,7 @@ public class ScriptPlugin extends BaseCommandPlugin {
64 62
 
65 63
     @Override
66 64
     public ValidationResponse checkPrerequisites() {
67
-        if (scriptEngineManager.getEngineByName("JavaScript") == null) {
65
+        if (new ScriptEngineManager().getEngineByName("JavaScript") == null) {
68 66
             return new ValidationResponse("JavaScript Scripting Engine not found.");
69 67
         } else {
70 68
             return new ValidationResponse();
@@ -77,7 +75,7 @@ public class ScriptPlugin extends BaseCommandPlugin {
77 75
      * @return Human-Readable reason for checkPrerequisites failing.
78 76
      */
79 77
     public String checkPrerequisitesReason() {
80
-        if (scriptEngineManager.getEngineByName("JavaScript") == null) {
78
+        if (new ScriptEngineManager().getEngineByName("JavaScript") == null) {
81 79
             return "JavaScript Scripting Engine not found.";
82 80
         } else {
83 81
             return "";

Načítá se…
Zrušit
Uložit