Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2014-03-10 17:31:10 +0000
committerptessier2014-03-10 17:31:10 +0000
commit640dfda940e18dae06c5d50b7c3aa4be03fd917d (patch)
treeafff8bfdb04d447440752b6284fa24e4e546805f /plugins/infra
parent71f4bf2b7c278933f92a5024e0242955e16683f1 (diff)
downloadorg.eclipse.papyrus-640dfda940e18dae06c5d50b7c3aa4be03fd917d.tar.gz
org.eclipse.papyrus-640dfda940e18dae06c5d50b7c3aa4be03fd917d.tar.xz
org.eclipse.papyrus-640dfda940e18dae06c5d50b7c3aa4be03fd917d.zip
Bug 386118 - [EMF Facet] Papyrus should progressively support EMF Facet
0.2 add the function rename
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java4
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
index 92b11cb8c0b..a0090e3f2c6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.emf.facet.efacet.core,
org.eclipse.papyrus.emf.facet.efacet,
org.eclipse.papyrus.emf.facet.efacet.metamodel,
- org.eclipse.papyrus.emf.facet.custom.metamodel
+ org.eclipse.papyrus.emf.facet.custom.metamodel,
+ org.eclipse.papyrus.infra.emf
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java
index adf3874d627..1dd2411f27a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/providers/DiagramPropertyTester.java
@@ -19,7 +19,7 @@ import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
/**
* This class provides test called by the plugin.xml in order to know if handlers should be active or not.
@@ -96,7 +96,7 @@ public class DiagramPropertyTester extends PropertyTester {
* Used for example for facet elements
*/
final Object next = iter.next();
- EObject diag = NavigatorUtils.getElement(next, EObject.class);
+ EObject diag = EMFHelper.getEObject(next);
if(!(diag instanceof Diagram)) {
return false;
}

Back to the top