diff options
Diffstat (limited to 'plugins')
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/plugin.xml index c7319065fed..9218c38a5fb 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/plugin.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.editor/plugin.xml @@ -5,8 +5,8 @@ point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
<propertyContributor
contributorId="CustomizablePropertyView"
- labelProvider="org.eclipse.papyrus.properties.providers.SelectionLabelProvider"
- tabDescriptorProvider="org.eclipse.papyrus.properties.xwt.XWTTabDescriptorProvider">
+ labelProvider="org.eclipse.papyrus.views.properties.providers.SelectionLabelProvider"
+ tabDescriptorProvider="org.eclipse.papyrus.views.properties.xwt.XWTTabDescriptorProvider">
</propertyContributor>
</extension>
<extension
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLContentProvider.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLContentProvider.java index 05713c9e85b..a715b4b132b 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLContentProvider.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLContentProvider.java @@ -20,10 +20,9 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.ModelUtils;
import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
import org.eclipse.papyrus.infra.emf.providers.EMFEnumeratorContentProvider;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
import org.eclipse.papyrus.uml.tools.util.UMLProviderHelper;
@@ -99,7 +98,8 @@ public class UMLContentProvider extends EncapsulatedContentProvider { }
try {
- ModelSet root = ModelUtils.getModelSetChecked(EditorUtils.getServiceRegistry());
+ ModelSet root = ServiceUtilsForResource.getInstance().getModelSet(eObject.eResource());
+ //ModelSet root = ModelUtils.getModelSetChecked(EditorUtils.getServiceRegistry());
if(feature == UMLPackage.eINSTANCE.getPort_Provided() || feature == UMLPackage.eINSTANCE.getPort_Required()) {
//TODO : Use a specific content provider here, when it exists
|