From 22c69dd32293c88628fc86a0082a61429f440960 Mon Sep 17 00:00:00 2001
From: Florian Noyrit
Date: Wed, 10 Feb 2016 11:50:11 +0100
Subject: Bug 487480 - Refactor elementtypesconfiguration framework

Insert a "oep/infra/types" layer to host the core
elementtypesconfiguration framework. 
Move UML elementtypesconfiguration extensions to "oep/uml"
Move EMF elementtypesconfiguration extensions to "oep/infra/emf"
Move elementtypesconfiguration tests to
oep/tests/junit/plugins/infra/types

Rename all elementtypesconfiguration plugins (core, dev, tests and
extensions) and corresponfing packages to shorter qualifiers as follows: 

oep.infra.elementtypesconfigurations -> oep.infra.types.core and
oep.infra.types
oep.infra.elementtypesconfigurations.edit -> oep.infra.types.edit
oep.infra.elementtypesconfigurations.editor -> oep.infra.types.editor
oep.infra.elementtypesconfigurations.ui -> oep.infra.types.ui

oep.infra.elementtypesconfigurations.invarianttypes ->
oep.infra.types.rulebased

oep.infra.elementtypesconfigurations.emf -> oep.infra.emf.types
oep.infra.elementtypesconfigurations.emf.ui -> oep.infra.emf.types.ui

oep.uml.elementtypesconfigurations -> oep.uml.types

oep.elementtypesconfigurations.developer -> oep.dev.types

oep.infra.elementtypesconfigurations.tests	-> oep.infra.types.tests
oep.infra.elementtypesconfigurations.ui.tests ->
oep.infra.types.ui.tests

Change-Id: Iad7f5689b183e6ad29daab06a1cc2858ee408aa7
---
 .../GraphicalEFFB.elementtypesconfigurations       | 173 ++++++---------------
 1 file changed, 47 insertions(+), 126 deletions(-)

(limited to 'extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/GraphicalEFFB.elementtypesconfigurations')

