svn commit: r669972 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/model/ProcessorRef.java main/java/org/apache/camel/processor/interceptor/TraceFormatter.java test/java/org/apache/camel/processor/TraceInterceptorTest.java

[js...@apache.org]

Author: jstrachan
Date: Fri Jun 20 09:23:29 2008
New Revision: 669972

URL: http://svn.apache.org/viewvc?rev=669972&view=rev
Log:
added nicer output of the trace formatter

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java?rev=669972&r1=669971&r2=669972&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java Fri Jun 20 09:23:29 2008
@@ -16,15 +16,11 @@
  */
 package org.apache.camel.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-
 import org.apache.camel.Processor;
 import org.apache.camel.spi.RouteContext;
 
+import javax.xml.bind.annotation.*;
+
 /**
  * Represents an XML <process/> element
  *
@@ -47,7 +43,9 @@
 
     @Override
     public String toString() {
-        return "Processor[ref:  " + ref + "]";
+        return "Processor[" +
+                ((ref != null) ? "ref:  " + ref : processor)
+                + "]";
     }
 
     @Override

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java?rev=669972&r1=669971&r2=669972&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java Fri Jun 20 09:23:29 2008
@@ -25,6 +25,7 @@
  * @version $Revision: 1.1 $
  */
 public class TraceFormatter {
+    private boolean showNode = true;
     private boolean showProperties = true;
     private boolean showHeaders = true;
     private boolean showBody = true;
@@ -36,6 +37,7 @@
         Throwable exception = exchange.getException();
         return (showBreadCrumb ? getBreadCrumbID(exchange) + " " : "")
                 + "-> " + getNodeMessage(interceptor) + " "
+                + (showNode ? interceptor.getNode() + " " : "")
                 + exchange.getPattern()
                 + (showExchangeId ? " Id: " + exchange.getExchangeId() : "")
                 + ((showProperties) ? " Properties:" + exchange.getProperties() : "")
@@ -85,6 +87,14 @@
         this.showProperties = showProperties;
     }
 
+    public boolean isShowNode() {
+        return showNode;
+    }
+
+    public void setShowNode(boolean showNode) {
+        this.showNode = showNode;
+    }
+
     // Implementation methods
     //-------------------------------------------------------------------------
     protected Object getBreadCrumbID(Exchange exchange) {

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java?rev=669972&r1=669971&r2=669972&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java Fri Jun 20 09:23:29 2008
@@ -43,7 +43,11 @@
                         process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 // do nothing
+                            }
 
+                            @Override
+                            public String toString() {
+                                return "MyProcessor";
                             }
                         }).
                         to("mock:a").