tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r567542 [4/7] - in /incubator/tuscany/java/sca/modules: assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ assembly/src/main/java/org/apache/tuscany/sca/assembly/i...
Date Mon, 20 Aug 2007 05:13:50 GMT
Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java Sun Aug 19 22:13:29 2007
@@ -44,14 +44,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return OMElement.class;
     }
 
+    @Override
     public Class getTargetType() {
         return String.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java Sun Aug 19 22:13:29 2007
@@ -32,14 +32,17 @@
         return source.getXMLStreamReader();
     }
 
+    @Override
     public Class getSourceType() {
         return OMElement.class;
     }
 
+    @Override
     public Class getTargetType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java Sun Aug 19 22:13:29 2007
@@ -40,6 +40,7 @@
         factory = OMAbstractFactory.getOMFactory();
     }
 
+    @Override
     protected OMElement createElement(QName element, String text, TransformationContext context) {
         OMElement omElement = AxiomHelper.createOMElement(factory, element);
         if (text == null) {

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java Sun Aug 19 22:13:29 2007
@@ -42,14 +42,17 @@
         }
     }
 
+    @Override
     public Class getTargetType() {
         return OMElement.class;
     }
 
+    @Override
     public Class getSourceType() {
         return String.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java Sun Aug 19 22:13:29 2007
@@ -45,14 +45,17 @@
         }
     }
 
+    @Override
     public Class getTargetType() {
         return OMElement.class;
     }
 
+    @Override
     public Class getSourceType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java Sun Aug 19 22:13:29 2007
@@ -73,6 +73,7 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         this.handler = new AxiomExceptionHandler();

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java Sun Aug 19 22:13:29 2007
@@ -50,14 +50,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Object.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Node.class;
     }
 
+    @Override
     public int getWeight() {
         return 30;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java Sun Aug 19 22:13:29 2007
@@ -71,7 +71,7 @@
         if (value instanceof JAXBElement) {
             return (JAXBElement)value;
         } else {
-            Class type = (Class)dataType.getPhysical();
+            Class type = dataType.getPhysical();
             Object logical = dataType.getLogical();
             QName elementName = JAXBDataBinding.ROOT_ELEMENT;
             if (logical instanceof XMLType) {

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java Sun Aug 19 22:13:29 2007
@@ -53,9 +53,9 @@
      * </ul>
      */
     public Exception createException(DataType<DataType> exceptionType, String message, Object faultInfo, Throwable cause) {
-        Class exceptionClass = (Class)exceptionType.getPhysical();
+        Class exceptionClass = exceptionType.getPhysical();
         DataType<?> faultBeanType = exceptionType.getLogical();
-        Class faultBeanClass = (Class)faultBeanType.getPhysical();
+        Class faultBeanClass = faultBeanType.getPhysical();
         try {
             Constructor constructor =
                 exceptionClass.getConstructor(new Class[] {String.class, faultBeanClass, Throwable.class});
@@ -78,7 +78,7 @@
     }
 
     public DataType<?> getFaultType(DataType exDataType) {
-        Class<?> exceptionType  = (Class) exDataType.getPhysical();
+        Class<?> exceptionType  = exDataType.getPhysical();
         WebFault webFault = exceptionType.getAnnotation(WebFault.class);
         if (webFault == null) {
             return null;

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java Sun Aug 19 22:13:29 2007
@@ -46,14 +46,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Node.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Object.class;
     }
 
+    @Override
     public int getWeight() {
         return 30;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java Sun Aug 19 22:13:29 2007
@@ -47,14 +47,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Reader.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Object.class;
     }
 
+    @Override
     public int getWeight() {
         return 30;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java Sun Aug 19 22:13:29 2007
@@ -49,14 +49,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Object.class;
     }
 
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java Sun Aug 19 22:13:29 2007
@@ -45,6 +45,7 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         binding = new JAXBDataBinding();
@@ -112,7 +113,7 @@
         poType.setComment("Comment");
         PurchaseOrderType copy = (PurchaseOrderType)binding.copy(poType);
         assertTrue(copy instanceof PurchaseOrderType);
-        assertEquals("Comment", ((PurchaseOrderType)copy).getComment());
+        assertEquals("Comment", (copy).getComment());
     }
 
     @SuppressWarnings("unchecked")
@@ -122,7 +123,7 @@
         address.setCity("San Jose");
         USAddress copy = (USAddress)binding.copy(address);
         assertTrue(copy instanceof USAddress);
-        assertEquals("San Jose", ((USAddress)copy).getCity());
+        assertEquals("San Jose", (copy).getCity());
 
     }
 }

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java Sun Aug 19 22:13:29 2007
@@ -41,6 +41,7 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         this.handler = new JAXBExceptionHandler();

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java Sun Aug 19 22:13:29 2007
@@ -72,8 +72,7 @@
             + "  </items>"
             + "</ipo:purchaseOrder>";
 
-    private String contextPath = "com.example.ipo.jaxb";
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
     }
@@ -153,6 +152,7 @@
 
     }
     
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java Sun Aug 19 22:13:29 2007
@@ -40,6 +40,7 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         this.handler = new JAXBWrapperHandler();

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXWSJavaInterfaceProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -36,6 +36,7 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         interfaceProcessor = new JAXWSJavaInterfaceProcessor();

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java Sun Aug 19 22:13:29 2007
@@ -27,7 +27,8 @@
  */
 @WebFault(name = "InvalidSymbolFault", targetNamespace = "http://www.example.com/stock")
 public class InvalidSymbolFault_Exception extends Exception {
-
+    private static final long serialVersionUID = -4618497501663457633L;
+    
     /**
      * Java type that goes as soapenv:Fault detail element.
      */

Modified: incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java Sun Aug 19 22:13:29 2007
@@ -49,6 +49,7 @@
         } 
     }
 
