X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.template2d.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Ftemplate2d%2Fui%2Fwizard%2FDrawingTemplateExporter.java;h=ead7e836d2d18d2d8f61907245422aadb6f79ff1;hp=bee851607a3a748848fd1f171c96ef14a2877fa1;hb=60509f4629d5ca644dd9533dd2abc64349aad328;hpb=e88be95edf1f80781646cfdf717ec1b663264179

diff --git a/bundles/org.simantics.modeling.template2d.ui/src/org/simantics/modeling/template2d/ui/wizard/DrawingTemplateExporter.java b/bundles/org.simantics.modeling.template2d.ui/src/org/simantics/modeling/template2d/ui/wizard/DrawingTemplateExporter.java
index bee851607..ead7e836d 100644
--- a/bundles/org.simantics.modeling.template2d.ui/src/org/simantics/modeling/template2d/ui/wizard/DrawingTemplateExporter.java
+++ b/bundles/org.simantics.modeling.template2d.ui/src/org/simantics/modeling/template2d/ui/wizard/DrawingTemplateExporter.java
@@ -29,7 +29,6 @@ import org.simantics.databoard.serialization.SerializationException;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
-import org.simantics.db.common.utils.Logger;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.CopyHandler;
 import org.simantics.db.layer0.util.ClipboardUtils;
@@ -41,13 +40,17 @@ import org.simantics.db.request.Read;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.modeling.template2d.DiagramTemplateConstants;
 import org.simantics.utils.ui.dialogs.ShowMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Tuukka Lehtonen
- * @author Teemu Mätäsniemi
+ * @author Teemu M�t�sniemi
  */
 public class DrawingTemplateExporter implements IRunnableWithProgress {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DrawingTemplateExporter.class);
+    
     ExportPlan exportModel;
 
     public DrawingTemplateExporter(ExportPlan exportModel) {
@@ -92,25 +95,22 @@ public class DrawingTemplateExporter implements IRunnableWithProgress {
                 public SimanticsClipboard perform(ReadGraph graph) throws DatabaseException {
                     CopyHandler ch = graph.adapt(template, CopyHandler.class);
                     SimanticsClipboardImpl clipboard = new SimanticsClipboardImpl();
-                    ch.copyToClipboard(graph, clipboard);
+                    ch.copyToClipboard(graph, clipboard, SubMonitor.convert(mon, 50));
                     return clipboard;
                 }
             });
             for (Set<Representation> object : clipboard.getContents()) {
                 TransferableGraph1 tg = ClipboardUtils.accept(object, SimanticsKeys.KEY_TRANSFERABLE_GRAPH);
-                mon.worked(95);
+                mon.worked(50);
 
                 mon.setTaskName("Writing transferable graph...");
                 DataContainers.writeFile(location, new DataContainer(
                         DiagramTemplateConstants.DRAWING_TEMPLATE_FORMAT, DiagramTemplateConstants.DRAWING_TEMPLATE_CURRENT_VERSION,
                         new Variant(TransferableGraph1.BINDING, tg)));
-
                 mon.worked(5);
             }
-
         } catch (DatabaseException e) {
-            e.printStackTrace();
-            Logger.defaultLogError(e);
+            LOGGER.error("Drawing template export failed", e);
             mon.setCanceled(true);
             ShowMessage.showError("Export failed.", "Internal application error in export. See log for details.");
         }