Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

82400: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80250: ACE-2276	 - Update Activiti to 5.16.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 07:00:28 +00:00
parent f1583306ca
commit 9f7a5d3bfe
2 changed files with 6 additions and 9 deletions

View File

@@ -40,11 +40,12 @@ import org.activiti.engine.form.StartFormData;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.history.HistoricProcessInstanceQuery;
import org.activiti.engine.history.HistoricVariableInstance;
import org.activiti.engine.impl.bpmn.diagram.ProcessDiagramGenerator;
import org.activiti.engine.impl.identity.Authentication;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.engine.repository.ProcessDefinitionQuery;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.image.ProcessDiagramGenerator;
import org.activiti.image.impl.DefaultProcessDiagramGenerator;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.i18n.MessageService;
import org.alfresco.repo.model.Repository;
@@ -1011,7 +1012,8 @@ public class ProcessesImpl extends WorkflowRestImpl implements Processes
if(model != null && model.getLocationMap().size() > 0)
{
List<String> activeActivities = activitiProcessEngine.getRuntimeService().getActiveActivityIds(processId);
InputStream generateDiagram = ProcessDiagramGenerator.generateDiagram(model, "png", activeActivities);
ProcessDiagramGenerator generator = new DefaultProcessDiagramGenerator();
InputStream generateDiagram = generator.generateDiagram(model, "png", activeActivities);
File file = TempFileProvider.createTempFile(processId + UUID.randomUUID(), ".png");
FileOutputStream fos = new FileOutputStream(file);