From ac913acc061f98ed99bad3fced6cf47527fefcbb Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 26 Mar 2019 13:46:28 +0100 Subject: [PATCH] [Fix] Clear locator if id is changed for root elements --- li.strolch.model/src/main/java/li/strolch/model/Order.java | 6 ++++++ .../src/main/java/li/strolch/model/Resource.java | 6 ++++++ .../src/main/java/li/strolch/model/activity/Activity.java | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/li.strolch.model/src/main/java/li/strolch/model/Order.java b/li.strolch.model/src/main/java/li/strolch/model/Order.java index 726b047bc..f7197f7f6 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/Order.java +++ b/li.strolch.model/src/main/java/li/strolch/model/Order.java @@ -88,6 +88,12 @@ public class Order extends AbstractStrolchRootElement implements StrolchRootElem setDate(date); } + @Override + public void setId(String id) { + this.locator = null; + super.setId(id); + } + @Override public String getObjectType() { return Tags.ORDER; diff --git a/li.strolch.model/src/main/java/li/strolch/model/Resource.java b/li.strolch.model/src/main/java/li/strolch/model/Resource.java index 6dcd12ce6..a8f993160 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/Resource.java +++ b/li.strolch.model/src/main/java/li/strolch/model/Resource.java @@ -59,6 +59,12 @@ public class Resource extends AbstractStrolchRootElement implements StrolchRootE super(id, name, type); } + @Override + public void setId(String id) { + this.locator = null; + super.setId(id); + } + @Override public String getObjectType() { return Tags.RESOURCE; diff --git a/li.strolch.model/src/main/java/li/strolch/model/activity/Activity.java b/li.strolch.model/src/main/java/li/strolch/model/activity/Activity.java index d191139c9..b509ca6d3 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/activity/Activity.java +++ b/li.strolch.model/src/main/java/li/strolch/model/activity/Activity.java @@ -70,6 +70,12 @@ public class Activity extends AbstractStrolchRootElement this.timeOrdering = timeOrdering; } + @Override + public void setId(String id) { + this.locator = null; + super.setId(id); + } + @Override public String getObjectType() { return Tags.ACTIVITY;