cmailleux 2005/12/13 10:54:10 CET
Modified files:
core/src/java/org/jahia/engines/workflow
AdvancedWorkflowEngine.java
Log:
remove unused variable
Revision Changes Path
1.30 +3 -11
jahia/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.java.diff?r1=1.29&r2=1.30&f=h
Index: AdvancedWorkflowEngine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- AdvancedWorkflowEngine.java 12 Dec 2005 17:48:59 -0000 1.29
+++ AdvancedWorkflowEngine.java 13 Dec 2005 09:54:10 -0000 1.30
@@ -73,8 +73,6 @@
private final static String notifyCompletedPages =
"notifyCompletedPages";
private final static String approvePendingPages = "approvePendingPages";
private final static String approveRefusePendingPages =
"approveRefusePendingPages";
- private final static String refusePendingPages = "refusePendingPages";
- private final static String administration = "admin";
private final static String jahiaWorkflow = "jahiaWorkflow";
private final static String ACCEPT = "default";
private final static String REFUSE = "reject";
@@ -111,7 +109,6 @@
*/
public String renderLink(final ProcessingContext jParams, final Object
theObj)
throws JahiaException {
- final JahiaUser user = jParams.getUser();
final String params = "?screen=display&obj="+theObj;
// Per default set the engines to the notification completed pages
if the
// user has admin accesses.
@@ -239,8 +236,6 @@
_lastDisplay.put(jParams.getSessionID(), display);
_lastAction.put(jParams.getSessionID(), action);
- // Init parameters map
- final Map params = new HashMap();
if (action.indexOf('.') > 0) {
final String name = action.substring(0,
action.indexOf('.'));
final String processId =
action.substring(action.indexOf('.') + 1, action.lastIndexOf('.'));
@@ -295,10 +290,9 @@
pageID = contentField.getPageID();
}
}
- final LockKey lockKey =
LockKey.composeLockKey(LockKey.WORKFLOW_ACTION+"_"+
-
siteMapContentPage.getObjectKey().getType(),
- fieldId, pageID);
- return lockKey;
+ return LockKey.composeLockKey(LockKey.WORKFLOW_ACTION+"_"+
+
siteMapContentPage.getObjectKey().getType(),
+ fieldId, pageID);
}
private WorkflowHelper getWorkflowHelper(final ProcessingContext jParams,
@@ -320,7 +314,6 @@
}
final int mode = service.getInheritedMode(object);
- final ContentObject inheritingParent =
service.getInheritingParent(object);
// LockKey lockKey =
LockKey.composeLockKey(LockKey.WORKFLOW_TYPE, object.getID(), object.getID());
// LockPrerequisites lockPrerequisites =
LockPrerequisites.getInstance();
@@ -543,7 +536,6 @@
// #ifdef LOCK
if (jParams.settings().areLocksActivated()) {
// Ensure that the lock is always our's.
- int pageID =
Integer.parseInt(objectKey.getIDInType());
LockService lockRegistry =
ServicesRegistry.getInstance().getLockService();
LockKey lockKey =
getLockKey(ContentObject.getContentObjectInstance(objectKey));
if
(!lockRegistry.isAlreadyAcquiredInContext(lockKey, jParams.getUser(),