+    @Override
     public int getWeight() {
         return 500;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java Sun Aug 19 22:13:29 2007
@@ -52,6 +52,7 @@
         } 
     }
 
+    @Override
     public int getWeight() {
         return 500;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java Sun Aug 19 22:13:29 2007
@@ -49,6 +49,7 @@
         } 
     }
 
+    @Override
     public int getWeight() {
         return 500;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java Sun Aug 19 22:13:29 2007
@@ -60,6 +60,7 @@
         } 
     }
 
+    @Override
     public int getWeight() {
         return 500;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java Sun Aug 19 22:13:29 2007
@@ -76,6 +76,7 @@
         }
     }
 
+    @Override
     public int getWeight() {
         return 500;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java Sun Aug 19 22:13:29 2007
@@ -45,6 +45,7 @@
      * @return The XMLStreamReader according to the JSON String.
      * @throws javax.xml.stream.XMLStreamException if there is an error while making the StAX reader.
      */
+    @Override
     public javax.xml.stream.XMLStreamReader getReader() throws XMLStreamException {
         try {
             return new BadgerFishXMLStreamReader(json);

Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java Sun Aug 19 22:13:29 2007
@@ -68,14 +68,17 @@
         return element;
     }
 
+    @Override
     public Class getSourceType() {
         return DataObject.class;
     }
 
+    @Override
     public Class getTargetType() {
         return OMElement.class;
     }
 
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java Sun Aug 19 22:13:29 2007
@@ -139,7 +139,7 @@
                 throw new IllegalArgumentException("Prefix is null");
             }
 
-            String ns = (String)prefixToNamespaceMapping.get(prefix);
+            String ns = prefixToNamespaceMapping.get(prefix);
             if (ns != null) {
                 return ns;
             } else {

Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java Sun Aug 19 22:13:29 2007
@@ -47,14 +47,17 @@
         return element;
     }
 
+    @Override
     public Class getSourceType() {
         return XMLDocument.class;
     }
 
+    @Override
     public Class getTargetType() {
         return OMElement.class;
     }
 
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java Sun Aug 19 22:13:29 2007
@@ -49,6 +49,7 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         helperContext = HelperProvider.getDefaultContext();

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java Sun Aug 19 22:13:29 2007
@@ -43,14 +43,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return DataObject.class;
     }
 
+    @Override
     public Class getTargetType() {
         return String.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java Sun Aug 19 22:13:29 2007
@@ -52,14 +52,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return DataObject.class;
     }
 
+    @Override
     public Class getTargetType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java Sun Aug 19 22:13:29 2007
@@ -89,6 +89,7 @@
         return wrapperHandler;
     }
 
