From 02f18503f2e2707b6ed535929bcd412877512419 Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 2 Jul 2008 06:14:13 +0000 Subject: Fix the compilation errors git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@673290 13f79535-47bb-0310-9956-ffa450edef68 --- .../saxon/ItemList2ObjectTransformer.java | 133 ++++++++++----------- .../sca/databinding/saxon/Value2JavaArray.java | 78 ++++++------ 2 files changed, 101 insertions(+), 110 deletions(-) (limited to 'java/sca/modules/databinding-saxon') diff --git a/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java b/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java index bfd41d5557..7122217b8b 100644 --- a/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java +++ b/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java @@ -53,106 +53,101 @@ import org.apache.tuscany.sca.databinding.saxon.collection.ItemList; * * @version $Rev: 659284 $ $Date: 2008-05-22 14:26:18 -0800 (Thu, 22 May 2008) $ */ -public class ItemList2ObjectTransformer extends - BaseTransformer implements - PullTransformer { +public class ItemList2ObjectTransformer extends BaseTransformer implements + PullTransformer { - private NodeInfo2DataObjectTransformer nodeInfo2DataObjectTransformer = new NodeInfo2DataObjectTransformer(); + private NodeInfo2DataObjectTransformer nodeInfo2DataObjectTransformer = new NodeInfo2DataObjectTransformer(); - public ItemList2ObjectTransformer() { - } + public ItemList2ObjectTransformer() { + } - @Override - protected Class getSourceType() { - return ItemList.class; - } + @Override + protected Class getSourceType() { + return ItemList.class; + } - @Override - protected Class getTargetType() { - return Object.class; - } + @Override + protected Class getTargetType() { + return Object.class; + } - @Override - public int getWeight() { - return 30 + nodeInfo2DataObjectTransformer.getWeight(); - } + @Override + public int getWeight() { + return 30 + nodeInfo2DataObjectTransformer.getWeight(); + } - public Object transform(ItemList source, TransformationContext context) { + public Object transform(ItemList source, TransformationContext context) { - if (source.size() == 0) { - return null; - } + if (source.size() == 0) { + return null; + } - Class targetType = context.getTargetDataType().getPhysical(); + Class targetType = context.getTargetDataType().getPhysical(); - if (targetType.isArray()) { - int i = 0; - Class componentClass = targetType.getComponentType(); - Object[] result = (Object[]) Array.newInstance(componentClass, - source.size()); + if (targetType.isArray()) { + int i = 0; + Class componentClass = targetType.getComponentType(); + Object[] result = (Object[])Array.newInstance(componentClass, source.size()); - try { + try { - if (componentClass.isAssignableFrom(NodeInfo.class) - || componentClass.isAssignableFrom(Value.class)) { + if (componentClass.isAssignableFrom(NodeInfo.class) || componentClass.isAssignableFrom(Value.class)) { - for (Item item : source) { - result[i++] = item; - } + for (Item item : source) { + result[i++] = item; + } - } else { + } else { - for (Item item : source) { + for (Item item : source) { - if (item instanceof NodeInfo) { - result[i] = nodeInfo2DataObjectTransformer - .transform((NodeInfo) item, context); + if (item instanceof NodeInfo) { + result[i] = nodeInfo2DataObjectTransformer.transform((NodeInfo)item, context); - } else if (item instanceof Value) { - result[i] = Value.convertToJava(item); + } else if (item instanceof Value) { + result[i] = Value.convert(item); - } else { - result[i] = item; - } + } else { + result[i] = item; + } - i++; + i++; - } + } - } + } - } catch (ArrayStoreException ex) { - throw new TransformationException(ex); + } catch (ArrayStoreException ex) { + throw new TransformationException(ex); - } catch (XPathException ex) { - throw new TransformationException(ex); - } + } catch (XPathException ex) { + throw new TransformationException(ex); + } - return result; + return result; - } else { - Item item = source.iterator().next(); + } else { + Item item = source.iterator().next(); - if (item.getClass().isAssignableFrom(targetType)) { - return item; + if (item.getClass().isAssignableFrom(targetType)) { + return item; - } else if (item instanceof NodeInfo) { - return nodeInfo2DataObjectTransformer.transform( - (NodeInfo) item, context); + } else if (item instanceof NodeInfo) { + return nodeInfo2DataObjectTransformer.transform((NodeInfo)item, context); - } else { + } else { - try { - return Value.convertToJava(item); + try { + return Value.convert(item); - } catch (XPathException e) { - throw new TransformationException(e); - } + } catch (XPathException e) { + throw new TransformationException(e); + } - } + } - } + } - } + } } diff --git a/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java b/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java index c3365c49bb..16d5f524bb 100644 --- a/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java +++ b/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java @@ -20,8 +20,6 @@ package org.apache.tuscany.sca.databinding.saxon; import java.lang.reflect.Array; -import net.sf.saxon.om.Item; -import net.sf.saxon.om.NodeInfo; import net.sf.saxon.trans.XPathException; import net.sf.saxon.value.Value; @@ -29,50 +27,48 @@ 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.databinding.saxon.collection.ItemList; /** * Transforms a Value object to a Java Object and return it in an array. * * @version $Rev: 659284 $ $Date: 2008-05-22 14:26:18 -0800 (Thu, 22 May 2008) $ */ -public class Value2JavaArray extends - BaseTransformer implements - PullTransformer { - - public Value2JavaArray() {} - - @Override - protected Class getSourceType() { - return Value.class; - } - - @Override - protected Class getTargetType() { - return Object[].class; - } - - @Override - public int getWeight() { - return super.getWeight() + 100; - } - - public Object[] transform(Value source, TransformationContext context) { - - try { - Object object = Value.convertToJava(Value.asItem(source)); - - Class componentClass = context.getTargetDataType().getPhysical().getComponentType(); - Object[] result = (Object[]) Array.newInstance(componentClass, 1); - - result[0] = object; - - return result; - - } catch (XPathException e) { - throw new TransformationException(e.getMessage()); - } - - } +public class Value2JavaArray extends BaseTransformer implements PullTransformer { + + public Value2JavaArray() { + } + + @Override + protected Class getSourceType() { + return Value.class; + } + + @Override + protected Class getTargetType() { + return Object[].class; + } + + @Override + public int getWeight() { + return super.getWeight() + 100; + } + + public Object[] transform(Value source, TransformationContext context) { + + try { + Object object = Value.convert(Value.asItem(source)); + + Class componentClass = context.getTargetDataType().getPhysical().getComponentType(); + Object[] result = (Object[])Array.newInstance(componentClass, 1); + + result[0] = object; + + return result; + + } catch (XPathException e) { + throw new TransformationException(e.getMessage()); + } + + } } -- cgit v1.2.3