From 8ccfacaf5b8d93c27d98e153d752517a25cc282f Mon Sep 17 00:00:00 2001 From: MenTaLguY Date: Sat, 5 Apr 2008 22:29:20 +0000 Subject: [PATCH] make console banner configurable (and optional) git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@6414 961051c9-f516-0410-bf72-c9f7e237a7b7 --- samples/irb-applet.html | 1 + src/org/jruby/JRubyApplet.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/samples/irb-applet.html b/samples/irb-applet.html index efc2d025f3f..d9c203f5e0d 100644 --- a/samples/irb-applet.html +++ b/samples/irb-applet.html @@ -3,6 +3,7 @@ codebase="../lib/" archive="jruby-complete.jar" width="500" height="500"> + diff --git a/src/org/jruby/JRubyApplet.java b/src/org/jruby/JRubyApplet.java index 4623378097d..87f7e416b70 100644 --- a/src/org/jruby/JRubyApplet.java +++ b/src/org/jruby/JRubyApplet.java @@ -129,12 +129,12 @@ private static RubyProc blockToProc(Ruby runtime, Block block) { } } - private boolean getBooleanParameter(String name, boolean default_value) { + private boolean getBooleanParameter(String name, boolean defaultValue) { String value = getParameter(name); if ( value != null ) { return value.equals("true"); } else { - return default_value; + return defaultValue; } } @@ -206,7 +206,7 @@ public void init() { super.init(); if (getBooleanParameter("jruby.console", false)) { - facade = new ConsoleFacade(); + facade = new ConsoleFacade(getParameter("jruby.banner")); } else { facade = new TrivialFacade(); } @@ -388,7 +388,7 @@ private static class ConsoleFacade implements Facade { private PrintStream outputStream; private PrintStream errorStream; - public ConsoleFacade() { + public ConsoleFacade(String bannerText) { textPane = new JTextPane(); textPane.setMargin(new Insets(4, 4, 0, 4)); textPane.setCaretColor(new Color(0xa4, 0x00, 0x00)); @@ -402,7 +402,10 @@ public ConsoleFacade() { scrollPane = new JScrollPane(textPane); scrollPane.setDoubleBuffered(true); - adaptor = new TextAreaReadline(textPane, " JRuby applet console \n\n"); + if ( bannerText != null ) { + bannerText = " " + bannerText + " \n\n"; + } + adaptor = new TextAreaReadline(textPane, bannerText); inputStream = adaptor.getInputStream(); outputStream = new PrintStream(adaptor.getOutputStream()); errorStream = new PrintStream(adaptor.getOutputStream());