Skip to content

Commit

Permalink
refactoring
Browse files Browse the repository at this point in the history
issue #590
  • Loading branch information
rsoika committed Jul 15, 2024
1 parent f9c891e commit d71402f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ public class ModelController implements Serializable {

private static Logger logger = Logger.getLogger(ModelController.class.getName());


/**
* returns all groups for a version
*
Expand Down Expand Up @@ -165,7 +164,7 @@ public List<String> 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<String> getSubWorkflowGroups(String parentWorkflowGroup) {
Expand Down Expand Up @@ -231,16 +230,16 @@ public Model getModelByGroup(String group) {
* @return
*/
public List<String> getVersions() {
List<String> list=modelService.getVersions();
Collections.sort(list);
List<String> list = modelService.getVersions();
Collections.sort(list);
return list;
}

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);
}

Expand Down Expand Up @@ -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
*/
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

<!-- Dependency Versions -->
<jakarta.version>10.0.0</jakarta.version>
<org.imixs.workflow.version>6.0.6</org.imixs.workflow.version>
<org.imixs.workflow.version>6.0.7-SNAPSHOT</org.imixs.workflow.version>
<org.imixs.archive.version>3.0.1</org.imixs.archive.version>
<org.imixs.office.version />
<org.imixs.marty.version>5.0.1</org.imixs.marty.version>
Expand Down

0 comments on commit d71402f

Please sign in to comment.