[jbpm-commits] JBoss JBPM SVN: r3844 - in jbpm3/trunk/modules/core/src/main/java/org/jbpm: graph/exe and 1 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-02-11 17:36:06 -0500 (Wed, 11 Feb 2009)
New Revision: 3844

Modified:
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Action.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Job.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java
Log:
review toString() in a few select classes

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Action.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Action.java	2009-02-11 21:42:58 UTC (rev 3843)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Action.java	2009-02-11 22:36:06 UTC (rev 3844)
@@ -57,17 +57,14 @@
   
   public String toString() {
     String toString = null;
-    if (name!=null) {
-      toString = "action["+name+"]";
-    } else if (actionExpression!=null) {
-      toString = "action["+actionExpression+"]";
+    if (actionExpression!=null) {
+      toString = "Action("+actionExpression+')';
     } else {
-      String className = getClass().getName(); 
-      className = className.substring(className.lastIndexOf('.')+1);
+      String className = getClass().getSimpleName(); 
       if (name!=null) {
-        toString = className+"("+name+")";
+        toString = className+'('+name+')';
       } else {
-        toString = className+"("+Integer.toHexString(System.identityHashCode(this))+")";
+        toString = className+'@'+Integer.toHexString(hashCode());
       }
     }
     return toString;

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java	2009-02-11 21:42:58 UTC (rev 3843)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java	2009-02-11 22:36:06 UTC (rev 3844)
@@ -176,7 +176,7 @@
   // event handling ///////////////////////////////////////////////////////////
 
   public void fireEvent(String eventType, ExecutionContext executionContext) {
-    log.debug("event '" + eventType + "' on '" + this + "' for '" + executionContext.getToken() + "'");
+    log.debug("event '" + eventType + "' on " + this + " for " + executionContext.getToken());
     try {
       executionContext.setEventSource(this);
 
@@ -268,7 +268,7 @@
       executionContext.setAction(action);
 
       // execute the action
-      log.debug("executing action '" + action + "'");
+      log.debug("executing " + action);
       String lockOwnerId = "token[" + token.getId() + "]";
       try {
         if (actionMustBeLocked) {
@@ -465,14 +465,8 @@
   }
 
   public String toString() {
-    String className = getClass().getName();
-    className = className.substring(className.lastIndexOf('.') + 1);
-    if (name != null) {
-      className = className + "(" + name + ")";
-    } else {
-      className = className + "(" + Integer.toHexString(System.identityHashCode(this)) + ")";
-    }
-    return className;
+    return getClass().getSimpleName() + (name != null ? '(' + name + ')'
+        : '@' + Integer.toHexString(hashCode()));
   }
 
   // equals ///////////////////////////////////////////////////////////////////

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java	2009-02-11 21:42:58 UTC (rev 3843)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java	2009-02-11 22:36:06 UTC (rev 3844)
@@ -511,7 +511,8 @@
 
   public String toString()
   {
-    return "ProcessInstance" + (key != null ? '(' + key + ')' : "@" + Integer.toHexString(hashCode()));
+    return "ProcessInstance" + (key != null ? '(' + key + ')'
+        : id != 0 ? "(" + id + ')' : '@' + Integer.toHexString(hashCode()));
   }
 
   // getters and setters //////////////////////////////////////////////////////

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java	2009-02-11 21:42:58 UTC (rev 3843)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java	2009-02-11 22:36:06 UTC (rev 3844)
@@ -456,8 +456,7 @@
 
   public String toString()
   {
-    getNode();
-    return "Token[name=" + getFullName() + ",node=" + getNode() + "]";
+    return "Token(" + getFullName() + ')';
   }
 
   public boolean hasEnded()

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Job.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Job.java	2009-02-11 21:42:58 UTC (rev 3843)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Job.java	2009-02-11 22:36:06 UTC (rev 3844)
@@ -58,7 +58,7 @@
   public abstract boolean execute(JbpmContext jbpmContext) throws Exception;
   
   public String toString() {
-    return "job["+id+"]";
+    return "Job("+id+')';
   }
   
   public String toStringLongFormat() {

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java	2009-02-11 21:42:58 UTC (rev 3843)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java	2009-02-11 22:36:06 UTC (rev 3844)
@@ -107,25 +107,25 @@
   }
   
   public String toString() {
-    StringBuffer buffer = new StringBuffer("Timer");
+    StringBuilder text = new StringBuilder("Timer");
     if (name != null || dueDate != null) {
-      buffer.append("(");
-      if (name!=null) {
-        buffer.append(name).append(",");
-      }
-      if (dueDate!=null) {
-        buffer.append(formatDueDate(dueDate)).append(",");
-      }
+      text.append('(');
+
+      if (name!=null)
+        text.append(name).append(",");
+      if (dueDate!=null)
+        text.append(formatDueDate(dueDate)).append(",");
       if (taskInstance!=null)
-        buffer.append(taskInstance).append(",");
+        text.append(taskInstance).append(",");
+
       if (token!=null)
-        buffer.append(token);
+        text.append(token);
       else if (processInstance!=null)
-        buffer.append(processInstance);
+        text.append(processInstance);
 
-      buffer.append(")");
+      text.append(')');
     }
-    return buffer.toString();
+    return text.toString();
   }
 
   public static String formatDueDate(Date date) {