svn commit: r1301965 - in /incubator/kitty/trunk/src: main/groovy/org/apache/kitty/command/ main/groovy/org/apache/kitty/io/ test/groovy/org/apache/kitty/io/

[anovarini]

Author: anovarini
Date: Sat Mar 17 17:16:38 2012
New Revision: 1301965

URL: http://svn.apache.org/viewvc?rev=1301965&view=rev
Log:
Fixed codeNard errors

Modified:
    
incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/Connect.groovy
    
incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/SetDomain.groovy
    incubator/kitty/trunk/src/main/groovy/org/apache/kitty/io/Terminal.groovy
    
incubator/kitty/trunk/src/test/groovy/org/apache/kitty/io/TerminalTest.groovy

Modified: 
incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/Connect.groovy
URL: 
http://svn.apache.org/viewvc/incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/Connect.groovy?rev=1301965&r1=1301964&r2=1301965&view=diff
==============================================================================
--- 
incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/Connect.groovy 
(original)
+++ 
incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/Connect.groovy 
Sat Mar 17 17:16:38 2012
@@ -18,8 +18,6 @@ package org.apache.kitty.command
 
 import org.apache.kitty.client.Client
 import org.apache.kitty.Command
-import org.apache.kitty.IODevice
-import org.apache.kitty.listener.DomainListener
 import org.apache.kitty.listener.ConnectListener
 
 class Connect implements Command {

Modified: 
incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/SetDomain.groovy
URL: 
http://svn.apache.org/viewvc/incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/SetDomain.groovy?rev=1301965&r1=1301964&r2=1301965&view=diff
==============================================================================
--- 
incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/SetDomain.groovy 
(original)
+++ 
incubator/kitty/trunk/src/main/groovy/org/apache/kitty/command/SetDomain.groovy 
Sat Mar 17 17:16:38 2012
@@ -17,7 +17,6 @@
 package org.apache.kitty.command
 
 import org.apache.kitty.Command
-import org.apache.kitty.IODevice
 import org.apache.kitty.utils.Constants
 import org.apache.kitty.client.Client
 import org.apache.kitty.listener.DomainListener

Modified: 
incubator/kitty/trunk/src/main/groovy/org/apache/kitty/io/Terminal.groovy
URL: 
http://svn.apache.org/viewvc/incubator/kitty/trunk/src/main/groovy/org/apache/kitty/io/Terminal.groovy?rev=1301965&r1=1301964&r2=1301965&view=diff
==============================================================================
--- incubator/kitty/trunk/src/main/groovy/org/apache/kitty/io/Terminal.groovy 
(original)
+++ incubator/kitty/trunk/src/main/groovy/org/apache/kitty/io/Terminal.groovy 
Sat Mar 17 17:16:38 2012
@@ -49,10 +49,10 @@ class Terminal implements IODevice, Doma
     }
 
     String read() {
-        reader?.readLine(createPrompt(), 0 as char)?.trim()
+        reader?.readLine(composePrompt(), 0 as char)?.trim()
     }
 
-    String createPrompt() {
+    String composePrompt() {
         String userToDisplay = user?:''
         String hostToDisplay = host?"@$host":''
         String portToDisplay = port?":$port":''

Modified: 
incubator/kitty/trunk/src/test/groovy/org/apache/kitty/io/TerminalTest.groovy
URL: 
http://svn.apache.org/viewvc/incubator/kitty/trunk/src/test/groovy/org/apache/kitty/io/TerminalTest.groovy?rev=1301965&r1=1301964&r2=1301965&view=diff
==============================================================================
--- 
incubator/kitty/trunk/src/test/groovy/org/apache/kitty/io/TerminalTest.groovy 
(original)
+++ 
incubator/kitty/trunk/src/test/groovy/org/apache/kitty/io/TerminalTest.groovy 
Sat Mar 17 17:16:38 2012
@@ -20,7 +20,7 @@ class TerminalTest extends GroovyTestCas
 
     void testShouldReturnDefaultPromptWhenNotConnected() {
         Terminal terminal = new Terminal(null, null)
-        String prompt = terminal.createPrompt()
+        String prompt = terminal.composePrompt()
 
         assertEquals "Default prompt", "kitty> ", prompt
     }
@@ -29,7 +29,7 @@ class TerminalTest extends GroovyTestCas
         Terminal terminal = new Terminal(null, null)
         terminal.connectionSucceeded 'aHost', 'aPort'
 
-        String prompt = terminal.createPrompt()
+        String prompt = terminal.composePrompt()
 
         assertEquals "Prompt", "@aHost:aPort> ", prompt
     }
@@ -38,7 +38,7 @@ class TerminalTest extends GroovyTestCas
         Terminal terminal = new Terminal(null, null)
         terminal.connectionSucceeded 'aHost', 'aPort', 'anUser'
 
-        String prompt = terminal.createPrompt()
+        String prompt = terminal.composePrompt()
 
         assertEquals "Prompt", "anUser@aHost:aPort> ", prompt
     }
@@ -48,7 +48,7 @@ class TerminalTest extends GroovyTestCas
         terminal.connectionSucceeded 'aHost', 'aPort'
         terminal.domainChanged 'aDomain'
 
-        String prompt = terminal.createPrompt()
+        String prompt = terminal.composePrompt()
 
         assertEquals "Prompt", "@aHost:aPort/aDomain> ", prompt
     }