You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/03/05 02:28:25 UTC
svn commit: r514518 - in /incubator/tuscany/java/sca/kernel/spi/src:
main/java/org/apache/tuscany/spi/loader/
main/java/org/apache/tuscany/spi/model/
main/java/org/apache/tuscany/spi/model/physical/
main/java/org/apache/tuscany/spi/util/stax/ test/java...
Author: jboynes
Date: Sun Mar 4 17:28:24 2007
New Revision: 514518
URL: http://svn.apache.org/viewvc?view=rev&rev=514518
Log:
svn sourcecheck violations
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ElementInfo.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java?view=diff&rev=514518&r1=514517&r2=514518
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java Sun Mar 4 17:28:24 2007
@@ -22,7 +22,6 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.Implementation;
import org.apache.tuscany.spi.model.ModelObject;
@@ -46,6 +45,7 @@
* @param reader the XML stream to parse
* @param deploymentContext the current deployment context
* @return the model object obtained by parsing the current element on the stream
+ * @throws LoaderException if there was a problem loading the document
* @throws XMLStreamException if there was a problem reading the stream
*/
ModelObject load(ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext)
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java?view=diff&rev=514518&r1=514517&r2=514518
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java Sun Mar 4 17:28:24 2007
@@ -223,8 +223,12 @@
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
CompositeComponentType that = (CompositeComponentType) o;
return name.equals(that.name);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ElementInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ElementInfo.java?view=diff&rev=514518&r1=514517&r2=514518
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ElementInfo.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ElementInfo.java Sun Mar 4 17:28:24 2007
@@ -21,8 +21,6 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.model.TypeInfo;
-
/**
* An abstraction of XML schema elements
*/
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java?view=diff&rev=514518&r1=514517&r2=514518
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java Sun Mar 4 17:28:24 2007
@@ -22,8 +22,6 @@
import java.util.List;
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.model.ElementInfo;
-
/**
* The "Wrapper Style" WSDL operation is defined by The Java API for XML-Based Web Services (JAX-WS) 2.0 specification,
* section 2.3.1.2 Wrapper Style.
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java?view=diff&rev=514518&r1=514517&r2=514518
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java Sun Mar 4 17:28:24 2007
@@ -30,19 +30,22 @@
*
* @version $Rev$ $Date$
*/
-public abstract class PhysicalComponentDefinition<PSD extends PhysicalServiceDefinition, PRD extends PhysicalReferenceDefinition> extends ModelObject {
+public abstract class PhysicalComponentDefinition<PSD extends PhysicalServiceDefinition,
+ PRD extends PhysicalReferenceDefinition>
+ extends ModelObject {
// Component Id.
private URI componentId;
-
+
// Services exposed by this component
private Set<PSD> services = new HashSet<PSD>();
-
+
// References exposed by this component
private Set<PRD> references = new HashSet<PRD>();
/**
* Gets the component id.
+ *
* @return Component id.
*/
public URI getComponentId() {
@@ -51,14 +54,16 @@
/**
* Sets the component id.
+ *
* @param componentId
*/
public void setComponentId(URI componentId) {
this.componentId = componentId;
}
-
+
/**
* Returns the service definitions available for this component.
+ *
* @return Service definitions for this operation.
*/
public Set<PSD> getServices() {
@@ -67,14 +72,16 @@
/**
* Adds a service definition to the component.
+ *
* @param service Service definition to be added to the component.
*/
public void addService(PSD service) {
services.add(service);
}
-
+
/**
* Returns the reference definitions available for this component.
+ *
* @return Reference definitions for this operation.
*/
public Set<PRD> getReferences() {
@@ -83,6 +90,7 @@
/**
* Adds a reference definition to the component.
+ *
* @param reference Reference definition to be added to the component.
*/
public void addReference(PRD reference) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java?view=diff&rev=514518&r1=514517&r2=514518
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java Sun Mar 4 17:28:24 2007
@@ -163,13 +163,14 @@
* Render the attributes.
*/
private static void onAttributes(XMLStreamReader reader, StringBuffer xml) {
- for (int i = 0, n = reader.getAttributeCount(); i < n; ++i) {
- xml.append(" ");
+ int n = reader.getAttributeCount();
+ for (int i = 0; i < n; ++i) {
+ xml.append(' ');
xml.append(reader.getAttributeLocalName(i));
- xml.append("=");
- xml.append("'");
+ xml.append('=');
+ xml.append('\'');
xml.append(reader.getAttributeValue(i));
- xml.append("'");
+ xml.append('\'');
}
}
@@ -177,15 +178,17 @@
* Renedr namespace mappings.
*/
private static void onNsMappings(XMLStreamReader reader, StringBuffer xml) {
- for (int i = 0, n = reader.getNamespaceCount(); i < n; ++i) {
+ int n = reader.getNamespaceCount();
+ for (int i = 0; i < n; ++i) {
String prefix = reader.getNamespacePrefix(i);
- prefix = prefix == null ? prefix = "xmlns" : "xmlns:" + prefix;
- xml.append(" ");
- xml.append(prefix);
- xml.append("=");
- xml.append("'");
+ xml.append(" xmlns");
+ if (prefix != null) {
+ xml.append(':').append(prefix);
+ }
+ xml.append('=');
+ xml.append('\'');
xml.append(reader.getNamespaceURI(i));
- xml.append("'");
+ xml.append('\'');
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java?view=diff&rev=514518&r1=514517&r2=514518
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java Sun Mar 4 17:28:24 2007
@@ -18,16 +18,15 @@
*/
package org.apache.tuscany.spi.extension;
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.model.Implementation;
-
import junit.framework.TestCase;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.eq;
+
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
+import org.apache.tuscany.spi.model.Implementation;
/**
* @version $Rev$ $Date$
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org