Author: jmarino
Date: Wed Oct 18 21:22:10 2006
New Revision: 465474
URL: http://svn.apache.org/viewvc?view=rev&rev=465474
Log:
sourcecheck cleanup
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeReferenceTargetInvoker.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DataType.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java?view=diff&rev=465474&r1=465473&r2=465474
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java
Wed Oct 18 21:22:10 2006
@@ -25,7 +25,6 @@
import java.io.StringWriter;
import java.io.Writer;
import java.util.NoSuchElementException;
-
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.stream.Location;
@@ -47,10 +46,9 @@
}
/**
- * This class is derived from Apache Axis2 class
- * org.apache.axis2.util.StreamWrapper</a>. It's used wrap a
- * XMLStreamReader to create a XMLStreamReader representing a document and
- * it will produce START_DOCUMENT, END_DOCUMENT events.
+ * This class is derived from Apache Axis2 class
org.apache.axis2.util.StreamWrapper</a>. It's used wrap a
+ * XMLStreamReader to create a XMLStreamReader representing a document and
it will produce START_DOCUMENT,
+ * END_DOCUMENT events.
*/
public static class XMLDocumentStreamReader implements XMLStreamReader {
private static final int STATE_COMPLETE_AT_NEXT = 2; // The wrapper
@@ -413,7 +411,7 @@
}
public int next() throws XMLStreamException {
- int returnEvent = -1;
+ int returnEvent;
switch (state) {
case STATE_SWITCHED:
@@ -474,16 +472,13 @@
String ELEMENT_TEXT = "Element Text";
/**
- * Initiate the parser - this will do whatever the needed tasks to
- * initiate the parser and must be called before attempting any
specific
- * parsing using this parser
+ * Initiate the parser - this will do whatever the needed tasks to
initiate the parser and must be called before
+ * attempting any specific parsing using this parser
*/
void init();
/**
* Extra method to query the state of the pullparser
- *
- * @return
*/
boolean isEndOfFragment();
@@ -494,8 +489,7 @@
}
/**
- * The XMLStreamSerializer pulls events from the XMLStreamReader and dumps
- * into the XMLStreamWriter
+ * The XMLStreamSerializer pulls events from the XMLStreamReader and dumps
into the XMLStreamWriter
*/
public static class XMLStreamSerializer implements XMLStreamConstants {
@@ -514,12 +508,11 @@
/**
* Field depth
*/
- private int depth = 0;
+ private int depth;
/**
- * Generates a unique namespace prefix that is not in the scope of the
- * NamespaceContext
- *
+ * Generates a unique namespace prefix that is not in the scope of the
NamespaceContext
+ *
* @param nsCtxt
* @return string
*/
@@ -535,7 +528,7 @@
/**
* Method serialize.
- *
+ *
* @param node
* @param writer
* @throws XMLStreamException
@@ -552,9 +545,9 @@
protected void serializeAttributes(XMLStreamReader reader,
XMLStreamWriter writer)
throws XMLStreamException {
int count = reader.getAttributeCount();
- String prefix = null;
- String namespaceName = null;
- String writerPrefix = null;
+ String prefix;
+ String namespaceName;
+ String writerPrefix;
for (int i = 0; i < count; i++) {
prefix = reader.getAttributePrefix(i);
namespaceName = reader.getAttributeNamespace(i);
@@ -578,9 +571,9 @@
// writer
if (writerPrefix != null && (prefix == null ||
prefix.equals(""))) {
writer.writeAttribute(writerPrefix,
- namespaceName,
- reader.getAttributeLocalName(i),
- reader.getAttributeValue(i));
+ namespaceName,
+ reader.getAttributeLocalName(i),
+ reader.getAttributeValue(i));
// writer prefix is available but different from the
// current
@@ -616,7 +609,7 @@
/**
* Method serializeCData.
- *
+ *
* @param reader
* @param writer
* @throws XMLStreamException
@@ -628,7 +621,7 @@
/**
* Method serializeComment.
- *
+ *
* @param reader
* @param writer
* @throws XMLStreamException
@@ -685,7 +678,7 @@
/**
* Method serializeEndElement.
- *
+ *
* @param writer
* @throws XMLStreamException
*/
@@ -695,7 +688,7 @@
/**
* Method serializeNamespace.
- *
+ *
* @param prefix
* @param uri
* @param writer
@@ -712,7 +705,7 @@
/**
* Method serializeNode.
- *
+ *
* @param reader
* @param writer
* @throws XMLStreamException
@@ -772,18 +765,15 @@
}
public static XMLStreamReader createXMLStreamReader(InputStream
inputStream) throws XMLStreamException {
- XMLStreamReader streamReader =
INPUT_FACTORY.createXMLStreamReader(inputStream);
- return streamReader;
+ return INPUT_FACTORY.createXMLStreamReader(inputStream);
}
public static XMLStreamReader createXMLStreamReader(Reader reader) throws
XMLStreamException {
- XMLStreamReader streamReader =
INPUT_FACTORY.createXMLStreamReader(reader);
- return streamReader;
+ return INPUT_FACTORY.createXMLStreamReader(reader);
}
public static XMLStreamReader createXMLStreamReader(Source source) throws
XMLStreamException {
- XMLStreamReader reader = INPUT_FACTORY.createXMLStreamReader(source);
- return reader;
+ return INPUT_FACTORY.createXMLStreamReader(source);
}
public static XMLStreamReader createXMLStreamReader(String string) throws
XMLStreamException {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeReferenceTargetInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeReferenceTargetInvoker.java?view=diff&rev=465474&r1=465473&r2=465474
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeReferenceTargetInvoker.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeReferenceTargetInvoker.java
Wed Oct 18 21:22:10 2006
@@ -66,7 +66,7 @@
faultMsg.setBodyWithFault(e);
return faultMsg;
}
-}
+ }
@Override
public AbstractCompositeReferenceTargetInvoker clone() throws
CloneNotSupportedException {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java?view=diff&rev=465474&r1=465473&r2=465474
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
Wed Oct 18 21:22:10 2006
@@ -49,7 +49,7 @@
/**
*/
public TargetInvoker createCallbackTargetInvoker(ServiceContract contract,
Operation operation) {
- return new CompositeReferenceCallbackTargetInvoker(operation,
inboundWire);
+ return new CompositeReferenceCallbackTargetInvoker(operation,
inboundWire);
}
public Object getServiceInstance() throws TargetException {
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java?view=diff&rev=465474&r1=465473&r2=465474
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
Wed Oct 18 21:22:10 2006
@@ -118,7 +118,7 @@
assertNull(context.getCurrentCorrelationId());
}
- private static class ChildThread extends Thread {
+ private static final class ChildThread extends Thread {
private WorkContext context;
private boolean passed = true;
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java?view=diff&rev=465474&r1=465473&r2=465474
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceCallbackTargetInvokerThrowableTestCase.java
Wed Oct 18 21:22:10 2006
@@ -61,6 +61,7 @@
EasyMock.verify(head);
}
+ @SuppressWarnings("unchecked")
protected void setUp() throws Exception {
super.setUp();
Object id = new Object();
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java?view=diff&rev=465474&r1=465473&r2=465474
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/ImplementationCompositeLoaderTestCase.java
Wed Oct 18 21:22:10 2006
@@ -25,22 +25,23 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.reportMatcher;
-import static org.easymock.EasyMock.verify;
-import org.easymock.IArgumentMatcher;
import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.deployer.CompositeClassLoader;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.model.CompositeImplementation;
import org.apache.tuscany.spi.services.artifact.Artifact;
import org.apache.tuscany.spi.services.artifact.ArtifactRepository;
+import junit.framework.TestCase;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reportMatcher;
+import static org.easymock.EasyMock.verify;
+import org.easymock.IArgumentMatcher;
+
/**
* @version $Rev$ $Date$
*/
@@ -98,7 +99,8 @@
verify(context);
verify(artifactRepository);
assertEquals(name, impl.getName());
- assertEquals(new
URL("jar:http://www.example.com/sca/base.jar!/META-INF/sca/default.scdl";),
impl.getScdlLocation());
+ assertEquals(new
URL("jar:http://www.example.com/sca/base.jar!/META-INF/sca/default.scdl";),
+ impl.getScdlLocation());
assertTrue(impl.getClassLoader() instanceof CompositeClassLoader);
}
@@ -149,7 +151,7 @@
verify(artifactRepository);
assertEquals(name, impl.getName());
assertEquals(new
URL("jar:http://www.example.com/sca/bar.jar!/META-INF/sca/default.scdl";),
- impl.getScdlLocation());
+ impl.getScdlLocation());
}
protected void setUp() throws Exception {
@@ -173,10 +175,10 @@
}
Artifact artifact = (Artifact) object;
- boolean match = group.equals(artifact.getGroup()) &&
- name.equals(artifact.getName()) &&
- version.equals(artifact.getVersion()) &&
- "jar".equals(artifact.getType());
+ boolean match = group.equals(artifact.getGroup())
+ && name.equals(artifact.getName())
+ && version.equals(artifact.getVersion())
+ && "jar".equals(artifact.getType());
if (match) {
artifact.setUrl(url);
}
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DataType.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DataType.java?view=diff&rev=465474&r1=465473&r2=465474
==============================================================================
---
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DataType.java
(original)
+++
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DataType.java
Wed Oct 18 21:22:10 2006
@@ -148,24 +148,24 @@
return result;
}
- public boolean equals(Object o){
+ public boolean equals(Object o) {
if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
- final DataType dataType = (DataType) o;
+ final DataType dataType = (DataType) o;
+
+ if (dataBinding != null ? !dataBinding.equals(dataType.dataBinding) :
dataType.dataBinding != null) {
+ return false;
+ }
+ if (logical != null ? !logical.equals(dataType.logical) :
dataType.logical != null) {
+ return false;
+ }
+ return !(physical != null ? !physical.equals(dataType.physical) :
dataType.physical != null);
- if (dataBinding != null ? !dataBinding.equals(dataType.dataBinding) :
dataType.dataBinding != null) {
- return false;
- }
- if (logical != null ? !logical.equals(dataType.logical) :
dataType.logical != null) {
- return false;
- }
- return !(physical != null ? !physical.equals(dataType.physical) :
dataType.physical != null);
-
}
// @SuppressWarnings("unchecked")
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
