Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java?rev=385139&r1=385138&r2=385139&view=diff ============================================================================== --- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java (original) +++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java Sat Mar 11 11:03:11 2006 @@ -22,109 +22,125 @@ import org.apache.tuscany.model.types.wsdl.WSDLServiceContract; /** - * The Factory for the assembly model. - * Provides a create method for each non-abstract class of the model. + * The Factory for the assembly model. Provides a create method for each non-abstract class of the model. */ public interface AssemblyFactory { /** * Returns a new SimpleComponent. + * * @return */ SimpleComponent createSimpleComponent(); /** * Returns a new ComponentType. + * * @return */ ComponentType createComponentType(); /** * Returns a new EntryPoint. + * * @return */ EntryPoint createEntryPoint(); /** * Returns a new ExternalService. + * * @return */ ExternalService createExternalService(); /** * Returns a new JavaServiceContract. + * * @return */ JavaServiceContract createJavaServiceContract(); /** * Returns a new Module. + * * @return */ Module createModule(); /** * Returns a new ModuleComponent. + * * @return */ ModuleComponent createModuleComponent(); /** * Returns a new ModuleFragment. + * * @return */ ModuleFragment createModuleFragment(); /** * Returns a new Reference. + * * @return */ Reference createReference(); /** * Returns a new ConfiguredReference. + * * @return */ ConfiguredReference createConfiguredReference(); /** * Returns a new Service. + * * @return */ Service createService(); /** * Returns a new ConfiguredService. + * * @return */ ConfiguredService createConfiguredService(); /** * Returns a new Subsystem. + * * @return */ Subsystem createSubsystem(); /** * Returns Property. + * * @return */ Property createProperty(); /** * Returns a new ConfiguredProperty. + * * @return */ ConfiguredProperty createConfiguredProperty(); /** * Returns a new WSDLServiceContract. + * * @return */ WSDLServiceContract createWSDLServiceContract(); /** * Create a new ServiceURI from the given uri string. + * * @param uri * @return */ @@ -132,6 +148,7 @@ /** * Creates a new ServiceURI from a module component and a service name. + * * @param moduleComponent * @param serviceName * @return @@ -140,6 +157,7 @@ /** * Creates a new ServiceURI from a module component and configured port. + * * @param moduleComponent * @param aggregatePart * @param configuredPort @@ -149,6 +167,7 @@ /** * Create a qname from a URI + * * @param uri * @return */ @@ -156,13 +175,14 @@ /** * Create a wire + * * @return */ Wire createWire(); /** * Helper method for creating a reference. - * + * * @param name the name of the reference * @param service the Java type of the service * @return a Reference @@ -170,8 +190,18 @@ Reference createReference(String name, Class<?> service); /** + * Helper method for creating a reference. + * + * @param name the name of the reference + * @param service the Java type of the service + * @param the multiplicity of the reference + * @return a Reference + */ + Reference createReference(String name, Class<?> service, Multiplicity multiplicity); + + /** * Helper method for creating a configured reference. - * + * * @param name the name of the reference * @param targets the targets for the reference * @return a ConfiguredReference
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java?rev=385139&r1=385138&r2=385139&view=diff ============================================================================== --- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java (original) +++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java Sat Mar 11 11:03:11 2006 @@ -30,6 +30,7 @@ import org.apache.tuscany.model.assembly.Module; import org.apache.tuscany.model.assembly.ModuleComponent; import org.apache.tuscany.model.assembly.ModuleFragment; +import org.apache.tuscany.model.assembly.Multiplicity; import org.apache.tuscany.model.assembly.Property; import org.apache.tuscany.model.assembly.Reference; import org.apache.tuscany.model.assembly.Service; @@ -203,15 +204,20 @@ } public Reference createReference(String name, Class<?> service) { + return createReference(name,service,Multiplicity.ZERO_ONE); + } + + public Reference createReference(String name, Class<?> service, Multiplicity multiplicity){ JavaServiceContract refContract = createJavaServiceContract(); refContract.setInterface(service); Reference reference = createReference(); reference.setName(name); reference.setServiceContract(refContract); + reference.setMultiplicity(multiplicity); return reference; } - public ConfiguredReference createConfiguredReference(String name, String... targets) { + public ConfiguredReference createConfiguredReference(String name, String... targets) { ConfiguredReference ref = createConfiguredReference(); ref.setName(name); for (String target : targets) {
