[424422] Cleanup FontFormat access from tree labelProvider

Bug: 424422
Change-Id: If2ffe164da3459817c6ba15975a56475b7c5c7f9
Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>

1 files changed, 2 insertions, 9 deletions

diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java
index 6f1172132e..4f9ff91914 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java
@@ -12,7 +12,6 @@ package org.eclipse.sirius.tree.ui.tools.internal.editor.provider;
 
 import java.io.File;
 import java.net.MalformedURLException;
-import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.Path;
@@ -73,14 +72,8 @@ public class DTreeItemLabelProvider extends DSemanticTargetBasedLabelProvider im
         if (element instanceof DTreeItem) {
             final DTreeItem item = (DTreeItem) element;
             if (item.getOwnedStyle() != null) {
-                final int size = item.getOwnedStyle().getLabelSize();
-                List<FontFormat> labelFormat = new ArrayList<FontFormat>();
-                if (item.getOwnedStyle().getLabelFormat() != null) {
-                    labelFormat = item.getOwnedStyle().getLabelFormat();
-                } else {
-                    labelFormat.clear();
-                }
-                return VisualBindingManager.getDefault().getFontFromLabelFormatAndSize(labelFormat, size);
+                TreeItemStyle style = item.getOwnedStyle();
+                return VisualBindingManager.getDefault().getFontFromLabelFormatAndSize(style.getLabelFormat(), style.getLabelSize());
             }
         }
         return null;