Author: mcombellack
Date: Wed May 21 03:53:14 2008
New Revision: 658623
URL: http://svn.apache.org/viewvc?rev=658623&view=rev
Log:
Corrected order of modifiers to be consistent with the recommendations from the
Java Language Specification
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java?rev=658623&r1=658622&r2=658623&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
Wed May 21 03:53:14 2008
@@ -58,9 +58,9 @@
* @version $Rev$ $Date$
*/
public abstract class BaseConfigurationBuilderImpl {
- private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
- private final static String BINDING_SCA = "binding.sca";
- private final static QName BINDING_SCA_QNAME = new QName(SCA10_NS,
BINDING_SCA);
+ private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
+ private static final String BINDING_SCA = "binding.sca";
+ private static final QName BINDING_SCA_QNAME = new QName(SCA10_NS,
BINDING_SCA);
private AssemblyFactory assemblyFactory;
private SCABindingFactory scaBindingFactory;
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java?rev=658623&r1=658622&r2=658623&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
Wed May 21 03:53:14 2008
@@ -42,7 +42,7 @@
* @version $Rev$ $Date$
*/
public class CompositeBuilderImpl implements CompositeBuilder {
- private final static Logger logger =
Logger.getLogger(CompositeBuilderImpl.class.getName());
+ private static final Logger logger =
Logger.getLogger(CompositeBuilderImpl.class.getName());
private CompositeBuilder compositeIncludeBuilder;
private CompositeBuilder componentWireBuilder;
private CompositeBuilder compositeReferenceWireBuilder;
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java?rev=658623&r1=658622&r2=658623&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
Wed May 21 03:53:14 2008
@@ -52,7 +52,7 @@
*/
abstract class PolicyConfigurationUtil {
- static private List<Intent>
computeInheritableIntents(IntentAttachPointType attachPointType,
+ private static List<Intent>
computeInheritableIntents(IntentAttachPointType attachPointType,
List<Intent>
inheritableIntents) throws PolicyValidationException {
List<Intent> validInheritableIntents = new ArrayList<Intent>();
@@ -77,7 +77,7 @@
return validInheritableIntents;
}
- static private void normalizeIntents(IntentAttachPoint intentAttachPoint) {
+ private static void normalizeIntents(IntentAttachPoint intentAttachPoint) {
//expand profile intents specified in the attachpoint (binding /
implementation)
PolicyComputationUtils.expandProfileIntents(intentAttachPoint.getRequiredIntents());
@@ -86,7 +86,7 @@
filterDuplicatesAndQualifiableIntents(intentAttachPoint);
}
- static private void trimInherentlyProvidedIntents(IntentAttachPointType
attachPointType, List<Intent>intents) {
+ private static void trimInherentlyProvidedIntents(IntentAttachPointType
attachPointType, List<Intent>intents) {
//exclude intents that are inherently supported by the
//attachpoint-type (binding-type / implementation-type)
List<Intent> requiredIntents = new ArrayList<Intent>(intents);
@@ -106,7 +106,7 @@
}
}
- static private void computeIntentsForOperations(OperationsConfigurator
opConfigurator,
+ private static void computeIntentsForOperations(OperationsConfigurator
opConfigurator,
IntentAttachPoint
intentAttachPoint,
List<Intent> parentIntents)
throws PolicyValidationException {
IntentAttachPointType attachPointType = intentAttachPoint.getType();
@@ -170,7 +170,7 @@
}
}
- static private List<PolicySet>
computeInheritablePolicySets(List<PolicySet> inheritablePolicySets,
+ private static List<PolicySet>
computeInheritablePolicySets(List<PolicySet> inheritablePolicySets,
List<PolicySet>
applicablePolicySets)
throws
PolicyValidationException {
List<PolicySet> validInheritablePolicySets = new
ArrayList<PolicySet>();
@@ -188,7 +188,7 @@
return validInheritablePolicySets;
}
- static private void normalizePolicySets(PolicySetAttachPoint
policySetAttachPoint ) {
+ private static void normalizePolicySets(PolicySetAttachPoint
policySetAttachPoint ) {
//get rid of duplicate entries
HashMap<QName, PolicySet> policySetTable = new HashMap<QName,
PolicySet>();
for ( PolicySet policySet : policySetAttachPoint.getPolicySets() ) {
@@ -204,7 +204,7 @@
}
}
- static private void computePolicySetsForOperations(List<PolicySet>
applicablePolicySets,
+ private static void computePolicySetsForOperations(List<PolicySet>
applicablePolicySets,
PolicySetAttachPoint
policySetAttachPoint)
throws
PolicyValidationException {
if ( policySetAttachPoint instanceof OperationsConfigurator ) {
@@ -215,7 +215,7 @@
}
- static private void computePolicySetsForOperations(List<PolicySet>
applicablePolicySets,
+ private static void computePolicySetsForOperations(List<PolicySet>
applicablePolicySets,
OperationsConfigurator
opConfigurator,
PolicySetAttachPoint
policySetAttachPoint)
throws
PolicyValidationException {
@@ -262,13 +262,13 @@
}
- static private void trimProvidedIntents(List<Intent> requiredIntents,
List<PolicySet> policySets) {
+ private static void trimProvidedIntents(List<Intent> requiredIntents,
List<PolicySet> policySets) {
for ( PolicySet policySet : policySets ) {
trimProvidedIntents(requiredIntents, policySet);
}
}
- static private void determineApplicableDomainPolicySets(List<PolicySet>
applicablePolicySets,
+ private static void determineApplicableDomainPolicySets(List<PolicySet>
applicablePolicySets,
PolicySetAttachPoint
policySetAttachPoint,
IntentAttachPointType
intentAttachPointType) {
@@ -543,7 +543,7 @@
}
}
- static private void determineApplicableDomainPolicySets(Contract contract,
+ private static void determineApplicableDomainPolicySets(Contract contract,
PolicySetAttachPoint
policiedBinding)
throws
PolicyConfigurationException {
//if ( domainPolicySets != null) {
@@ -689,7 +689,7 @@
}
}
- static private void determineApplicableImplementationPolicySets(Component
component) throws PolicyConfigurationException {
+ private static void determineApplicableImplementationPolicySets(Component
component) throws PolicyConfigurationException {
List<Intent> intentsCopy = null;
if ( component.getImplementation() instanceof PolicySetAttachPoint ) {
PolicySetAttachPoint policiedImplementation =
(PolicySetAttachPoint)component.getImplementation();
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java?rev=658623&r1=658622&r2=658623&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
Wed May 21 03:53:14 2008
@@ -61,7 +61,7 @@
private static final DocumentBuilderFactory DOC_BUILDER_FACTORY =
DocumentBuilderFactory.newInstance();
private static final TransformerFactory TRANSFORMER_FACTORY =
TransformerFactory.newInstance();
- static private Document evaluate(Document node, XPathExpression expression)
+ private static Document evaluate(Document node, XPathExpression expression)
throws XPathExpressionException, ParserConfigurationException {
Node value = node.getDocumentElement();
@@ -82,7 +82,7 @@
}
}
- static private Document loadFromFile(String file) throws
MalformedURLException, IOException,
+ private static Document loadFromFile(String file) throws
MalformedURLException, IOException,
TransformerException, ParserConfigurationException {
URI uri = URI.create(file);
// URI resolution for relative URIs is done when the composite is
resolved.
