From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Thu, 31 May 2018 08:52:52 +0000 (+0300)
Subject: Previous changes broke Apros specific code, heres a fix.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=49f314240bff561ea8a3723959a8cf022fa36e38;p=simantics%2Finterop.git

Previous changes broke Apros specific code, heres a fix.

gitlab #1

Change-Id: I4fcbb926dd4c116ca9d27010353668936cc835c2
---

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/ModelUpdate.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/ModelUpdate.java
index e736e22..cbdfc8f 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/ModelUpdate.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/ModelUpdate.java
@@ -71,7 +71,7 @@ public abstract class ModelUpdate {
 				showWarning(result2.second);
 			comparator2.test(getSession());
 			changes2 = comparator2.getChanges();
-			changes2 = getSession().syncRequest(new FilterChangesRead(changes2, filters));
+			changes2 = getSession().syncRequest(createFilterRead(changes2, filters));
 			updateTree2 = getUpdateTree(changes2);
 			updateList2 = getUpdateList(changes2);
 			
@@ -82,7 +82,7 @@ public abstract class ModelUpdate {
 				showWarning(result3.second);
 			comparator3.test(getSession());
 			changes3 = comparator3.getChanges();
-			changes3 = getSession().syncRequest(new FilterChangesRead(changes3, filters));
+			changes3 = getSession().syncRequest(createFilterRead(changes3, filters));
 		}
 		
 		Pair<GraphComparator,String> result = getChanges(oldModel,newModel);
@@ -124,7 +124,7 @@ public abstract class ModelUpdate {
 		}
 		comparator.test(getSession());
 		changes = comparator.getChanges();
-		changes = getSession().syncRequest(new FilterChangesRead(changes, filters));
+		changes = getSession().syncRequest(createFilterRead(changes, filters));
 		updateTree = getUpdateTree(changes);
 		updateList = getUpdateList(changes);
 		if (userFilters.size() != 0) {
@@ -194,7 +194,7 @@ public abstract class ModelUpdate {
 			// Create filtered changes
 			List<ChangeFilter> combined = new ArrayList<>(filters);
 			combined.addAll(userFilters);
-			GraphChanges filteredChanges = getSession().syncRequest(new FilterChangesRead(changes, combined));
+			GraphChanges filteredChanges = getSession().syncRequest(createFilterRead(changes, combined));
 			UpdateTree updateTreeF = getUpdateTree(filteredChanges);
 			UpdateList updateListF = getUpdateList(filteredChanges);
 			// hide changes that are not contained within the filtered changes.
@@ -339,6 +339,10 @@ public abstract class ModelUpdate {
 		return Simantics.getSession();
 	}
 	
+	public Read<GraphChanges> createFilterRead(GraphChanges changes, List<ChangeFilter> filters) {
+		return new FilterChangesRead(changes, filters);
+	}
+	
 	
 	
 	public static class FilterChangesRead implements Read<GraphChanges> {