Skip to content

Commit

Permalink
refactoring
Browse files Browse the repository at this point in the history
issue #597
  • Loading branch information
rsoika committed Sep 6, 2024
1 parent 1854b50 commit 8a7fe92
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
1 change: 0 additions & 1 deletion Dockerfile-wildfly-debug
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM quay.io/wildfly/wildfly:27.0.1.Final-jdk17
#FROM jboss/wildfly:25.0.0.Final

LABEL description="Imixs-Office-Workflow"
LABEL maintainer="[email protected]"
Expand Down
3 changes: 2 additions & 1 deletion imixs-office-workflow-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -428,12 +428,13 @@
<scope>compile</scope>
</dependency>

<!-- Melman -->
<!-- Melman
<dependency>
<groupId>org.imixs.workflow</groupId>
<artifactId>imixs-melman</artifactId>
<scope>compile</scope>
</dependency>
-->

<!-- xsl 2.0 support -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@
package org.imixs.workflow.office.forms;

import java.io.Serializable;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;

import org.imixs.workflow.ItemCollection;
import org.imixs.workflow.engine.WorkflowService;
import org.imixs.workflow.exceptions.ModelException;
import org.imixs.workflow.exceptions.PluginException;
import org.imixs.workflow.faces.data.WorkflowController;

Expand Down Expand Up @@ -80,7 +82,7 @@ public class ValidationController implements Serializable {
@Inject
WorkflowService workflowService;

public boolean isRequired() throws PluginException {
public boolean isRequired() throws PluginException, ModelException {
required = false;
if (workflowController != null && workflowController.getWorkitem() != null) {

Expand All @@ -99,8 +101,9 @@ public boolean isRequired() throws PluginException {
String eventid = id.substring(eventPos + 24);
if (eventid != null && !eventid.isEmpty()) {
// fetch model event.....
for (ItemCollection event : workflowController.getEvents()) {

List<ItemCollection> eventList = null;
eventList = workflowController.getEvents();
for (ItemCollection event : eventList) {
if (eventid.equals(event.getItemValueString("numactivityid"))) {
logger.finest("......evaluate validation rule for event " + eventid);
// we found the corresponding event.
Expand Down
8 changes: 6 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<!-- Dependency Versions -->
<jakarta.version>10.0.0</jakarta.version>
<org.imixs.workflow.version>6.1.0-SNAPSHOT</org.imixs.workflow.version>
<org.imixs.archive.version>3.0.1</org.imixs.archive.version>
<org.imixs.archive.version>3.1.0-SNAPSHOT</org.imixs.archive.version>
<org.imixs.office.version />
<org.imixs.marty.version>5.0.1</org.imixs.marty.version>
<org.imixs.mock.version>6.1.0-SNAPSHOT</org.imixs.mock.version>
Expand Down Expand Up @@ -364,13 +364,14 @@
<version>${org.imixs.marty.version}</version>
</dependency>

<!-- Imixs Melman -->
<!-- Imixs Melman
<dependency>
<groupId>org.imixs.workflow</groupId>
<artifactId>imixs-melman</artifactId>
<version>1.0.20</version>
<scope>provided</scope>
</dependency>
-->

<!-- Imixs-Archive -->
<dependency>
Expand Down Expand Up @@ -468,11 +469,14 @@
<version>3.4.10</version>
<scope>test</scope>
</dependency>

<!--
<dependency>
<groupId>org.imixs.workflow</groupId>
<artifactId>imixs-melman</artifactId>
<scope>test</scope>
</dependency>
-->
<dependency>
<groupId>org.eclipse.parsson</groupId>
<artifactId>jakarta.json</artifactId>
Expand Down

0 comments on commit 8a7fe92

Please sign in to comment.