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

[Minor] Allow to create locator even if parent is missing

This commit is contained in:
Robert von Burg 2016-09-01 10:06:32 +02:00
parent 62794e8e59
commit 916f927ccd
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
li.strolch.model/src/main/java/li/strolch/model/ParameterBag.java
View File

@ -51,7 +51,8 @@ public class ParameterBag extends ParameterizedElement {
@Override @Override
public void fillLocator(LocatorBuilder lb) { public void fillLocator(LocatorBuilder lb) {
this.parent.fillLocator(lb); if (this.parent != null)
this.parent.fillLocator(lb);
lb.append(Tags.BAG); lb.append(Tags.BAG);
lb.append(this.id); lb.append(this.id);
} }

3
li.strolch.model/src/main/java/li/strolch/model/activity/Action.java
View File

@ -211,7 +211,8 @@ public class Action extends GroupedParameterizedElement implements IActivityElem
@Override @Override
public Locator getLocator() { public Locator getLocator() {
LocatorBuilder lb = new LocatorBuilder(); LocatorBuilder lb = new LocatorBuilder();
this.parent.fillLocator(lb); if (this.parent != null)
this.parent.fillLocator(lb);
fillLocator(lb); fillLocator(lb);
return lb.build(); return lb.build();
} }

3
li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java
View File

@ -138,7 +138,8 @@ public abstract class AbstractParameter<T> extends AbstractStrolchElement implem
@Override @Override
public Locator getLocator() { public Locator getLocator() {
LocatorBuilder lb = new LocatorBuilder(); LocatorBuilder lb = new LocatorBuilder();
this.parent.fillLocator(lb); if (this.parent != null)
this.parent.fillLocator(lb);
fillLocator(lb); fillLocator(lb);
return lb.build(); return lb.build();
} }

7
li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java
View File

@ -37,8 +37,8 @@ import li.strolch.utils.helper.StringHelper;
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
*/ */
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public abstract class AbstractStrolchTimedState<T extends IValue> extends AbstractStrolchElement implements public abstract class AbstractStrolchTimedState<T extends IValue> extends AbstractStrolchElement
StrolchTimedState<T> { implements StrolchTimedState<T> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -161,7 +161,8 @@ public abstract class AbstractStrolchTimedState<T extends IValue> extends Abstra
@Override @Override
public Locator getLocator() { public Locator getLocator() {
LocatorBuilder lb = new LocatorBuilder(); LocatorBuilder lb = new LocatorBuilder();
this.parent.fillLocator(lb); if (this.parent != null)
this.parent.fillLocator(lb);
fillLocator(lb); fillLocator(lb);
return lb.build(); return lb.build();
} }