From 4c9458f1c32bcfcfa6305c37a52b311437aeab75 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 27 Feb 2023 10:49:43 +0100 Subject: [PATCH] [New] Added State.getState(Set) --- model/src/main/java/li/strolch/model/State.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/model/src/main/java/li/strolch/model/State.java b/model/src/main/java/li/strolch/model/State.java index 5a1bc7cf0..5302c935b 100644 --- a/model/src/main/java/li/strolch/model/State.java +++ b/model/src/main/java/li/strolch/model/State.java @@ -235,7 +235,7 @@ public enum State { public static State parseAllowNull(String s) { for (State state : values()) { - if (state.state.toLowerCase().equals(s.toLowerCase())) + if (state.state.equalsIgnoreCase(s)) return state; } @@ -245,7 +245,7 @@ public enum State { public static State parse(String s) { DBC.PRE.assertNotEmpty("Value may not be null", s); for (State state : values()) { - if (state.state.toLowerCase().equals(s.toLowerCase())) + if (state.state.equalsIgnoreCase(s)) return state; } @@ -253,8 +253,15 @@ public enum State { } public static State getState(Activity activity) { - Set states = activity.elementStream().map(e -> e.getValue().getState()).collect(toSet()); + return getState(states); + } + + public static State getState(Set states) { + + // if no states + if (states.isEmpty()) + return CREATED; // if only one state if (states.size() == 1)