[Yanel-commits] rev 44494 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl

[michi at wyona.com]

Author: michi
Date: 2009-08-31 13:11:11 +0200 (Mon, 31 Aug 2009)
New Revision: 44494

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java
Log:
log if no workflow implemented or referenced and also switched date such that it is better human readable

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java	2009-08-31 10:05:19 UTC (rev 44493)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java	2009-08-31 11:11:11 UTC (rev 44494)
@@ -48,7 +48,7 @@
      * Generate revision menu
      */
     private String getContent(boolean mostRecent, boolean oldestRevision) {
-        String value = "<li class=\"haschild\">" + this.revisionInfo.getName();
+        String value = "<li class=\"haschild\">" + formatDate(this.revisionInfo.getDate()) + " (" + this.revisionInfo.getName();
         
         WorkflowableV1 workflowableRes = null;
         try {
@@ -62,7 +62,7 @@
                     liveMarker = " (LIVE)";
                 }
 
-                value += " (" + formatDate(this.revisionInfo.getDate()) + ", " + state + liveMarker + ")" + NBSP + "<ul><li class=\"haschild\">Workflow";
+                value += ", " + state + liveMarker + ")" + NBSP + "<ul><li class=\"haschild\">Workflow";
             
                 ITransitionMenuContent x = new TransitionMenuContentImpl(getResource(), state, getRevisionInfo().getName(), getMenuLanguageCode());
                 RevisionTransitionsMenuContent rt = new RevisionTransitions(getResource(), getRevisionInfo().getName(), getMenuLanguageCode(), x);
@@ -70,11 +70,18 @@
                 value += rt.toHTML();
                 value += "</li>";
             } else {
-                value += " (" + formatDate(this.revisionInfo.getDate()) + ")" + NBSP + "<ul>";
+                value += ")" + NBSP + "<ul>";
+
+                if (ResourceAttributeHelper.hasAttributeImplemented(resource, "Workflowable", "1")) {
+                    log.warn("Workflow interface 'WorkflowableV1' implemented, but does not seem to reference any workflow configuration!");
+                } else {
+                    log.warn("No workflow interface implemented!");
+                }
             }
         } catch (WorkflowException e) {
             log.error("Could not get workflow: " + e.getMessage(), e);
         }
+
         if (!mostRecent) value += "<li><a href=\"?yanel.resource.usecase=roll-back&amp;yanel.resource.revision=" + revisionInfo.getName() + "\">Revert to (roll back)</a></li>";
         value += "<li class=\"haschild\">Show more details" + NBSP + "<ul>";
         value += "<li>Revision name: " + this.revisionInfo.getName() + "</li>";