make console banner configurable (and optional)

git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@6414 961051c9-f516-0410-bf72-c9f7e237a7b7
pjenvey · Apr 5, 2008 · 8ccfaca · 8ccfaca
1 parent 6bf7e4c
commit 8ccfaca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/samples/irb-applet.html b/samples/irb-applet.html
@@ -3,6 +3,7 @@
   codebase="../lib/"
   archive="jruby-complete.jar"
   width="500" height="500">
+<param name="jruby.banner" value="Welcome to JRuby on the Web!" />
 <param name="jruby.console" value="true" />
 <param name="jruby.objectspace" value="true" />
 <param name="jruby.eval" value="ARGV[0..-1] = %w(-f) ; require 'irb' ; require 'irb/completion' ; Thread.new { IRB.start }" />

diff --git 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());