diff options
| author | Florian Noyrit | 2014-03-17 16:52:40 +0000 |
|---|---|---|
| committer | Florian Noyrit | 2014-03-17 16:52:40 +0000 |
| commit | a05aba1790a09f29251d4e2b01daefbbe512039c (patch) | |
| tree | 5eac75c8cd7a53f27728a21e4272259a1a140f2d /extraplugins/codegen | |
| parent | 15cc9be7875d54179a9fe771ba0189912164b4ae (diff) | |
| parent | 94a6b86b468c7e9b095cb994d5ff205139fa008a (diff) | |
| download | org.eclipse.papyrus-a05aba1790a09f29251d4e2b01daefbbe512039c.tar.gz org.eclipse.papyrus-a05aba1790a09f29251d4e2b01daefbbe512039c.tar.xz org.eclipse.papyrus-a05aba1790a09f29251d4e2b01daefbbe512039c.zip | |
Merge branch 'master' into committers/fnoyrit/gmft
Conflicts:
plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/factory/CustomUMLeditPartFactory.java
Diffstat (limited to 'extraplugins/codegen')
| -rw-r--r-- | extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java | 5 |
1 files changed, 1 insertions, 4 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 8c5e656e4bf..11627b79ab6 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 @@ -35,10 +35,7 @@ public abstract class CmdHandler extends AbstractHandler { .getSelectionService().getSelection(); if(selection != null) { - Object selectedObject = EMFHelper.getEObject(selection.getFirstElement()); - if (selectedObject instanceof EObject) { - selectedEObject = (EObject) selectedObject; - } + selectedEObject = EMFHelper.getEObject(selection.getFirstElement()); } } |