Nantes Université

Skip to content
Extraits de code Groupes Projets
Valider 386ddb18 rédigé par Erwan Bousse's avatar Erwan Bousse
Parcourir les fichiers

codegen: fix dependencies demo1

parent 80fc740f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
src/impress/codegen/demos/miniuml.demo1.generator.model.java/META-INF/MANIFEST.MF
+ 4
− 4
Voir le fichier @ 386ddb18
...@@ -4,12 +4,12 @@ Bundle-Name: Java ...@@ -4,12 +4,12 @@ Bundle-Name: Java
Bundle-SymbolicName: miniuml.demo1.generator.model.java Bundle-SymbolicName: miniuml.demo1.generator.model.java
Bundle-Version: 1.0.0.qualifier Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.gmt.modisco.java;bundle-version="1.0.0", Require-Bundle: miniuml;bundle-version="0.1.0",
miniuml;bundle-version="0.1.0",
org.eclipse.emf.ecore, org.eclipse.emf.ecore,
org.eclipse.emf.ecore.xmi;bundle-version="2.12.0", org.eclipse.emf.ecore.xmi;bundle-version="2.12.0",
org.junit;bundle-version="4.12.0", org.junit;bundle-version="4.12.0",
org.eclipse.gmt.modisco.java.generation;bundle-version="1.0.0", org.eclipse.acceleo.engine;bundle-version="3.6.5",
org.eclipse.acceleo.engine;bundle-version="3.6.5" org.eclipse.modisco.java.generation;bundle-version="1.5.0",
org.eclipse.modisco.java;bundle-version="1.5.0"
Automatic-Module-Name: miniuml.demo1.generator.model.java Automatic-Module-Name: miniuml.demo1.generator.model.java
src/impress/codegen/demos/miniuml.demo1.generator.model.java/src/miniuml/demo1/generator/model/java/MiniUML2JavaModel.java
+ 38
− 38
Voir le fichier @ 386ddb18
...@@ -8,31 +8,31 @@ import java.util.Set; ...@@ -8,31 +8,31 @@ import java.util.Set;
import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.gmt.modisco.java.AbstractMethodDeclaration; import org.eclipse.modisco.java.AbstractMethodDeclaration;
import org.eclipse.gmt.modisco.java.Assignment; import org.eclipse.modisco.java.Assignment;
import org.eclipse.gmt.modisco.java.AssignmentKind; import org.eclipse.modisco.java.AssignmentKind;
import org.eclipse.gmt.modisco.java.Block; import org.eclipse.modisco.java.Block;
import org.eclipse.gmt.modisco.java.ClassDeclaration; import org.eclipse.modisco.java.ClassDeclaration;
import org.eclipse.gmt.modisco.java.ClassInstanceCreation; import org.eclipse.modisco.java.ClassInstanceCreation;
import org.eclipse.gmt.modisco.java.CompilationUnit; import org.eclipse.modisco.java.CompilationUnit;
import org.eclipse.gmt.modisco.java.ExpressionStatement; import org.eclipse.modisco.java.ExpressionStatement;
import org.eclipse.gmt.modisco.java.FieldAccess; import org.eclipse.modisco.java.FieldAccess;
import org.eclipse.gmt.modisco.java.FieldDeclaration; import org.eclipse.modisco.java.FieldDeclaration;
import org.eclipse.gmt.modisco.java.ImportDeclaration; import org.eclipse.modisco.java.ImportDeclaration;
import org.eclipse.gmt.modisco.java.InterfaceDeclaration; import org.eclipse.modisco.java.InterfaceDeclaration;
import org.eclipse.gmt.modisco.java.MethodDeclaration; import org.eclipse.modisco.java.MethodDeclaration;
import org.eclipse.gmt.modisco.java.Model; import org.eclipse.modisco.java.Model;
import org.eclipse.gmt.modisco.java.Modifier; import org.eclipse.modisco.java.Modifier;
import org.eclipse.gmt.modisco.java.ParameterizedType; import org.eclipse.modisco.java.ParameterizedType;
import org.eclipse.gmt.modisco.java.PrimitiveType; import org.eclipse.modisco.java.PrimitiveType;
import org.eclipse.gmt.modisco.java.ReturnStatement; import org.eclipse.modisco.java.ReturnStatement;
import org.eclipse.gmt.modisco.java.SingleVariableAccess; import org.eclipse.modisco.java.SingleVariableAccess;
import org.eclipse.gmt.modisco.java.SingleVariableDeclaration; import org.eclipse.modisco.java.SingleVariableDeclaration;
import org.eclipse.gmt.modisco.java.ThisExpression; import org.eclipse.modisco.java.ThisExpression;
import org.eclipse.gmt.modisco.java.Type; import org.eclipse.modisco.java.Type;
import org.eclipse.gmt.modisco.java.TypeAccess; import org.eclipse.modisco.java.TypeAccess;
import org.eclipse.gmt.modisco.java.VariableDeclarationFragment; import org.eclipse.modisco.java.VariableDeclarationFragment;
import org.eclipse.gmt.modisco.java.VisibilityKind; import org.eclipse.modisco.java.VisibilityKind;
import miniuml.Attribute; import miniuml.Attribute;
import miniuml.Class; import miniuml.Class;
...@@ -51,7 +51,7 @@ import miniuml.Relationship; ...@@ -51,7 +51,7 @@ import miniuml.Relationship;
public class MiniUML2JavaModel { public class MiniUML2JavaModel {
// Java Modisco EMF factory // Java Modisco EMF factory
private static org.eclipse.gmt.modisco.java.emf.JavaFactory factory = org.eclipse.gmt.modisco.java.emf.JavaFactory.eINSTANCE; private static org.eclipse.modisco.java.emf.JavaFactory factory = org.eclipse.modisco.java.emf.JavaFactory.eINSTANCE;
// Traceability links // Traceability links
private Map<miniuml.Class, ClassDeclaration> classToClassDeclaration = new HashMap<>(); private Map<miniuml.Class, ClassDeclaration> classToClassDeclaration = new HashMap<>();
...@@ -68,7 +68,7 @@ public class MiniUML2JavaModel { ...@@ -68,7 +68,7 @@ public class MiniUML2JavaModel {
/** /**
* Output model. * Output model.
*/ */
private org.eclipse.gmt.modisco.java.Model outputJavaModel = factory.createModel(); private org.eclipse.modisco.java.Model outputJavaModel = factory.createModel();
// Java Primitive types // Java Primitive types
private PrimitiveType javaIntType; private PrimitiveType javaIntType;
...@@ -89,14 +89,14 @@ public class MiniUML2JavaModel { ...@@ -89,14 +89,14 @@ public class MiniUML2JavaModel {
* The Java primitive library to copy. * The Java primitive library to copy.
*/ */
public MiniUML2JavaModel(Set<miniuml.Package> inputMiniUMLPackages, public MiniUML2JavaModel(Set<miniuml.Package> inputMiniUMLPackages,
org.eclipse.gmt.modisco.java.Model primitiveLibrary) { org.eclipse.modisco.java.Model primitiveLibrary) {
outputJavaModel = factory.createModel(); outputJavaModel = factory.createModel();
this.inputMiniUMLPackages.addAll(inputMiniUMLPackages); this.inputMiniUMLPackages.addAll(inputMiniUMLPackages);
// Copying all primitive types // Copying all primitive types
EcoreUtil.Copier copier = new EcoreUtil.Copier(); EcoreUtil.Copier copier = new EcoreUtil.Copier();
for (EObject o : primitiveLibrary.eContents()) { for (EObject o : primitiveLibrary.eContents()) {
if (o instanceof org.eclipse.gmt.modisco.java.Package) { if (o instanceof org.eclipse.modisco.java.Package) {
org.eclipse.gmt.modisco.java.Package copy = (org.eclipse.gmt.modisco.java.Package) copier.copy(o); org.eclipse.modisco.java.Package copy = (org.eclipse.modisco.java.Package) copier.copy(o);
outputJavaModel.getOwnedElements().add(copy); outputJavaModel.getOwnedElements().add(copy);
} else if (o instanceof PrimitiveType) { } else if (o instanceof PrimitiveType) {
PrimitiveType copy = (PrimitiveType) copier.copy(o); PrimitiveType copy = (PrimitiveType) copier.copy(o);
...@@ -147,7 +147,7 @@ public class MiniUML2JavaModel { ...@@ -147,7 +147,7 @@ public class MiniUML2JavaModel {
* *
* @return The output Java {@link Model}. * @return The output Java {@link Model}.
*/ */
public org.eclipse.gmt.modisco.java.Model transform() { public org.eclipse.modisco.java.Model transform() {
for (miniuml.Package inputMiniUMLPackage : inputMiniUMLPackages) { for (miniuml.Package inputMiniUMLPackage : inputMiniUMLPackages) {
JavaPackageElements outputJavaPackageElements = transform(inputMiniUMLPackage); JavaPackageElements outputJavaPackageElements = transform(inputMiniUMLPackage);
outputJavaModel.getOwnedElements().add(outputJavaPackageElements.javaPackage); outputJavaModel.getOwnedElements().add(outputJavaPackageElements.javaPackage);
...@@ -160,10 +160,10 @@ public class MiniUML2JavaModel { ...@@ -160,10 +160,10 @@ public class MiniUML2JavaModel {
* Data class for results of transform method. * Data class for results of transform method.
*/ */
private static class JavaPackageElements { private static class JavaPackageElements {
public final org.eclipse.gmt.modisco.java.Package javaPackage; public final org.eclipse.modisco.java.Package javaPackage;
public final Set<CompilationUnit> javaCompilationUnits = new HashSet<>(); public final Set<CompilationUnit> javaCompilationUnits = new HashSet<>();
public JavaPackageElements(org.eclipse.gmt.modisco.java.Package javaPackage, public JavaPackageElements(org.eclipse.modisco.java.Package javaPackage,
Set<CompilationUnit> javaCompilationUnits) { Set<CompilationUnit> javaCompilationUnits) {
this.javaPackage = javaPackage; this.javaPackage = javaPackage;
this.javaCompilationUnits.addAll(javaCompilationUnits); this.javaCompilationUnits.addAll(javaCompilationUnits);
...@@ -184,7 +184,7 @@ public class MiniUML2JavaModel { ...@@ -184,7 +184,7 @@ public class MiniUML2JavaModel {
} }
// Create java package // Create java package
org.eclipse.gmt.modisco.java.Package outputJavaPackage = factory.createPackage(); org.eclipse.modisco.java.Package outputJavaPackage = factory.createPackage();
Set<CompilationUnit> outputJavaCompilationUnits = new HashSet<CompilationUnit>(); Set<CompilationUnit> outputJavaCompilationUnits = new HashSet<CompilationUnit>();
JavaPackageElements result = new JavaPackageElements(outputJavaPackage, outputJavaCompilationUnits); JavaPackageElements result = new JavaPackageElements(outputJavaPackage, outputJavaCompilationUnits);
packageToPackage.put(inputMiniUMLPackage, result); packageToPackage.put(inputMiniUMLPackage, result);
...@@ -440,7 +440,7 @@ public class MiniUML2JavaModel { ...@@ -440,7 +440,7 @@ public class MiniUML2JavaModel {
* @return The output {@link FieldDeclaration} * @return The output {@link FieldDeclaration}
*/ */
private FieldDeclaration createFieldDeclaration(CompilationUnit compilationUnit, private FieldDeclaration createFieldDeclaration(CompilationUnit compilationUnit,
org.eclipse.gmt.modisco.java.Type typeX, String name, boolean isMany) { org.eclipse.modisco.java.Type typeX, String name, boolean isMany) {
FieldDeclaration fieldDeclaration = factory.createFieldDeclaration(); FieldDeclaration fieldDeclaration = factory.createFieldDeclaration();
fieldDeclaration.setOriginalCompilationUnit(compilationUnit); fieldDeclaration.setOriginalCompilationUnit(compilationUnit);
...@@ -537,7 +537,7 @@ public class MiniUML2JavaModel { ...@@ -537,7 +537,7 @@ public class MiniUML2JavaModel {
classToCompilationUnit.put(inputMiniUMLClass, outputJavaCompilationUnit); classToCompilationUnit.put(inputMiniUMLClass, outputJavaCompilationUnit);
// Set package // Set package
org.eclipse.gmt.modisco.java.Package p = transform(inputMiniUMLClass.getPackage()).javaPackage; org.eclipse.modisco.java.Package p = transform(inputMiniUMLClass.getPackage()).javaPackage;
outputJavaCompilationUnit.setPackage(p); outputJavaCompilationUnit.setPackage(p);
// Set name // Set name
...@@ -545,7 +545,7 @@ public class MiniUML2JavaModel { ...@@ -545,7 +545,7 @@ public class MiniUML2JavaModel {
// Set file // Set file
ClassDeclaration classDeclaration = transformToClassDeclaration(inputMiniUMLClass); ClassDeclaration classDeclaration = transformToClassDeclaration(inputMiniUMLClass);
org.eclipse.gmt.modisco.java.Package outputJavaPackage = transform(inputMiniUMLClass.getPackage()).javaPackage; org.eclipse.modisco.java.Package outputJavaPackage = transform(inputMiniUMLClass.getPackage()).javaPackage;
classDeclaration.setPackage(outputJavaPackage); classDeclaration.setPackage(outputJavaPackage);
outputJavaCompilationUnit.setOriginalFilePath("NONE"); outputJavaCompilationUnit.setOriginalFilePath("NONE");
...@@ -584,7 +584,7 @@ public class MiniUML2JavaModel { ...@@ -584,7 +584,7 @@ public class MiniUML2JavaModel {
* The input MiniUML {@link miniuml.Type}. * The input MiniUML {@link miniuml.Type}.
* @return The corresponding Java primitive {@link Type}. * @return The corresponding Java primitive {@link Type}.
*/ */
public org.eclipse.gmt.modisco.java.Type getJavaPrimitiveType(miniuml.Type type) { public org.eclipse.modisco.java.Type getJavaPrimitiveType(miniuml.Type type) {
switch (type.toString()) { switch (type.toString()) {
case "Integer": case "Integer":
return javaIntType; return javaIntType;
......
src/impress/codegen/demos/miniuml.demo1.generator.model.java/src/miniuml/demo1/generator/model/java/MiniUML2JavaModelTest.java
+ 2
− 2
Voir le fichier @ 386ddb18
...@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.resource.Resource; ...@@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
import org.eclipse.gmt.modisco.java.Model; import org.eclipse.modisco.java.Model;
import org.eclipse.gmt.modisco.java.generation.files.GenerateJavaExtended; import org.eclipse.modisco.java.generation.files.GenerateJavaExtended;
import org.junit.Test; import org.junit.Test;
public class MiniUML2JavaModelTest { public class MiniUML2JavaModelTest {
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter