Author: bpapez
Date: Wed Jan 2 19:02:31 2008
New Revision: 19443
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19443&repname=
=3Djahia
Log:
Changed the signature of acquireLocks and getLocks to use ContentObjectKey =
instead of ContentObject
Modified:
trunk/core/src/java/org/jahia/engines/workflow/ManageWorkflow.java
Modified: trunk/core/src/java/org/jahia/engines/workflow/ManageWorkflow.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/workflow/ManageWorkflow.java&rev=3D19443&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/engines/workflow/ManageWorkflow.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/engines/workflow/ManageWorkflow.java Wed =
Jan 2 19:02:31 2008
@@ -288,7 +288,7 @@
return true;
}
=
- private boolean acquireLocks(ContentObject object, HashMap engineMap, =
ProcessingContext jParams) throws JahiaException {
+ private boolean acquireLocks(ContentObjectKey object, HashMap engineMa=
p, ProcessingContext jParams) throws JahiaException {
Set locks =3D new HashSet();
LockRegistry lockReg =3D LockRegistry.getInstance();
JahiaUser user =3D jParams.getUser();
@@ -318,15 +318,15 @@
}
}
=
- private void getLocks(ContentObject object,
+ private void getLocks(ContentObjectKey object,
WorkflowService workflowService, Set locks) thro=
ws JahiaException {
LockKey lockKey =3D LockKey.composeLockKey(LockKey.WORKFLOW_ACTION=
+ "_" +
- object.getObjectKey().getType(), object.getID());
+ object.getType(), object.getIdInType());
locks.add(lockKey);
=
List l =3D workflowService.getUnlinkedContentObjects(object, false=
, false);
for (Iterator iterator =3D l.iterator(); iterator.hasNext();) {
- ContentObject child =3D (ContentObject) iterator.next();
+ ContentObjectKey child =3D (ContentObjectKey) iterator.next();
child =3D workflowService.getMainLinkObject(child);
if (workflowService.getWorkflowMode(child) =3D=3D WorkflowServ=
ice.INHERITED) {
getLocks(child, workflowService, locks);
@@ -435,7 +435,7 @@
if (process !=3D null && names.contains(process)) {
if (service.hasChanged((ContentObjectKey) object.g=
etObjectKey(),
WorkflowService.EXTERNAL, workflowName, pr=
ocess)) {
- boolean locked =3D acquireLocks(object, engine=
Map, jParams);
+ boolean locked =3D acquireLocks((ContentObject=
Key) object.getObjectKey(), engineMap, jParams);
engineMap.put("locksActive", Boolean.valueOf(!=
locked));
if (locked) {
service.setWorkflowMode(object, WorkflowSe=
rvice.EXTERNAL, workflowName, process, jParams);
@@ -455,7 +455,7 @@
}
} else {
if (service.hasChanged((ContentObjectKey) object.getObjectKey(=
), mode, null, null)) {
- boolean locked =3D acquireLocks(object, engineMap, jParams=
);
+ boolean locked =3D acquireLocks((ContentObjectKey) object.=
getObjectKey(), engineMap, jParams);
engineMap.put("locksActive", Boolean.valueOf(!locked));
if (locked) {
service.setWorkflowMode(object, mode, null, null, jPar=
ams);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
