Simplify TreeViewerFactory.createTreeViewer()
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/TreeViewerFactory.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/TreeViewerFactory.java
index 3dba8da..5fa178c 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/TreeViewerFactory.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/TreeViewerFactory.java
@@ -139,26 +139,16 @@
return viewer;
}
- /**
- * @param labelProvider
- * @param contentProvider
- * @param input
- * @param labelDecorator
- * @param viewer
- */
private static void createTreeViewer(ILabelProvider labelProvider, ITreeContentProvider contentProvider,
Object input, ILabelDecorator labelDecorator, TreeViewer viewer, boolean sort) {
+ if (labelDecorator != null && !(labelProvider instanceof DecoratingLabelProvider)) {
+ labelProvider = new DecoratingLabelProvider(labelProvider, labelDecorator);
+ }
viewer.setContentProvider(contentProvider);
viewer.setLabelProvider(labelProvider);
if (sort) {
viewer.setSorter(new ViewerSorter());
}
viewer.setInput(input);
-
- if (labelDecorator != null) {
- if (!(labelProvider instanceof DecoratingLabelProvider)) {
- viewer.setLabelProvider(new DecoratingLabelProvider(labelProvider, labelDecorator));
- }
- }
}
}
