Change repository classes to avoid duplication of templates.

tools.descartes.prisma.core/src/tools/descartes/prisma/core/templates/repository/InterfaceProvidingRoleTemplate.java

@@ -10,10 +10,14 @@ import tools.descartes.prisma.core.templates.ModelTemplate;
 public class InterfaceProvidingRoleTemplate extends ModelTemplate<InterfaceProvidingEntity, InterfaceProvidingRole> {
 	
 	private final String portName;
-	private final InterfaceTemplate interfaceCmd;	
-
+	private final InterfaceTemplate interfaceCmd;
+	
 	public InterfaceProvidingRoleTemplate(String portName, InterfaceTemplate addInterface) {
-		super(RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__INTERFACE_PROVIDING_ROLES, InterfaceProvidingRole.class);
+		this(Status.CREATE, portName, addInterface);
+	}
+
+	public InterfaceProvidingRoleTemplate(Status status, String portName, InterfaceTemplate addInterface) {
+		super(status, RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__INTERFACE_PROVIDING_ROLES, InterfaceProvidingRole.class);
 		this.portName = portName;
 		this.interfaceCmd = addInterface;
 	}

tools.descartes.prisma.core/src/tools/descartes/prisma/core/templates/repository/InterfaceRequiringRoleTemplate.java

@@ -11,9 +11,13 @@ public class InterfaceRequiringRoleTemplate extends ModelTemplate<InterfaceRequi
 
 	private final String portName;
 	private final InterfaceTemplate interfaceCmd;
+	
+	public InterfaceRequiringRoleTemplate(String portName, InterfaceTemplate addInterface) {
+		this(Status.CREATE, portName, addInterface);
+	}
 
-	public InterfaceRequiringRoleTemplate(InterfaceTemplate addInterface, String portName) {
-		super(RepositoryPackage.Literals.INTERFACE_REQUIRING_ENTITY__INTERFACE_REQUIRING_ROLES, InterfaceRequiringRole.class);
+	public InterfaceRequiringRoleTemplate(Status status, String portName, InterfaceTemplate addInterface) {
+		super(status, RepositoryPackage.Literals.INTERFACE_REQUIRING_ENTITY__INTERFACE_REQUIRING_ROLES, InterfaceRequiringRole.class);
 		this.portName = portName;
 		this.interfaceCmd = addInterface;
 	}

tools.descartes.prisma.core/src/tools/descartes/prisma/core/templates/repository/InterfaceTemplate.java

 package tools.descartes.prisma.core.templates.repository;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface;
 import edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository;
@@ -12,12 +14,16 @@ import tools.descartes.prisma.core.templates.ModelTemplate;
 public class InterfaceTemplate extends ModelTemplate<Repository, Interface> {
 
 	private final String interfaceName;
-	private final List<SignatureTemplate> signatures = new LinkedList<>();
+	private final Map<String, SignatureTemplate> signatures = new HashMap<>();
 	
 	public InterfaceTemplate(String interfaceName) {
 		super(RepositoryPackage.Literals.REPOSITORY__INTERFACES, Interface.class);
 		this.interfaceName = interfaceName;
 	}
+	
+	public String getName() {
+		return interfaceName;
+	}
 
 	@Override
 	protected Interface create(Repository repository) {
@@ -34,11 +40,15 @@ public class InterfaceTemplate extends ModelTemplate<Repository, Interface> {
 	
 	@Override
 	public List<? extends ModelTemplate<Interface, ?>> getChildCommands() {
-		return signatures;
+		return new ArrayList<>(signatures.values());
 	}
 
-	public InterfaceTemplate add(SignatureTemplate signature) {
-		signatures.add(signature);
-		return this;
+	public SignatureTemplate defineSignature(String signatureName) {
+		SignatureTemplate template = signatures.get(signatureName);
+		if (template == null) {
+			template = new SignatureTemplate(signatureName);
+			signatures.put(signatureName, template);
+		}
+		return template;
 	}
 }

tools.descartes.prisma.core/src/tools/descartes/prisma/core/templates/repository/ProvidingDelegationConnectorTemplate.java

@@ -33,12 +33,15 @@ public class ProvidingDelegationConnectorTemplate extends ModelTemplate<Composed
 		InterfaceProvidingRole outerRole = outerRoleCmd.get(parent);
 		InterfaceProvidingRole innerRole = innerRoleCmd.get(assemblyContext.getEncapsulatedComponent());
 		
-		ProvidingDelegationConnector connector = RepositoryFactory.eINSTANCE.createProvidingDelegationConnector();
-		connector.setAssemblyContext(assemblyContext);
-		connector.setInnerInterfaceProvidingRole(innerRole);
-		connector.setOuterInterfaceProvidingRole(outerRole);
-		connector.setName(outerRole.getName() + " -> " + innerRole.getName());
-		return connector;
+		if (outerRole != null && innerRole != null) {
+			ProvidingDelegationConnector connector = RepositoryFactory.eINSTANCE.createProvidingDelegationConnector();
+			connector.setAssemblyContext(assemblyContext);
+			connector.setInnerInterfaceProvidingRole(innerRole);
+			connector.setOuterInterfaceProvidingRole(outerRole);
+			connector.setName(outerRole.getName() + " -> " + innerRole.getName());
+			return connector;
+		}
+		return null;
 	}
 
 }

tools.descartes.prisma.core/src/tools/descartes/prisma/core/templates/repository/RepositoryComponentTemplate.java

 package tools.descartes.prisma.core.templates.repository;
 
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository;
 import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryComponent;
@@ -11,8 +13,8 @@ import tools.descartes.prisma.core.templates.ModelTemplate;
 public abstract class RepositoryComponentTemplate<E extends RepositoryComponent> extends ModelTemplate<Repository, E> {
 	
 	private final String componentName;
-	private final List<InterfaceProvidingRoleTemplate> interfaceProvidingRoles = new LinkedList<>();
-	private final List<InterfaceRequiringRoleTemplate> interfaceRequiringRoles = new LinkedList<>();
+	private final Map<String, InterfaceProvidingRoleTemplate> interfaceProvidingRoles = new HashMap<>();
+	private final Map<String, InterfaceRequiringRoleTemplate> interfaceRequiringRoles = new HashMap<>();
 
 	protected RepositoryComponentTemplate(String componentName, Class<E> componentType) {
 		super(RepositoryPackage.Literals.REPOSITORY__COMPONENTS, componentType);
@@ -30,8 +32,8 @@ public abstract class RepositoryComponentTemplate<E extends RepositoryComponent>
 	@Override
 	public List<ModelTemplate<? super E, ?>> getChildCommands() {
 		List<ModelTemplate<? super E, ?>> list = new LinkedList<>();
-		list.addAll(interfaceProvidingRoles);
-		list.addAll(interfaceRequiringRoles);
+		list.addAll(interfaceProvidingRoles.values());
+		list.addAll(interfaceRequiringRoles.values());
 		return list;
 	}
 	
@@ -45,11 +47,21 @@ public abstract class RepositoryComponentTemplate<E extends RepositoryComponent>
 	
 	protected abstract E createRepositoryComponent();
 	
-	public void add(InterfaceProvidingRoleTemplate providingRole) {
-		interfaceProvidingRoles.add(providingRole);
+	public InterfaceProvidingRoleTemplate defineInterfaceProvidingRole(String portName, InterfaceTemplate interf) {
+		InterfaceProvidingRoleTemplate template = interfaceProvidingRoles.get(portName);
+		if (template == null) {
+			template = new InterfaceProvidingRoleTemplate(portName, interf);
+			interfaceProvidingRoles.put(portName, template);
+		}
+		return template;
 	}
 	
-	public void add(InterfaceRequiringRoleTemplate requiringRole) {
-		interfaceRequiringRoles.add(requiringRole);
+	public InterfaceRequiringRoleTemplate defineInterfaceRequiringRole(String portName, InterfaceTemplate interf) {
+		InterfaceRequiringRoleTemplate template = interfaceRequiringRoles.get(portName);
+		if (template == null) {
+			template = new InterfaceRequiringRoleTemplate(portName, interf);
+			interfaceRequiringRoles.put(portName, template);
+		}
+		return template;
 	}
 }

tools.descartes.prisma.core/src/tools/descartes/prisma/core/templates/repository/RepositoryTemplate.java

 package tools.descartes.prisma.core.templates.repository;
 
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository;
 import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
@@ -13,8 +15,8 @@ public class RepositoryTemplate extends ModelTemplate<Repository, Repository> {
 		super(null, Repository.class);
 	}
 
-	private final List<InterfaceTemplate> interfaces = new LinkedList<>();
-	private final List<RepositoryComponentTemplate<?>> components = new LinkedList<>();
+	private final Map<String, InterfaceTemplate> interfaces = new HashMap<>();
+	private final Map<String, RepositoryComponentTemplate<?>> components = new HashMap<>();
 	
 	@Override
 	public Repository get(Repository parent) {
@@ -26,21 +28,38 @@ public class RepositoryTemplate extends ModelTemplate<Repository, Repository> {
 		return repo;
 	}
 	
-	public RepositoryTemplate add(InterfaceTemplate interf) {
-		interfaces.add(interf);
-		return this;
+	public InterfaceTemplate defineInterface(String name) {
+		InterfaceTemplate template = interfaces.get(name);
+		if (template == null) {
+			template = new InterfaceTemplate(name);
+			interfaces.put(name, template);
+		}
+		return template;
 	}
 	
-	public RepositoryTemplate add(RepositoryComponentTemplate<?> component) {
-		components.add(component);
-		return this;
+	public BasicComponentTemplate defineBasicComponent(String name) {
+		BasicComponentTemplate template = (BasicComponentTemplate)components.get(name);
+		if (template == null) {
+			template = new BasicComponentTemplate(name);
+			components.put(name, template);
+		}
+		return template;
+	}
+	
+	public CompositeComponentTemplate defineCompositeComponent(String name) {
+		CompositeComponentTemplate template = (CompositeComponentTemplate)components.get(name);
+		if (template == null) {
+			template = new CompositeComponentTemplate(name);
+			components.put(name, template);
+		}
+		return template;
 	}
 	
 	@Override
 	public List<ModelTemplate<Repository, ?>> getChildCommands() {
 		List<ModelTemplate<Repository,?>> children = new LinkedList<>();
-		children.addAll(interfaces);
-		children.addAll(components);
+		children.addAll(interfaces.values());
+		children.addAll(components.values());
 		return children;
 	}
 

tools.descartes.prisma.core/src/tools/descartes/prisma/core/templates/repository/RequiringDelegationConnectorTemplate.java

@@ -33,12 +33,15 @@ public class RequiringDelegationConnectorTemplate extends ModelTemplate<Composed
 		InterfaceRequiringRole outerRole = outerRoleCmd.get(parent);
 		InterfaceRequiringRole innerRole = innerRoleCmd.get(assemblyContext.getEncapsulatedComponent());
 		
-		RequiringDelegationConnector connector = RepositoryFactory.eINSTANCE.createRequiringDelegationConnector();
-		connector.setAssemblyContext(assemblyContext);
-		connector.setInnerInterfaceRequiringRole(innerRole);
-		connector.setOuterInterfaceRequiringRole(outerRole);
-		connector.setName(innerRole.getName() + " -> " + outerRole.getName());
-		return connector;
+		if (outerRole != null && innerRole != null) {
+			RequiringDelegationConnector connector = RepositoryFactory.eINSTANCE.createRequiringDelegationConnector();
+			connector.setAssemblyContext(assemblyContext);
+			connector.setInnerInterfaceRequiringRole(innerRole);
+			connector.setOuterInterfaceRequiringRole(outerRole);
+			connector.setName(innerRole.getName() + " -> " + outerRole.getName());
+			return connector;
+		}
+		return null;
 	}
 
 }