Author: davsclaus
Date: Sat Oct 18 05:53:36 2008
New Revision: 705880
URL: http://svn.apache.org/viewvc?rev=705880&view=rev
Log:
All model toString() is now aligned
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
Sat Oct 18 05:53:36 2008
@@ -80,7 +80,7 @@
@Override
public String toString() {
- return "Aggregator[ " + getExpression() + " -> " + getOutputs() + "]";
+ return "Aggregator[" + getExpression() + " -> " + getOutputs() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
Sat Oct 18 05:53:36 2008
@@ -56,9 +56,9 @@
@Override
public String toString() {
if (getOtherwise() != null) {
- return "Choice[ " + getWhenClauses() + " " + getOtherwise() + "]";
+ return "Choice[" + getWhenClauses() + " " + getOtherwise() + "]";
} else {
- return "Choice[ " + getWhenClauses() + "]";
+ return "Choice[" + getWhenClauses() + "]";
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
Sat Oct 18 05:53:36 2008
@@ -55,7 +55,7 @@
@Override
public String toString() {
- return "convertBodyTo[ " + getType() + "]";
+ return "convertBodyTo[" + getType() + "]";
}
@Override
@@ -86,7 +86,6 @@
}
public void setTypeClass(Class typeClass) {
-
this.typeClass = typeClass;
}
@@ -94,7 +93,7 @@
if (typeClass == null) {
Class clazz = createTypeClass();
if (clazz == null) {
- throw new RuntimeCamelException("can't load the class with the
class name " + getType());
+ throw new RuntimeCamelException("Can't load the class with the
class name: " + getType());
}
setTypeClass(clazz);
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
Sat Oct 18 05:53:36 2008
@@ -57,7 +57,7 @@
@Override
public String toString() {
- return "Delayer[ " + getExpression() + " -> " + getOutputs() + "]";
+ return "Delayer[" + getExpression() + " -> " + getOutputs() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
Sat Oct 18 05:53:36 2008
@@ -77,7 +77,7 @@
@Override
public String toString() {
- return "Exception[ " + getExceptionClasses() + " -> " + getOutputs() +
"]";
+ return "Exception[" + getExceptionClasses() + " -> " + getOutputs() +
"]";
}
/**
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
Sat Oct 18 05:53:36 2008
@@ -46,7 +46,7 @@
@Override
public String toString() {
- return "Filter[ " + getExpression() + " -> " + getOutputs() + "]";
+ return "Filter[" + getExpression() + " -> " + getOutputs() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
Sat Oct 18 05:53:36 2008
@@ -51,7 +51,7 @@
@Override
public String toString() {
- return "IdempotentConsumer[ " + getExpression() + " -> " +
getOutputs() + "]";
+ return "IdempotentConsumer[" + getExpression() + " -> " + getOutputs()
+ "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
Sat Oct 18 05:53:36 2008
@@ -174,14 +174,11 @@
@Override
public String toString() {
- String result;
if (loadBalancerType != null) {
- result = "LoadBalanceType[" + loadBalancerType + ", ";
+ return "LoadBalanceType[" + loadBalancerType + ", " + getOutputs()
+ "]";
} else {
- result = "LoadBalanceType[" + ref + ", ";
+ return "LoadBalanceType[ref: " + ref + ", " + getOutputs() + "]";
}
- result = result + getOutputs() + "]";
- return result;
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java
Sat Oct 18 05:53:36 2008
@@ -52,7 +52,7 @@
}
@Override
public String toString() {
- return "Loop[ " + getExpression() + " -> " + getOutputs() + "]";
+ return "Loop[" + getExpression() + " -> " + getOutputs() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
Sat Oct 18 05:53:36 2008
@@ -79,7 +79,7 @@
if (dataFormatType != null) {
return "Marshal[" + dataFormatType + "]";
} else {
- return "Marshal[ref: " + ref + "]";
+ return "Marshal[ref: " + ref + "]";
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
Sat Oct 18 05:53:36 2008
@@ -97,7 +97,7 @@
if (policy != null) {
return policy.toString();
} else {
- return "ref: " + ref;
+ return "ref: " + ref;
}
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
Sat Oct 18 05:53:36 2008
@@ -47,7 +47,7 @@
@Override
public String toString() {
- return "RecipientList[ " + getExpression() + "]";
+ return "RecipientList[" + getExpression() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java
Sat Oct 18 05:53:36 2008
@@ -43,7 +43,7 @@
@Override
public String toString() {
- return "RemoveHeader[ " + getHeaderName() + "]";
+ return "RemoveHeader[" + getHeaderName() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java
Sat Oct 18 05:53:36 2008
@@ -43,7 +43,7 @@
@Override
public String toString() {
- return "RemoveProperty[ " + getPropertyName() + "]";
+ return "RemoveProperty[" + getPropertyName() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
Sat Oct 18 05:53:36 2008
@@ -120,7 +120,7 @@
@Override
public String toString() {
- return "Resequencer[ " + getExpressions() + " -> " + getOutputs() +
"]";
+ return "Resequencer[" + getExpressions() + " -> " + getOutputs() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
Sat Oct 18 05:53:36 2008
@@ -72,7 +72,7 @@
@Override
public String toString() {
- return "Route[ " + inputs + " -> " + outputs + "]";
+ return "Route[" + inputs + " -> " + outputs + "]";
}
public void addRoutes(CamelContext context, Collection<Route> routes)
throws Exception {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
Sat Oct 18 05:53:36 2008
@@ -57,7 +57,7 @@
@Override
public String toString() {
- return "RoutingSlip[ headerName=" + getHeaderName() + " uriDelimiter="
+ getUriDelimiter() + "]";
+ return "RoutingSlip[headerName=" + getHeaderName() + ", uriDelimiter="
+ getUriDelimiter() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
Sat Oct 18 05:53:36 2008
@@ -42,7 +42,7 @@
@Override
public String toString() {
- return "SetBody[ " + getExpression() + "]";
+ return "SetBody[" + getExpression() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
Sat Oct 18 05:53:36 2008
@@ -57,7 +57,7 @@
@Override
public String toString() {
- return "SetHeader[ " + getHeaderName() + ", " + getExpression() + "]";
+ return "SetHeader[" + getHeaderName() + ", " + getExpression() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java
Sat Oct 18 05:53:36 2008
@@ -51,7 +51,7 @@
@Override
public String toString() {
- return "SetOutHeader[ " + getHeaderName() + ", " + getExpression() +
"]";
+ return "SetOutHeader[" + getHeaderName() + ", " + getExpression() +
"]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java
Sat Oct 18 05:53:36 2008
@@ -57,7 +57,7 @@
@Override
public String toString() {
- return "SetProperty[ " + getPropertyName() + ", " + getExpression() +
"]";
+ return "SetProperty[" + getPropertyName() + ", " + getExpression() +
"]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
Sat Oct 18 05:53:36 2008
@@ -64,7 +64,7 @@
@Override
public String toString() {
- return "Splitter[ " + getExpression() + " -> " + getOutputs() + "]";
+ return "Splitter[" + getExpression() + " -> " + getOutputs() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
Sat Oct 18 05:53:36 2008
@@ -84,7 +84,7 @@
@Override
public String toString() {
- return "Thread[" + getLabel() + "]";
+ return "Thread[" + name + "]";
}
@Override
@@ -93,11 +93,6 @@
}
@Override
- public String getLabel() {
- return "coreSize=" + coreSize;
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
ThreadProcessor thread = new ThreadProcessor();
thread.setExecutor(executor);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
Sat Oct 18 05:53:36 2008
@@ -51,6 +51,15 @@
return "throwFault";
}
+ @Override
+ public String toString() {
+ if (faultRef != null) {
+ return "ThrowFault[ref: " + faultRef + "]";
+ } else {
+ return "ThrowFault[" + fault.getClass().getCanonicalName();
+ }
+ }
+
public void setFault(Throwable fault) {
this.fault = fault;
}
@@ -69,7 +78,6 @@
@Override
public Processor createProcessor(RouteContext routeContext) {
-
if (processor == null) {
if (fault == null) {
fault = routeContext.lookup(faultRef, Throwable.class);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
Sat Oct 18 05:53:36 2008
@@ -41,7 +41,7 @@
@Override
public String toString() {
- return "Transform[ " + getExpression() + "]";
+ return "Transform[" + getExpression() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
Sat Oct 18 05:53:36 2008
@@ -48,7 +48,7 @@
@Override
public String toString() {
- return "Try[ " + getOutputs() + "]";
+ return "Try[" + getOutputs() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
Sat Oct 18 05:53:36 2008
@@ -79,7 +79,7 @@
if (dataFormatType != null) {
return "Marshal[" + dataFormatType + "]";
} else {
- return "Marshal[ref: " + ref + "]";
+ return "Marshal[ref: " + ref + "]";
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
Sat Oct 18 05:53:36 2008
@@ -44,7 +44,7 @@
@Override
public String toString() {
- return "When[ " + getExpression() + " -> " + getOutputs() + "]";
+ return "When[" + getExpression() + " -> " + getOutputs() + "]";
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java?rev=705880&r1=705879&r2=705880&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
Sat Oct 18 05:53:36 2008
@@ -88,7 +88,23 @@
@Override
public String toString() {
- return getLanguage() + "Expression[" + getExpression() + "]";
+ StringBuilder sb = new StringBuilder();
+ if (getLanguage() != null) {
+ sb.append(getLanguage() + "{");
+ }
+ if (getExpression() != null) {
+ sb.append(getExpression());
+ }
+ if (getPredicate() != null) {
+ sb.append(getPredicate().toString());
+ }
+ if (getExpressionValue() != null) {
+ sb.append(getExpressionValue().toString());
+ }
+ if (getLanguage() != null) {
+ sb.append("}");
+ }
+ return sb.toString();
}
public Object evaluate(Exchange exchange) {
