X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=samples%2Fbsh%2Fsrc%2Fdolda%2Fbsvc%2FShellPage.java;h=c26998e337eca7abe646f5958bb14f8eda079239;hb=6e40b32ee7b4e65f600f6aeb25838d6d40e76838;hp=e7412ad0684ea59ac51cb8d8d18ef8e45330d76b;hpb=c04f28ae77d5a372eb4afd0296c12014fdbcf96e;p=jsvc.git diff --git a/samples/bsh/src/dolda/bsvc/ShellPage.java b/samples/bsh/src/dolda/bsvc/ShellPage.java index e7412ad..c26998e 100644 --- a/samples/bsh/src/dolda/bsvc/ShellPage.java +++ b/samples/bsh/src/dolda/bsvc/ShellPage.java @@ -6,47 +6,9 @@ import java.io.*; import bsh.Interpreter; public class ShellPage extends SimpleWriter { - private RConsole cons = new RConsole(); + private Console cons = new Console(); private Interpreter ip = new Interpreter(cons); - private static class RConsole implements bsh.ConsoleInterface { - public Console back; - Reader in = new StringReader(""); - - public void error(Object msg) { - if(back != null) - back.error(msg); - } - - public void print(Object msg) { - if(back != null) - back.print(msg); - } - - public void println(Object msg) { - if(back != null) - back.println(msg); - } - - public PrintStream getOut() { - if(back == null) - return(null); - return(back.getOut()); - } - - public PrintStream getErr() { - if(back == null) - return(null); - return(back.getErr()); - } - - public Reader getIn() { - if(back == null) - return(null); - return(in); - } - } - private static class Console implements bsh.ConsoleInterface { ByteArrayOutputStream obuf = new ByteArrayOutputStream(); ByteArrayOutputStream ebuf = new ByteArrayOutputStream(); @@ -85,6 +47,11 @@ public class ShellPage extends SimpleWriter { public Reader getIn() { return(in); } + + public void reset() { + obuf.reset(); + ebuf.reset(); + } } public void respond(Request req, PrintWriter out) { @@ -101,37 +68,32 @@ public class ShellPage extends SimpleWriter { out.println("
"); out.println(""); - out.println(Misc.htmlq((resp == null)?"(null)":(resp.toString()))); - out.println(""); - } catch(bsh.EvalError exc) { - out.println("
"); + out.println(Misc.htmlq((resp == null)?"(null)":(resp.toString()))); + out.println(""); + } catch(bsh.EvalError exc) { + out.println("
"); + out.print(exc.toString()); + out.println(""); + if(exc instanceof bsh.TargetError) { + bsh.TargetError te = (bsh.TargetError)exc; + out.println("
"); - out.print(exc.toString()); + te.getTarget().printStackTrace(out); out.println(""); - if(exc instanceof bsh.TargetError) { - bsh.TargetError te = (bsh.TargetError)exc; - out.println("
"); - te.getTarget().printStackTrace(out); - out.println(""); - } } - } finally { - this.cons.back = null; } + eo = new String(cons.obuf.toByteArray(), Misc.utf8); + ee = new String(cons.ebuf.toByteArray(), Misc.utf8); } - String eo = new String(cons.obuf.toByteArray(), Misc.utf8); - String ee = new String(cons.ebuf.toByteArray(), Misc.utf8); - cons = null; if(eo.length() > 0) { out.println("
");