From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 2 Feb 2017 11:22:03 +0000 (+0200)
Subject: Removed logging of PendingVariableExceptions from LabelContribution
X-Git-Tag: v1.28.0~87^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=cf355af9bf70b9bafea8e45f763e341e50343732;p=simantics%2Fplatform.git

Removed logging of PendingVariableExceptions from LabelContribution

org.simantics.browsing.ui.model.labels.LabelContribution.getLabel used
to log all DatabaseExceptions which filled logs with very uninformative
PendingVariableException prints in normal operation.
PendingVariableExceptions are expected to happen in this context and
therefore should simply be ignored by returning empty labeling results.

refs #7011

Change-Id: Iec164d65682da038646c9fbfbee074016546095e
---

diff --git a/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/labels/LabelContribution.java b/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/labels/LabelContribution.java
index e8a7b6222..25f0d054d 100644
--- a/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/labels/LabelContribution.java
+++ b/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/labels/LabelContribution.java
@@ -24,6 +24,7 @@ import org.simantics.browsing.ui.model.tests.Test;
 import org.simantics.browsing.ui.model.visuals.VisualsContribution;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.exception.PendingVariableException;
 
 /**
  * Produces labels for nodes of given node type.
@@ -31,7 +32,7 @@ import org.simantics.db.exception.DatabaseException;
  */
 public class LabelContribution extends VisualsContribution {
     LabelRule labelRule;
-    
+
     public LabelContribution(NodeType nodeType, Test test, LabelRule labelRule, double priority) throws InvalidContribution {
         super(nodeType, test, priority);
         if(!labelRule.isCompatible(
@@ -40,7 +41,7 @@ public class LabelContribution extends VisualsContribution {
             throw new InvalidContribution("Label rule is not compatible with the content type.");
         this.labelRule = labelRule;
     }
-       
+
     /**
      * Returns a label for the node or null, if contribution is
      * not suitable for the input.
@@ -48,15 +49,15 @@ public class LabelContribution extends VisualsContribution {
     public Map<String, String> getLabel(ReadGraph graph, NodeContext context) {
         Object content = context.getConstant(BuiltinKeys.INPUT);
         try {
-            if(test == null || test.test(graph, content))            
+            if(test == null || test.test(graph, content))
                 return labelRule.getLabel(graph, content);
             else
                 return null;
+        } catch(PendingVariableException e) {
+            return Collections.singletonMap(ColumnKeys.SINGLE, "");
         } catch(DatabaseException e) {
             ErrorLogger.defaultLogError(e);
-        	//Logger.defaultLogError(e);
-            // TODO reconsider
             return Collections.singletonMap(ColumnKeys.SINGLE, "");
         }
-    }    
+    }
 }