From: Antti Villberg <antti.villberg@semantum.fi>
Date: Mon, 9 Oct 2017 17:06:15 +0000 (+0300)
Subject: Remove merge semantics of CommandContext keys
X-Git-Tag: v1.31.0~135
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=547942cd382c0212a72b528aaa85aa686f7c1d83;p=simantics%2Fplatform.git

Remove merge semantics of CommandContext keys

refs #7533

Change-Id: I2b1ff40aa64fbb10d215641962866dad634df472
---

diff --git a/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/CommandContextImpl.java b/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/CommandContextImpl.java
index 5fb3a283e..8ff198cbf 100644
--- a/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/CommandContextImpl.java
+++ b/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/CommandContextImpl.java
@@ -67,13 +67,7 @@ public class CommandContextImpl implements CommandContextMutable {
 			Map<String,List<List<Object>>> from = context.getData(); 
 			for (Map.Entry<String, List<List<Object>>> entry : from.entrySet()) {
 				String key = entry.getKey();
-				Object existing = getValue(key);
-				Object newValue = context.getValue(key);
-				// Do not merge duplicates!
-				if (newValue != null && newValue.equals(existing))
-					continue;
-				List<List<Object>> rows = ensureRowsAvailable(entry.getKey());
-				rows.addAll(entry.getValue());
+				putValue(key, context.getValue(key));
 			}
 		}
 		return this;