From: jsimomaa <jani.simomaa@gmail.com>
Date: Fri, 13 Oct 2017 07:44:43 +0000 (+0300)
Subject: ConstantLabelDecorationRule to avoid Display in creating FontDescriptors
X-Git-Tag: v1.31.0~123
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=ed9dab5ea6ac1708c65865c7f589a75b7d8e71a4;p=simantics%2Fplatform.git

ConstantLabelDecorationRule to avoid Display in creating FontDescriptors

refs #7545

Change-Id: I921a8f43129cb9710f6c5db0842c174ee802ab81
---

diff --git a/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/labeldecorators/ConstantLabelDecorationRule.java b/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/labeldecorators/ConstantLabelDecorationRule.java
index 494c0a819..2df8e52ee 100644
--- a/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/labeldecorators/ConstantLabelDecorationRule.java
+++ b/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/labeldecorators/ConstantLabelDecorationRule.java
@@ -13,9 +13,8 @@ package org.simantics.browsing.ui.model.labeldecorators;
 
 import org.eclipse.jface.resource.ColorDescriptor;
 import org.eclipse.jface.resource.FontDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.RGB;
 import org.simantics.browsing.ui.content.LabelDecorator;
 import org.simantics.databoard.Bindings;
@@ -30,6 +29,11 @@ import org.simantics.viewpoint.ontology.ViewpointResource;
  */
 public class ConstantLabelDecorationRule extends AbstractLabelDecorator implements LabelDecorationRule {
 
+    /**
+     * For headless instances where no Display is available
+     */
+    private static final FontDescriptor DEFAULT_FONT_DESCRIPTOR = FontDescriptor.createFrom(new FontData("Arial", 11, 0));
+
     String prefix;
     String postfix;
     ColorDescriptor foregroundColor;
@@ -135,7 +139,8 @@ public class ConstantLabelDecorationRule extends AbstractLabelDecorator implemen
             return font;
         else {
             FontDescriptor desc = (FontDescriptor)font;
-            if(desc == null) desc = FontDescriptor.createFrom(JFaceResources.getDialogFont().getFontData());
+            if(desc == null)
+                desc = DEFAULT_FONT_DESCRIPTOR;
             return (Font)desc.withStyle(style);
         }
     }