From 916f927ccd51d253c30f5aeee1fe3d78665b434e Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 1 Sep 2016 10:06:32 +0200 Subject: [PATCH] [Minor] Allow to create locator even if parent is missing --- .../src/main/java/li/strolch/model/ParameterBag.java | 3 ++- .../src/main/java/li/strolch/model/activity/Action.java | 3 ++- .../java/li/strolch/model/parameter/AbstractParameter.java | 3 ++- .../model/timedstate/AbstractStrolchTimedState.java | 7 ++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/li.strolch.model/src/main/java/li/strolch/model/ParameterBag.java b/li.strolch.model/src/main/java/li/strolch/model/ParameterBag.java index 8bc9541a4..2f530176e 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/ParameterBag.java +++ b/li.strolch.model/src/main/java/li/strolch/model/ParameterBag.java @@ -51,7 +51,8 @@ public class ParameterBag extends ParameterizedElement { @Override public void fillLocator(LocatorBuilder lb) { - this.parent.fillLocator(lb); + if (this.parent != null) + this.parent.fillLocator(lb); lb.append(Tags.BAG); lb.append(this.id); } diff --git a/li.strolch.model/src/main/java/li/strolch/model/activity/Action.java b/li.strolch.model/src/main/java/li/strolch/model/activity/Action.java index 639c1019b..ad395777f 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/activity/Action.java +++ b/li.strolch.model/src/main/java/li/strolch/model/activity/Action.java @@ -211,7 +211,8 @@ public class Action extends GroupedParameterizedElement implements IActivityElem @Override public Locator getLocator() { LocatorBuilder lb = new LocatorBuilder(); - this.parent.fillLocator(lb); + if (this.parent != null) + this.parent.fillLocator(lb); fillLocator(lb); return lb.build(); } diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java index 8a6f68025..4a736faab 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java @@ -138,7 +138,8 @@ public abstract class AbstractParameter extends AbstractStrolchElement implem @Override public Locator getLocator() { LocatorBuilder lb = new LocatorBuilder(); - this.parent.fillLocator(lb); + if (this.parent != null) + this.parent.fillLocator(lb); fillLocator(lb); return lb.build(); } diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java b/li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java index 4f65d5fc6..81335703e 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java +++ b/li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java @@ -37,8 +37,8 @@ import li.strolch.utils.helper.StringHelper; * @author Robert von Burg */ @SuppressWarnings("rawtypes") -public abstract class AbstractStrolchTimedState extends AbstractStrolchElement implements - StrolchTimedState { +public abstract class AbstractStrolchTimedState extends AbstractStrolchElement + implements StrolchTimedState { private static final long serialVersionUID = 1L; @@ -161,7 +161,8 @@ public abstract class AbstractStrolchTimedState extends Abstra @Override public Locator getLocator() { LocatorBuilder lb = new LocatorBuilder(); - this.parent.fillLocator(lb); + if (this.parent != null) + this.parent.fillLocator(lb); fillLocator(lb); return lb.build(); }