Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms
In directory
james.mmbase.org:/tmp/cvs-serv10328/workflow/src/java/com/finalist/cmsc/workflow/forms
Modified Files:
PageWorkflowPublishAction.java
Log Message:
CMSC-1064 Reduce mmapps.CloudProvider usage
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1064
Index: PageWorkflowPublishAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/PageWorkflowPublishAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PageWorkflowPublishAction.java 27 May 2008 08:21:31 -0000 1.1
+++ PageWorkflowPublishAction.java 10 Sep 2008 12:36:37 -0000 1.2
@@ -1,19 +1,11 @@
package com.finalist.cmsc.workflow.forms;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.*;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
@@ -72,13 +64,13 @@
ResourceBundle rbundle =
ResourceBundle.getBundle("cmsc-workflow");
List<Node> workitemList =
pageNode.getRelatedNodes("workflowitem");
- Iterator itor = workitemList.iterator();
+ Iterator<Node> itor = workitemList.iterator();
Node workitemNode = null;
response.setCharacterEncoding("utf-8");
if (itor.hasNext()) {
- workitemNode = (Node) itor.next();
+ workitemNode = itor.next();
List<Node> workflowErrors =
performWorkflowAction(tmpAction,
workitemNode);
if (workflowErrors != null && workflowErrors.size() >
0) {
@@ -87,11 +79,13 @@
+
rbundle.getString("publish.failednode"));
}
String tmpActionValue;
- if (tmpAction.equals("accept"))
+ if (tmpAction.equals("accept")) {
tmpActionValue =
rbundle.getString("workflow.tab.approved");
- else
+ }
+ else {
tmpActionValue =
rbundle.getString("workflow.tab." + tmpAction
+ "ed");
+ }
response.getWriter().print(
rbundle.getString("workflow.status.page") + tmpActionValue);
} else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
