geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r706538 - in /geronimo/gshell/trunk: gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/ gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ gshell-commands/gshell-builtins/src/main/java/org/apache/geronim...
Date Tue, 21 Oct 2008 06:39:12 GMT
Author: jdillon
Date: Mon Oct 20 23:39:11 2008
New Revision: 706538

URL: http://svn.apache.org/viewvc?rev=706538&view=rev
Log:
Renamed the gshell-ansi classes, made Ansi thread-context aware
Added support for --terminal auto (the default)

Added:
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Ansi.java
  (contents, props changed)
      - copied, changed from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/ANSI.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiBuffer.java
  (contents, props changed)
      - copied, changed from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Buffer.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiCode.java
  (contents, props changed)
      - copied, changed from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Code.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderMessageSource.java
  (contents, props changed)
      - copied, changed from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderMessageSource.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderWriter.java
  (contents, props changed)
      - copied, changed from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderWriter.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderer.java
  (contents, props changed)
      - copied, changed from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Renderer.java
Removed:
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/ANSI.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Buffer.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Code.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderMessageSource.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderWriter.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Renderer.java
Modified:
    geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
    geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java
    geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/BufferTest.java
    geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/CodeTest.java
    geronimo/gshell/trunk/gshell-support/gshell-io/src/main/java/org/apache/geronimo/gshell/io/IO.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java

Modified: geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
(original)
+++ geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
Mon Oct 20 23:39:11 2008
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.gshell.cli;
 
-import org.apache.geronimo.gshell.ansi.ANSI;
+import org.apache.geronimo.gshell.ansi.Ansi;
 import org.apache.geronimo.gshell.clp.Argument;
 import org.apache.geronimo.gshell.clp.CommandLineProcessor;
 import org.apache.geronimo.gshell.clp.Option;
