You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/02/17 01:10:04 UTC
svn commit: r508664 -
/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/
Author: rfeng
Date: Fri Feb 16 16:10:03 2007
New Revision: 508664
URL: http://svn.apache.org/viewvc?view=rev&rev=508664
Log:
Make sure the java2xml and xml2java transformers won't be used in multi-hop transformations
Modified:
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformer.java
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2XMLTransformer.java
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBeansDataBinding.java
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaBeanTransformer.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformer.java?view=diff&rev=508664&r1=508663&r2=508664
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformer.java Fri Feb 16 16:10:03 2007
@@ -32,18 +32,18 @@
*/
@Service(Transformer.class)
public class DOMNode2JavaBeanTransformer extends XML2JavaBeanTransformer<Node> {
-
+
@Override
- public Node getRootElement(Node element) throws XML2JavaMapperException {
- if ( element instanceof Document ) {
- return ((Document)element).getDocumentElement();
- } else {
- return element;
- }
-
- }
+ public Node getRootElement(Node element) throws XML2JavaMapperException {
+ if (element instanceof Document) {
+ return ((Document)element).getDocumentElement();
+ } else {
+ return element;
+ }
- @Override
+ }
+
+ @Override
public List<Node> getChildElements(Node parent) throws XML2JavaMapperException {
NodeList nodeList = parent.getChildNodes();
List<Node> nodeArrayList = new ArrayList<Node>(nodeList.getLength());
@@ -62,7 +62,7 @@
@Override
public String getText(Node element) throws XML2JavaMapperException {
if (element instanceof Document) {
- element = ((Document) element).getDocumentElement();
+ element = ((Document)element).getDocumentElement();
}
return element.getTextContent();
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2XMLTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2XMLTransformer.java?view=diff&rev=508664&r1=508663&r2=508664
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2XMLTransformer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2XMLTransformer.java Fri Feb 16 16:10:03 2007
@@ -215,6 +215,11 @@
return PREFIX + prefixCount++;
}
+ @Override
+ public int getWeight() {
+ return JavaBeansDataBinding.HEAVY_WEIGHT;
+ }
+
public abstract T createElement(QName qName) throws Java2XMLMapperException;
public abstract T createText(String textData) throws Java2XMLMapperException;
public abstract void appendChild(T parentElement, T childElement) throws Java2XMLMapperException;
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBeansDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBeansDataBinding.java?view=diff&rev=508664&r1=508663&r2=508664
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBeansDataBinding.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/JavaBeansDataBinding.java Fri Feb 16 16:10:03 2007
@@ -28,7 +28,11 @@
*/
@Service(DataBinding.class)
public class JavaBeansDataBinding extends DataBindingExtension {
-
+ /**
+ * Defining a weight to a very high number so that the transformer won't be picked
+ * up by other paths unless it's the only available path
+ */
+ public static final int HEAVY_WEIGHT = 10000;
public static final String NAME = Object.class.getName();
public JavaBeansDataBinding() {
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaBeanTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaBeanTransformer.java?view=diff&rev=508664&r1=508663&r2=508664
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaBeanTransformer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaBeanTransformer.java Fri Feb 16 16:10:03 2007
@@ -51,6 +51,11 @@
this.mapper = new SimpleTypeMapperExtension();
}
+ @Override
+ public int getWeight() {
+ return JavaBeansDataBinding.HEAVY_WEIGHT;
+ }
+
public Object transform(T source, TransformationContext context) {
TypeInfo xmlType =
(TypeInfo) context.getSourceDataType().getMetadata(TypeInfo.class.getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org