+    @Override
     public SimpleTypeMapper getSimpleTypeMapper() {
         return new SDOSimpleTypeMapper();
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java Sun Aug 19 22:13:29 2007
@@ -60,9 +60,9 @@
      * </ul>
      */
     public Exception createException(DataType<DataType> exceptionType, String message, Object faultInfo, Throwable cause) {
-        Class exceptionClass = (Class)exceptionType.getPhysical();
+        Class exceptionClass = exceptionType.getPhysical();
         DataType<?> faultBeanType = exceptionType.getLogical();
-        Class faultBeanClass = (Class)faultBeanType.getPhysical();
+        Class faultBeanClass = faultBeanType.getPhysical();
         try {
             Constructor constructor =
                 exceptionClass.getConstructor(new Class[] {String.class, faultBeanClass, Throwable.class});
@@ -85,7 +85,7 @@
     }
 
     public DataType<?> getFaultType(DataType exceptionDataType) {
-        Class exceptionType = (Class) exceptionDataType.getPhysical();
+        Class exceptionType = exceptionDataType.getPhysical();
         Class faultBeanClass = null;
         try {
             Method method = exceptionType.getMethod("getFaultInfo", EMPTY_CLASS_ARRAY);

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java Sun Aug 19 22:13:29 2007
@@ -40,14 +40,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return String.class;
     }
 
+    @Override
     public Class getTargetType() {
         return DataObject.class;
     }
 
+    @Override
     public int getWeight() {
         return 50;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java Sun Aug 19 22:13:29 2007
@@ -44,14 +44,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return XMLDocument.class;
     }
 
+    @Override
     public Class getTargetType() {
         return String.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java Sun Aug 19 22:13:29 2007
@@ -48,14 +48,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return XMLDocument.class;
     }
 
+    @Override
     public Class getTargetType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java Sun Aug 19 22:13:29 2007
@@ -51,14 +51,17 @@
         }
     }
 
+    @Override
     public Class getTargetType() {
         return DataObject.class;
     }
 
+    @Override
     public Class getSourceType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 15;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java Sun Aug 19 22:13:29 2007
@@ -45,14 +45,17 @@
         }
     }
 
+    @Override
     public Class getTargetType() {
         return XMLDocument.class;
     }
 
+    @Override
     public Class getSourceType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 15;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java Sun Aug 19 22:13:29 2007
@@ -28,6 +28,8 @@
  *
  */
 public class InvalidSymbolFault_Exception extends Exception {
+    private static final long serialVersionUID = 8602157311925253920L;
+    
     /**
      * Generated QName for the fault element
      */

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -19,7 +19,6 @@
 package org.apache.tuscany.sca.databinding.sdo;
 
 import java.io.StringReader;
-import java.net.URI;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -62,9 +61,8 @@
         assertTrue(inited);
     }
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
-        URI id = URI.create("/composite1/");
         loader = new ImportSDOProcessor(null);
         xmlFactory = XMLInputFactory.newInstance();
     }

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java Sun Aug 19 22:13:29 2007
@@ -46,6 +46,7 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         binding = new SDODataBinding();

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java Sun Aug 19 22:13:29 2007
@@ -42,6 +42,7 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         this.handler = new SDOExceptionHandler();

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java Sun Aug 19 22:13:29 2007
@@ -49,6 +49,7 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         helperContext = HelperProvider.getDefaultContext();

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java Sun Aug 19 22:13:29 2007
@@ -36,6 +36,7 @@
     private HelperContext context;
     private SDOWrapperHandler handler;
 
+    @Override
     public void setUp() throws Exception {
         context = SDOUtil.createHelperContext();
         handler = new SDOWrapperHandler();

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java Sun Aug 19 22:13:29 2007
@@ -38,14 +38,17 @@
         }
     }
 
+    @Override
     public Class getTargetType() {
         return XmlObject.class;
     }
 
+    @Override
     public Class getSourceType() {
         return Node.class;
     }
 
+    @Override
     public int getWeight() {
         return 30;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java Sun Aug 19 22:13:29 2007
@@ -39,14 +39,17 @@
         }
     }
 
+    @Override
     public Class getTargetType() {
         return XmlObject.class;
     }
 
+    @Override
     public Class getSourceType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java Sun Aug 19 22:13:29 2007
@@ -37,14 +37,17 @@
         return source.newDomNode();
     }
 
+    @Override
     public Class getSourceType() {
         return XmlObject.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Node.class;
     }
 
+    @Override
     public int getWeight() {
         return 30;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java Sun Aug 19 22:13:29 2007
@@ -32,14 +32,17 @@
         return source.newXMLStreamReader();
     }
 
+    @Override
     public Class getSourceType() {
         return XmlObject.class;
     }
 
+    @Override
     public Class getTargetType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java Sun Aug 19 22:13:29 2007
@@ -42,6 +42,7 @@
     + "      <ipo:comment>Want this for the holidays</ipo:comment>" + "      <shipDate>1999-12-05</shipDate>" + "    </item>" + "  </items>"
     + "</ipo:purchaseOrder>";
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
     }
