From 58be94f743062b49f7beebc23c7bc1c16284025b Mon Sep 17 00:00:00 2001 From: rfeng Date: Sat, 27 Feb 2010 00:44:05 +0000 Subject: Some refactoring of the databinding code git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@916888 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java | 3 ++- .../org/apache/tuscany/sca/databinding/sdo/DataObject2String.java | 2 +- .../tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java | 2 +- .../org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java | 2 +- .../java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java | 6 +++--- .../org/apache/tuscany/sca/databinding/sdo/String2DataObject.java | 2 +- .../org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java | 2 +- .../tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java | 2 +- .../tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java | 2 +- .../tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java | 2 +- .../apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java | 6 +++--- 11 files changed, 16 insertions(+), 15 deletions(-) (limited to 'sca-java-2.x/trunk/modules/databinding-sdo') diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java index bc7f20ab30..80f4602fac 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java @@ -21,10 +21,11 @@ package org.apache.tuscany.sca.databinding.sdo; import javax.xml.namespace.QName; import javax.xml.transform.dom.DOMResult; import javax.xml.parsers.DocumentBuilderFactory; + +import org.apache.tuscany.sca.databinding.BaseTransformer; import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; -import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import org.w3c.dom.Document; diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java index 8ce8eae587..eaaf153dd5 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java @@ -20,10 +20,10 @@ package org.apache.tuscany.sca.databinding.sdo; import javax.xml.namespace.QName; +import org.apache.tuscany.sca.databinding.BaseTransformer; import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; -import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import commonj.sdo.DataObject; import commonj.sdo.helper.HelperContext; diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java index 116ac4c553..7d66810ca0 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java @@ -25,10 +25,10 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; +import org.apache.tuscany.sca.databinding.BaseTransformer; import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; -import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import org.apache.tuscany.sdo.api.SDOUtil; import org.apache.tuscany.sdo.api.XMLStreamHelper; diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java index ae8975efa2..a7fc9aeb5c 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java @@ -20,10 +20,10 @@ package org.apache.tuscany.sca.databinding.sdo; import javax.xml.transform.dom.DOMSource; +import org.apache.tuscany.sca.databinding.BaseTransformer; import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; -import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import org.apache.tuscany.sca.common.xml.dom.DOMHelper; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.w3c.dom.Document; diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java index 39e9ffc161..957ba7679b 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java @@ -24,9 +24,9 @@ import java.security.PrivilegedAction; import javax.xml.namespace.QName; +import org.apache.tuscany.sca.databinding.BaseDataBinding; import org.apache.tuscany.sca.databinding.WrapperHandler; import org.apache.tuscany.sca.databinding.XMLTypeHelper; -import org.apache.tuscany.sca.databinding.impl.BaseDataBinding; import org.apache.tuscany.sca.interfacedef.DataType; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.util.XMLType; @@ -129,7 +129,7 @@ public class SDODataBinding extends BaseDataBinding { } @Override - public Object copy(Object arg, DataType dataType, Operation operation) { + public Object copy(Object arg, DataType dataType, DataType targetDataType, Operation operation, Operation targetOperation) { HelperContext context = SDOContextHelper.getHelperContext(operation); CopyHelper copyHelper = context.getCopyHelper(); if (arg instanceof XMLDocument) { @@ -141,7 +141,7 @@ public class SDODataBinding extends BaseDataBinding { } else if (arg instanceof DataObject) { return context.getCopyHelper().copy((DataObject)arg); } else { - return super.copy(arg, dataType, operation); + return super.copy(arg, dataType, targetDataType, operation, targetOperation); } } diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java index 7ac423f8d8..a48e357960 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java @@ -18,10 +18,10 @@ */ package org.apache.tuscany.sca.databinding.sdo; +import org.apache.tuscany.sca.databinding.BaseTransformer; import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; -import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import commonj.sdo.DataObject; import commonj.sdo.helper.HelperContext; diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java index 4e5aa1d5fd..d73f714384 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java @@ -20,10 +20,10 @@ package org.apache.tuscany.sca.databinding.sdo; import java.io.StringWriter; +import org.apache.tuscany.sca.databinding.BaseTransformer; import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; -import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import commonj.sdo.helper.HelperContext; import commonj.sdo.helper.XMLDocument; diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java index e70fa08477..2f41fb1957 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java @@ -21,10 +21,10 @@ package org.apache.tuscany.sca.databinding.sdo; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; +import org.apache.tuscany.sca.databinding.BaseTransformer; import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; -import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import org.apache.tuscany.sdo.api.SDOUtil; import org.apache.tuscany.sdo.api.XMLStreamHelper; diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java index baf3e2e90a..fbc13e6fed 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java @@ -21,10 +21,10 @@ package org.apache.tuscany.sca.databinding.sdo; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; +import org.apache.tuscany.sca.databinding.BaseTransformer; import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; -import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import org.apache.tuscany.sdo.api.SDOUtil; import org.apache.tuscany.sdo.api.XMLStreamHelper; diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java index ac452910f6..658fe115a5 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java @@ -20,10 +20,10 @@ package org.apache.tuscany.sca.databinding.sdo; import javax.xml.stream.XMLStreamReader; +import org.apache.tuscany.sca.databinding.BaseTransformer; import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; -import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import org.apache.tuscany.sdo.api.SDOUtil; import org.apache.tuscany.sdo.api.XMLStreamHelper; diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java index 3c21b56c9f..ef0d63f941 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java @@ -80,7 +80,7 @@ public class SDODataBindingTestCase extends TestCase { public final void testCopyRoot() { PurchaseOrderType po = SdoFactory.INSTANCE.createPurchaseOrderType(); po.setComment("Comment"); - Object copy = binding.copy(po, null, null); + Object copy = binding.copy(po, null, null, null, null); assertTrue(copy instanceof PurchaseOrderType); assertTrue(po != copy); assertTrue(context.getEqualityHelper().equal((DataObject)po, (DataObject)copy)); @@ -90,7 +90,7 @@ public class SDODataBindingTestCase extends TestCase { public final void testCopyNonRoot() { USAddress address = SdoFactory.INSTANCE.createUSAddress(); address.setCity("San Jose"); - Object copy = binding.copy(address, null, null); + Object copy = binding.copy(address, null, null, null, null); assertTrue(copy instanceof USAddress); assertTrue(address != copy); assertTrue(context.getEqualityHelper().equal((DataObject)address, (DataObject)copy)); @@ -104,7 +104,7 @@ public class SDODataBindingTestCase extends TestCase { context.getXMLHelper().createDocument((DataObject)po, ORDER_QNAME.getNamespaceURI(), ORDER_QNAME.getLocalPart()); - Object copy = binding.copy(doc, null, null); + Object copy = binding.copy(doc, null, null, null, null); assertTrue(copy instanceof XMLDocument); XMLDocument docCopy = (XMLDocument)copy; assertTrue(doc != copy); -- cgit v1.2.3