Started efactoring InviatationServiceImpl so that it uses Activit workflow engine.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29990 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-08-23 13:24:42 +00:00
parent 24fa893ac3
commit fba09d9b2a
22 changed files with 602 additions and 682 deletions

View File

@@ -21,13 +21,12 @@ package org.alfresco.repo.forms.processor.workflow;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import org.alfresco.repo.forms.Form;
import org.alfresco.repo.forms.FormData;
import org.alfresco.repo.forms.FormData.FieldData;
import org.alfresco.repo.forms.FormNotFoundException;
import org.alfresco.repo.forms.Item;
import org.alfresco.repo.forms.FormData.FieldData;
import org.alfresco.repo.forms.processor.FormCreationData;
import org.alfresco.repo.forms.processor.node.ContentModelFormProcessor;
import org.alfresco.repo.forms.processor.node.ContentModelItemData;

View File

@@ -65,7 +65,7 @@ public class TaskFormPersister extends ContentModelFormPersister<WorkflowTask>
throw new AccessDeniedException("Failed to update task with id '" + item.getId() + "'.");
}
this.updater = new TaskUpdater(item.id, workflowService, nodeService, behaviourFilter);
this.updater = new TaskUpdater(item.getId(), workflowService, nodeService, behaviourFilter);
}
/**

View File

@@ -99,8 +99,8 @@ public class TaskFormProcessor extends AbstractWorkflowFormProcessor<WorkflowTas
this.personService = personService;
}
/* (non-Javadoc)
* @see org.alfresco.repo.forms.processor.workflow.AbstractWorkflowFormProcessor#getTypedItemForDecodedId(java.lang.String)
/**
* {@inheritDoc}
*/
@Override
protected WorkflowTask getTypedItemForDecodedId(String itemId)
@@ -108,32 +108,28 @@ public class TaskFormProcessor extends AbstractWorkflowFormProcessor<WorkflowTas
return workflowService.getTaskById(itemId);
}
/*
* (non-Javadoc)
*
* @see org.alfresco.repo.forms.processor.FilteredFormProcessor#getItemType(java.lang.Object)
*/
/**
* {@inheritDoc}
*/
@Override
protected String getItemType(WorkflowTask item)
{
TypeDefinition typeDef = item.definition.metadata;
TypeDefinition typeDef = item.getDefinition().getMetadata();
return typeDef.getName().toPrefixString(namespaceService);
}
/*
* (non-Javadoc)
*
* @see org.alfresco.repo.forms.processor.FilteredFormProcessor#getItemURI(java.lang.Object)
*/
/**
* {@inheritDoc}
*/
@Override
protected String getItemURI(WorkflowTask item)
{
return "api/task-instances/" + item.id;
return "api/task-instances/" + item.getId();
}
/*
* @see org.alfresco.repo.forms.processor.task.ContentModelFormProcessor#getLogger()
*/
/**
* {@inheritDoc}
*/
@Override
protected Log getLogger()
{
@@ -143,19 +139,19 @@ public class TaskFormProcessor extends AbstractWorkflowFormProcessor<WorkflowTas
@Override
protected TypeDefinition getBaseType(WorkflowTask task)
{
return task.definition.metadata;
return task.getDefinition().getMetadata();
}
@Override
protected Map<QName, Serializable> getPropertyValues(WorkflowTask task)
{
return task.properties;
return task.getProperties();
}
@Override
protected Map<QName, Serializable> getAssociationValues(WorkflowTask item)
{
return item.properties;
return item.getProperties();
}
@Override
@@ -245,7 +241,7 @@ public class TaskFormProcessor extends AbstractWorkflowFormProcessor<WorkflowTas
private String getTransitionValues(WorkflowTask item)
{
WorkflowTransition[] transitions = item.definition.node.transitions;
WorkflowTransition[] transitions = item.getDefinition().getNode().getTransitions();
if (transitions == null || transitions.length == 0)
{

View File

@@ -90,7 +90,7 @@ public class WorkflowFormProcessor extends AbstractWorkflowFormProcessor<Workflo
@Override
protected String getItemType(WorkflowDefinition item)
{
return item.name;
return item.getName();
}
/* (non-Javadoc)
@@ -99,7 +99,7 @@ public class WorkflowFormProcessor extends AbstractWorkflowFormProcessor<Workflo
@Override
protected String getItemURI(WorkflowDefinition item)
{
return "api/workflow-definitions/"+item.id;
return "api/workflow-definitions/"+item.getId();
}
/* (non-Javadoc)