From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Sat, 5 Aug 2017 00:46:46 +0000 (+0300)
Subject: Merge "Added Simantics/Diagram#diagramsUnder to complement diagramsOf"
X-Git-Tag: v1.31.0~264^2~5
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=cf021c1849215d34e13a8f55308063cb7e7d249b;hp=b586228b0a54c5b8aa55a31d929d7f24c4fc5f53

Merge "Added Simantics/Diagram#diagramsUnder to complement diagramsOf"
---

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 5b49810fa..5fb3a283e 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
@@ -66,6 +66,12 @@ public class CommandContextImpl implements CommandContextMutable {
 		if (context != null) {
 			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());
 			}