Merge commit '7684bae'

[simantics/platform.git] / bundles / org.simantics.modeling / src / org / simantics / modeling / typicals / SyncTypicalTemplatesToInstances.java

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/SyncTypicalTemplatesToInstances.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/SyncTypicalTemplatesToInstances.java
index 83407bb04cacafb34e35261a54798d7e7a167b02..44b2abcfeae8d3ad1915a2bf16a827fd86313730 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/SyncTypicalTemplatesToInstances.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/SyncTypicalTemplatesToInstances.java
@@ -24,7 +24,6 @@ import java.util.Map;
 import java.util.Set;\r
 \r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import java.util.Set;\r
 \r
 import org.eclipse.core.runtime.IProgressMonitor;\r

-import org.simantics.Logger;\r

 import org.simantics.Simantics;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.Simantics;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.db.ReadGraph;\r


@@ -82,6 +81,8 @@ import org.simantics.utils.datastructures.MapSet;
 import org.simantics.utils.strings.AlphanumComparator;\r
 import org.simantics.utils.strings.EString;\r
 import org.simantics.utils.ui.ErrorLogger;\r
 import org.simantics.utils.strings.AlphanumComparator;\r
 import org.simantics.utils.strings.EString;\r
 import org.simantics.utils.ui.ErrorLogger;\r

+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r

 \r
 import gnu.trove.map.hash.THashMap;\r
 import gnu.trove.set.hash.THashSet;\r
 \r
 import gnu.trove.map.hash.THashMap;\r
 import gnu.trove.set.hash.THashSet;\r


@@ -103,6 +104,7 @@ import gnu.trove.set.hash.THashSet;
  * @see TypicalSynchronizationMetadata\r
  */\r
 public class SyncTypicalTemplatesToInstances extends WriteRequest {\r
  * @see TypicalSynchronizationMetadata\r
  */\r
 public class SyncTypicalTemplatesToInstances extends WriteRequest {\r

+    private static final Logger LOGGER = LoggerFactory.getLogger(SyncTypicalTemplatesToInstances.class);\r

 \r
     /**\r
      * A constant used as the second argument to\r
 \r
     /**\r
      * A constant used as the second argument to\r


@@ -424,8 +426,7 @@ public class SyncTypicalTemplatesToInstances extends WriteRequest {
                 syncInstance(graph, template, instance, templateElements);\r
             }\r
         } catch (Exception e) {\r
                 syncInstance(graph, template, instance, templateElements);\r
             }\r
         } catch (Exception e) {\r

-               Logger.defaultLogError(e);\r
-               e.printStackTrace();\r
+            LOGGER.error("Template synchronization failed.", e);\r

         } finally {\r
             this.temporaryDiagram.removeHint(DiagramModelHints.KEY_DIAGRAM_RESOURCE);\r
         }\r
         } finally {\r
             this.temporaryDiagram.removeHint(DiagramModelHints.KEY_DIAGRAM_RESOURCE);\r
         }\r