Merged V1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4227 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4228 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4242 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4243 .
   Records management changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-10-30 11:43:37 +00:00
parent 4645415989
commit 71d2442632
10 changed files with 146 additions and 16 deletions

View File

@@ -35,7 +35,7 @@ import org.mozilla.javascript.Wrapper;
*
* @author davidc
*/
public final class Actions implements Scopeable
public final class Actions extends BaseScriptImplementation implements Scopeable
{
/** Repository Service Registry */
private ServiceRegistry services;
@@ -44,14 +44,13 @@ public final class Actions implements Scopeable
private Scriptable scope;
/**
* Constructor
* Set the service registry
*
* @param services
* repository service registry
* @param serviceRegistry the service registry
*/
public Actions(ServiceRegistry services)
public void setServiceRegistry(ServiceRegistry serviceRegistry)
{
this.services = services;
this.services = serviceRegistry;
}
/**
@@ -61,7 +60,7 @@ public final class Actions implements Scopeable
{
this.scope = scope;
}
/**
* Gets the list of registered action names
*
@@ -216,6 +215,9 @@ public final class Actions implements Scopeable
}
}
services.getActionService().executeAction(action, node.getNodeRef());
// Reset the actioned upon node
node.reset();
}
/**