Author: jkoster
Date: 2009-07-08 15:46:47 +0200 (Wed, 08 Jul 2009)
New Revision: 36669
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/WorkflowManager.java
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/ContentWorkflowAction.java
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/LinkWorkflowAction.java
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/PageWorkflowAction.java
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/WorkflowAction.java
Log:
CMSC-1247 - Rename a variable for better meaning; clean-up imports.
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/WorkflowManager.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/WorkflowManager.java
2009-07-08 13:46:45 UTC (rev 36668)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/WorkflowManager.java
2009-07-08 13:46:47 UTC (rev 36669)
@@ -1,11 +1,6 @@
package com.finalist.cmsc.workflow;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.Cloud;
@@ -20,21 +15,12 @@
import org.mmbase.module.core.MMBase;
import org.mmbase.module.core.MMObjectBuilder;
import org.mmbase.module.core.MMObjectNode;
-import org.mmbase.storage.search.AggregatedField;
-import org.mmbase.storage.search.CompositeConstraint;
-import org.mmbase.storage.search.Constraint;
-import org.mmbase.storage.search.FieldCompareConstraint;
-import org.mmbase.storage.search.FieldValueConstraint;
-import org.mmbase.storage.search.FieldValueInConstraint;
-import org.mmbase.storage.search.RelationStep;
-import org.mmbase.storage.search.Step;
+import org.mmbase.storage.search.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
import com.finalist.cmsc.mmbase.RelationUtil;
-import com.finalist.cmsc.security.Role;
-import com.finalist.cmsc.security.SecurityUtil;
-import com.finalist.cmsc.security.UserRole;
+import com.finalist.cmsc.security.*;
import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.services.workflow.Workflow;
import com.finalist.cmsc.services.workflow.WorkflowException;
@@ -696,9 +682,7 @@
clone.addAggregatedField(step3, workflowManager.getField(TYPE_FIELD),
AggregatedField.AGGREGATION_TYPE_GROUP_BY);
clone.addAggregatedField(step3,
workflowManager.getField(NODETYPE_FIELD),
AggregatedField.AGGREGATION_TYPE_GROUP_BY);
- clone
- .addAggregatedField(step3, workflowManager.getField(STATUS_FIELD),
- AggregatedField.AGGREGATION_TYPE_GROUP_BY);
+ clone.addAggregatedField(step3, workflowManager.getField(STATUS_FIELD),
AggregatedField.AGGREGATION_TYPE_GROUP_BY);
clone.addAggregatedField(step3, workflowManager.getField(NUMBER_FIELD),
AggregatedField.AGGREGATION_TYPE_COUNT);
return clone;
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/ContentWorkflowAction.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/ContentWorkflowAction.java
2009-07-08 13:46:45 UTC (rev 36668)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/ContentWorkflowAction.java
2009-07-08 13:46:47 UTC (rev 36669)
@@ -30,7 +30,7 @@
@Override
- protected NodeQuery createDetailQuery(Cloud cloud, String orderby, boolean
aord) {
+ protected NodeQuery createDetailQuery(Cloud cloud, String orderby, boolean
orderDesc) {
NodeManager manager =
cloud.getNodeManager(ContentElementUtil.CONTENTELEMENT);
NodeQuery wfQuery = WorkflowManager.createDetailQuery(cloud, manager);
@@ -43,25 +43,25 @@
wfQuery.addField(ContentElementUtil.CONTENTELEMENT + "." +
ContentElementUtil.LASTMODIFIER_FIELD);
wfQuery.addField(RepositoryUtil.CONTENTCHANNEL + "." +
RepositoryUtil.NAME_FIELD);
if (orderby.equals(ContentElementUtil.TITLE_FIELD)) {
- addOrderBy(manager, wfQuery, ContentElementUtil.TITLE_FIELD, aord);
+ addOrderBy(manager, wfQuery, ContentElementUtil.TITLE_FIELD,
orderDesc);
}
else if (orderby.equals(ContentElementUtil.LASTMODIFIER_FIELD)) {
- addOrderBy(manager, wfQuery, ContentElementUtil.LASTMODIFIER_FIELD,
aord);
+ addOrderBy(manager, wfQuery, ContentElementUtil.LASTMODIFIER_FIELD,
orderDesc);
}
else if (orderby.equals(ContentElementUtil.LASTMODIFIEDDATE_FIELD)) {
- addOrderBy(manager, wfQuery,
ContentElementUtil.LASTMODIFIEDDATE_FIELD, aord);
+ addOrderBy(manager, wfQuery,
ContentElementUtil.LASTMODIFIEDDATE_FIELD, orderDesc);
}
else if (orderby.equals(RepositoryUtil.CONTENTCHANNEL)) {
- addOrderBy(channelManager, wfQuery, RepositoryUtil.NAME_FIELD, aord);
+ addOrderBy(channelManager, wfQuery, RepositoryUtil.NAME_FIELD,
orderDesc);
}
else if (orderby.equals("number")) {
- addOrderBy(manager, wfQuery, "number", aord);
+ addOrderBy(manager, wfQuery, "number", orderDesc);
}
else if (orderby.equals(WorkflowManager.REMARK_FIELD)) {
- addOrderBy(WorkflowManager.getManager(cloud), wfQuery,
WorkflowManager.REMARK_FIELD, aord);
+ addOrderBy(WorkflowManager.getManager(cloud), wfQuery,
WorkflowManager.REMARK_FIELD, orderDesc);
}
else {
- addOrderBy(manager, wfQuery, WorkflowManager.LASTMODIFIEDDATE_FIELD,
aord);
+ addOrderBy(manager, wfQuery, WorkflowManager.LASTMODIFIEDDATE_FIELD,
orderDesc);
}
return wfQuery;
}
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/LinkWorkflowAction.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/LinkWorkflowAction.java
2009-07-08 13:46:45 UTC (rev 36668)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/LinkWorkflowAction.java
2009-07-08 13:46:47 UTC (rev 36669)
@@ -29,7 +29,7 @@
@Override
- protected NodeQuery createDetailQuery(Cloud cloud, String orderby, boolean
aord) {
+ protected NodeQuery createDetailQuery(Cloud cloud, String orderby, boolean
orderDesc) {
NodeManager manager =
cloud.getNodeManager(RepositoryUtil.CONTENTCHANNEL);
NodeQuery wfQuery = WorkflowManager.createDetailQuery(cloud, manager);
@@ -37,16 +37,16 @@
wfQuery.addField(RepositoryUtil.CONTENTCHANNEL + "." +
RepositoryUtil.TITLE_FIELD);
if (orderby.equals(RepositoryUtil.TITLE_FIELD)) {
- addOrderBy(manager, wfQuery, RepositoryUtil.TITLE_FIELD, aord);
+ addOrderBy(manager, wfQuery, RepositoryUtil.TITLE_FIELD, orderDesc);
}
else if (orderby.equals("number")) {
- addOrderBy(manager, wfQuery, "number", aord);
+ addOrderBy(manager, wfQuery, "number", orderDesc);
}
else if (orderby.equals(WorkflowManager.REMARK_FIELD)) {
- addOrderBy(WorkflowManager.getManager(cloud), wfQuery,
WorkflowManager.REMARK_FIELD, aord);
+ addOrderBy(WorkflowManager.getManager(cloud), wfQuery,
WorkflowManager.REMARK_FIELD, orderDesc);
}
else {
- addOrderBy(WorkflowManager.getManager(cloud), wfQuery,
WorkflowManager.LASTMODIFIEDDATE_FIELD, aord);
+ addOrderBy(WorkflowManager.getManager(cloud), wfQuery,
WorkflowManager.LASTMODIFIEDDATE_FIELD, orderDesc);
}
return wfQuery;
}
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/PageWorkflowAction.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/PageWorkflowAction.java
2009-07-08 13:46:45 UTC (rev 36668)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/PageWorkflowAction.java
2009-07-08 13:46:47 UTC (rev 36669)
@@ -25,7 +25,7 @@
}
@Override
- protected NodeQuery createDetailQuery(Cloud cloud, String orderby, boolean
aord) {
+ protected NodeQuery createDetailQuery(Cloud cloud, String orderby, boolean
orderDesc) {
NodeManager manager = cloud.getNodeManager(PagesUtil.PAGE);
NodeQuery wfQuery = WorkflowManager.createDetailQuery(cloud, manager);
@@ -35,22 +35,22 @@
wfQuery.addField(PagesUtil.PAGE + "." + PagesUtil.LASTMODIFIER_FIELD);
if (orderby.equals(PagesUtil.TITLE_FIELD)) {
- addOrderBy(manager, wfQuery, PagesUtil.TITLE_FIELD, aord);
+ addOrderBy(manager, wfQuery, PagesUtil.TITLE_FIELD, orderDesc);
}
else if (orderby.equals(PagesUtil.LASTMODIFIER_FIELD)) {
- addOrderBy(manager, wfQuery, PagesUtil.LASTMODIFIER_FIELD, aord);
+ addOrderBy(manager, wfQuery, PagesUtil.LASTMODIFIER_FIELD, orderDesc);
}
else if (orderby.equals(PagesUtil.LASTMODIFIEDDATE_FIELD)) {
- addOrderBy(manager, wfQuery, PagesUtil.LASTMODIFIEDDATE_FIELD, aord);
+ addOrderBy(manager, wfQuery, PagesUtil.LASTMODIFIEDDATE_FIELD,
orderDesc);
}
else if (orderby.equals("number")) {
- addOrderBy(manager, wfQuery, "number", aord);
+ addOrderBy(manager, wfQuery, "number", orderDesc);
}
else if (orderby.equals(WorkflowManager.REMARK_FIELD)) {
- addOrderBy(WorkflowManager.getManager(cloud), wfQuery,
WorkflowManager.REMARK_FIELD, aord);
+ addOrderBy(WorkflowManager.getManager(cloud), wfQuery,
WorkflowManager.REMARK_FIELD, orderDesc);
}
else {
- addOrderBy(manager, wfQuery, WorkflowManager.LASTMODIFIEDDATE_FIELD,
aord);
+ addOrderBy(manager, wfQuery, WorkflowManager.LASTMODIFIEDDATE_FIELD,
orderDesc);
}
return wfQuery;
}
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/WorkflowAction.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/WorkflowAction.java
2009-07-08 13:46:45 UTC (rev 36668)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/forms/WorkflowAction.java
2009-07-08 13:46:47 UTC (rev 36669)
@@ -149,7 +149,7 @@
protected abstract String getWorkflowType();
- protected abstract NodeQuery createDetailQuery(Cloud cloud, String orderby,
boolean AorD);
+ protected abstract NodeQuery createDetailQuery(Cloud cloud, String orderby,
boolean orderDesc);
private void addWorkflowListToRequest(HttpServletRequest request, Cloud
cloud, NodeQuery detailQuery,
@@ -176,10 +176,10 @@
return detailQuery;
}
- protected void addOrderBy(NodeManager manager, NodeQuery query, String
fieldname, boolean aord) {
+ protected void addOrderBy(NodeManager manager, NodeQuery query, String
fieldname, boolean orderDesc) {
Step step = query.getStep(manager.getName());
StepField sf = query.createStepField(step, manager.getField(fieldname));
- if (aord) {
+ if (orderDesc) {
/*
* System.out.println("WorkflowAction : orderby-- " + fieldname + "
descending");
*/
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
