From 6b4c6b143380c3f0ba08741e894c3fc5e5583d9d Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Wed, 19 Jan 2022 19:30:59 +0100
Subject: [PATCH] [New] Added IActivityElement. and
 State.inExecutionPlanningPhase()

---
 .../src/main/java/li/strolch/model/State.java       | 13 ++++++++++---
 .../li/strolch/model/activity/IActivityElement.java |  4 ++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/li.strolch.model/src/main/java/li/strolch/model/State.java b/li.strolch.model/src/main/java/li/strolch/model/State.java
index 20f0a8bcc..ed1dbb769 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/State.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/State.java
@@ -40,7 +40,7 @@ public enum State {
 	EXECUTED("Executed"), //$NON-NLS-1$
 	CLOSED("Closed"); //$NON-NLS-1$
 
-	private String state;
+	private final String state;
 
 	State(String state) {
 		this.state = state;
@@ -72,6 +72,13 @@ public enum State {
 		return this == EXECUTION || this == STOPPED || this == WARNING || this == ERROR;
 	}
 
+	/**
+	 * @return true if {@link #inPlanningPhase()} or {@link #inExecutionPhase()} returns true
+	 */
+	public boolean inExecutionPlanningPhase() {
+		return inPlanningPhase() || inExecutionPhase();
+	}
+
 	/**
 	 * @return true if the state is {@link #ERROR} or {@link #STOPPED}
 	 */
@@ -80,10 +87,10 @@ public enum State {
 	}
 
 	/**
-	 * @return true if the state is one of {@link #STOPPED}, {@link #WARNING} or {@link #ERROR}
+	 * @return true if the state is one of {@link #EXECUTION}, {@link #STOPPED}, {@link #WARNING} or {@link #ERROR}
 	 */
 	public boolean inExecutionWarningPhase() {
-		return this == STOPPED || this == WARNING || this == ERROR;
+		return this == EXECUTION || this == STOPPED || this == WARNING || this == ERROR;
 	}
 
 	/**
diff --git a/li.strolch.model/src/main/java/li/strolch/model/activity/IActivityElement.java b/li.strolch.model/src/main/java/li/strolch/model/activity/IActivityElement.java
index 94b542043..895953365 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/activity/IActivityElement.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/activity/IActivityElement.java
@@ -190,6 +190,10 @@ public interface IActivityElement extends StrolchElement {
 		return getState().inExecutionPhase();
 	}
 
+	default boolean inExecutionPlanningPhase() {
+		return getState().inExecutionPlanningPhase();
+	}
+
 	default boolean inErrorPhase() {
 		return getState().inErrorPhase();
 	}