From d71402fb64117b3a4a875d7c74e689867ece6e65 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 15 Jul 2024 18:07:54 +0200 Subject: [PATCH] refactoring issue #590 --- .../workflow/office/model/ModelController.java | 16 +++++++--------- pom.xml | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/imixs-office-workflow-util/src/main/java/org/imixs/workflow/office/model/ModelController.java b/imixs-office-workflow-util/src/main/java/org/imixs/workflow/office/model/ModelController.java index 2e9ca1d4..efb68888 100644 --- a/imixs-office-workflow-util/src/main/java/org/imixs/workflow/office/model/ModelController.java +++ b/imixs-office-workflow-util/src/main/java/org/imixs/workflow/office/model/ModelController.java @@ -95,7 +95,6 @@ public class ModelController implements Serializable { private static Logger logger = Logger.getLogger(ModelController.class.getName()); - /** * returns all groups for a version * @@ -165,7 +164,7 @@ public List getWorkflowGroups() { * @see getWorkflowGroups() * * @param parentWorkflowGroup - * - the parent workflow group name + * - the parent workflow group name * @return list of all sub workflow groups for the given parent group name */ public List getSubWorkflowGroups(String parentWorkflowGroup) { @@ -231,8 +230,8 @@ public Model getModelByGroup(String group) { * @return */ public List getVersions() { - List list=modelService.getVersions(); - Collections.sort(list); + List list = modelService.getVersions(); + Collections.sort(list); return list; } @@ -240,7 +239,7 @@ public ItemCollection getModelEntity(String version) { ItemCollection result = modelEntityCache.get(version); if (result == null) { - result = modelService.loadModelEntity(version); + result = modelService.findModelEntity(version); modelEntityCache.put(version, result); } @@ -307,9 +306,9 @@ public void deleteModel(String modelversion) throws AccessDeniedException, Model * * * @param modelVersion - * - version for the model to search the process entity + * - version for the model to search the process entity * @param processid - * - id of the process entity + * - id of the process entity * @return an instance of the matching process entity * @throws ModelException */ @@ -344,9 +343,8 @@ public String getProcessDescription(int processid, String modelversion, ItemColl if (pe == null) { return ""; } - //String desc = pe.getItemValueString("rtfdescription"); + // String desc = pe.getItemValueString("rtfdescription"); String desc = pe.getItemValueString(BPMNModel.TASK_ITEM_DOCUMENTATION); - try { desc = workflowService.adaptText(desc, documentContext); diff --git a/pom.xml b/pom.xml index a05219c9..a0c0245a 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 10.0.0 - 6.0.6 + 6.0.7-SNAPSHOT 3.0.1 5.0.1