X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Fdiagram%2Fmonitor%2FMonitorClassFactory2.java;h=75d3050b9cd91689c5d136ed82868bd20808fd5f;hb=HEAD;hp=5c3d7fbe3a26318d0761461b8765ce042c87a9b2;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

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 5c3d7fbe3..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
@@ -60,7 +60,6 @@ import org.simantics.scl.runtime.function.Function1;
 import org.simantics.ui.colors.Colors;
 import org.simantics.ui.fonts.FontDescriptor;
 import org.simantics.ui.fonts.Fonts;
-import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.datastructures.hints.IHintContext.Key;
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
 
@@ -71,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,
@@ -145,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) {
@@ -195,12 +194,9 @@ public class MonitorClassFactory2 extends SyncElementFactory {
                         }) {
                             @Override
                             public void accepted(MonitorVariable var) {
-                                session.asyncRequest(new MonitorVariableWrite(var.getVariable(), text), new Callback<DatabaseException>() {
-                                    @Override
-                                    public void run(DatabaseException e) {
-                                        if (e != null)
-                                            ErrorLogger.defaultLogError(e);
-                                    }
+                                session.asyncRequest(new MonitorVariableWrite(var.getVariable(), text), e -> {
+                                    if (e != null)
+                                        ErrorLogger.defaultLogError(e);
                                 });
                             }
                             @Override
@@ -213,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);
@@ -223,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);
             
         }
     }