From 102fe87b63135c4459cfeb4904f3fad30c6a7b50 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Tue, 4 Dec 2018 08:57:36 +0100
Subject: [PATCH] [New] Added optional locator to JSON visitors

---
 .../model/json/StrolchElementToJsonVisitor.java      | 12 ++++++++++++
 .../model/json/StrolchRootElementToJsonVisitor.java  |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
index d6024d6e5..86435ff88 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
@@ -41,6 +41,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 
 	private boolean flat;
 	private boolean withoutElementName;
+	private boolean withLocator;
 	private boolean withoutVersion;
 	private boolean withoutPolicies;
 	private int activityDepth = Integer.MAX_VALUE;
@@ -59,6 +60,10 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 		return !this.withoutVersion;
 	}
 
+	public boolean isWithLocator() {
+		return !this.withLocator;
+	}
+
 	public boolean isWithoutVersion() {
 		return this.withoutVersion;
 	}
@@ -71,6 +76,11 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 		return this.withoutPolicies;
 	}
 
+	public StrolchElementToJsonVisitor withLocator() {
+		this.withLocator = true;
+		return this;
+	}
+
 	public StrolchElementToJsonVisitor withVersion() {
 		this.withoutVersion = false;
 		return this;
@@ -448,6 +458,8 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 	protected JsonObject toJson(AbstractStrolchElement element, JsonObject rootJ) {
 
 		rootJ.addProperty(Json.ID, element.getId());
+		if (this.withLocator)
+			rootJ.addProperty(Json.LOCATOR, element.getLocator().toString());
 
 		if (!isWithoutElementName())
 			rootJ.addProperty(Json.NAME, element.getName());
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
index 338bd102f..cb9020a46 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
@@ -48,6 +48,11 @@ public class StrolchRootElementToJsonVisitor implements StrolchRootElementVisito
 		return this::visitActivity;
 	}
 
+	public StrolchRootElementToJsonVisitor withLocator() {
+		this.visitor.withLocator();
+		return this;
+	}
+
 	public StrolchRootElementToJsonVisitor withVersion() {
 		this.visitor.withVersion();
 		return this;