From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 27 Aug 2018 14:37:08 +0000 (+0000)
Subject: Merge "Debug logging through SLF4J Logger for Expressions"
X-Git-Tag: v1.43.0~136^2~400
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=25f90625263911a40f785edbeb8ca44b3db23911;hp=1a88878256eeb41efd2c0e3f82b69b4ef2565d61

Merge "Debug logging through SLF4J Logger for Expressions"
---

diff --git a/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF b/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF
index e13549a2f..ad2133153 100644
--- a/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Export-Package: org.simantics.basicexpression,
  org.simantics.basicexpression.lexer,
  org.simantics.basicexpression.node,
  org.simantics.basicexpression.parser
+Require-Bundle: org.slf4j.api;bundle-version="1.7.25"
diff --git a/bundles/org.simantics.basicexpression/src/org/simantics/basicexpression/Expressions.java b/bundles/org.simantics.basicexpression/src/org/simantics/basicexpression/Expressions.java
index ae28f399b..51dae6c36 100644
--- a/bundles/org.simantics.basicexpression/src/org/simantics/basicexpression/Expressions.java
+++ b/bundles/org.simantics.basicexpression/src/org/simantics/basicexpression/Expressions.java
@@ -18,9 +18,13 @@ import org.simantics.basicexpression.analysis.DepthFirstAdapter;
 import org.simantics.basicexpression.lexer.Lexer;
 import org.simantics.basicexpression.node.Start;
 import org.simantics.basicexpression.parser.Parser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Expressions {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(Expressions.class);
+	
 	private static final boolean DEBUG = false;
 	
     public static void evaluate(String expression, DepthFirstAdapter evaluator) {
@@ -47,10 +51,11 @@ public class Expressions {
         }
         catch(Exception e)
         {
-        	e.printStackTrace();
+        	if (LOGGER.isDebugEnabled())
+        		LOGGER.debug("Failed to evaluate expression {}", expression, e);
         	evaluator.except(e);
-        }        
-        
+        }
+
     }
 
 }