Debug logging through SLF4J Logger for Expressions

gitlab #88

Change-Id: I7917e8a207e99bf92feab50291bcb3d85e108cf3

diff --git a/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF b/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF
index e13549a2fb9de2203eb42662f24be5e656b33a80..ad2133153f2e227b94e0d862ebc8032f0e7552c0 100644 (file)
--- 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
  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 ae28f399b707cd9b02070a5a17b46665e9a27e90..51dae6c3698c61ded4bed6b9b8eae6b4be85520a 100644 (file)
--- 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.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 {
 
 
 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) {
        private static final boolean DEBUG = false;
        
     public static void evaluate(String expression, DepthFirstAdapter evaluator) {


@@ -47,10 +51,11 @@ public class Expressions {
         }
         catch(Exception e)
         {
         }
         catch(Exception e)
         {

-               e.printStackTrace();
+               if (LOGGER.isDebugEnabled())
+                       LOGGER.debug("Failed to evaluate expression {}", expression, e);

                evaluator.except(e);
                evaluator.except(e);

-        }        
-        
+        }
+

     }
 
 }
     }
 
 }