You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/02 19:09:40 UTC
svn commit: r524842 - in /incubator/tuscany/java/sca/scdl4j/assembly: ./
src/main/java/org/apache/tuscany/assembly/model/
src/main/java/org/apache/tuscany/assembly/model/impl/
src/test/java/org/apache/tuscany/assembly/model/
Author: rfeng
Date: Mon Apr 2 10:09:37 2007
New Revision: 524842
URL: http://svn.apache.org/viewvc?view=rev&rev=524842
Log:
Some cleanups with PMD and checkstyle
Added:
incubator/tuscany/java/sca/scdl4j/assembly/.checkstyle
incubator/tuscany/java/sca/scdl4j/assembly/.pmd
incubator/tuscany/java/sca/scdl4j/assembly/.ruleset
Modified:
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ConstrainingTypeImpl.java
incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/AssemblyFactoryTestCase.java
incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestImplementation.java
Added: incubator/tuscany/java/sca/scdl4j/assembly/.checkstyle
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/.checkstyle?view=auto&rev=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/.checkstyle (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/.checkstyle Mon Apr 2 10:09:37 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <fileset name="all" enabled="true" check-config-name="Tuscany Checks" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+</fileset-config>
Added: incubator/tuscany/java/sca/scdl4j/assembly/.pmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/.pmd?view=auto&rev=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/.pmd (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/.pmd Mon Apr 2 10:09:37 2007
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/><includeDerivedFiles>false</includeDerivedFiles></pmd>
\ No newline at end of file
Added: incubator/tuscany/java/sca/scdl4j/assembly/.ruleset
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/.ruleset?view=auto&rev=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/.ruleset (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/.ruleset Mon Apr 2 10:09:37 2007
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<ruleset name="pmd-eclipse">
+ <description>PMD Plugin preferences rule set</description>
+
+
+ <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
+ <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+ <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+<!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->
+
+<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
+
+<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
+<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
+<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
+
+<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
+<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
+
+<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
+<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
+<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
+<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
+<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
+<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
+<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
+
+<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
+<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
+<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
+
+<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
+<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
+<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
+<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
+<!--<rule ref="rulesets/design.xml/BadComparison"/>-->
+<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
+<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
+<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
+<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
+<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
+<rule ref="rulesets/design.xml/IdempotentOperations"/>
+<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
+<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
+<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
+<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
+<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
+<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
+<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+<rule ref="rulesets/design.xml/SimplifyConditional"/>
+<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
+<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
+<!--<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>-->
+<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
+<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
+<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
+
+<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
+<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
+
+<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
+<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
+<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
+<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
+
+<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
+<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
+
+<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
+<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
+<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
+
+ <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
+
+ <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
+ <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
+ <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
+
+ <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
+
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
+
+ <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
+ <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
+ <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
+
+ <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
+ <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
+
+ <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+ <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
+
+</ruleset>
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java Mon Apr 2 10:09:37 2007
@@ -24,6 +24,8 @@
/**
* Interface contracts define one or more business functions. These business
* functions are provided by services and are used by references.
+ *
+ * @version $Rev$ $Date$
*/
public interface AbstractContract extends Base, IntentAttachPoint {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java Mon Apr 2 10:09:37 2007
@@ -20,6 +20,8 @@
/**
* Represents a reference contract.
+ *
+ * @version $Rev$ $Date$
*/
public interface AbstractReference extends AbstractContract {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java Mon Apr 2 10:09:37 2007
@@ -20,6 +20,8 @@
/**
* Represents a service contract.
+ *
+ * @version $Rev$ $Date$
*/
public interface AbstractService extends AbstractContract {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java Mon Apr 2 10:09:37 2007
@@ -22,6 +22,8 @@
/**
* A factory for the assembly model
+ *
+ * @version $Rev$ $Date$
*/
public interface AssemblyFactory {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java Mon Apr 2 10:09:37 2007
@@ -22,6 +22,8 @@
/**
* Base interface for all assembly model objects.
+ *
+ * @version $Rev$ $Date$
*/
public interface Base {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java Mon Apr 2 10:09:37 2007
@@ -23,6 +23,8 @@
/**
* Represents a binding.
+ *
+ * @version $Rev$ $Date$
*/
public interface Binding extends Base, IntentAttachPoint, PolicySetAttachPoint {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java Mon Apr 2 10:09:37 2007
@@ -25,6 +25,8 @@
/**
* Represents a callback object describing the bindings to use for callbacks.
+ *
+ * @version $Rev$ $Date$
*/
public interface Callback extends Base, IntentAttachPoint, PolicySetAttachPoint {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java Mon Apr 2 10:09:37 2007
@@ -26,6 +26,8 @@
/**
* Represents a component. A component is a configured instance of an
* implementation.
+ *
+ * @version $Rev$ $Date$
*/
public interface Component extends Base, IntentAttachPoint, PolicySetAttachPoint {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java Mon Apr 2 10:09:37 2007
@@ -20,6 +20,8 @@
/**
* Represents a configured property of a component.
+ *
+ * @version $Rev$ $Date$
*/
public interface ComponentProperty extends Property {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java Mon Apr 2 10:09:37 2007
@@ -20,6 +20,8 @@
/**
* An instance of a reference associated with a particular component.
+ *
+ * @version $Rev$ $Date$
*/
public interface ComponentReference extends Reference {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java Mon Apr 2 10:09:37 2007
@@ -20,6 +20,8 @@
/**
* An addressable instance of a service associated with a particular component.
+ *
+ * @version $Rev$ $Date$
*/
public interface ComponentService extends Service {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java Mon Apr 2 10:09:37 2007
@@ -25,6 +25,8 @@
/**
* Describes an implementation and represents its configurable aspects.
+ *
+ * @version $Rev$ $Date$
*/
public interface ComponentType extends Base, IntentAttachPoint, PolicySetAttachPoint {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java Mon Apr 2 10:09:37 2007
@@ -24,6 +24,8 @@
/**
* Represents a composite.
+ *
+ * @version $Rev$ $Date$
*/
public interface Composite extends Implementation {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java Mon Apr 2 10:09:37 2007
@@ -22,6 +22,8 @@
/**
* Represents composite reference.
+ *
+ * @version $Rev$ $Date$
*/
public interface CompositeReference extends Reference {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java Mon Apr 2 10:09:37 2007
@@ -20,6 +20,8 @@
/**
* Represents a composite service.
+ *
+ * @version $Rev$ $Date$
*/
public interface CompositeService extends Service {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java Mon Apr 2 10:09:37 2007
@@ -29,6 +29,8 @@
* implementation. Any component configuration that points to a constrainingType
* is constrained by this shape. The constrainingType specifies the services,
* references and properties that must be implemented.
+ *
+ * @version $Rev$ $Date$
*/
public interface ConstrainingType extends Base, IntentAttachPoint {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java Mon Apr 2 10:09:37 2007
@@ -24,6 +24,8 @@
/**
* Represents a contract. A contract can be either a service or a reference.
+ *
+ * @version $Rev$ $Date$
*/
public interface Contract extends AbstractContract, PolicySetAttachPoint {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java Mon Apr 2 10:09:37 2007
@@ -20,6 +20,8 @@
/**
* Represents a component implementation.
+ *
+ * @version $Rev$ $Date$
*/
public interface Implementation extends ComponentType {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java Mon Apr 2 10:09:37 2007
@@ -21,6 +21,8 @@
/**
* Enumeration for multiplicity. Defines the number of wires that can connect a
* reference to target services.
+ *
+ * @version $Rev$ $Date$
*/
public enum Multiplicity {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java Mon Apr 2 10:09:37 2007
@@ -25,6 +25,8 @@
* set data values. An implementation can have zero or more properties. Each
* property has a data type, which may be either simple or complex. An
* implementation may also define a default value for a property.
+ *
+ * @version $Rev$ $Date$
*/
public interface Property extends AbstractProperty, PolicySetAttachPoint {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java Mon Apr 2 10:09:37 2007
@@ -24,6 +24,8 @@
* Represents a reference. References within an implementation represent links
* to services that the implementation uses that must be provided by other
* components.
+ *
+ * @version $Rev$ $Date$
*/
public interface Reference extends AbstractReference, Contract {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java Mon Apr 2 10:09:37 2007
@@ -21,6 +21,8 @@
/**
* Represents a service. Services are used to publish services provided by
* implementations, so that they are addressable by other components.
+ *
+ * @version $Rev$ $Date$
*/
public interface Service extends AbstractService, Contract {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java Mon Apr 2 10:09:37 2007
@@ -23,6 +23,8 @@
/**
* Represents a wire.
+ *
+ * @version $Rev$ $Date$
*/
public interface Wire extends Base, IntentAttachPoint, PolicySetAttachPoint {
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java Mon Apr 2 10:09:37 2007
@@ -32,7 +32,7 @@
*/
public abstract class BaseImpl implements Base, Visitable {
private List<Object> extensions = new ArrayList<Object>();
- private boolean unresolved = false;
+ private boolean unresolved;
public List<Object> getExtensions() {
return extensions;
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java Mon Apr 2 10:09:37 2007
@@ -51,11 +51,13 @@
}
public boolean accept(Visitor visitor) {
- if (!super.accept(visitor))
+ if (!super.accept(visitor)) {
return false;
+ }
for (Binding binding : bindings) {
- if (!visitor.visit(binding))
+ if (!visitor.visit(binding)) {
return false;
+ }
}
return true;
}
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java Mon Apr 2 10:09:37 2007
@@ -100,19 +100,23 @@
}
public boolean accept(Visitor visitor) {
- if (!super.accept(visitor))
+ if (!super.accept(visitor)) {
return false;
+ }
for (ComponentProperty property : properties) {
- if (!visitor.visit(property))
+ if (!visitor.visit(property)) {
return false;
+ }
}
for (ComponentReference reference : references) {
- if (!visitor.visit(reference))
+ if (!visitor.visit(reference)) {
return false;
+ }
}
for (ComponentService service : services) {
- if (!visitor.visit(service))
+ if (!visitor.visit(service)) {
return false;
+ }
}
return true;
}
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java Mon Apr 2 10:09:37 2007
@@ -72,19 +72,23 @@
}
public boolean accept(Visitor visitor) {
- if (!super.accept(visitor))
+ if (!super.accept(visitor)) {
return false;
+ }
for (Property property : properties) {
- if (!visitor.visit(property))
+ if (!visitor.visit(property)) {
return false;
+ }
}
for (Reference reference : references) {
- if (!visitor.visit(reference))
+ if (!visitor.visit(reference)) {
return false;
+ }
}
for (Service service : services) {
- if (!visitor.visit(service))
+ if (!visitor.visit(service)) {
return false;
+ }
}
return true;
}
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ConstrainingTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ConstrainingTypeImpl.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ConstrainingTypeImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ConstrainingTypeImpl.java Mon Apr 2 10:09:37 2007
@@ -67,19 +67,23 @@
}
public boolean accept(Visitor visitor) {
- if (!super.accept(visitor))
+ if (!super.accept(visitor)) {
return false;
+ }
for (AbstractProperty property : properties) {
- if (!visitor.visit(property))
+ if (!visitor.visit(property)) {
return false;
+ }
}
for (AbstractReference reference : references) {
- if (!visitor.visit(reference))
+ if (!visitor.visit(reference)) {
return false;
+ }
}
for (AbstractService service : services) {
- if (!visitor.visit(service))
+ if (!visitor.visit(service)) {
return false;
+ }
}
return true;
}
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/AssemblyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/AssemblyFactoryTestCase.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/AssemblyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/AssemblyFactoryTestCase.java Mon Apr 2 10:09:37 2007
@@ -111,25 +111,21 @@
p.setProperty(i.getProperties().get(0));
c.getProperties().add(p);
- {
- ComponentReference r = factory.createComponentReference();
- r.setName("accountDataService");
- r.setMultiplicity(Multiplicity.ONE_ONE);
- r.setInterface(new TestInterface(factory));
- r.setReference(i.getReferences().get(0));
- c.getReferences().add(r);
- r.getBindings().add(new TestBinding(factory));
- }
-
- {
- ComponentReference r = factory.createComponentReference();
- r.setName("stockQuoteService");
- r.setMultiplicity(Multiplicity.ONE_ONE);
- r.setInterface(new TestInterface(factory));
- r.setReference(i.getReferences().get(1));
- c.getReferences().add(r);
- r.getBindings().add(new TestBinding(factory));
- }
+ ComponentReference ref1 = factory.createComponentReference();
+ ref1.setName("accountDataService");
+ ref1.setMultiplicity(Multiplicity.ONE_ONE);
+ ref1.setInterface(new TestInterface(factory));
+ ref1.setReference(i.getReferences().get(0));
+ c.getReferences().add(ref1);
+ ref1.getBindings().add(new TestBinding(factory));
+
+ ComponentReference ref2 = factory.createComponentReference();
+ ref2.setName("stockQuoteService");
+ ref2.setMultiplicity(Multiplicity.ONE_ONE);
+ ref2.setInterface(new TestInterface(factory));
+ ref2.setReference(i.getReferences().get(1));
+ c.getReferences().add(ref2);
+ ref2.getBindings().add(new TestBinding(factory));
ComponentService s = factory.createComponentService();
s.setName("AccountService");
@@ -156,23 +152,19 @@
p.setXSDType(new QName("", ""));
ctype.getProperties().add(p);
- {
- Reference r = factory.createReference();
- r.setName("accountDataService");
- r.setInterface(new TestInterface(factory));
- r.setMultiplicity(Multiplicity.ONE_ONE);
- ctype.getReferences().add(r);
- r.getBindings().add(new TestBinding(factory));
- }
-
- {
- Reference r = factory.createReference();
- r.setName("stockQuoteService");
- r.setInterface(new TestInterface(factory));
- r.setMultiplicity(Multiplicity.ONE_ONE);
- ctype.getReferences().add(r);
- r.getBindings().add(new TestBinding(factory));
- }
+ Reference ref1 = factory.createReference();
+ ref1.setName("accountDataService");
+ ref1.setInterface(new TestInterface(factory));
+ ref1.setMultiplicity(Multiplicity.ONE_ONE);
+ ctype.getReferences().add(ref1);
+ ref1.getBindings().add(new TestBinding(factory));
+
+ Reference ref2 = factory.createReference();
+ ref2.setName("stockQuoteService");
+ ref2.setInterface(new TestInterface(factory));
+ ref2.setMultiplicity(Multiplicity.ONE_ONE);
+ ctype.getReferences().add(ref2);
+ ref2.getBindings().add(new TestBinding(factory));
Service s = factory.createService();
s.setName("AccountService");
@@ -198,21 +190,17 @@
p.setXSDType(new QName("", ""));
ctype.getProperties().add(p);
- {
- AbstractReference r = factory.createAbstractReference();
- r.setName("accountDataService");
- r.setInterface(new TestInterface(factory));
- r.setMultiplicity(Multiplicity.ONE_ONE);
- ctype.getReferences().add(r);
- }
-
- {
- AbstractReference r = factory.createAbstractReference();
- r.setName("stockQuoteService");
- r.setInterface(new TestInterface(factory));
- r.setMultiplicity(Multiplicity.ONE_ONE);
- ctype.getReferences().add(r);
- }
+ AbstractReference ref1 = factory.createAbstractReference();
+ ref1.setName("accountDataService");
+ ref1.setInterface(new TestInterface(factory));
+ ref1.setMultiplicity(Multiplicity.ONE_ONE);
+ ctype.getReferences().add(ref1);
+
+ AbstractReference ref2 = factory.createAbstractReference();
+ ref2.setName("stockQuoteService");
+ ref2.setInterface(new TestInterface(factory));
+ ref2.setMultiplicity(Multiplicity.ONE_ONE);
+ ctype.getReferences().add(ref2);
AbstractService s = factory.createAbstractService();
s.setName("AccountService");
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestImplementation.java?view=diff&rev=524842&r1=524841&r2=524842
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestImplementation.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestImplementation.java Mon Apr 2 10:09:37 2007
@@ -38,22 +38,18 @@
p.setXSDType(new QName("", ""));
getProperties().add(p);
- {
- Reference r = factory.createReference();
- r.setName("accountDataService");
- r.setMultiplicity(Multiplicity.ONE_ONE);
- getReferences().add(r);
- r.getBindings().add(new TestBinding(factory));
- }
+ Reference ref1 = factory.createReference();
+ ref1.setName("accountDataService");
+ ref1.setMultiplicity(Multiplicity.ONE_ONE);
+ getReferences().add(ref1);
+ ref1.getBindings().add(new TestBinding(factory));
- {
- Reference r = factory.createReference();
- r.setName("stockQuoteService");
- r.setMultiplicity(Multiplicity.ONE_ONE);
- r.setInterface(new TestInterface(factory));
- getReferences().add(r);
- r.getBindings().add(new TestBinding(factory));
- }
+ Reference ref2 = factory.createReference();
+ ref2.setName("stockQuoteService");
+ ref2.setMultiplicity(Multiplicity.ONE_ONE);
+ ref2.setInterface(new TestInterface(factory));
+ getReferences().add(ref2);
+ ref2.getBindings().add(new TestBinding(factory));
Service s = factory.createService();
s.setName("AccountService");
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org