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

6 files changed, 20 insertions, 20 deletions

diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend
index 378f5f0c559..7ebc4421897 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend
@@ -14,14 +14,14 @@ package org.eclipse.papyrus.uml.profile.assistants.generator
 
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
 import org.eclipse.papyrus.infra.filters.Filter
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory
 import org.eclipse.papyrus.infra.gmfdiag.assistant.ConnectionAssistant
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UML
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UMLElementTypes
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ImpliedExtension
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers
+import org.eclipse.papyrus.uml.profile.types.generator.UML
+import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes
+import org.eclipse.papyrus.uml.profile.types.generator.ImpliedExtension
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
 
 /**
  * Transformation rule for generating a {@link ConnectionAssistant} from a UML {@link Extension}.
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend
index 4fb746c6c44..3a08459ab4f 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend
@@ -23,8 +23,8 @@ import org.eclipse.uml2.uml.Profile
 import org.eclipse.papyrus.uml.filters.UMLFiltersFactory
 import org.eclipse.emf.ecore.util.EcoreUtil
 import javax.inject.Inject
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UML
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
+import org.eclipse.papyrus.uml.profile.types.generator.UML
 
 /**
  * Utility extensions for working with {@link Filter}s.
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java
index 969258b07f8..8720b304b18 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java
@@ -15,13 +15,13 @@ package org.eclipse.papyrus.uml.profile.assistants.generator;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantPackage;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.OutputModel;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.OutputModel;
 
 /**
  * The base Guice injector module for the UML Profile to Modeling Assistants transformation.
  */
-public class GeneratorModule extends org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.GeneratorModule {
+public class GeneratorModule extends org.eclipse.papyrus.uml.profile.types.generator.GeneratorModule {
 	public GeneratorModule(Identifiers identifiers) {
 		super(identifiers);
 	}
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend
index e7db611a1d1..20a0a3a8eed 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend
@@ -16,9 +16,9 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory
 import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UML
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UMLElementTypes
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers
+import org.eclipse.papyrus.uml.profile.types.generator.UML
+import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes
 import org.eclipse.uml2.uml.Profile
 
 /**
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java
index 97f22f5686a..bdd9b6bba57 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.uml.profile.assistants.generator;
 
 import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.AbstractGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.AbstractGenerator;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
 import org.eclipse.uml2.uml.Profile;
 
 import com.google.inject.Inject;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend
index 7b95dd16dc6..76e34290c06 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend
@@ -14,14 +14,14 @@ package org.eclipse.papyrus.uml.profile.assistants.generator
 
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
 import org.eclipse.papyrus.infra.filters.Filter
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory
 import org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UML
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UMLElementTypes
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ImpliedExtension
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers
+import org.eclipse.papyrus.uml.profile.types.generator.UML
+import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes
+import org.eclipse.papyrus.uml.profile.types.generator.ImpliedExtension
 
 /**
  * Transformation rule for generating a {@link PopupAssistant} from a UML {@link Extension}.