[MMBASE CVS] contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow WorkflowServiceMMBaseImpl.java

[mfang]

Update of 
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow
In directory 
james.mmbase.org:/tmp/cvs-serv2776/workflow/src/java/com/finalist/cmsc/services/workflow

Modified Files:
        WorkflowServiceMMBaseImpl.java 
Log Message:
CMSC-1087 (changes the status box of a page to a dynamic tree in the Workflow 
section of the CMSc)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1087


Index: WorkflowServiceMMBaseImpl.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow/WorkflowServiceMMBaseImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- WorkflowServiceMMBaseImpl.java      8 Aug 2008 13:44:01 -0000       1.9
+++ WorkflowServiceMMBaseImpl.java      10 Nov 2008 06:54:25 -0000      1.10
@@ -96,6 +96,10 @@
       if (manager.isWorkflowElement(node, isWorkflowItem)) {
          return manager;
       }
+      manager = getAssetWorkflow(node.getCloud());
+      if (manager.isWorkflowElement(node, isWorkflowItem)) {
+         return manager;
+      }
       manager = getPageWorkflow(node.getCloud());
       if (manager.isWorkflowElement(node, isWorkflowItem)) {
          return manager;
@@ -113,6 +117,11 @@
    }
 
 
+   private AssetWorkflow getAssetWorkflow(Cloud cloud) {
+      return new AssetWorkflow(cloud);
+   }
+
+
    private LinkWorkflow getLinkWorkflow(Cloud cloud) {
       return new LinkWorkflow(cloud);
    }
@@ -132,6 +141,7 @@
    @Override
    public boolean hasWorkflow(Node node) {
       return getContentWorkflow(node.getCloud()).hasWorkflow(node)
+            || getAssetWorkflow(node.getCloud()).hasWorkflow(node)
             || getPageWorkflow(node.getCloud()).hasWorkflow(node) || 
getLinkWorkflow(node.getCloud()).hasWorkflow(node);
    }
 
@@ -139,7 +149,8 @@
    @Override
    public boolean isWorkflowType(String type) {
       Cloud cloud = getUserCloud();
-      return getContentWorkflow(cloud).isWorkflowType(type) || 
getPageWorkflow(cloud).isWorkflowType(type);
+      return getContentWorkflow(cloud).isWorkflowType(type) || 
getAssetWorkflow(cloud).isWorkflowType(type)
+            || getPageWorkflow(cloud).isWorkflowType(type);
    }
 
 
@@ -147,6 +158,7 @@
    public boolean isWorkflowElement(Node node) {
       Cloud cloud = node.getCloud();
       return getContentWorkflow(cloud).isWorkflowElement(node, false)
+            || getAssetWorkflow(cloud).isWorkflowElement(node, false)
             || getPageWorkflow(cloud).isWorkflowElement(node, false)
             || getLinkWorkflow(cloud).isWorkflowElement(node, false);
    }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs