|
From: Thies <tg...@us...> - 2007-12-05 23:22:47
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/dsl/ruby In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22072/src/java/net/sf/tail/dsl/ruby Modified Files: RubyDSL.java Log Message: Refatoração nos scripts Index: RubyDSL.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/dsl/ruby/RubyDSL.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RubyDSL.java 1 Dec 2007 12:29:31 -0000 1.9 --- RubyDSL.java 5 Dec 2007 23:22:46 -0000 1.10 *************** *** 34,43 **** } ! public Indicator<?> evalIndicator(String code) throws ScriptException { ScriptEngine engine = factory.getEngineByName("jruby"); engine.put("series", series); ! ! engine.eval(header + code); Invocable invocable = (Invocable)engine; Indicator<?> indicator = invocable.getInterface(Indicator.class); --- 34,47 ---- } ! public Indicator<?> evalIndicator(String code) { ScriptEngine engine = factory.getEngineByName("jruby"); engine.put("series", series); ! ! try { ! engine.eval(header + code); ! } catch (ScriptException e) { ! throw new RuntimeException(e); ! } Invocable invocable = (Invocable)engine; Indicator<?> indicator = invocable.getInterface(Indicator.class); *************** *** 45,49 **** } ! public Set<Strategy> evalStrategies(String code) throws ScriptException { ScriptEngine engine = factory.getEngineByName("jruby"); --- 49,53 ---- } ! public Set<Strategy> evalStrategies(String code) { ScriptEngine engine = factory.getEngineByName("jruby"); *************** *** 52,57 **** engine.put("series", series); engine.put("close", new ClosePriceIndicator(series)); ! engine.eval(header + code ); ! return strategies; --- 56,64 ---- engine.put("series", series); engine.put("close", new ClosePriceIndicator(series)); ! try { ! engine.eval(header + code ); ! } catch (ScriptException e) { ! throw new RuntimeException(e); ! } return strategies; *************** *** 69,73 **** e.printStackTrace(); } ! return text; } --- 76,80 ---- e.printStackTrace(); } ! return text; } |