X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Fdiagram%2Fmonitor%2FMonitorClassFactory2.java;h=75d3050b9cd91689c5d136ed82868bd20808fd5f;hp=17c26f48386e6455ae85301da8506b0fcd4b35d2;hb=90a52d58489b6c518b13dde238923125c8f63eec;hpb=4aa615b51b887cd75b558a823f0d87b3174e5f5e

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/monitor/MonitorClassFactory2.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/monitor/MonitorClassFactory2.java
index 17c26f483..75d3050b9 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/monitor/MonitorClassFactory2.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/monitor/MonitorClassFactory2.java
@@ -70,9 +70,9 @@ import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
 public class MonitorClassFactory2 extends SyncElementFactory {
 
     private static final Key               KEY_VARIABLE_LISTENER = new KeyOf(MonitorListener.class,
-                                                                         "MONITOR_VARIABLE_LISTENER");
+                                                                         "MONITOR_VARIABLE_LISTENER"); //$NON-NLS-1$
 
-    private static final String            CLASS_ID          = "Monitor";
+    private static final String            CLASS_ID          = "Monitor"; //$NON-NLS-1$
 
     private static final IHintSynchronizer HINT_SYNCHRONIZER = new CompositeHintSynchronizer(
             MonitorSynchronizer.INSTANCE,
@@ -144,7 +144,7 @@ public class MonitorClassFactory2 extends SyncElementFactory {
         loadParentRelationships(graph, element, e);
 
         final Map<String, String> substitutions = new HashMap<String, String>();
-        substitutions.put("#v1", "");
+        substitutions.put("#v1", ""); //$NON-NLS-1$ //$NON-NLS-2$
 
         final Resource diagramRuntime = diagram.getHint(DiagramModelHints.KEY_DIAGRAM_RUNTIME_RESOURCE);
         if (diagramRuntime != null) {
@@ -209,7 +209,7 @@ public class MonitorClassFactory2 extends SyncElementFactory {
                 });
             }
 
-            IElement mappedElement = diagram.getDiagramClass().getSingleItem(DataElementMap.class).getElement(diagram, element);
+            IElement mappedElement = e;//diagram.getDiagramClass().getSingleItem(DataElementMap.class).getElement(diagram, element);
             MonitorListener monitorListener = new MonitorListener(element, canvas, diagram, substitutions);
             if (mappedElement != null) {
                 MonitorListener oldListener = mappedElement.getHint(KEY_VARIABLE_LISTENER);
@@ -219,7 +219,7 @@ public class MonitorClassFactory2 extends SyncElementFactory {
             }
 
             if(monitorVariable != null)
-            	graph.asyncRequest(new MonitorVariableValueRequest(diagramRuntime, element), monitorListener);
+            	graph.syncRequest(new MonitorVariableValueRequest(diagramRuntime, element), monitorListener);
             
         }
     }