Author: rfeng
Date: Thu May 22 15:25:50 2008
New Revision: 659283
URL: http://svn.apache.org/viewvc?rev=659283&view=rev
Log:
Fix the generics for source and target type
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java?rev=659283&r1=659282&r2=659283&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
Thu May 22 15:25:50 2008
@@ -64,7 +64,7 @@
* @see
org.apache.tuscany.sca.databinding.impl.BaseTransformer#getSourceType()
*/
@Override
- protected Class getSourceType() {
+ protected Class<Object> getSourceType() {
return Object.class;
}
@@ -72,7 +72,7 @@
* @see
org.apache.tuscany.sca.databinding.impl.BaseTransformer#getTargetType()
*/
@Override
- protected Class getTargetType() {
+ protected Class<Object> getTargetType() {
return Object.class;
}
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java?rev=659283&r1=659282&r2=659283&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
Thu May 22 15:25:50 2008
@@ -26,20 +26,18 @@
import org.apache.tuscany.sca.databinding.TransformationException;
import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
import org.apache.tuscany.sca.databinding.xml.StAXHelper;
-
import org.osoa.sca.CallableReference;
[EMAIL PROTECTED]("unchecked")
public class CallableReference2XMLStreamReader extends
BaseTransformer<CallableReference, XMLStreamReader> implements
PullTransformer<CallableReference, XMLStreamReader> {
@Override
- protected Class getSourceType() {
+ protected Class<CallableReference> getSourceType() {
return CallableReference.class;
}
@Override
- protected Class getTargetType() {
+ protected Class<XMLStreamReader> getTargetType() {
return XMLStreamReader.class;
}
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java?rev=659283&r1=659282&r2=659283&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
Thu May 22 15:25:50 2008
@@ -33,7 +33,7 @@
*
* @version $Rev$ $Date$
*/
-public class Exception2ExceptionTransformer extends BaseTransformer<Object[],
Object[]> implements
+public class Exception2ExceptionTransformer extends BaseTransformer<Throwable,
Throwable> implements
PullTransformer<Throwable, Throwable> {
protected Mediator mediator;
@@ -70,7 +70,7 @@
* @see
org.apache.tuscany.sca.databinding.impl.BaseTransformer#getSourceType()
*/
@Override
- protected Class getSourceType() {
+ protected Class<Throwable> getSourceType() {
return Throwable.class;
}
@@ -78,7 +78,7 @@
* @see
org.apache.tuscany.sca.databinding.impl.BaseTransformer#getTargetType()
*/
@Override
- protected Class getTargetType() {
+ protected Class<Throwable> getTargetType() {
return Throwable.class;
}
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java?rev=659283&r1=659282&r2=659283&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
Thu May 22 15:25:50 2008
@@ -74,7 +74,7 @@
* @see
org.apache.tuscany.sca.databinding.impl.BaseTransformer#getSourceType()
*/
@Override
- protected Class getSourceType() {
+ protected Class<Object[]> getSourceType() {
return Object[].class;
}
@@ -82,7 +82,7 @@
* @see
org.apache.tuscany.sca.databinding.impl.BaseTransformer#getTargetType()
*/
@Override
- protected Class getTargetType() {
+ protected Class<Object[]> getTargetType() {
return Object[].class;
}
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java?rev=659283&r1=659282&r2=659283&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
Thu May 22 15:25:50 2008
@@ -74,7 +74,7 @@
* @see
org.apache.tuscany.sca.databinding.impl.BaseTransformer#getSourceType()
*/
@Override
- protected Class getSourceType() {
+ protected Class<Object> getSourceType() {
return Object.class;
}
@@ -82,7 +82,7 @@
* @see
org.apache.tuscany.sca.databinding.impl.BaseTransformer#getTargetType()
*/
@Override
- protected Class getTargetType() {
+ protected Class<Object> getTargetType() {
return Object.class;
}
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java?rev=659283&r1=659282&r2=659283&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
Thu May 22 15:25:50 2008
@@ -21,9 +21,10 @@
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
import java.lang.reflect.Constructor;
+
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
@@ -31,7 +32,6 @@
import org.apache.tuscany.sca.databinding.TransformationContext;
import org.apache.tuscany.sca.databinding.TransformationException;
import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
import org.osoa.sca.CallableReference;
@SuppressWarnings("unchecked")
@@ -83,12 +83,12 @@
}
@Override
- public Class getSourceType() {
+ protected Class<XMLStreamReader> getSourceType() {
return XMLStreamReader.class;
}
@Override
- public Class getTargetType() {
+ protected Class<CallableReference> getTargetType() {
return CallableReference.class;
}
