avatar

568

Clean up minor scripting detritus related to the upgrade to 1.1.3.

by mrs, 24 Jul, 2008 12:04 AM
1 1  
77 import com.jbidwatcher.util.queue.MQFactory
88 import com.jbidwatcher.auction.AuctionEntry
99 import com.jbidwatcher.auction.server.AuctionServerManager
10 import com.jbidwatcher.auction.AuctionsManager
11 import com.jbidwatcher.auction.FilterManager
10 import com.jbidwatcher.ui.AuctionsManager
11 import com.jbidwatcher.ui.FilterManager
1212 import com.jbidwatcher.ui.table.TableColumnController
1313 
1414 class JBidwatcherUtilities
561 568  
527527       Scripting.initialize();
528528       JConfig.enableScripting();
529529     } catch (Throwable e) {
530       System.err.println("Error setting up scripting: " + e.toString());
530531       JConfig.disableScripting();
531532     }
532533     inSplash.message("Initializing Database");
566 568  
77 import org.jruby.javasupport.JavaEmbedUtils;
88 import org.jruby.runtime.builtin.IRubyObject;
99 
10 import java.io.PipedInputStream;
11 import java.io.PrintStream;
12 import java.io.OutputStream;
13 import java.io.IOException;
1410 import java.util.ArrayList;
1511 
1612 /**
------
2925   public static Ruby getRuntime() { return (Ruby)sRuby; }
3026 
3127   public static void initialize() throws ClassNotFoundException {
28 //    System.err.println("Before: " + System.currentTimeMillis());
3229     //  Test for JRuby's presence
3330     Class.forName("org.jruby.RubyInstanceConfig", true, Thread.currentThread().getContextClassLoader());
3431 
35     final RubyInstanceConfig config = new RubyInstanceConfig()
36     {
37       {
38         setObjectSpaceEnabled(false);
39       }
40     };
32     final RubyInstanceConfig config = new RubyInstanceConfig();
4133     final Ruby runtime = Ruby.newInstance(config);
4234 
4335     String[] args = new String[0];
------
4739     runtime.getGlobalVariables().defineReadonly("$$", new ValueAccessor(runtime.newFixnum(System.identityHashCode(runtime))));
4840     runtime.getLoadService().init(new ArrayList());
4941 
42 //    System.err.println("Middle: " + System.currentTimeMillis());
5043     runtime.evalScriptlet("require 'builtin/javasupport.rb'; require 'jbidwatcher/utilities';");
44 //    System.err.println("After : " + System.currentTimeMillis());
5145 
5246     sRuby = runtime;
5347   }
5448 
5549   public static Object ruby(String command) {
5650     if(sRuby != null) {
57       Object rval = ((Ruby)sRuby).evalScriptlet(command);
58       return rval;
51       return ((Ruby)sRuby).evalScriptlet(command);
5952     } else {
6053       return null;
6154     }
------
7063       sJBidwatcher = ruby("JBidwatcher");
7164     }
7265 
73     Object rval = JavaEmbedUtils.invokeMethod((Ruby)sRuby, sJBidwatcher, method, method_params, Object.class);
74     return rval;
66     return JavaEmbedUtils.invokeMethod((Ruby)sRuby, sJBidwatcher, method, method_params, Object.class);
7567   }
7668 }