Bug 532709 - Generated elementtypeset should have an xmi:id

 - restore old version for applystereotype ids
 - add some Automatic-Module-Name for java9 compatibility

Change-Id: Ie50c229fa52e0256c3e208ed84cd8cef82127a8e
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

4 files changed, 7 insertions, 10 deletions

diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend
index 42a000dc237..dc9a555e5db 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend
@@ -18,7 +18,6 @@ import javax.inject.Singleton
 import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
 import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration
 import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory
-import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage
 import org.eclipse.uml2.uml.Stereotype
 
 /**
@@ -35,7 +34,7 @@ class ApplyStereotypeAdviceRule {
     def create createApplyStereotypeAdviceConfiguration toAdviceConfiguration(Stereotype umlStereotype,
         ImpliedExtension umlExtension, ElementTypeConfiguration supertype) {
 
-        identifier = umlStereotype.name.toFirstLower.qualified + supertype.hintSuffix +"."+ ApplyStereotypeAdvicePackage.eNAME;
+        identifier = umlStereotype.name.toFirstLower.qualified + supertype.hintSuffix;
         stereotypesToApply.add(umlStereotype.toStereotypeToApply(supertype))
         target = umlExtension.toElementType(supertype)
         // make file more readable
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
index d655082be0b..edfcc9ca242 100755
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
@@ -29,3 +29,4 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.generator.tests;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.uml.profile.assistants.generator.tests
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
index 469195216bb..3c92c8a3567 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.tests;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.uml.profile.types.generator.tests
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java
index 1646ffaf023..2f3bc3b4d84 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java
@@ -183,13 +183,11 @@ public class ModelGenFixture extends ResourceSetFixture {
 	}
 
 	public SpecializationTypeConfiguration assertSpecializationType(Pair<Stereotype, org.eclipse.uml2.uml.Class> metaclassExtension) {
-		SpecializationTypeConfiguration result = getElementTypeConfiguration(metaclassExtension, SpecializationTypeConfiguration.class);
-		return result;
+		return getElementTypeConfiguration(metaclassExtension, SpecializationTypeConfiguration.class);
 	}
 
 	public List<SpecializationTypeConfiguration> assertAllSpecializationTypes(Pair<Stereotype, org.eclipse.uml2.uml.Class> metaclassExtension) {
-		List<SpecializationTypeConfiguration> result = getAllElementTypeConfigurations(metaclassExtension, SpecializationTypeConfiguration.class);
-		return result;
+		return getAllElementTypeConfigurations(metaclassExtension, SpecializationTypeConfiguration.class);
 	}
 
 	public StereotypeApplicationMatcherConfiguration assertStereotypeMatcher(SpecializationTypeConfiguration specializationType) {
@@ -252,13 +250,11 @@ public class ModelGenFixture extends ResourceSetFixture {
 	}
 
 	public ApplyStereotypeAdviceConfiguration assertApplyStereotypeAdvice(Pair<Stereotype, org.eclipse.uml2.uml.Class> metaclassExtension) {
-		ApplyStereotypeAdviceConfiguration result = getAdviceBindingConfiguration(metaclassExtension, ApplyStereotypeAdviceConfiguration.class);
-		return result;
+		return getAdviceBindingConfiguration(metaclassExtension, ApplyStereotypeAdviceConfiguration.class);
 	}
 
 	public List<ApplyStereotypeAdviceConfiguration> assertAllApplyStereotypeAdvices(Pair<Stereotype, org.eclipse.uml2.uml.Class> metaclassExtension) {
-		List<ApplyStereotypeAdviceConfiguration> result = getAllAdviceBindingConfigurations(metaclassExtension, ApplyStereotypeAdviceConfiguration.class);
-		return result;
+		return getAllAdviceBindingConfigurations(metaclassExtension, ApplyStereotypeAdviceConfiguration.class);
 	}
 
 	public void assertNoApplyStereotypeAdvice(Pair<Stereotype, org.eclipse.uml2.uml.Class> metaclassExtension) {