diff --git a/ch.eitchnet.utils b/ch.eitchnet.utils index 540dbeab3..2008da00a 160000 --- a/ch.eitchnet.utils +++ b/ch.eitchnet.utils @@ -1 +1 @@ -Subproject commit 540dbeab32f542b7f4e3747c191d06c66b5108a9 +Subproject commit 2008da00a357accb2783147acd0b6bd67580f261 diff --git a/li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java b/li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java index d4b13fec6..18fb05207 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java +++ b/li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java @@ -22,10 +22,10 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import ch.eitchnet.utils.helper.StringHelper; import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchModelException; import li.strolch.model.parameter.Parameter; -import ch.eitchnet.utils.helper.StringHelper; /** * @author Robert von Burg @@ -88,7 +88,7 @@ public abstract class GroupedParameterizedElement extends AbstractStrolchElement * * @return the found {@link Parameter} or null if it was not found */ - public T getParameter(String bagKey, String paramKey) { + public > T getParameter(String bagKey, String paramKey) { return getParameter(bagKey, paramKey, false); } @@ -105,12 +105,12 @@ public abstract class GroupedParameterizedElement extends AbstractStrolchElement * * @return the found {@link Parameter} or null if it was not found */ - public T getParameter(String bagKey, String paramKey, boolean assertExists) { + public > T getParameter(String bagKey, String paramKey, boolean assertExists) { if (this.parameterBagMap == null) { if (assertExists) { String msg = "The Parameter {0} does not exist"; - throw new StrolchModelException(MessageFormat.format(msg, - getLocator().append(Tags.BAG, bagKey, paramKey))); + throw new StrolchModelException( + MessageFormat.format(msg, getLocator().append(Tags.BAG, bagKey, paramKey))); } return null; @@ -119,8 +119,8 @@ public abstract class GroupedParameterizedElement extends AbstractStrolchElement if (bag == null) { if (assertExists) { String msg = "The Parameter {0} does not exist"; - throw new StrolchModelException(MessageFormat.format(msg, - getLocator().append(Tags.BAG, bagKey, paramKey))); + throw new StrolchModelException( + MessageFormat.format(msg, getLocator().append(Tags.BAG, bagKey, paramKey))); } return null;