Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2014-03-14 14:06:17 +0000
committerAnsgar Radermacher2014-03-14 14:07:25 +0000
commit30ce30be670b586bac03cc70556b9a5076988096 (patch)
treed43537664a99f2e8b357bfcd36a77d7f375c6dd2 /extraplugins
parentf515b310417b386c79d9fbd2500c5373a7179aa7 (diff)
downloadorg.eclipse.papyrus-30ce30be670b586bac03cc70556b9a5076988096.tar.gz
org.eclipse.papyrus-30ce30be670b586bac03cc70556b9a5076988096.tar.xz
org.eclipse.papyrus-30ce30be670b586bac03cc70556b9a5076988096.zip
Bug 386118 - [EMF Facet] Papyrus should progressively support EMF Facet: add getFirstElement / replace BusinessModelResolver
Diffstat (limited to 'extraplugins')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java4
2 files changed, 3 insertions, 5 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java
index 39c89da798b..8c5e656e4bf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.acceleo.ui.handlers;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.ui.PlatformUI;
@@ -35,7 +35,7 @@ public abstract class CmdHandler extends AbstractHandler {
.getSelectionService().getSelection();
if(selection != null) {
- Object selectedObject = BusinessModelResolver.getInstance().getBusinessModel(selection.getFirstElement());
+ Object selectedObject = EMFHelper.getEObject(selection.getFirstElement());
if (selectedObject instanceof EObject) {
selectedEObject = (EObject) selectedObject;
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java
index ccb634c2366..7fb7f8df94c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.qompass.designer.ui.handlers;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.ui.PlatformUI;
@@ -36,8 +35,7 @@ public abstract class CmdHandler extends AbstractHandler {
.getSelectionService().getSelection();
if(selection != null) {
-
- selectedEObject = EMFHelper.getEObject(selection);
+ selectedEObject = EMFHelper.getEObject(selection.getFirstElement());
}
}

Back to the top