[vassalengine-svn] SF.net SVN: vassalengine:[8070] VASSAL-src/trunk/src/VASSAL/script/ BeanShell.java

[<uck...@us...>]

Revision: 8070
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8070&view=rev
Author:   uckelman
Date:     2012-02-07 04:06:04 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Singleton creation cleanup.

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/script/BeanShell.java

Modified: VASSAL-src/trunk/src/VASSAL/script/BeanShell.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/script/BeanShell.java	2012-02-06 05:02:24 UTC (rev 8069)
+++ VASSAL-src/trunk/src/VASSAL/script/BeanShell.java	2012-02-07 04:06:04 UTC (rev 8070)
@@ -36,13 +36,9 @@
  */
 public class BeanShell {
 
-  public static BeanShell instance;
+  private static BeanShell instance = new BeanShell();
 
   public static BeanShell getInstance() {
-    if (instance == null) {
-      instance = new BeanShell();
-      instance.init();
-    }
     return instance;
   }
 
@@ -55,6 +51,7 @@
 
   public BeanShell() {
     globalInterpreter = new ScriptInterpreter(this.getClass().getClassLoader());
+    init();
   }
 
   public void init() {
@@ -117,9 +114,8 @@
     catch (EvalError e) {
       e.printStackTrace();
     }
-
-
   }
+
   /**
    * Parse and validate a single expression or script. No evaluation or checking
    * for undefined variables

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.