Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Small change in ParameterizedElement

This commit is contained in:
Robert von Burg 2017-05-04 20:45:44 +02:00
parent 5d907dc6db
commit 358f4eff63
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
li.strolch.model/src/main/java/li/strolch/model/ParameterizedElement.java
View File

@ -90,7 +90,7 @@ public abstract class ParameterizedElement extends AbstractStrolchElement {
*
* @return the {@link Parameter} with the given id, or null if it does not exist
*/
public <T> T getParameter(String key) {
public <U, T extends Parameter<U>> T getParameter(String key) {
return getParameter(key, false);
}
@ -105,7 +105,7 @@ public abstract class ParameterizedElement extends AbstractStrolchElement {
* @return the {@link Parameter} with the given id, or null if it does not exist
*/
@SuppressWarnings("unchecked")
public <T> T getParameter(String key, boolean assertExists) {
public <U, T extends Parameter<U>> T getParameter(String key, boolean assertExists) {
if (this.parameterMap == null) {
if (assertExists) {
@ -153,11 +153,11 @@ public abstract class ParameterizedElement extends AbstractStrolchElement {
* @return the removed {@link Parameter}, or null if it does not exist
*/
@SuppressWarnings("unchecked")
public <T> Parameter<T> removeParameter(String key) {
public <U, T extends Parameter<U>> T removeParameter(String key) {
if (this.parameterMap == null) {
return null;
}
return (Parameter<T>) this.parameterMap.remove(key);
return (T) this.parameterMap.remove(key);
}
/**

2
li.strolch.service/src/main/java/li/strolch/report/GenericReport.java
View File

@ -166,7 +166,7 @@ public class GenericReport {
public Stream<ReportElement> doReport() {
return buildStream().map(e -> new ReportElement(this.columnIds, columnId -> {
StringParameter columnDefP = (StringParameter) this.columnsBag.getParameter(columnId, true);
StringParameter columnDefP = this.columnsBag.getParameter(columnId, true);
return evaluateColumnValue(columnDefP, e);
}));
}