Author: scooter
Date: 2010-07-15 19:24:10 -0700 (Thu, 15 Jul 2010)
New Revision: 20944

Modified:
   
csplugins/trunk/ucsf/scooter/commandTool/src/commandTool/handlers/CommandHandler.java
   
csplugins/trunk/ucsf/scooter/commandTool/src/commandTool/handlers/StdMessageHandler.java
Log:
Add a little more information to the std message handler


Modified: 
csplugins/trunk/ucsf/scooter/commandTool/src/commandTool/handlers/CommandHandler.java
===================================================================
--- 
csplugins/trunk/ucsf/scooter/commandTool/src/commandTool/handlers/CommandHandler.java
       2010-07-15 23:57:52 UTC (rev 20943)
+++ 
csplugins/trunk/ucsf/scooter/commandTool/src/commandTool/handlers/CommandHandler.java
       2010-07-16 02:24:10 UTC (rev 20944)
@@ -61,6 +61,7 @@
                                String line = null;
                                while ((line = input.readLine()) != null) {
                                        line = line.trim();
+                                       
CommandTool.getMessageHandlerContext().appendCommand(line);
                                        
handleCommand(CommandTool.getMessageHandlerContext(), line);
                                }
                        } 
@@ -72,11 +73,7 @@
 
        public static void handleCommand(MessageHandler resultsText, String 
input) {
                CyCommandResult results = null;
-               if (input.length() == 0) return;
-               if (input.startsWith("#")) {
-                       resultsText.appendMessage(input);
-                       return;
-               }
+               if (input.length() == 0 || input.startsWith("#")) return;
 
                try {
                        // Handle our built-ins

Modified: 
csplugins/trunk/ucsf/scooter/commandTool/src/commandTool/handlers/StdMessageHandler.java
===================================================================
--- 
csplugins/trunk/ucsf/scooter/commandTool/src/commandTool/handlers/StdMessageHandler.java
    2010-07-15 23:57:52 UTC (rev 20943)
+++ 
csplugins/trunk/ucsf/scooter/commandTool/src/commandTool/handlers/StdMessageHandler.java
    2010-07-16 02:24:10 UTC (rev 20944)
@@ -37,19 +37,23 @@
        }
 
        public void appendCommand(String s) {
-               System.out.println(s);
+               System.out.println("Command: "+s);
        }
 
        public void appendError(String s) {
-               System.err.println(s);
+               System.err.println("ERROR:  "+s);
        }
 
        public void appendResult(String s) {
-               System.out.println(s);
+               if (s == null || s.length() == 0)
+                       return;
+               System.out.println("-->    "+s);
        }
 
        public void appendMessage(String s) {
-               System.out.println(s);
+               if (s == null || s.length() == 0)
+                       return;
+               System.out.println("-->    "+s);
        }
 
 }

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to