@@ -146,14 +146,17 @@
 
     @Option(name="-C", aliases={"--color"}, argumentRequired=true)
     private void enableAnsiColors(final boolean flag) {
-        ANSI.setEnabled(flag);
+        Ansi.setEnabled(flag);
     }
 
     @Option(name="-T", aliases={"--terminal"}, argumentRequired=true)
     private void setTerminalType(String type) {
         type = type.toLowerCase();
 
-        if ("unix".equals(type)) {
+        if ("auto".equals(type)) {
+            type = AutoDetectedTerminal.class.getName();
+        }
+        else if ("unix".equals(type)) {
             type = UnixTerminal.class.getName();
         }
         else if ("win".equals(type) || "windows".equals("type")) {

Modified: geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java
Mon Oct 20 23:39:11 2008
@@ -24,8 +24,8 @@
 import org.apache.bsf.BSFManager;
 import org.apache.commons.vfs.FileObject;
 import org.apache.commons.vfs.FileUtil;
-import org.apache.geronimo.gshell.ansi.Code;
-import org.apache.geronimo.gshell.ansi.Renderer;
+import org.apache.geronimo.gshell.ansi.AnsiCode;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
 import org.apache.geronimo.gshell.clp.Argument;
 import org.apache.geronimo.gshell.clp.Option;
 import org.apache.geronimo.gshell.command.CommandAction;
@@ -224,10 +224,10 @@
         });
 
         runner.setPrompter(new Console.Prompter() {
-            Renderer renderer = new Renderer();
+            AnsiRenderer renderer = new AnsiRenderer();
 
             public String prompt() {
-                return renderer.render(Renderer.encode(language, Code.BOLD) + "> ");
+                return renderer.render(AnsiRenderer.encode(language, AnsiCode.BOLD) + ">
");
             }
         });
 

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
Mon Oct 20 23:39:11 2008
@@ -19,8 +19,8 @@
 
 package org.apache.geronimo.gshell.commands.builtins;
 
-import org.apache.geronimo.gshell.ansi.Code;
-import org.apache.geronimo.gshell.ansi.Renderer;
+import org.apache.geronimo.gshell.ansi.AnsiCode;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
 import org.apache.geronimo.gshell.clp.Argument;
 import org.apache.geronimo.gshell.command.CommandAction;
 import org.apache.geronimo.gshell.command.CommandContext;
@@ -92,7 +92,7 @@
                 String formattedName = String.format("%-" + maxNameLen + "s", name);
 
                 io.out.print("  ");
-                io.out.print(Renderer.encode(formattedName, Code.BOLD));
+                io.out.print(AnsiRenderer.encode(formattedName, AnsiCode.BOLD));
 
                 io.out.print("  ");
                 io.out.print("Alias to: ");

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java
Mon Oct 20 23:39:11 2008
@@ -20,7 +20,7 @@
 package org.apache.geronimo.gshell.commands.builtins;
 
 import jline.ConsoleReader;
-import org.apache.geronimo.gshell.ansi.ANSI;
+import org.apache.geronimo.gshell.ansi.Ansi;
 import org.apache.geronimo.gshell.command.CommandAction;
 import org.apache.geronimo.gshell.command.CommandContext;
 import org.apache.geronimo.gshell.io.IO;
@@ -39,7 +39,7 @@
         IO io = context.getIo();
 
         // We can only clear the screen if ANSI is enabled, so complain and fail otherwise
-        if (!ANSI.isEnabled()) {
+        if (!Ansi.isEnabled()) {
             io.error("ANSI is not enabled.  The clear command is not functional");
             return Result.FAILURE;
         }

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
Mon Oct 20 23:39:11 2008
@@ -19,8 +19,8 @@
 
 package org.apache.geronimo.gshell.commands.builtins;
 
-import org.apache.geronimo.gshell.ansi.Code;
-import org.apache.geronimo.gshell.ansi.Renderer;
+import org.apache.geronimo.gshell.ansi.AnsiCode;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
 import org.apache.geronimo.gshell.clp.Argument;
 import org.apache.geronimo.gshell.command.Command;
 import org.apache.geronimo.gshell.command.CommandAction;
@@ -61,11 +61,11 @@
 
         if (commands.isEmpty()) {
             io.out.print("Command ");
-            io.out.print(Renderer.encode(commandName, Code.BOLD));
+            io.out.print(AnsiRenderer.encode(commandName, AnsiCode.BOLD));
             io.out.println(" not found.");
 
             io.out.print("Try ");
-            io.out.print(Renderer.encode("help", Code.BOLD));
+            io.out.print(AnsiRenderer.encode("help", AnsiCode.BOLD));
             io.out.println(" for a list of available commands.");
 
             return Result.FAILURE;
@@ -107,7 +107,7 @@
             String desc = documenter.getDescription();
 
             io.out.print("  ");
-            io.out.print(Renderer.encode(formattedName, Code.BOLD));
+            io.out.print(AnsiRenderer.encode(formattedName, AnsiCode.BOLD));
 
             if (desc != null) {
                 io.out.print("  ");

Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java
Mon Oct 20 23:39:11 2008
@@ -20,8 +20,8 @@
 package org.apache.geronimo.gshell.commands.builtins;
 
 import jline.History;
-import org.apache.geronimo.gshell.ansi.Code;
-import org.apache.geronimo.gshell.ansi.Renderer;
+import org.apache.geronimo.gshell.ansi.AnsiCode;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
 import org.apache.geronimo.gshell.command.CommandAction;
 import org.apache.geronimo.gshell.command.CommandContext;
 import org.apache.geronimo.gshell.io.IO;
@@ -54,7 +54,7 @@
         int i = 0;
         for (String element : elements) {
             String index = String.format("%3d", i);
-            io.info("  {}  {}", Renderer.encode(index, Code.BOLD), element);
+            io.info("  {}  {}", AnsiRenderer.encode(index, AnsiCode.BOLD), element);
             i++;
         }
 

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java
Mon Oct 20 23:39:11 2008
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.gshell.remote.client.proxy;
 
-import org.apache.geronimo.gshell.ansi.Renderer;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
 import org.apache.geronimo.gshell.console.Console;
 import org.apache.geronimo.gshell.console.JLineConsole;
 import org.apache.geronimo.gshell.io.IO;
@@ -189,7 +189,7 @@
         JLineConsole console = new JLineConsole(executor, io);
 
         console.setPrompter(new Console.Prompter() {
-            Renderer renderer = new Renderer();
+            AnsiRenderer renderer = new AnsiRenderer();
 
             public String prompt() {
                 //

Copied: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Ansi.java
(from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/ANSI.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Ansi.java?p2=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Ansi.java&p1=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/ANSI.java&r1=706527&r2=706538&rev=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/ANSI.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Ansi.java
Mon Oct 20 23:39:11 2008
@@ -26,12 +26,8 @@
  *
  * @version $Rev$ $Date$
  */
-public class ANSI
+public class Ansi
 {
-    //
-    // TODO: Need to make this thread-aware.
-    //
-
     /**
      * Tries to detect if the current system supports ANSI.
      */
@@ -39,7 +35,7 @@
         boolean enabled = Terminal.getTerminal().isANSISupported();
 
         if (!enabled) {
-            String force = System.getProperty(ANSI.class.getName() + ".force", "false");
+            String force = System.getProperty(Ansi.class.getName() + ".force", "false");
             enabled = Boolean.valueOf(force);
         }
 
@@ -50,17 +46,18 @@
         return detect();
     }
 
-    private static Boolean enabled;
-
+    private static final InheritableThreadLocal<Boolean> holder = new InheritableThreadLocal<Boolean>()
{
+        @Override
+        protected Boolean initialValue() {
+            return isDetected();
+        }
+    };
+    
     public static void setEnabled(final boolean flag) {
-        enabled = flag;
+        holder.set(flag);
     }
 
     public static boolean isEnabled() {
-        if (enabled == null) {
-            enabled = isDetected();
-        }
-
-        return enabled;
+        return holder.get();
     }
 }

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Ansi.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Ansi.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Ansi.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiBuffer.java
(from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Buffer.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiBuffer.java?p2=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiBuffer.java&p1=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Buffer.java&r1=706527&r2=706538&rev=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Buffer.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiBuffer.java
Mon Oct 20 23:39:11 2008
@@ -24,27 +24,23 @@
  *
  * @version $Rev$ $Date$
  */
-public class Buffer
+public class AnsiBuffer
 {
-    //
-    // TODO: Rename
-    //
-    
-    private final StringBuffer buff = new StringBuffer();
+    private final StringBuilder buff = new StringBuilder();
 
     public Boolean ansiEnabled;
     
     public boolean autoClear;
 
-    public Buffer(final Boolean ansiEnabled, final boolean autoClear) {
+    public AnsiBuffer(final Boolean ansiEnabled, final boolean autoClear) {
         this.ansiEnabled = ansiEnabled;
         this.autoClear = autoClear;
     }
 
-    public Buffer() {
+    public AnsiBuffer() {
         this(null, true);
     }
-    
+
     public String toString() {
         try {
             return buff.toString();
@@ -57,7 +53,7 @@
     public boolean isAnsiEnabled() {
         // Late bind the current system detected ANSI state
         if (ansiEnabled == null) {
-            ansiEnabled = ANSI.isEnabled();
+            ansiEnabled = Ansi.isEnabled();
         }
 
         return ansiEnabled;
@@ -71,29 +67,29 @@
         return buff.length();
     }
 
-    public Buffer append(final String text) {
+    public AnsiBuffer append(final String text) {
         buff.append(text);
 
         return this;
     }
 
-    public Buffer append(final Object obj) {
+    public AnsiBuffer append(final Object obj) {
         return append(String.valueOf(obj));
     }
 
-    public Buffer attrib(final int code) {
+    public AnsiBuffer attrib(final int code) {
         if (isAnsiEnabled()) {
-            buff.append(Code.attrib(code));
+            buff.append(AnsiCode.attrib(code));
         }
 
         return this;
     }
 
-    public Buffer attrib(final String text, final int code) {
+    public AnsiBuffer attrib(final String text, final int code) {
         assert text != null;
 
         if (isAnsiEnabled()) {
-            buff.append(Code.attrib(code)).append(text).append(Code.attrib(Code.OFF));
+            buff.append(AnsiCode.attrib(code)).append(text).append(AnsiCode.attrib(AnsiCode.OFF));
         }
         else {
             buff.append(text);
@@ -102,7 +98,7 @@
         return this;
     }
 
-    public Buffer attrib(final String text, final String codeName) {
-        return attrib(text, Code.forName(codeName));
+    public AnsiBuffer attrib(final String text, final String codeName) {
+        return attrib(text, AnsiCode.forName(codeName));
     }
 }

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiBuffer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiBuffer.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiBuffer.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiCode.java
(from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Code.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiCode.java?p2=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiCode.java&p1=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Code.java&r1=706527&r2=706538&rev=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Code.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiCode.java
Mon Oct 20 23:39:11 2008
@@ -29,10 +29,10 @@
  *
  * @version $Rev$ $Date$
  */
-public class Code
+public class AnsiCode
 {
     //
-    // TODO: Rename
+    // TODO: Consider converting this to an enum
     //
     
     public static final int OFF = 0;
@@ -79,7 +79,7 @@
     private static final Map<Integer,String> CODES_TO_NAMES;
 
     static {
-        Field[] fields = Code.class.getDeclaredFields();
+        Field[] fields = AnsiCode.class.getDeclaredFields();
         Map<String,Integer> names = new HashMap<String,Integer>(fields.length);
         Map<Integer,String> codes = new HashMap<Integer,String>(fields.length);
 
@@ -92,7 +92,7 @@
                 }
 
                 String name = field.getName();
-                Integer code = (Integer) field.get(Code.class);
+                Integer code = (Integer) field.get(AnsiCode.class);
 
                 names.put(name, code);
                 codes.put(code, name);
@@ -109,7 +109,7 @@
 
     /**
      * Returns the ANSI code for the given symbolic name.  Supported symbolic names are all
defined as
-     * fields in {@link Code} where the case is not significant.
+     * fields in {@link AnsiCode} where the case is not significant.
      */
     public static int forName(final String name) throws IllegalArgumentException {
         assert name != null;

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiCode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiCode.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiCode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderMessageSource.java
(from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderMessageSource.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderMessageSource.java?p2=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderMessageSource.java&p1=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderMessageSource.java&r1=706527&r2=706538&rev=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderMessageSource.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderMessageSource.java
Mon Oct 20 23:39:11 2008
@@ -26,37 +26,33 @@
  *
  * @version $Rev$ $Date$
  */
-public class RenderMessageSource
+public class AnsiRenderMessageSource
     implements MessageSource
 {
-    //
-    // TODO: Rename
-    //
-    
-    private final Renderer renderer = new Renderer();
+    private final AnsiRenderer renderer = new AnsiRenderer();
 
     private final MessageSource source;
 
-    public RenderMessageSource(final MessageSource source) {
+    public AnsiRenderMessageSource(final MessageSource source) {
         assert source != null;
 
         this.source = source;
     }
-    
+
     public String getMessage(final String code) {
         String msg = source.getMessage(code);
 
-        if (Renderer.test(msg)) {
+        if (AnsiRenderer.test(msg)) {
             return renderer.render(msg);
         }
 
         return msg;
     }
 
-    public String format(String code, Object... args) {
+    public String format(final String code, final Object... args) {
         String msg = source.format(code, args);
 
-        if (Renderer.test(msg)) {
+        if (AnsiRenderer.test(msg)) {
             return renderer.render(msg);
         }
 

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderMessageSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderMessageSource.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderMessageSource.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderWriter.java
(from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderWriter.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderWriter.java?p2=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderWriter.java&p1=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderWriter.java&r1=706527&r2=706538&rev=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/RenderWriter.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderWriter.java
Mon Oct 20 23:39:11 2008
@@ -28,33 +28,29 @@
  *
  * @version $Rev$ $Date$
  */
-public class RenderWriter
+public class AnsiRenderWriter
     extends PrintWriter
 {
-    //
-    // TODO: Rename
-    //
-    
-    private final Renderer renderer = new Renderer();
+    private final AnsiRenderer renderer = new AnsiRenderer();
 
-    public RenderWriter(final OutputStream out) {
+    public AnsiRenderWriter(final OutputStream out) {
         super(out);
     }
 
-    public RenderWriter(final OutputStream out, final boolean autoFlush) {
+    public AnsiRenderWriter(final OutputStream out, final boolean autoFlush) {
         super(out, autoFlush);
     }
 
-    public RenderWriter(final Writer out) {
+    public AnsiRenderWriter(final Writer out) {
         super(out);
     }
 
-    public RenderWriter(final Writer out, final boolean autoFlush) {
+    public AnsiRenderWriter(final Writer out, final boolean autoFlush) {
         super(out, autoFlush);
     }
 
     public void write(final String s) {
-        if (Renderer.test(s)) {
+        if (AnsiRenderer.test(s)) {
             super.write(renderer.render(s));
         }
         else {

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderWriter.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderWriter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderer.java
(from r706527, geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Renderer.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderer.java?p2=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderer.java&p1=geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Renderer.java&r1=706527&r2=706538&rev=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/Renderer.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderer.java
Mon Oct 20 23:39:11 2008
@@ -31,12 +31,8 @@
  *
  * @version $Rev$ $Date$
  */
-public class Renderer
+public class AnsiRenderer
 {
-    //
-    // TODO: Rename
-    //
-
     public static final String BEGIN_TOKEN = "@|";
 
     private static final int BEGIN_TOKEN_SIZE = BEGIN_TOKEN.length();
@@ -49,7 +45,7 @@
 
     public static final String CODE_LIST_SEPARATOR  = ",";
 
-    private final Buffer buff = new Buffer();
+    private final AnsiBuffer buff = new AnsiBuffer();
 
     public String render(final String input) throws RenderException {
         assert input != null;
@@ -93,13 +89,13 @@
         String text = input.substring(i + 1, input.length());
 
         for (String name : codes) {
-            int code = Code.forName(name);
+            int code = AnsiCode.forName(name);
             buff.attrib(code);
         }
 
         buff.append(text);
 
-        buff.attrib(Code.OFF);
+        buff.attrib(AnsiCode.OFF);
     }
 
     //
@@ -123,8 +119,8 @@
     }
 
     public static String encode(final Object text, final int code) {
-        return new StringBuffer(BEGIN_TOKEN).
-                append(Code.name(code)).
+        return new StringBuilder(BEGIN_TOKEN).
+                append(AnsiCode.name(code)).
                 append(CODE_TEXT_SEPARATOR).
                 append(text).
                 append(END_TOKEN).

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderer.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/main/java/org/apache/geronimo/gshell/ansi/AnsiRenderer.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/BufferTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/BufferTest.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/BufferTest.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/BufferTest.java
Mon Oct 20 23:39:11 2008
@@ -22,7 +22,7 @@
 import junit.framework.TestCase;
 
 /**
- * Tests for the {@link org.apache.geronimo.gshell.ansi.Code} class.
+ * Tests for the {@link AnsiCode} class.
  *
  * @version $Rev$ $Date$
  */
@@ -30,8 +30,8 @@
     extends TestCase
 {
     public void testIsAnsiEnabledOverride() throws Exception {
-        boolean detected = ANSI.isEnabled();
-        Buffer buff = new Buffer();
+        boolean detected = Ansi.isEnabled();
+        AnsiBuffer buff = new AnsiBuffer();
 
         // Make sure the buffer starts out with the system detected value
         assertEquals(detected, buff.isAnsiEnabled());

Modified: geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/CodeTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/CodeTest.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/CodeTest.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ansi/src/test/java/org/apache/geronimo/gshell/ansi/CodeTest.java
Mon Oct 20 23:39:11 2008
@@ -22,7 +22,7 @@
 import junit.framework.TestCase;
 
 /**
- * Tests for the {@link Code} class.
+ * Tests for the {@link AnsiCode} class.
  *
  * @version $Rev$ $Date$
  */
@@ -30,11 +30,11 @@
     extends TestCase
 {
     public void testForName() throws Exception {
-        assertEquals(Code.OFF, Code.forName("OFF"));
-        assertEquals(Code.OFF, Code.forName("off"));
+        assertEquals(AnsiCode.OFF, AnsiCode.forName("OFF"));
+        assertEquals(AnsiCode.OFF, AnsiCode.forName("off"));
     }
 
     public void testName() throws Exception {
-        assertEquals("OFF", Code.name(Code.OFF));
+        assertEquals("OFF", AnsiCode.name(AnsiCode.OFF));
     }
 }
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-support/gshell-io/src/main/java/org/apache/geronimo/gshell/io/IO.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-io/src/main/java/org/apache/geronimo/gshell/io/IO.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-io/src/main/java/org/apache/geronimo/gshell/io/IO.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-io/src/main/java/org/apache/geronimo/gshell/io/IO.java
Mon Oct 20 23:39:11 2008
@@ -21,7 +21,7 @@
 
 import jline.Terminal;
 import jline.ConsoleReader;
-import org.apache.geronimo.gshell.ansi.RenderWriter;
+import org.apache.geronimo.gshell.ansi.AnsiRenderWriter;
 import org.apache.geronimo.gshell.yarn.Yarn;
 import org.slf4j.helpers.MessageFormatter;
 
@@ -107,14 +107,14 @@
         //
 
 
-        this.out = new RenderWriter(outputStream, autoFlush);
+        this.out = new AnsiRenderWriter(outputStream, autoFlush);
 
         /// Don't rewrite the error stream if we have the same stream for out and error
         if (isSharedOutputStreams()) {
             this.err = this.out;
         }
         else {
-            this.err = new RenderWriter(errorStream, autoFlush);
+            this.err = new AnsiRenderWriter(errorStream, autoFlush);
         }
 
         // this.out = new PrintWriter(out, autoFlush);

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java
Mon Oct 20 23:39:11 2008
@@ -19,9 +19,9 @@
 
 package org.apache.geronimo.gshell.wisdom.branding;
 
-import org.apache.geronimo.gshell.ansi.Buffer;
-import org.apache.geronimo.gshell.ansi.Code;
-import org.apache.geronimo.gshell.ansi.RenderWriter;
+import org.apache.geronimo.gshell.ansi.AnsiBuffer;
+import org.apache.geronimo.gshell.ansi.AnsiCode;
+import org.apache.geronimo.gshell.ansi.AnsiRenderWriter;
 import org.apache.geronimo.gshell.application.model.Branding;
 
 import java.io.PrintWriter;
@@ -70,7 +70,7 @@
     @Override
     public String getAboutMessage() {
         StringWriter writer = new StringWriter();
-        PrintWriter out = new RenderWriter(writer);
+        PrintWriter out = new AnsiRenderWriter(writer);
 
         out.println("For information about @|cyan GShell|, visit:");
         out.println("    @|bold http://gshell.org| ");
@@ -125,11 +125,11 @@
     @Override
     public String getWelcomeMessage() {
         StringWriter writer = new StringWriter();
-        PrintWriter out = new RenderWriter(writer);
-        Buffer buff = new Buffer();
+        PrintWriter out = new AnsiRenderWriter(writer);
+        AnsiBuffer buff = new AnsiBuffer();
 
         for (String line : BANNER) {
-            buff.attrib(line, Code.CYAN);
+            buff.attrib(line, AnsiCode.CYAN);
             out.println(buff);
         }
 

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterSupport.java
Mon Oct 20 23:39:11 2008
@@ -19,8 +19,8 @@
 
 package org.apache.geronimo.gshell.wisdom.command;
 
-import org.apache.geronimo.gshell.ansi.Code;
-import org.apache.geronimo.gshell.ansi.Renderer;
+import org.apache.geronimo.gshell.ansi.AnsiCode;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
 import org.apache.geronimo.gshell.clp.CommandLineProcessor;
 import org.apache.geronimo.gshell.clp.Printer;
 import org.apache.geronimo.gshell.command.Command;
@@ -96,14 +96,14 @@
 
         log.trace("Rendering command manual");
 
-        Renderer renderer = new Renderer();
+        AnsiRenderer renderer = new AnsiRenderer();
         
-        out.println(renderer.render(Renderer.encode("NAME", Code.BOLD)));
+        out.println(renderer.render(AnsiRenderer.encode("NAME", AnsiCode.BOLD)));
         out.print("  ");
         out.println(getCommand().getLocation().getName());
         out.println();
 
-        out.println(renderer.render(Renderer.encode("DESCRIPTION", Code.BOLD)));
+        out.println(renderer.render(AnsiRenderer.encode("DESCRIPTION", AnsiCode.BOLD)));
         out.print("  ");
         out.println(getDescription());
         out.println();
@@ -112,7 +112,7 @@
         // TODO: Use a prefixing writer here, take the impl from shitty
         //
         
-        out.println(renderer.render(Renderer.encode("MANUAL", Code.BOLD)));
+        out.println(renderer.render(AnsiRenderer.encode("MANUAL", AnsiCode.BOLD)));
         out.println(getManual());
         out.println();
     }

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java
Mon Oct 20 23:39:11 2008
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.gshell.wisdom.shell;
 
-import org.apache.geronimo.gshell.ansi.Renderer;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
 import org.apache.geronimo.gshell.application.Application;
 import org.apache.geronimo.gshell.console.Console;
 import org.apache.geronimo.gshell.event.EventManager;
@@ -42,7 +42,7 @@
 
     private final Application application;
 
-    private Renderer renderer = new Renderer();
+    private AnsiRenderer renderer = new AnsiRenderer();
 
     public ConsoleErrorHandlerImpl(final EventManager eventManager, final Application application)
{
         assert eventManager != null;

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java?rev=706538&r1=706537&r2=706538&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java
Mon Oct 20 23:39:11 2008
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.gshell.wisdom.shell;
 
-import org.apache.geronimo.gshell.ansi.Renderer;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
 import org.apache.geronimo.gshell.application.Application;
 import org.apache.geronimo.gshell.command.Variables;
 import org.apache.geronimo.gshell.console.Console;
@@ -49,7 +49,7 @@
 
     private final VariablesValueSource variablesValueSource = new VariablesValueSource();
 
-    private final Renderer renderer = new Renderer();
+    private final AnsiRenderer renderer = new AnsiRenderer();
 
     public ConsolePrompterImpl(final Application application) {
         assert application != null;
@@ -90,7 +90,7 @@
         }
 
         // Encode ANSI muck if it looks like there are codes encoded
-        if (Renderer.test(prompt)) {
+        if (AnsiRenderer.test(prompt)) {
             prompt = renderer.render(prompt);
         }
 



Mime
View raw message