diff options
Diffstat (limited to 'plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java')
| -rw-r--r-- | plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java index 34335d381cc..b905edac67b 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/AbstractContextualContentProvider.java @@ -17,7 +17,8 @@ import java.util.List; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.infra.widgets.providers.AbstractFilteredContentProvider;
+import org.eclipse.papyrus.infra.emf.providers.strategy.SemanticEMFContentProvider;
+import org.eclipse.papyrus.infra.tools.util.ListHelper;
import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
import org.eclipse.papyrus.views.properties.contexts.Context;
import org.eclipse.papyrus.views.properties.util.PropertiesUtil;
@@ -30,7 +31,7 @@ import org.eclipse.papyrus.views.properties.util.PropertiesUtil; * @author Camille Letavernier
*
*/
-public abstract class AbstractContextualContentProvider extends AbstractFilteredContentProvider implements IStaticContentProvider {
+public abstract class AbstractContextualContentProvider extends SemanticEMFContentProvider implements IStaticContentProvider {
/**
* The list of available contexts in the current model
@@ -38,11 +39,6 @@ public abstract class AbstractContextualContentProvider extends AbstractFiltered protected Collection<Context> contexts;
/**
- * The EObject used to retrieve the available contexts
- */
- protected EObject source;
-
- /**
*
* Constructor.
*
@@ -50,12 +46,11 @@ public abstract class AbstractContextualContentProvider extends AbstractFiltered * The EObject used to retrieve the available contexts
*/
protected AbstractContextualContentProvider(EObject source) {
- contexts = findContexts(source);
- this.source = source;
- showIfHasVisibleParent = true;
+ super(findContexts(source).toArray(new Context[0]));
+ contexts = ListHelper.asList((Context[])roots);
}
- private List<Context> findContexts(EObject source) {
+ private static List<Context> findContexts(EObject source) {
List<Context> contexts = new LinkedList<Context>();
Context rootContext = null;
|