Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java Mon Jul 6 17:39:44 2009 @@ -40,7 +40,7 @@ */ protected CompositeReferenceImpl() { } - + @Override public Object clone() throws CloneNotSupportedException { CompositeReferenceImpl copy = (CompositeReferenceImpl)super.clone(); @@ -56,7 +56,7 @@ public List<Component> getPromotedComponents() { return promotedComponents; } - + public String toString() { return getName(); }
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java Mon Jul 6 17:39:44 2009 @@ -50,13 +50,13 @@ public void setPromotedService(ComponentService promotedService) { this.promotedService = promotedService; } - + public Component getPromotedComponent() { return promotedComponent; } - + public void setPromotedComponent(Component promotedComponent) { this.promotedComponent = promotedComponent; } - + } Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java Mon Jul 6 17:39:44 2009 @@ -43,7 +43,7 @@ private List<AbstractService> services = new ArrayList<AbstractService>(); private List<Intent> requiredIntents = new ArrayList<Intent>(); private List<PolicySet> policySets = new ArrayList<PolicySet>(); - + /** * Constructs a new ConstrainingType */ @@ -73,7 +73,7 @@ public List<Intent> getRequiredIntents() { return requiredIntents; } - + public List<PolicySet> getPolicySets() { return policySets; } @@ -82,7 +82,7 @@ public int hashCode() { return String.valueOf(getName()).hashCode(); } - + @Override public boolean equals(Object obj) { if (obj == this) { @@ -97,12 +97,12 @@ return false; } } - + public ExtensionType getExtensionType() { return null; } public void setExtensionType(ExtensionType type) { } - + } Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java Mon Jul 6 17:39:44 2009 @@ -37,15 +37,15 @@ private String name; private List<Intent> requiredIntents = new ArrayList<Intent>(); private List<PolicySet> policySets = new ArrayList<PolicySet>(); - + private boolean isCallback = false; - + /** * Constructs a new contract. */ protected ContractImpl() { } - + public String getName() { return name; } @@ -57,11 +57,11 @@ public InterfaceContract getInterfaceContract() { return interfaceContract; } - + public void setInterfaceContract(InterfaceContract interfaceContract) { this.interfaceContract = interfaceContract; } - + public List<Intent> getRequiredIntents() { return requiredIntents; } @@ -80,7 +80,7 @@ public void setExtensionType(ExtensionType type) { } - + public List<PolicySet> getPolicySets() { return policySets; } Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java Mon Jul 6 17:39:44 2009 @@ -34,34 +34,34 @@ private SCABinding scaBinding; - public SCABinding getSCABinding(){ + public SCABinding getSCABinding() { return scaBinding; } - public void setSCABinding(SCABinding scaBinding){ + public void setSCABinding(SCABinding scaBinding) { this.scaBinding = scaBinding; } - public String getURI(){ + public String getURI() { return null; } - public void setURI(String uri){ + public void setURI(String uri) { } - public String getName(){ + public String getName() { return null; } - public void setName(String name){ + public void setName(String name) { } - public boolean isUnresolved(){ + public boolean isUnresolved() { return false; } - public void setUnresolved(boolean unresolved){ + public void setUnresolved(boolean unresolved) { } Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java Mon Jul 6 17:39:44 2009 @@ -116,7 +116,7 @@ * * @return callbackEndpoint the reference callback endpoint */ - public List<EndpointReference> getCallbackEndpointReferences(){ + public List<EndpointReference> getCallbackEndpointReferences() { resolve(); return callbackEndpointReferences; } @@ -142,10 +142,10 @@ throw new UnsupportedOperationException(); } - public String toString(){ - String output = "Endpoint: "; + public String toString() { + String output = "Endpoint: "; - if (getURI() != null){ + if (getURI() != null) { output += " URI = " + uri; } Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java Mon Jul 6 17:39:44 2009 @@ -39,10 +39,8 @@ * @version $Rev$ $Date$ */ public class EndpointReferenceImpl implements EndpointReference { - private static final long serialVersionUID = 8838066441709300972L; - + private static final long serialVersionUID = 8838066441709300972L; - protected ExtensionPointRegistry registry; protected boolean unresolved = true; protected String uri; @@ -62,7 +60,7 @@ // will be directed toward protected Endpoint callbackEndpoint; - protected EndpointReferenceImpl(ExtensionPointRegistry registry){ + protected EndpointReferenceImpl(ExtensionPointRegistry registry) { this.registry = registry; } @@ -70,7 +68,7 @@ public Object clone() throws CloneNotSupportedException { EndpointReference cloned = (EndpointReference)super.clone(); - if (targetEndpoint != null){ + if (targetEndpoint != null) { cloned.setTargetEndpoint((Endpoint)targetEndpoint.clone()); } @@ -172,7 +170,7 @@ if (getURI() != null) { output += " URI = " + uri; } - + switch (status) { case 0: output += " NOT_CONFIGURED "; @@ -237,12 +235,12 @@ public void setExtensionPointRegistry(ExtensionPointRegistry registry) { this.registry = registry; } - + public int getStatus() { return status; } - + public void setStatus(int status) { - this.status = status; + this.status = status; } } Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java Mon Jul 6 17:39:44 2009 @@ -38,12 +38,12 @@ */ protected ExtensibleImpl() { } - + public List<Object> getExtensions() { return extensions; } - + public List<Extension> getAttributeExtensions() { return attributeExtensions; } -} \ No newline at end of file +} Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java Mon Jul 6 17:39:44 2009 @@ -45,7 +45,7 @@ } public <T> T getValue() { - return (T) value; + return (T)value; } public <T> void setValue(T value) { Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java Mon Jul 6 17:39:44 2009 @@ -33,13 +33,13 @@ public class PropertyImpl extends AbstractPropertyImpl implements Property, Cloneable { private List<PolicySet> policySets = new ArrayList<PolicySet>(); private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>(); - + /** * Constructs a new property. */ protected PropertyImpl() { } - + @Override public Object clone() throws CloneNotSupportedException { return super.clone(); @@ -48,9 +48,9 @@ public List<PolicySet> getPolicySets() { return policySets; } - + public void setPolicySets(List<PolicySet> policySets) { - this.policySets = policySets; + this.policySets = policySets; } public List<PolicySet> getApplicablePolicySets() { Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java Mon Jul 6 17:39:44 2009 @@ -57,8 +57,8 @@ // clone the endpoint references themselves and set the reference pointer back to // this new refrence clone.endpointReferences = new ArrayList<EndpointReference>(); - - for (EndpointReference epr : endpointReferences){ + + for (EndpointReference epr : endpointReferences) { EndpointReference eprClone = (EndpointReference)epr.clone(); eprClone.setReference((ComponentReference)clone); clone.endpointReferences.add(eprClone); Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java Mon Jul 6 17:39:44 2009 @@ -30,7 +30,7 @@ */ public class SCABindingFactoryImpl implements SCABindingFactory { - public SCABindingFactoryImpl (){ + public SCABindingFactoryImpl() { } Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java Mon Jul 6 17:39:44 2009 @@ -100,7 +100,7 @@ } public boolean isUnresolved() { - if (targetComponentService == null){ + if (targetComponentService == null) { return true; } else { return targetComponentService.isUnresolved(); @@ -160,11 +160,11 @@ this.requiredIntents = intents; } - public void setIsAutomatic(boolean isAutomatic){ + public void setIsAutomatic(boolean isAutomatic) { this.isAutomatic = isAutomatic; } - public boolean getIsAutomatic(){ + public boolean getIsAutomatic() { return this.isAutomatic; } Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java Mon Jul 6 17:39:44 2009 @@ -38,13 +38,12 @@ private Callback callback; private List<Endpoint> endpoints = new ArrayList<Endpoint>(); - /** * Constructs a new service. */ protected ServiceImpl() { } - + @Override public Object clone() throws CloneNotSupportedException { ServiceImpl clone = (ServiceImpl)super.clone(); @@ -84,13 +83,13 @@ public void setCallback(Callback callback) { this.callback = callback; } - + /** * By default return the interface contract for the service */ - public InterfaceContract getInterfaceContract(Binding binding){ + public InterfaceContract getInterfaceContract(Binding binding) { return getInterfaceContract(); - } + } public List<Endpoint> getEndpoints() { return endpoints; Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java (original) +++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java Mon Jul 6 17:39:44 2009 @@ -86,9 +86,9 @@ public void setExtensionType(ExtensionType type) { } - + public void setPolicySets(List<PolicySet> policySets) { - this.policySets = policySets; + this.policySets = policySets; } public void setRequiredIntents(List<Intent> intents) { Modified: tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java (original) +++ tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java Mon Jul 6 17:39:44 2009 @@ -23,7 +23,6 @@ import org.junit.BeforeClass; import org.junit.Test; - /** * Test building of assembly model instances using the assembly factory. * Modified: tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java (original) +++ tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java Mon Jul 6 17:39:44 2009 @@ -29,7 +29,7 @@ public class TestInterfaceContract extends InterfaceContractImpl implements InterfaceContract { public TestInterfaceContract(AssemblyFactory factory) { - + TestInterface testInterface = new TestInterface(factory); setInterface(testInterface); Modified: tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java (original) +++ tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java Mon Jul 6 17:39:44 2009 @@ -38,14 +38,14 @@ * @version $Rev$ $Date$ */ public class CompositeBuilderTestCase { - + private static AssemblyFactory assemblyFactory; - + @BeforeClass public static void setUp() throws Exception { assemblyFactory = new DefaultAssemblyFactory(); } - + @Test public void testFuseIncludes() throws Exception { Composite c1 = assemblyFactory.createComposite(); @@ -66,19 +66,19 @@ Component b = assemblyFactory.createComponent(); b.setName("b"); c2.getComponents().add(b); - + Composite c = assemblyFactory.createComposite(); c.setName(new QName("http://foo";, "C")); c.getIncludes().add(c1); - + new CompositeIncludeBuilderImpl(null).build(c, null, null); - + assertTrue(c.getComponents().get(0).getName().equals("a")); assertTrue(c.getComponents().get(1).getName().equals("b")); assertTrue(c.getServices().get(0).getName().equals("s")); assertTrue(c.getReferences().get(0).getName().equals("r")); } - + @Test public void testExpandComposites() throws Exception { Composite c1 = assemblyFactory.createComposite(); @@ -98,7 +98,7 @@ Component b = assemblyFactory.createComponent(); b.setName("b"); c2.getComponents().add(b); - + Composite c = assemblyFactory.createComposite(); c.setName(new QName("http://foo";, "C")); Component x = assemblyFactory.createComponent(); @@ -113,9 +113,9 @@ z.setName("z"); z.setImplementation(c1); c.getComponents().add(z); - + new CompositeCloneBuilderImpl().build(c, null, null); - + assertTrue(c.getComponents().get(0).getImplementation() != c1); assertTrue(c.getComponents().get(1).getImplementation() != c2); assertTrue(c.getComponents().get(2).getImplementation() != c1); Modified: tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java?rev=791550&r1=791549&r2=791550&view=diff ============================================================================== --- tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java (original) +++ tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java Mon Jul 6 17:39:44 2009 @@ -55,7 +55,7 @@ public class PrintUtilTestCase { private AssemblyFactory factory = new DefaultAssemblyFactory(); - + /** * Create a composite */ @@ -225,5 +225,5 @@ PrintUtil p = new PrintUtil(new PrintWriter(sw), false); p.print(composite); // System.out.println(sw.toString()); - } + } }
