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

[Minor] Activity casts to returned object

This commit is contained in:
Robert von Burg 2017-05-04 15:48:26 +02:00
parent 49f8e2bec5
commit 4965af17b4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
li.strolch.model/src/main/java/li/strolch/model/activity/Activity.java
View File

@ -148,7 +148,8 @@ public class Activity extends AbstractStrolchRootElement
* @param activityElement * @param activityElement
* @return the element added * @return the element added
*/ */
public IActivityElement addElement(IActivityElement activityElement) { @SuppressWarnings("unchecked")
public <T extends IActivityElement> T addElement(IActivityElement activityElement) {
DBC.PRE.assertNotEquals("Can't add element to itself!", this, activityElement); DBC.PRE.assertNotEquals("Can't add element to itself!", this, activityElement);
DBC.PRE.assertNull("Parent can't already be set!", activityElement.getParent()); DBC.PRE.assertNull("Parent can't already be set!", activityElement.getParent());
@ -163,7 +164,7 @@ public class Activity extends AbstractStrolchRootElement
"Activiy " + getLocator() + " already contains an activity element with id = " + id); "Activiy " + getLocator() + " already contains an activity element with id = " + id);
else { else {
activityElement.setParent(this); activityElement.setParent(this);
return this.elements.put(activityElement.getId(), activityElement); return (T) this.elements.put(activityElement.getId(), activityElement);
} }
} }
@ -175,11 +176,12 @@ public class Activity extends AbstractStrolchRootElement
* *
* @return the removed element, or null if it does not exist * @return the removed element, or null if it does not exist
*/ */
public IActivityElement remove(String id) { @SuppressWarnings("unchecked")
public <T extends IActivityElement> T remove(String id) {
IActivityElement element = this.elements.remove(id); IActivityElement element = this.elements.remove(id);
if (element != null) if (element != null)
element.setParent(null); element.setParent(null);
return element; return (T) element;
} }
/** /**