diff options
| author | cletavernie | 2012-10-26 12:01:04 +0000 |
|---|---|---|
| committer | cletavernie | 2012-10-26 12:01:04 +0000 |
| commit | 4b5547218d558df2971afbe788818adc9d98de48 (patch) | |
| tree | ddaec9e5525a90fa5ac9d4a106f0003cb85efce3 /plugins/customization | |
| parent | 45e3a9d71f25c51bc1c8a65c79ae24921f8b3fa1 (diff) | |
| download | org.eclipse.papyrus-4b5547218d558df2971afbe788818adc9d98de48.tar.gz org.eclipse.papyrus-4b5547218d558df2971afbe788818adc9d98de48.tar.xz org.eclipse.papyrus-4b5547218d558df2971afbe788818adc9d98de48.zip | |
392438: [Core Services] Papyrus should provide a LabelProvider service
https://bugs.eclipse.org/bugs/show_bug.cgi?id=392438
LabelProviderService is now partially used.
Diffstat (limited to 'plugins/customization')
2 files changed, 11 insertions, 3 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF index bb37a2dc047..4dd337a498a 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF @@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.databinding;bundle-version="1.2.0",
org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
org.eclipse.papyrus.infra.constraints;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.0"
Export-Package: org.eclipse.papyrus.customization.properties.editor,
org.eclipse.papyrus.customization.properties.modelelement,
org.eclipse.papyrus.customization.properties.providers
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java index ec409194917..f7832c1e141 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java @@ -24,7 +24,10 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.facet.infra.query.ModelQuery;
import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;
import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;
@@ -122,7 +125,11 @@ public class GenericAttributeModelElement extends AbstractModelElement { @Override
public ILabelProvider getLabelProvider(String propertyPath) {
- return new EMFLabelProvider();
+ try {
+ return ServiceUtilsForResource.getInstance().getServiceRegistry(source.eResource()).getService(LabelProviderService.class).getLabelProvider();
+ } catch (ServiceException ex) {
+ return new LabelProvider();
+ }
}
@Override
|