From 191875134b6c8950fe6eb80b77ee4b36c7770b83 Mon Sep 17 00:00:00 2001
From: ptessier
Date: Mon, 10 Mar 2014 18:46:35 +0100
Subject: Bug 386118 - [EMF Facet] Papyrus should progressively support EMF
 Facet add import menus and validate menus

---
 .../uml/org.eclipse.papyrus.uml.import/plugin.xml  | 27 ++++-------
 .../plugin.xml                                     | 54 ++++++++--------------
 2 files changed, 27 insertions(+), 54 deletions(-)

(limited to 'plugins/uml')

diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml
index 1663f4cbfd3..2aaf4d06a99 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.import/plugin.xml
@@ -73,12 +73,9 @@
                <with
                      variable="selection">
                   <iterate>
-                     <adapt
-                           type="org.eclipse.emf.ecore.EObject">
-                        <instanceof
-                              value="org.eclipse.uml2.uml.Package">
-                        </instanceof>
-                     </adapt>
+                     <instanceof
+                           value="org.eclipse.emf.ecore.EObject">
+                     </instanceof>
                   </iterate>
                </with>
                <count
@@ -95,12 +92,9 @@
                <with
                      variable="selection">
                   <iterate>
-                     <adapt
-                           type="org.eclipse.emf.ecore.EObject">
-                        <instanceof
-                              value="org.eclipse.uml2.uml.Package">
-                        </instanceof>
-                     </adapt>
+                     <instanceof
+                           value="org.eclipse.emf.ecore.EObject">
+                     </instanceof>
                   </iterate>
                </with>
                <count
@@ -117,12 +111,9 @@
             <with
                   variable="selection">
                <iterate>
-                  <adapt
-                        type="org.eclipse.emf.ecore.EObject">
-                     <instanceof
-                           value="org.eclipse.uml2.uml.Package">
-                     </instanceof>
-                  </adapt>
+                  <instanceof
+                        value="org.eclipse.emf.ecore.EObject">
+                  </instanceof>
                </iterate>
             </with>
             <count
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
index c3d9204bfd7..a0ce1c267b8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/plugin.xml
@@ -13,12 +13,9 @@
            <iterate
                  ifEmpty="false"
                  operator="or">
-              <adapt
-                    type="org.eclipse.emf.ecore.EObject">
-                 <instanceof
-                       value="org.eclipse.uml2.uml.Element">
-                 </instanceof>
-              </adapt>
+              <instanceof
+                    value="org.eclipse.emf.ecore.EObject">
+              </instanceof>
            </iterate>
         </with>
         </activeWhen>
@@ -32,12 +29,9 @@
              <iterate
                    ifEmpty="false"
                    operator="or">
-                <adapt
-                      type="org.eclipse.emf.ecore.EObject">
-                   <instanceof
-                         value="org.eclipse.uml2.uml.Element">
-                   </instanceof>
-                </adapt>
+                <instanceof
+                      value="org.eclipse.emf.ecore.EObject">
+                </instanceof>
              </iterate>
           </with>
        </activeWhen>
@@ -51,12 +45,9 @@
              <iterate
                    ifEmpty="false"
                    operator="or">
-                <adapt
-                      type="org.eclipse.emf.ecore.EObject">
-                   <instanceof
-                         value="org.eclipse.uml2.uml.Element">
-                   </instanceof>
-                </adapt>
+                <instanceof
+                      value="org.eclipse.emf.ecore.EObject">
+                </instanceof>
              </iterate>
           </with>
        </activeWhen>
@@ -70,12 +61,9 @@
              <iterate
                    ifEmpty="false"
                    operator="or">
-                <adapt
-                      type="org.eclipse.emf.ecore.EObject">
-                   <instanceof
-                         value="org.eclipse.uml2.uml.Element">
-                   </instanceof>
-                </adapt>
+                <instanceof
+                      value="org.eclipse.emf.ecore.EObject">
+                </instanceof>
              </iterate>
           </with>
        </activeWhen>
@@ -89,12 +77,9 @@
              <iterate
                    ifEmpty="false"
                    operator="or">
-                <adapt
-                      type="org.eclipse.emf.ecore.EObject">
-                   <instanceof
-                         value="org.eclipse.uml2.uml.Element">
-                   </instanceof>
-                </adapt>
+                <instanceof
+                      value="org.eclipse.emf.ecore.EObject">
+                </instanceof>
              </iterate>
           </with>
        </activeWhen>
@@ -108,12 +93,9 @@
              <iterate
                    ifEmpty="false"
                    operator="or">
-                <adapt
-                      type="org.eclipse.emf.ecore.EObject">
-                   <instanceof
-                         value="org.eclipse.uml2.uml.Element">
-                   </instanceof>
-                </adapt>
+                <instanceof
+                      value="org.eclipse.emf.ecore.EObject">
+                </instanceof>
              </iterate>
           </with>
        </activeWhen>
-- 
cgit v1.2.3