diff options
author | Camille Letavernier | 2014-11-04 15:25:26 +0000 |
---|---|---|
committer | Camille Letavernier | 2014-11-04 15:25:26 +0000 |
commit | f8a0549609b4b0c149bd8b6a9a76fbde61afbc98 (patch) | |
tree | 6b25d0b6b632e1fdffc4d3637d128b884608bcc1 /plugins/views/properties | |
parent | 5fb9f39b4d50f0d6634abc4a0d3d5a61f6be781d (diff) | |
download | org.eclipse.papyrus-f8a0549609b4b0c149bd8b6a9a76fbde61afbc98.tar.gz org.eclipse.papyrus-f8a0549609b4b0c149bd8b6a9a76fbde61afbc98.tar.xz org.eclipse.papyrus-f8a0549609b4b0c149bd8b6a9a76fbde61afbc98.zip |
351804: [EMF Embedded Editor] Papyrus shall provide an embedded EMF
Editor
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351804
- Update the generic/customizable Papyrus Tree Editor to use the latest
New Child component
- Fix various issues to let the UML Properties view work with the
Customizable Papyrus Tree Editor
Diffstat (limited to 'plugins/views/properties')
-rw-r--r-- | plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java index b132441dbfa..6e5daf70755 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElement.java @@ -209,7 +209,7 @@ public class EMFModelElement extends AbstractModelElement { : ServiceUtilsForResourceSet.getInstance().getService(LabelProviderService.class, NestedEditingDialogContext.getInstance().getResourceSet());
return lpSvc.getLabelProvider();
} catch (ServiceException ex) {
- Activator.log.error(ex);
+ // The service registry isn't always present in the properties view. Don't log an error and use a standard label provider
return new EMFLabelProvider();
}
}
|