Still working for multiple readers

[simantics/platform.git] / bundles / org.simantics.modeling.ui / src / org / simantics / modeling / ui / diagramEditor / DiagramViewerLoadJob.java

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerLoadJob.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerLoadJob.java
index dcadd4d9130cb872aca11a096066e46412f9a1fd..926ec6ae3a79bd5cd3076aeceb13d3e948f1e4d1 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerLoadJob.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerLoadJob.java
@@ -11,6 +11,8 @@
  *******************************************************************************/
 package org.simantics.modeling.ui.diagramEditor;
 
+import java.util.Collections;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -20,6 +22,8 @@ import org.simantics.db.exception.CancelTransactionException;
 import org.simantics.g2d.diagram.DiagramHints;
 import org.simantics.g2d.diagram.IDiagram;
 import org.simantics.modeling.ui.Activator;
+import org.simantics.threadlog.Task;
+import org.simantics.threadlog.ThreadLog;
 import org.simantics.utils.DataContainer;
 import org.simantics.utils.threads.ThreadUtils;
 
@@ -40,10 +44,12 @@ public class DiagramViewerLoadJob extends DatabaseJob {
 
         try {
             Object task = BEGIN("DV.loadDiagram");
+            System.err.println("foo1");
             final IDiagram diagram = viewer.loadDiagram(mon.newChild(100), viewer.diagramResource);
             if (diagram == null)
                 return Status.CANCEL_STATUS;
             END(task);
+            System.err.println("foo2");
 
             // Start an activation for the input resource.
             // This will activate mapping if necessary.
@@ -74,6 +80,8 @@ public class DiagramViewerLoadJob extends DatabaseJob {
                         mon.worked(10);
                         END(task);
 
+                       viewer.selectionProvider.fireSelection(Collections.emptyList());
+                        
                         // Zoom to fit if no previous view transform is available
                         task = BEGIN("DV.scheduleZoomToFit");
                         viewer.scheduleZoomToFit(diagram);
@@ -122,14 +130,14 @@ public class DiagramViewerLoadJob extends DatabaseJob {
 
     protected static Object BEGIN(String name) {
         if (PROFILE) {
-            //return ThreadLog.BEGIN(name);
+            return ThreadLog.BEGIN(name);
         }
         return null;
     }
 
     protected static void END(Object task) {
         if (PROFILE) {
-            //((Task) task).end();
+            ((Task) task).end();
         }
     }
 }