diff --git a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/GraphicalEFFB.elementtypesconfigurations b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/GraphicalEFFB.elementtypesconfigurations
index aebf2ce9606..622b8691af9 100644
--- a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/GraphicalEFFB.elementtypesconfigurations
+++ b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/GraphicalEFFB.elementtypesconfigurations
@@ -1,126 +1,47 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
-    xmi:id="_k4SmgLwFEeSwNLK2W02HwA"
-    name="EFFB"
-    description="EFFB extension element type set"
-    identifier="org.eclipse.papyrus.effb.elementTypes"
-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_kGRHgJ0AEeW4i7v9QEMhZg"
-      name="org.eclipse.papyrus.effbd.graphicalfunction"
-      description="Create a function on the diagram"
-      identifier="org.eclipse.papyrus.effbd.graphicalfunction"
-      hint="3007">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.function</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_79MooJ56EeWHhcFWyAfOIA"
-      name="Input Data node"
-      identifier="org.eclipse.papyrus.effbd.inputdata_node"
-      hint="inputdata_node">
-    <specializedTypesID>org.eclipse.papyrus.effbd.inputdata</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_WtGt4J6IEeWHhcFWyAfOIA"
-      name="Output Data node"
-      identifier="org.eclipse.papyrus.effbd.outputdata_node"
-      hint="outputdata_node">
-    <specializedTypesID>org.eclipse.papyrus.effbd.outputdata</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_K6I1AKAbEeWbYYB8YU_3Xg"
-      name="a body for the opaqueAction"
-      identifier="org.eclipse.papyrus.effbd.opaqueAction_body"
-      hint="opaqueAction_body">
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="__fIUoKJnEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalorbegin"
-      description="OR operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalorbegin"
-      hint="3038">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.orbegin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_R6uGMKJoEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalorEnd"
-      description="OR operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalorEnd"
-      hint="3039">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.orend</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_vCnM8KJpEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalandbegin"
-      description="AND operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalandbegin"
-      hint="3040">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.andbegin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_vCnM8aJpEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalandEnd"
-      description="AND operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalandEnd"
-      hint="3041">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.andend</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_dn8fUaKJEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalitbegin"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalitbegin"
-      hint="3041">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.itbegin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_dn8fUKKJEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalitend"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalitend"
-      hint="3040">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.itend</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_mWMhgKKMEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicallpbegin"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.graphicallpbegin"
-      hint="3041">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.lpbegin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_mWMhgaKMEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicallpend"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.graphicallpend"
-      hint="3040">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.lpend</specializedTypesID>
-  </elementTypeConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="EFFB extension element type set" identifier="org.eclipse.papyrus.effb.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="EFFB" xmi:id="_k4SmgLwFEeSwNLK2W02HwA" xmi:version="2.0">
+  <elementTypeConfigurations description="Create a function on the diagram" hint="3007" identifier="org.eclipse.papyrus.effbd.graphicalfunction" name="org.eclipse.papyrus.effbd.graphicalfunction" xmi:id="_kGRHgJ0AEeW4i7v9QEMhZg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.effbd.function</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations hint="inputdata_node" identifier="org.eclipse.papyrus.effbd.inputdata_node" name="Input Data node" xmi:id="_79MooJ56EeWHhcFWyAfOIA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.effbd.inputdata</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations hint="outputdata_node" identifier="org.eclipse.papyrus.effbd.outputdata_node" name="Output Data node" xmi:id="_WtGt4J6IEeWHhcFWyAfOIA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.effbd.outputdata</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations hint="opaqueAction_body" identifier="org.eclipse.papyrus.effbd.opaqueAction_body" name="a body for the opaqueAction" xmi:id="_K6I1AKAbEeWbYYB8YU_3Xg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations description="OR operator" hint="3038" identifier="org.eclipse.papyrus.effbd.graphicalorbegin" name="org.eclipse.papyrus.effbd.graphicalorbegin" xmi:id="__fIUoKJnEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.effbd.orbegin</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations description="OR operator" hint="3039" identifier="org.eclipse.papyrus.effbd.graphicalorEnd" name="org.eclipse.papyrus.effbd.graphicalorEnd" xmi:id="_R6uGMKJoEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.effbd.orend</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations description="AND operator" hint="3040" identifier="org.eclipse.papyrus.effbd.graphicalandbegin" name="org.eclipse.papyrus.effbd.graphicalandbegin" xmi:id="_vCnM8KJpEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.effbd.andbegin</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations description="AND operator" hint="3041" identifier="org.eclipse.papyrus.effbd.graphicalandEnd" name="org.eclipse.papyrus.effbd.graphicalandEnd" xmi:id="_vCnM8aJpEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.effbd.andend</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations description="IT operator" hint="3041" identifier="org.eclipse.papyrus.effbd.graphicalitbegin" name="org.eclipse.papyrus.effbd.graphicalitbegin" xmi:id="_dn8fUaKJEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.effbd.itbegin</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations description="IT operator" hint="3040" identifier="org.eclipse.papyrus.effbd.graphicalitend" name="org.eclipse.papyrus.effbd.graphicalitend" xmi:id="_dn8fUKKJEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.effbd.itend</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations description="IT operator" hint="3041" identifier="org.eclipse.papyrus.effbd.graphicallpbegin" name="org.eclipse.papyrus.effbd.graphicallpbegin" xmi:id="_mWMhgKKMEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.effbd.lpbegin</specializedTypesID>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations description="IT operator" hint="3040" identifier="org.eclipse.papyrus.effbd.graphicallpend" name="org.eclipse.papyrus.effbd.graphicallpend" xmi:id="_mWMhgaKMEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.effbd.lpend</specializedTypesID>
+  </elementTypeConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
-- 
cgit v1.2.3