X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.simulator.toolkit%2Fsrc%2Forg%2Fsimantics%2Fsimulator%2Ftoolkit%2FStandardNodeManager.java;h=e09b3136e6307c7750f81f2ab1271ed340e4a2b4;hb=3c17e1a55c108f120808016dd5e4d3893c29c0e8;hp=8f1d1cf53c9c2a0c29ce8a6fbefd499128646df7;hpb=8c8283a01e63980527d605936286747006bea601;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.simulator.toolkit/src/org/simantics/simulator/toolkit/StandardNodeManager.java b/bundles/org.simantics.simulator.toolkit/src/org/simantics/simulator/toolkit/StandardNodeManager.java
index 8f1d1cf53..e09b3136e 100644
--- a/bundles/org.simantics.simulator.toolkit/src/org/simantics/simulator/toolkit/StandardNodeManager.java
+++ b/bundles/org.simantics.simulator.toolkit/src/org/simantics/simulator/toolkit/StandardNodeManager.java
@@ -13,6 +13,7 @@
 package org.simantics.simulator.toolkit;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -46,12 +47,12 @@ import gnu.trove.set.hash.THashSet;
  *
  * @author Antti Villberg
  */
-public abstract class StandardNodeManager<Node, Engine extends StandardNodeManagerSupport<Node>> implements NodeManager<Node> {
+public class StandardNodeManager<Node, Engine extends StandardNodeManagerSupport<Node>> implements NodeManager<Node> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StandardNodeManager.class);
 
-    private final Node root;
-    private final StandardRealm<Node,Engine> realm;
+    protected final Node root;
+    protected final StandardRealm<Node,Engine> realm;
 
     static final Binding NO_BINDING = new VariantBinding() {
 
@@ -115,7 +116,7 @@ public abstract class StandardNodeManager<Node, Engine extends StandardNodeManag
 
     };
 
-    THashMap<Node, Variant> valueCache = new THashMap<>();
+    protected THashMap<Node, Variant> valueCache = new THashMap<>();
     protected THashMap<Node, THashSet<Runnable>> listeners = new THashMap<>();
 
     AtomicBoolean fireNodeListenersScheduled = new AtomicBoolean(false);
@@ -193,7 +194,10 @@ public abstract class StandardNodeManager<Node, Engine extends StandardNodeManag
     @Override
     public Object getValue(Node node, Binding binding) throws NodeManagerException, BindingException {
         try {
-            return getValue(node).getValue(binding);
+            Variant value = getValue(node);
+            if(NodeManager.PENDING_NODE_VALUE == value)
+                return value;
+            return value.getValue(binding);
         } catch (AdaptException e) {
             throw new BindingException(e);
         }
@@ -295,6 +299,8 @@ public abstract class StandardNodeManager<Node, Engine extends StandardNodeManag
         Variant variant = valueCache.get(node);
         if(variant == null) {
             Object value = realm.getEngine().getEngineValue(node);
+            if(NodeManager.PENDING_NODE_VALUE == value)
+                return (Variant)value;
             Binding binding = realm.getEngine().getEngineBinding(node);
             variant = new Variant(binding, value);
             valueCache.put(node, variant);
@@ -322,6 +328,23 @@ public abstract class StandardNodeManager<Node, Engine extends StandardNodeManag
     @Override
     public void setValue(Node node, Object value, Binding binding)
             throws NodeManagerException {
+    	updateValueInner(node, value, binding);
+        refreshVariable(node);
+    }
+
+    //Update the value of the node and remove from valueCache only the references nodes
+    public void setValueAndFireSelectedListeners(Node node, Object value, Binding binding, Set<Node> references) throws NodeManagerException {
+    	if(references.size() > 0) {
+    		for(Node n : references) {
+    			valueCache.remove(n);
+    		}
+    	}
+    	updateValueInner(node, value, binding);
+    	fireNodeListenersSync();
+    }
+    
+    //Update the value of the node helper method
+    private void updateValueInner(Node node, Object value, Binding binding) throws NodeManagerException {
         checkThreadAccess();
         Binding targetBinding = realm.getEngine().getEngineBinding(node);
         if(binding.equals(targetBinding)) {
@@ -341,7 +364,6 @@ public abstract class StandardNodeManager<Node, Engine extends StandardNodeManag
                 throw new NodeManagerException(e);
             }
         }
-        refreshVariable(node);
     }
 
     @Override
@@ -408,4 +430,9 @@ public abstract class StandardNodeManager<Node, Engine extends StandardNodeManag
         listeners.clear();
     }
 
+    @Override
+    public Set<String> getClassifications(Node node) throws NodeManagerException {
+        return Collections.emptySet();
+    }
+
 }
\ No newline at end of file