Attachment 136890 Details for Bug 276134 – corrected patch file

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] corrected patch file

bug276134_patch.txt (text/plain), 14.08 KB, created by Mukul Gandhi

on 2009-05-23 12:42:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mukul Gandhi

Created: 2009-05-23 12:42:10 EDT

Size: 14.08 KB

patch

obsolete

>Index: src/org/eclipse/wst/xml/xpath2/processor/internal/types/ElementType.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/types/ElementType.java,v
>retrieving revision 1.1
>diff -u -r1.1 ElementType.java
>--- src/org/eclipse/wst/xml/xpath2/processor/internal/types/ElementType.java	27 Apr 2009 15:07:08 -0000	1.1
>+++ src/org/eclipse/wst/xml/xpath2/processor/internal/types/ElementType.java	23 May 2009 16:37:09 -0000
>@@ -6,15 +6,22 @@
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
>+ *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
>+ *     Mukul Gandhi - bug 276134 - improvements to schema aware primitive type support
>+ *                                  for attribute/element nodes  
>  *******************************************************************************/
> 
> package org.eclipse.wst.xml.xpath2.processor.internal.types;
> 
>-import org.w3c.dom.*;
>+import org.apache.xerces.dom.PSVIElementNSImpl;
>+import org.apache.xerces.xs.XSTypeDefinition;
> import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
> import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
>-import org.eclipse.wst.xml.xpath2.processor.internal.*;
>+import org.eclipse.wst.xml.xpath2.processor.function.XSCtrLibrary;
>+import org.w3c.dom.Element;
>+import org.w3c.dom.Node;
>+import org.w3c.dom.NodeList;
>+import org.w3c.dom.Text;
> 
> /**
>  * A representation of the ElementType datatype
>@@ -90,10 +97,22 @@
> 	 */
> 	@Override
> 	public ResultSequence typed_value() {
>-		ResultSequence rs = ResultSequenceFactory.create_new();
>-
>-		// XXX only if PSVI is not present!! [not our case]
>-		rs.add(new UntypedAtomic(string_value()));
>+		ResultSequence rs = ResultSequenceFactory.create_new();	
>+		
>+		PSVIElementNSImpl psviElem = (PSVIElementNSImpl)_value;
>+		XSTypeDefinition typeDef = psviElem.getTypeDefinition();
>+		
>+		if (typeDef != null && typeDef.getNamespace().equals(XSCtrLibrary.XML_SCHEMA_NS)) {
>+		  Object schemaTypeValue = getTypedValueForPrimitiveType(typeDef);
>+		  if (schemaTypeValue != null) {
>+			rs.add((AnyType)schemaTypeValue);  
>+		  }
>+		  else {
>+			rs.add(new UntypedAtomic(string_value()));  
>+		  }
>+	    } else {
>+		   rs.add(new UntypedAtomic(string_value()));	
>+		}	
> 
> 		return rs;
> 	}
>Index: src/org/eclipse/wst/xml/xpath2/processor/internal/types/NodeType.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/types/NodeType.java,v
>retrieving revision 1.1
>diff -u -r1.1 NodeType.java
>--- src/org/eclipse/wst/xml/xpath2/processor/internal/types/NodeType.java	27 Apr 2009 15:07:07 -0000	1.1
>+++ src/org/eclipse/wst/xml/xpath2/processor/internal/types/NodeType.java	23 May 2009 16:37:10 -0000
>@@ -6,17 +6,28 @@
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
>+ *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
>+ *     Mukul Gandhi - bug 276134 - improvements to schema aware primitive type support
>+ *                                 for attribute/element nodes 
>  *******************************************************************************/
> 
> package org.eclipse.wst.xml.xpath2.processor.internal.types;
> 
>-import org.w3c.dom.*;
>+import java.math.BigInteger;
>+import java.util.ArrayList;
>+import java.util.Hashtable;
>+import java.util.Iterator;
>+
>+import org.apache.xerces.xs.XSTypeDefinition;
> import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
> import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
>-import org.eclipse.wst.xml.xpath2.processor.internal.*;
>-
>-import java.util.*;
>+import org.w3c.dom.Attr;
>+import org.w3c.dom.Comment;
>+import org.w3c.dom.Document;
>+import org.w3c.dom.Element;
>+import org.w3c.dom.Node;
>+import org.w3c.dom.ProcessingInstruction;
>+import org.w3c.dom.Text;
> 
> /**
>  * A representation of a Node datatype
>@@ -175,4 +186,32 @@
> 
> 		return !before(a, b);
> 	}
>+	
>+	protected Object getTypedValueForPrimitiveType(XSTypeDefinition typeDef) {		
>+		Object schemaTypeValue = null;
>+		
>+		if (typeDef.getName().equals("date")) {		
>+		   schemaTypeValue = XSDate.parse_date(string_value());
>+		}
>+		else if (typeDef.getName().equals("int")) {		
>+		   schemaTypeValue = new XSInt(new BigInteger(string_value()));
>+		}
>+		else if (typeDef.getName().equals("long")) {		
>+		  schemaTypeValue = new XSLong(new BigInteger(string_value()));
>+	    }
>+		else if (typeDef.getName().equals("integer")) {		
>+		  schemaTypeValue = new XSInteger(new BigInteger(string_value()));
>+		}
>+		else if (typeDef.getName().equals("double")) {		
>+		  schemaTypeValue = new XSDouble(Double.parseDouble(string_value()));
>+		}
>+		else if (typeDef.getName().equals("float")) {		
>+		  schemaTypeValue = new XSFloat(Float.parseFloat(string_value()));
>+	    }
>+		else if (typeDef.getName().equals("decimal")) {		
>+		  schemaTypeValue = new XSDecimal(Double.parseDouble(string_value()));
>+		}
>+		
>+		return schemaTypeValue;
>+	}
> }
>Index: src/org/eclipse/wst/xml/xpath2/processor/internal/types/AttrType.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/types/AttrType.java,v
>retrieving revision 1.1
>diff -u -r1.1 AttrType.java
>--- src/org/eclipse/wst/xml/xpath2/processor/internal/types/AttrType.java	27 Apr 2009 15:07:07 -0000	1.1
>+++ src/org/eclipse/wst/xml/xpath2/processor/internal/types/AttrType.java	23 May 2009 16:37:09 -0000
>@@ -6,15 +6,19 @@
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
>+ *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
>+ *     Mukul Gandhi - bug 276134 - improvements to schema aware primitive type support
>+ *                                 for attribute/element nodes 
>  *******************************************************************************/
> 
> package org.eclipse.wst.xml.xpath2.processor.internal.types;
> 
>-import org.w3c.dom.*;
>+import org.apache.xerces.dom.PSVIAttrNSImpl;
>+import org.apache.xerces.xs.XSTypeDefinition;
> import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
> import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
>-import org.eclipse.wst.xml.xpath2.processor.internal.*;
>+import org.eclipse.wst.xml.xpath2.processor.function.XSCtrLibrary;
>+import org.w3c.dom.Attr;
> 
> /**
>  * A representation of the AttributeType datatype
>@@ -72,10 +76,22 @@
> 	@Override
> 	public ResultSequence typed_value() {
> 		ResultSequence rs = ResultSequenceFactory.create_new();
>-
>-		// XXX with no PSVI
>-		rs.add(new UntypedAtomic(string_value()));
>-
>+		
>+		PSVIAttrNSImpl psviAttr = (PSVIAttrNSImpl)_value;
>+		XSTypeDefinition typeDef = psviAttr.getTypeDefinition();
>+		
>+		if (typeDef != null && typeDef.getNamespace().equals(XSCtrLibrary.XML_SCHEMA_NS)) {
>+		  Object schemaTypeValue = getTypedValueForPrimitiveType(typeDef);
>+		  if (schemaTypeValue != null) {
>+			rs.add((AnyType)schemaTypeValue);  
>+		  }
>+		  else {
>+			rs.add(new UntypedAtomic(string_value()));  
>+		  }
>+	    } else {
>+		   rs.add(new UntypedAtomic(string_value()));	
>+		}
>+		
> 		return rs;
> 	}
> 
>Index: src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java,v
>retrieving revision 1.1
>diff -u -r1.1 FsEq.java
>--- src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java	27 Apr 2009 15:06:58 -0000	1.1
>+++ src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java	23 May 2009 16:37:09 -0000
>@@ -6,7 +6,9 @@
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
>+ *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
>+ *     Mukul Gandhi - bug 276134 - improvements to schema aware primitive type support
>+ *                                 for attribute/element nodes 
>  *******************************************************************************/
> 
> package org.eclipse.wst.xml.xpath2.processor.internal.function;
>@@ -64,7 +66,8 @@
> 		for (Iterator i = args.iterator(); i.hasNext();) {
> 			ResultSequence rs = (ResultSequence) i.next();
> 
>-			FnData.fast_atomize(rs);
>+			//FnData.fast_atomize(rs);
>+			rs = FnData.atomize(rs);
> 
> 			if (rs.empty())
> 				return new ArrayList();
>Index: src/org/eclipse/wst/xml/xpath2/processor/internal/function/FnData.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FnData.java,v
>retrieving revision 1.1
>diff -u -r1.1 FnData.java
>--- src/org/eclipse/wst/xml/xpath2/processor/internal/function/FnData.java	27 Apr 2009 15:06:56 -0000	1.1
>+++ src/org/eclipse/wst/xml/xpath2/processor/internal/function/FnData.java	23 May 2009 16:37:09 -0000
>@@ -6,17 +6,23 @@
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
>+ *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
>+ *     Mukul Gandhi - bug 276134 - improvements to schema aware primitive type support
>+ *                                 for attribute/element nodes 
>  *******************************************************************************/
> 
> package org.eclipse.wst.xml.xpath2.processor.internal.function;
> 
>+import java.util.Collection;
>+import java.util.Iterator;
>+import java.util.ListIterator;
>+
> import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
> import org.eclipse.wst.xml.xpath2.processor.ResultSequenceFactory;
>-import org.eclipse.wst.xml.xpath2.processor.internal.*;
>-import org.eclipse.wst.xml.xpath2.processor.internal.types.*;
>-
>-import java.util.*;
>+import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyAtomicType;
>+import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType;
>+import org.eclipse.wst.xml.xpath2.processor.internal.types.NodeType;
>+import org.eclipse.wst.xml.xpath2.processor.internal.types.QName;
> 
> /**
>  * fn:data takes a sequence of items and returns a sequence of atomic values.
>@@ -65,14 +71,15 @@
> 		for (Iterator i = arg.iterator(); i.hasNext();) {
> 			AnyType at = (AnyType) i.next();
> 
>-			if (at instanceof AnyAtomicType)
>+			if (at instanceof AnyAtomicType) {
> 				rs.add(at);
>+			}
> 			else if (at instanceof NodeType) {
> 				NodeType nt = (NodeType) at;
>-
> 				rs.concat(nt.typed_value());
>-			} else
>+			} else {
> 				assert false;
>+			}
> 		}
> 
> 		return rs;
>Index: src/org/eclipse/wst/xml/xpath2/processor/XercesLoader.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/XercesLoader.java,v
>retrieving revision 1.4
>diff -u -r1.4 XercesLoader.java
>--- src/org/eclipse/wst/xml/xpath2/processor/XercesLoader.java	27 Apr 2009 15:07:08 -0000	1.4
>+++ src/org/eclipse/wst/xml/xpath2/processor/XercesLoader.java	23 May 2009 16:37:09 -0000
>@@ -6,7 +6,9 @@
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0 
>+ *     Andrea Bittau - initial API and implementation from the PsychoPath XPath 2.0
>+ *     Mukul Gandhi - bug 276134 - improvements to schema aware primitive type support
>+ *                                 for attribute/element nodes  
>  *******************************************************************************/
> 
> package org.eclipse.wst.xml.xpath2.processor;
>@@ -15,6 +17,8 @@
> 
> import org.w3c.dom.*;
> import javax.xml.parsers.*;
>+import javax.xml.validation.Schema;
>+
> import org.xml.sax.*;
> 
> /**
>@@ -41,6 +45,8 @@
> 	public static final String DOCUMENT_PSVI_IMPLEMENTATION = "org.apache.xerces.dom.PSVIDocumentImpl";
> 
> 	boolean _validating;
>+	
>+	Schema _schema = null;;
> 
> 	/**
> 	 * Constructor for Xerxes loader.
>@@ -48,6 +54,11 @@
> 	public XercesLoader() {
> 		_validating = false;
> 	}
>+	
>+	public XercesLoader(Schema schema) {
>+		_validating = false;
>+		_schema = schema;
>+	}
> 
> 	/**
> 	 * The Xerces loader loads the XML docuemnt
>@@ -64,12 +75,17 @@
> 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
> 
> 		factory.setNamespaceAware(true);
>-		factory.setValidating(_validating);
> 		factory.setAttribute(SCHEMA_VALIDATION_FEATURE,
> 				new Boolean(_validating));
> 		factory.setAttribute(DOCUMENT_IMPLEMENTATION_PROPERTY,
> 				DOCUMENT_PSVI_IMPLEMENTATION);
>-		// factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
>+		
>+		if (_schema != null) {
>+		  factory.setSchema(_schema);
>+		}
>+		else {
>+		  factory.setValidating(_validating);	
>+		}
> 
> 		try {
> 			DocumentBuilder builder = factory.newDocumentBuilder();
>@@ -94,13 +110,16 @@
> 			}
> 			return builder.parse(in);
> 		} catch (SAXException e) {
>-			throw new DOMLoaderException("SAX exception: " + e.getMessage());
>+			//throw new DOMLoaderException("SAX exception: " + e.getMessage());
>+			e.printStackTrace();
> 		} catch (ParserConfigurationException e) {
> 			throw new DOMLoaderException("Parser configuration exception: "
> 					+ e.getMessage());
> 		} catch (IOException e) {
> 			throw new DOMLoaderException("IO exception: " + e.getMessage());
> 		}
>+		
>+		return null;
> 
> 	}
>

Actions: View | Diff

Attachments on bug 276134: 135625 | 135626 | 135634 | 135722 | 135723 | 136887 | 136888 | 136890 | 136891