diff options
| author | ptessier | 2014-03-12 14:16:25 +0000 |
|---|---|---|
| committer | ptessier | 2014-03-12 14:16:25 +0000 |
| commit | 1b8de31729e7cdd9be22542a0a5f7143e999d156 (patch) | |
| tree | 2ae92fcd21defd7cf2e444ba495805b095c47843 /extraplugins/dsml.validation | |
| parent | 0ba38fe51e554648dee8211004b90d8fbace2276 (diff) | |
| download | org.eclipse.papyrus-1b8de31729e7cdd9be22542a0a5f7143e999d156.tar.gz org.eclipse.papyrus-1b8de31729e7cdd9be22542a0a5f7143e999d156.tar.xz org.eclipse.papyrus-1b8de31729e7cdd9be22542a0a5f7143e999d156.zip | |
Bug 386118 - [EMF Facet] Papyrus should progressively support EMF Facet
0.2
fix compilation error on extraplugins
Diffstat (limited to 'extraplugins/dsml.validation')
2 files changed, 4 insertions, 8 deletions
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF index 3484205a9ab..1cfb4dc86ed 100644 --- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF +++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.dsml.validation.model;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0"
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf
Export-Package: org.eclipse.papyrus.dsml.validation.generation.ui
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java index 184c3371c67..40bb57bf762 100644 --- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java +++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java @@ -26,6 +26,7 @@ import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraint import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IValidationRule;
import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;
import org.eclipse.papyrus.dsml.validation.wizard.CreateEMFValidationProject;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
import org.eclipse.ui.PlatformUI;
import org.eclipse.uml2.uml.Profile;
@@ -65,13 +66,7 @@ public class CreateJavaValidationPluginHandler extends AbstractHandler { // Treat non-null selected object (try to adapt and return EObject)
if(selection != null) {
- if(selection instanceof IAdaptable) {
- selection = ((IAdaptable)selection).getAdapter(EObject.class);
- }
-
- if(selection instanceof EObject) {
- eObject = (EObject)selection;
- }
+ eObject = EMFHelper.getEObject(selection);
}
return eObject;
}
|