Repository: camel
Updated Branches:
  refs/heads/master a193465b9 -> ce1973f61


Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ce1973f6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ce1973f6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ce1973f6

Branch: refs/heads/master
Commit: ce1973f6199076ce25d15f50a490d380058b6d8e
Parents: a193465
Author: Claus Ibsen <[email protected]>
Authored: Sat Nov 14 11:03:42 2015 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Sun Nov 15 07:45:57 2015 +0100

----------------------------------------------------------------------
 .../apache/camel/language/bean/BeanExpression.java    |  2 +-
 .../java/org/apache/camel/model/BeanDefinition.java   |  2 +-
 .../org/apache/camel/model/TransactedDefinition.java  | 14 ++++++++++++--
 .../camel/model/language/MethodCallExpression.java    |  6 +++---
 4 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ce1973f6/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java 
b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index f5cc981..a417554 100644
--- 
a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++ 
b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -86,7 +86,7 @@ public class BeanExpression implements Expression, Predicate {
             sb.append(ObjectHelper.className(type));
         }
         if (method != null) {
-            sb.append(" method: ").append(method);
+            sb.append(" method:").append(method);
         }
         sb.append("]");
         return sb.toString();

http://git-wip-us.apache.org/repos/asf/camel/blob/ce1973f6/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
index d3733ed..222d9f6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
@@ -82,7 +82,7 @@ public class BeanDefinition extends 
NoOutputDefinition<BeanDefinition> {
         if (ref != null) {
             String methodText = "";
             if (method != null) {
-                methodText = " method: " + method;
+                methodText = " method:" + method;
             }
             return "ref:" + ref + methodText;
         } else if (bean != null) {

http://git-wip-us.apache.org/repos/asf/camel/blob/ce1973f6/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
index 0997315..159c150 100644
--- a/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
@@ -73,7 +73,12 @@ public class TransactedDefinition extends 
OutputDefinition<TransactedDefinition>
 
     @Override
     public String toString() {
-        return "Transacted[" + description() + "]";
+        String desc = description();
+        if (ObjectHelper.isEmpty(desc)) {
+            return "Transacted";
+        } else{
+            return "Transacted[" + desc + "]";
+        }
     }
     
     protected String description() {
@@ -88,7 +93,12 @@ public class TransactedDefinition extends 
OutputDefinition<TransactedDefinition>
 
     @Override
     public String getLabel() {
-        return "transacted[" + description() + "]";
+        String desc = description();
+        if (ObjectHelper.isEmpty(desc)) {
+            return "transacted";
+        } else{
+            return "transacted[" + desc + "]";
+        }
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/ce1973f6/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
 
b/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
index acc531c..e4587e8 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
@@ -257,9 +257,9 @@ public class MethodCallExpression extends 
ExpressionDefinition {
 
     protected String beanName() {
         if (bean != null) {
-            return bean;
+            return "ref:" + bean;
         } else if (ref != null) {
-            return ref;
+            return "ref:" + ref;
         } else if (instance != null) {
             return ObjectHelper.className(instance);
         }
@@ -268,6 +268,6 @@ public class MethodCallExpression extends 
ExpressionDefinition {
 
     @Override
     public String toString() {
-        return "bean{" + beanName() + (method != null ? ", method=" + method : 
"") + "}";
+        return "bean[" + beanName() + (method != null ? " method:" + method : 
"") + "]";
     }
 }
\ No newline at end of file

Reply via email to