@@ -91,6 +92,7 @@
         Assert.assertNotNull(object3);
     }   
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java Sun Aug 19 22:13:29 2007
@@ -248,6 +248,7 @@
         return transformers;
     }
 
+    @Override
     public String toString() {
         loadTransformers();
         

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java Sun Aug 19 22:13:29 2007
@@ -53,6 +53,7 @@
             this.target = target;
         }
 
+        @Override
         public boolean equals(Object object) {
             if (!VertexPair.class.isInstance(object)) {
                 return false;
@@ -61,6 +62,7 @@
             return source == pair.source && target == pair.target;
         }
 
+        @Override
         public int hashCode() {
             int x = source == null ? 0 : source.hashCode();
             int y = target == null ? 0 : target.hashCode();
@@ -85,6 +87,7 @@
             this.value = value;
         }
 
+        @Override
         public String toString() {
             return "(" + value + ")";
         }
@@ -118,6 +121,7 @@
             this.weight = weight;
         }
 
+        @Override
         public String toString() {
             return sourceVertex + "->" + targetVertex + "[" + value + "," + weight + "]";
         }
@@ -316,6 +320,7 @@
             weight += edge.weight;
         }
 
+        @Override
         public String toString() {
             return edges + ", " + weight;
         }
@@ -335,6 +340,7 @@
         return path;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         for (Vertex v : vertices.values()) {

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java Sun Aug 19 22:13:29 2007
@@ -76,6 +76,7 @@
     /**
      * @see org.apache.tuscany.sca.databinding.Transformer#getWeight()
      */
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java Sun Aug 19 22:13:29 2007
@@ -44,6 +44,7 @@
     }
 
     @SuppressWarnings("unchecked")
+    @Override
     public boolean introspect(DataType type, Annotation[] annotations) {
         if (markerTypes == null) {
             return false;

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java Sun Aug 19 22:13:29 2007
@@ -48,10 +48,12 @@
         return createElement(xmlType.getElementName(), text, context);
     }
 
+    @Override
     public Class getSourceType() {
         return Object.class;
     }
 
+    @Override
     public int getWeight() {
         return 10000;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java Sun Aug 19 22:13:29 2007
@@ -53,10 +53,12 @@
         return mapper.toJavaObject(type, getText(source), context);
     }
 
+    @Override
     public Class getTargetType() {
         return Object.class;
     }
 
+    @Override
     public int getWeight() {
         // Cannot be used for imtermediate
         return 10000;

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java Sun Aug 19 22:13:29 2007
@@ -438,6 +438,7 @@
             pBuffer.append(s);
         }
 
+        @Override
         public StringBuffer format(Object pCalendar, StringBuffer pBuffer, FieldPosition pPos) {
             assert pCalendar != null : "The Calendar argument must not be null.";
             assert pBuffer != null : "The StringBuffer argument must not be null.";
@@ -512,6 +513,7 @@
             return pOffset;
         }
 
+        @Override
         public Object parseObject(String pString, ParsePosition pParsePosition) {
             assert pString != null : "The String argument must not be null.";
             assert pParsePosition != null : "The ParsePosition argument must not be null.";

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java Sun Aug 19 22:13:29 2007
@@ -69,6 +69,7 @@
         return element.getNodeType() == Node.TEXT_NODE;
     }
 
+    @Override
     public Class getSourceType() {
         return Node.class;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java Sun Aug 19 22:13:29 2007
@@ -67,6 +67,7 @@
         }        
     }
 
+    @Override
     public Class getTargetType() {
         return Node.class;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java Sun Aug 19 22:13:29 2007
@@ -38,14 +38,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Object.class;
     }
 
+    @Override
     public Class getTargetType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 50;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java Sun Aug 19 22:13:29 2007
@@ -162,6 +162,7 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Object.class;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java Sun Aug 19 22:13:29 2007
@@ -47,6 +47,7 @@
         super(NAME, Object.class);
     }
     
+    @Override
     public Object copy(Object arg) {
         if (arg == null) {
             return null;
@@ -84,6 +85,7 @@
         }
     }
 
+    @Override
     public ExceptionHandler getExceptionHandler() {
         return new JavaBeansExceptionHandler();
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java Sun Aug 19 22:13:29 2007
@@ -36,6 +36,7 @@
         super(NAME, Object.class);
     }
 
