X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2FdiagramEditor%2FDiagramViewerLoadJob.java;h=926ec6ae3a79bd5cd3076aeceb13d3e948f1e4d1;hb=68ce0966a57f5153b133c6283fdbae10f683b745;hp=85f0dbbe7b432f35548a38488fa30491407036a9;hpb=46c8189fee24a71d1ce0634e12db5a696e952b10;p=simantics%2Fplatform.git 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 85f0dbbe7..926ec6ae3 100644 --- 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 @@ -22,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; @@ -42,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. @@ -126,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(); } } }