deprecate JSONDocumentLayout.type => use windowId

#348
metasfresh · May 5, 2017 · acaade1 · acaade1
1 parent 05df4cc
commit acaade1
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayout.java b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentLayout.java
@@ -57,9 +57,13 @@ public static final JSONDocumentLayout ofDetailTab(final DocumentLayoutDetailDes
 	{
 		return new JSONDocumentLayout(detailLayout, jsonOpts);
 	}
+
+	@JsonProperty("windowId")
+	private final String windowId;
 
 	/** i.e. AD_Window_ID */
 	@JsonProperty("type")
+	@Deprecated
 	private final String type;
 
 	@JsonProperty("tabid")
@@ -114,7 +118,8 @@ public static final JSONDocumentLayout ofDetailTab(final DocumentLayoutDetailDes
 	 */
 	private JSONDocumentLayout(final DocumentLayoutDescriptor layout, final JSONOptions jsonOpts)
 	{
-		type = String.valueOf(layout.getAD_Window_ID());
+		windowId = String.valueOf(layout.getAD_Window_ID());
+		type = windowId;
 		tabid = null;
 
 		caption = layout.getCaption(jsonOpts.getAD_Language());
@@ -166,7 +171,8 @@ private JSONDocumentLayout(final DocumentLayoutDetailDescriptor detailLayout, fi
 	{
 		final String adLanguage = jsonOpts.getAD_Language();
 
-		type = String.valueOf(detailLayout.getAD_Window_ID());
+		windowId = String.valueOf(detailLayout.getAD_Window_ID());
+		type = windowId;
 
 		final DetailId detailId = detailLayout.getDetailId();
 		tabid = DetailId.toJson(detailId);
@@ -192,7 +198,7 @@ private JSONDocumentLayout(final DocumentLayoutDetailDescriptor detailLayout, fi
 
 	@JsonCreator
 	private JSONDocumentLayout(
-			@JsonProperty("type") final String type//
+			@JsonProperty("windowId") final String windowId//
 			, @JsonProperty("tabid") final String tabId //
 			, @JsonProperty("caption") final String caption //
 			, @JsonProperty("documentSummaryElement") final JSONDocumentLayoutElement documentSummaryElement //
@@ -205,7 +211,8 @@ private JSONDocumentLayout(
 
 			)
 	{
-		this.type = type;
+		this.windowId = windowId;
+		type = windowId;
 		tabid = Strings.emptyToNull(tabId);
 
 		this.caption = caption;