+    @Override
     public Object copy(Object arg) {
         return arg;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java Sun Aug 19 22:13:29 2007
@@ -289,6 +289,7 @@
     
     public abstract T getRootElement(T element) throws XML2JavaMapperException;
 
+    @Override
     public Class getTargetType() {
         return Object.class;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java Sun Aug 19 22:13:29 2007
@@ -37,7 +37,7 @@
 import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
 
 public final class BeanUtil {
-    private static final Object[] NULL = (Object[])null;
+    private static final Object[] NULL = null;
     private static int nsCount = 1;
 
     private static final SimpleTypeMapperImpl MAPPER = new SimpleTypeMapperImpl();
@@ -46,14 +46,14 @@
     }
 
     private static boolean isSimpleType(Class javaType) {
-        return MAPPER.getXMLType(javaType) != null;
+        return SimpleTypeMapperImpl.getXMLType(javaType) != null;
     }
 
     private static String getStringValue(Object o) {
         if (o == null) {
             return null;
         }
-        TypeInfo info = MAPPER.getXMLType(o.getClass());
+        TypeInfo info = SimpleTypeMapperImpl.getXMLType(o.getClass());
         if (info != null) {
             return MAPPER.toXMLLiteral(info.getQName(), o, null);
         } else {
@@ -88,7 +88,7 @@
             List<NamedProperty> props = new ArrayList<NamedProperty>();
             for (int i = 0; i < properties.size(); i++) {
                 String property = properties.get(i);
-                PropertyDescriptor propDesc = (PropertyDescriptor)propertMap.get(property);
+                PropertyDescriptor propDesc = propertMap.get(property);
                 if (propDesc == null) {
                     // JAM does bad thing so I need to add this
                     continue;

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java Sun Aug 19 22:13:29 2007
@@ -50,6 +50,7 @@
         return new DOMWrapperHandler();
     }
 
+    @Override
     public Object copy(Object source) {
         if (Node.class.isAssignableFrom(source.getClass())) {
             Node nodeSource = (Node) source;

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java Sun Aug 19 22:13:29 2007
@@ -90,7 +90,7 @@
         // do the corrections as per the javadoc
         int index = prefixStack.search(prefix);
         if (index != -1) {
-            return (String)uriStack.get(index);
+            return uriStack.get(index);
         }
         if (parentNsContext != null) {
             return parentNsContext.getPrefix(prefix);
@@ -106,7 +106,7 @@
         // do the corrections as per the javadoc
         int index = uriStack.search(uri);
         if (index != -1) {
-            return (String)prefixStack.get(index);
+            return prefixStack.get(index);
         }
 
         if (parentNsContext != null) {
@@ -117,7 +117,7 @@
 
     public Iterator getPrefixes(String uri) {
         // create an arraylist that contains the relevant prefixes
-        String[] uris = (String[])uriStack.toArray(new String[uriStack.size()]);
+        String[] uris = uriStack.toArray(new String[uriStack.size()]);
         List<String> tempList = new ArrayList<String>();
         for (int i = uris.length - 1; i >= 0; i--) {
             if (uris[i].equals(uri)) {

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java Sun Aug 19 22:13:29 2007
@@ -47,14 +47,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return InputSource.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Node.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java Sun Aug 19 22:13:29 2007
@@ -45,14 +45,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return InputSource.class;
     }
 
+    @Override
     public Class getTargetType() {
         return ContentHandler.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java Sun Aug 19 22:13:29 2007
@@ -49,14 +49,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return InputStream.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Node.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java Sun Aug 19 22:13:29 2007
@@ -44,14 +44,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return InputStream.class;
     }
 
+    @Override
     public Class getTargetType() {
         return ContentHandler.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java Sun Aug 19 22:13:29 2007
@@ -48,14 +48,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Node.class;
     }
 
+    @Override
     public Class getTargetType() {
         return OutputStream.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java Sun Aug 19 22:13:29 2007
@@ -36,6 +36,7 @@
 
     }
 
+    @Override
     public Class getSourceType() {
         return Node.class;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java Sun Aug 19 22:13:29 2007
@@ -42,14 +42,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Node.class;
     }
 
+    @Override
     public Class getTargetType() {
         return String.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java Sun Aug 19 22:13:29 2007
@@ -47,14 +47,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Node.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Writer.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java Sun Aug 19 22:13:29 2007
@@ -41,14 +41,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Node.class;
     }
 
+    @Override
     public Class getTargetType() {
         return XMLStreamReader.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java Sun Aug 19 22:13:29 2007
@@ -47,14 +47,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Reader.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Node.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java Sun Aug 19 22:13:29 2007
@@ -40,14 +40,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Reader.class;
     }
 
+    @Override
     public Class getTargetType() {
         return ContentHandler.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java Sun Aug 19 22:13:29 2007
@@ -85,7 +85,7 @@
     }
 
     public void characters(char[] ch, int start, int length) {
-        final Node last = (Node)nodeStk.peek();
+        final Node last = nodeStk.peek();
 
         // No text nodes can be children of root (DOM006 exception)
         if (last != document) {
@@ -110,18 +110,18 @@
     }
 
     public void startElement(String namespace, String localName, String qName, Attributes attrs) {
-        final Element tmp = (Element)document.createElementNS(namespace, qName);
+        final Element tmp = document.createElementNS(namespace, qName);
 
         // Add namespace declarations first
         if (namespaceDecls != null) {
             final int nDecls = namespaceDecls.size();
             for (int i = 0; i < nDecls; i++) {
-                final String prefix = (String)namespaceDecls.get(i++);
+                final String prefix = namespaceDecls.get(i++);
 
                 if (prefix == null || prefix.equals(EMPTYSTRING)) {
-                    tmp.setAttributeNS(XMLNS_URI, XMLNS_PREFIX, (String)namespaceDecls.get(i));
+                    tmp.setAttributeNS(XMLNS_URI, XMLNS_PREFIX, namespaceDecls.get(i));
                 } else {
-                    tmp.setAttributeNS(XMLNS_URI, XMLNS_STRING + prefix, (String)namespaceDecls.get(i));
+                    tmp.setAttributeNS(XMLNS_URI, XMLNS_STRING + prefix, namespaceDecls.get(i));
                 }
             }
             namespaceDecls.clear();
@@ -138,7 +138,7 @@
         }
 
         // Append this new node onto current stack node
-        Node last = (Node)nodeStk.peek();
+        Node last = nodeStk.peek();
 
         // If the SAX2DOM is created with a non-null next sibling node,
         // insert the result nodes before the next sibling under the root.
@@ -180,7 +180,7 @@
      * adds processing instruction node to DOM.
      */
     public void processingInstruction(String target, String data) {
-        final Node last = (Node)nodeStk.peek();
+        final Node last = nodeStk.peek();
         ProcessingInstruction pi = document.createProcessingInstruction(target, data);
         if (pi != null) {
             if (last == root && nextSibling != null) {
@@ -209,7 +209,7 @@
      * Lexical Handler method to create comment node in DOM tree.
      */
     public void comment(char[] ch, int start, int length) {
-        final Node last = (Node)nodeStk.peek();
+        final Node last = nodeStk.peek();
         Comment comment = document.createComment(new String(ch, start, length));
         if (comment != null) {
             if (last == root && nextSibling != null) {

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java Sun Aug 19 22:13:29 2007
@@ -42,14 +42,17 @@
         return new Pipe();
     }
 
+    @Override
     public Class getTargetType() {
         return Node.class;
     }
 
+    @Override
     public Class getSourceType() {
         return ContentHandler.class;
     }
 
+    @Override
     public int getWeight() {
         return 30;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java Sun Aug 19 22:13:29 2007
@@ -45,6 +45,7 @@
         }
     }
 
+    @Override
     protected Node createElement(QName element, String text, TransformationContext context) {
         if (element == null) {
             element = DOMDataBinding.ROOT_ELEMENT;

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java Sun Aug 19 22:13:29 2007
@@ -43,14 +43,17 @@
         }
     }
 
+    @Override
     public Class getSourceType() {
         return Source.class;
     }
 
+    @Override
     public Class getTargetType() {
         return Result.class;
     }
 
+    @Override
     public int getWeight() {
         return 40;
     }

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java Sun Aug 19 22:13:29 2007
@@ -40,6 +40,7 @@
         super(NAME, ALIASES, XMLStreamReader.class);
     }
 
+    @Override
     public boolean introspect(DataType type, Annotation[] annotations) {
         if (super.introspect(type, annotations)) {
             type.setLogical(XMLType.UNKNOWN);

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java Sun Aug 19 22:13:29 2007
@@ -34,14 +34,17 @@
         return new Pipe();
     }
 
+    @Override
     public Class getTargetType() {
         return InputStream.class;
     }
 
+    @Override
     public int getWeight() {
         return 50;
     }
 
+    @Override
     public Class getSourceType() {
         return OutputStream.class;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message