diff options
Diffstat (limited to 'bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common')
8 files changed, 117 insertions, 60 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java index 045928c9..6d045a6b 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 BestSolution.at and others. + * Copyright (c) 2010, 2015 BestSolution.at and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation + * Simon Scholz <simon.scholz@vogella.com> - Bug 475365 ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common; @@ -14,17 +15,20 @@ import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor; import org.eclipse.e4.tools.emf.ui.internal.Messages; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.emf.ecore.EObject; +import org.eclipse.jface.resource.FontDescriptor; import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.viewers.StyledCellLabelProvider; +import org.eclipse.jface.resource.LocalResourceManager; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jface.viewers.BaseLabelProvider; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; +import org.eclipse.jface.viewers.IFontProvider; import org.eclipse.jface.viewers.StyledString; import org.eclipse.jface.viewers.StyledString.Styler; -import org.eclipse.jface.viewers.ViewerCell; -import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.FontData; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.TextStyle; -public class ComponentLabelProvider extends StyledCellLabelProvider { +public class ComponentLabelProvider extends BaseLabelProvider implements IStyledLabelProvider, IFontProvider { private final ModelEditor editor; @@ -34,7 +38,7 @@ public class ComponentLabelProvider extends StyledCellLabelProvider { public static final String NOT_VISIBLE_AND_RENDERED_KEY = "NOT_VISIBLE_AND_RENDERED_KEY";//$NON-NLS-1$ - private Font font; + private final FontDescriptor italicFontDescriptor; private final Messages Messages; @@ -61,16 +65,28 @@ public class ComponentLabelProvider extends StyledCellLabelProvider { } }; - public ComponentLabelProvider(ModelEditor editor, Messages Messages) { + private final ResourceManager resourceManager; + + public ComponentLabelProvider(ModelEditor editor, Messages Messages, FontDescriptor italicFontDescriptor) { this.editor = editor; this.Messages = Messages; + this.italicFontDescriptor = italicFontDescriptor; + resourceManager = new LocalResourceManager(JFaceResources.getResources()); + } + + @Override + public void dispose() { + if (resourceManager != null) { + resourceManager.dispose(); + } + super.dispose(); } @Override - public void update(final ViewerCell cell) { - if (cell.getElement() instanceof EObject) { + public StyledString getStyledText(Object element) { + if (element instanceof EObject) { - final EObject o = (EObject) cell.getElement(); + final EObject o = (EObject) element; final AbstractComponentEditor elementEditor = editor.getEditor(o.eClass()); if (elementEditor != null) { String label = elementEditor.getLabel(o); @@ -80,7 +96,8 @@ public class ComponentLabelProvider extends StyledCellLabelProvider { if (o instanceof MUIElement) { if (!((MUIElement) o).isVisible() && !((MUIElement) o).isToBeRendered()) { - label += "<" + Messages.ComponentLabelProvider_invisible + "/" + Messages.ComponentLabelProvider_notrendered + ">"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + label += "<" + Messages.ComponentLabelProvider_invisible + "/" //$NON-NLS-1$//$NON-NLS-2$ + + Messages.ComponentLabelProvider_notrendered + ">"; //$NON-NLS-1$ styler = BOTH_STYLER; } else if (!((MUIElement) o).isVisible()) { label += "<" + Messages.ComponentLabelProvider_invisible + ">"; //$NON-NLS-1$//$NON-NLS-2$ @@ -92,38 +109,33 @@ public class ComponentLabelProvider extends StyledCellLabelProvider { } if (detailText == null) { - final StyledString styledString = new StyledString(label, styler); - cell.setText(styledString.getString()); - cell.setStyleRanges(styledString.getStyleRanges()); - } else { - final StyledString styledString = new StyledString(label, styler); - styledString.append(" - " + detailText, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ - cell.setText(styledString.getString()); - cell.setStyleRanges(styledString.getStyleRanges()); + return new StyledString(label, styler); } - cell.setImage(elementEditor.getImage(o)); - } else { - cell.setText(cell.getElement().toString()); + final StyledString styledString = new StyledString(label, styler); + styledString.append(" - " + detailText, StyledString.DECORATIONS_STYLER); //$NON-NLS-1$ + return styledString; } - } else if (cell.getElement() instanceof VirtualEntry<?>) { - final String s = cell.getElement().toString(); - if (font == null) { - final FontData[] data = cell.getControl().getFont().getFontData(); - font = new Font(cell.getControl().getDisplay(), new FontData(data[0].getName(), data[0].getHeight(), SWT.ITALIC)); + } + return new StyledString(element.toString()); + } + + @Override + public Image getImage(Object element) { + if (element instanceof EObject) { + final EObject o = (EObject) element; + final AbstractComponentEditor elementEditor = editor.getEditor(o.eClass()); + if (elementEditor != null) { + return elementEditor.getImage(element); } - cell.setFont(font); - cell.setText(s); - } else { - cell.setText(cell.getElement().toString()); } + return null; } @Override - public void dispose() { - if (font != null) { - font.dispose(); - font = null; + public Font getFont(Object element) { + if(element instanceof VirtualEntry<?>) { + return resourceManager.createFont(italicFontDescriptor); } - super.dispose(); + return null; } }
\ No newline at end of file diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java index edad4587..5c7e824a 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/E4PickList.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014 TwelveTone LLC and others. + * Copyright (c) 2014, 2015 TwelveTone LLC and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Steven Spungin <steven@spungin.tv> - initial API and implementation + * Simon Scholz <simon.scholz@vogella.com> - Bug 475365 *******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common; @@ -31,10 +32,13 @@ import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.emf.edit.command.MoveCommand; import org.eclipse.emf.edit.command.RemoveCommand; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; +import org.eclipse.jface.resource.FontDescriptor; import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; /** @@ -68,7 +72,7 @@ public class E4PickList extends AbstractPickList { } public E4PickList(Composite parent, int style, List<PickListFeatures> listFeatures, final Messages messages, - final AbstractComponentEditor componentEditor, final EStructuralFeature feature) { + final AbstractComponentEditor componentEditor, final EStructuralFeature feature) { super(parent, style, listFeatures, messages, componentEditor); this.componentEditor = componentEditor; @@ -83,7 +87,10 @@ public class E4PickList extends AbstractPickList { } }); - viewer.setLabelProvider(new ComponentLabelProvider(componentEditor.getEditor(), messages)); + final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont()) + .setStyle(SWT.ITALIC); + viewer.setLabelProvider(new DelegatingStyledCellLabelProvider( + new ComponentLabelProvider(componentEditor.getEditor(), messages, italicFontDescriptor))); final ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); } @@ -100,7 +107,7 @@ public class E4PickList extends AbstractPickList { final int idx = l.indexOf(obj) + delta; if (delta > 0 && idx < l.size() || delta < 0 && idx >= 0) { final Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster() - .getValue(), feature, obj, idx); + .getValue(), feature, obj, idx); if (cmd.canExecute()) { componentEditor.getEditingDomain().getCommandStack().execute(cmd); @@ -122,7 +129,7 @@ public class E4PickList extends AbstractPickList { final MMenuElement eObject = (MMenuElement) EcoreUtil.create(eClass); setElementId(eObject); final Command cmd = AddCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster() - .getValue(), feature, eObject); + .getValue(), feature, eObject); if (cmd.canExecute()) { componentEditor.getEditingDomain().getCommandStack().execute(cmd); @@ -137,7 +144,7 @@ public class E4PickList extends AbstractPickList { final MApplicationElement el = (MApplicationElement) element; if (el.getElementId() == null || el.getElementId().trim().length() == 0) { el.setElementId(Util.getDefaultElementId( - ((EObject) componentEditor.getMaster().getValue()).eResource(), el, componentEditor.getEditor() + ((EObject) componentEditor.getMaster().getValue()).eResource(), el, componentEditor.getEditor() .getProject())); } } @@ -169,13 +176,13 @@ public class E4PickList extends AbstractPickList { if (idx >= 0) { if (obj instanceof MUIElement && feature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) { if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj, - componentEditor.getEditor().isLiveModel(), idx)) { + componentEditor.getEditor().isLiveModel(), idx)) { viewer.setSelection(new StructuredSelection(obj)); } } else if (obj instanceof MApplicationElement - || obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) { + || obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) { final Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor - .getMaster().getValue(), feature, obj, idx); + .getMaster().getValue(), feature, obj, idx); if (cmd.canExecute()) { componentEditor.getEditingDomain().getCommandStack().execute(cmd); viewer.setSelection(new StructuredSelection(obj)); @@ -205,13 +212,13 @@ public class E4PickList extends AbstractPickList { if (idx < children.size()) { if (obj instanceof MUIElement && feature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN) { if (Util.moveElementByIndex(componentEditor.getEditingDomain(), (MUIElement) obj, - componentEditor.getEditor().isLiveModel(), idx)) { + componentEditor.getEditor().isLiveModel(), idx)) { viewer.setSelection(new StructuredSelection(obj)); } } else if (obj instanceof MApplicationElement - || obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) { + || obj instanceof org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container) { final Command cmd = MoveCommand.create(componentEditor.getEditingDomain(), componentEditor - .getMaster().getValue(), feature, obj, idx); + .getMaster().getValue(), feature, obj, idx); if (cmd.canExecute()) { componentEditor.getEditingDomain().getCommandStack().execute(cmd); viewer.setSelection(new StructuredSelection(obj)); @@ -227,7 +234,7 @@ public class E4PickList extends AbstractPickList { if (!viewer.getSelection().isEmpty()) { final List<?> keybinding = ((IStructuredSelection) viewer.getSelection()).toList(); final Command cmd = RemoveCommand.create(componentEditor.getEditingDomain(), componentEditor.getMaster() - .getValue(), feature, keybinding); + .getValue(), feature, keybinding); if (cmd.canExecute()) { componentEditor.getEditingDomain().getCommandStack().execute(cmd); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java index 782464aa..c9e6067f 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2014 BestSolution.at and others. + * Copyright (c) 2010, 2015 BestSolution.at and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,6 +12,7 @@ * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance * Steven Spungin <steven@spungin.tv> - Bug 396902, 431755, 431735, 424730, 424730, 391089, 437236, 437552, Ongoing * Maintenance + * Simon Scholz <simon.scholz@vogella.com> - Bug 475365 ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common; @@ -189,11 +190,13 @@ import org.eclipse.jface.action.Separator; import org.eclipse.jface.databinding.viewers.ObservableListTreeContentProvider; import org.eclipse.jface.databinding.viewers.TreeStructureAdvisor; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.resource.FontDescriptor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.StringConverter; import org.eclipse.jface.viewers.AbstractTreeViewer; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -1094,7 +1097,10 @@ public class ModelEditor implements IGotoObject { } final TreeViewer viewer = tempViewer; - viewer.setLabelProvider(new ComponentLabelProvider(this, messages)); + final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont()) + .setStyle(SWT.ITALIC); + viewer.setLabelProvider(new DelegatingStyledCellLabelProvider( + new ComponentLabelProvider(this, messages, italicFontDescriptor))); final ObservableListTreeContentProvider contentProvider = new ObservableListTreeContentProvider( new ObservableFactoryImpl(), new TreeStructureAdvisor() { }); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java index 69a28c37..00b54c63 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ApplicationEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2014 BestSolution.at and others. + * Copyright (c) 2010, 2015 BestSolution.at and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation * Lars Vogel <Lars.Vogel@gmail.com> - Ongoing maintenance + * Simon Scholz <simon.scholz@vogella.com> - Bug 475365 ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component; @@ -54,9 +55,11 @@ import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.jface.action.Action; import org.eclipse.jface.databinding.swt.IWidgetValueProperty; import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.resource.FontDescriptor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ComboViewer; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; @@ -572,7 +575,11 @@ public class ApplicationEditor extends AbstractComponentEditor { l.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING)); bindtableViewer = new TableViewer(group); - bindtableViewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages)); + final FontDescriptor italicFontDescriptor = FontDescriptor + .createFrom(bindtableViewer.getControl().getFont()) + .setStyle(SWT.ITALIC); + bindtableViewer.setLabelProvider(new DelegatingStyledCellLabelProvider( + new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor))); bindtableViewer.setContentProvider(new ArrayContentProvider()); bindtableViewer.setInput(application.getBindingTables()); bindtableViewer.addSelectionChangedListener(new ISelectionChangedListener() { diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java index 8024deb6..85f0ec82 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CompositePartEditor.java @@ -49,8 +49,10 @@ import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.databinding.viewers.IViewerValueProperty; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.jface.databinding.viewers.ViewerProperties; +import org.eclipse.jface.resource.FontDescriptor; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ComboViewer; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.StructuredSelection; @@ -363,7 +365,11 @@ public class CompositePartEditor extends AbstractComponentEditor { viewer.getControl().setLayoutData(gd); final ObservableListContentProvider cp = new ObservableListContentProvider(); viewer.setContentProvider(cp); - viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages)); + + final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont()) + .setStyle(SWT.ITALIC); + viewer.setLabelProvider(new DelegatingStyledCellLabelProvider( + new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor))); final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN); viewer.setInput(prop.observeDetail(getMaster())); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java index 639994a2..abe32527 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/PerspectiveStackEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 BestSolution.at and others. + * Copyright (c) 2010, 2015 BestSolution.at and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation * Steven Spungin <steven@spungin.tv> - Ongoing maintenance + * Simon Scholz <simon.scholz@vogella.com> - Bug 475365 ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component; @@ -48,6 +49,8 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.databinding.swt.IWidgetValueProperty; import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; +import org.eclipse.jface.resource.FontDescriptor; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.window.Window; @@ -203,7 +206,10 @@ public class PerspectiveStackEditor extends AbstractComponentEditor { final TableViewer viewer = pickList.getList(); viewer.setContentProvider(new ObservableListContentProvider()); - viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages)); + final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont()) + .setStyle(SWT.ITALIC); + viewer.setLabelProvider(new DelegatingStyledCellLabelProvider( + new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor))); final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN); viewer.setInput(prop.observeDetail(getMaster())); } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java index f3f95a35..2cf92d35 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/TrimContributionEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2014 BestSolution.at and others. + * Copyright (c) 2010, 2015 BestSolution.at and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,6 +12,7 @@ * Nicolaj Hoess <nicohoess@gmail.com> - Bug 396975 * Steven Spungin <steven@spungin.tv> - Ongoing maintenance * Olivier Prouvost <olivier@opcoach.com> - Bug 462818 + * Simon Scholz <simon.scholz@vogella.com> - Bug 475365 ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component; @@ -54,7 +55,9 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.databinding.swt.IWidgetValueProperty; import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; +import org.eclipse.jface.resource.FontDescriptor; import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.StructuredSelection; @@ -243,7 +246,10 @@ public class TrimContributionEditor extends AbstractComponentEditor { pickList.setText(Messages.TrimContributionEditor_Controls); final TableViewer viewer = pickList.getList(); - viewer.setLabelProvider(new ComponentLabelProvider(getEditor(), Messages)); + final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont()) + .setStyle(SWT.ITALIC); + viewer.setLabelProvider(new DelegatingStyledCellLabelProvider( + new ComponentLabelProvider(getEditor(), Messages, italicFontDescriptor))); viewer.setContentProvider(new ObservableListContentProvider()); final IEMFListProperty prop = EMFProperties.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN); viewer.setInput(prop.observeDetail(getMaster())); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java index 248a5c5f..4251c1a1 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ParameterIdSelectionDialog.java @@ -8,6 +8,7 @@ * * Contributors: * Veselin Markov <veselin_m84@yahoo.com> - initial API and implementation + * Simon Scholz <simon.scholz@vogella.com> - Bug 475365 ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs; @@ -38,7 +39,10 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.jface.resource.FontDescriptor; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider; import org.eclipse.jface.viewers.IBaseLabelProvider; +import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; /** @@ -70,7 +74,10 @@ public class ParameterIdSelectionDialog extends AbstractIdDialog<MParameter, MCo @Override protected IBaseLabelProvider getLabelProvider() { - return new ComponentLabelProvider(editor, messages); + final FontDescriptor italicFontDescriptor = FontDescriptor.createFrom(viewer.getControl().getFont()) + .setStyle(SWT.ITALIC); + return new DelegatingStyledCellLabelProvider( + new ComponentLabelProvider(editor, messages, italicFontDescriptor)); } @Override |