Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Name.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Name.java?view=diff&rev=523794&r1=523793&r2=523794 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Name.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Name.java Thu Mar 29 11:49:12 2007 @@ -19,24 +19,24 @@ import org.apache.axis2.util.XMLChar; /** - * Custom class for supporting XSD data type Name - * Name represents XML Names. The value space of Name is - * the set of all strings which match the Name production - * of [XML 1.0 (Second Edition)]. - * The base type of Name is token. + * Custom class for supporting XSD data type Name Name represents XML Names. The value space of Name + * is the set of all strings which match the Name production of [XML 1.0 (Second Edition)]. The base + * type of Name is token. + * * @see <a href="http://www.w3.org/TR/xmlschema-2/#Name";>XML Schema 3.3.6</a> */ public class Name extends Token { private static final long serialVersionUID = -8354594301737358441L; - public Name() { + public Name() { super(); } /** * ctor for Name - * @exception IllegalArgumentException will be thrown if validation fails + * + * @throws IllegalArgumentException will be thrown if validation fails */ public Name(String stValue) throws IllegalArgumentException { try { @@ -45,44 +45,43 @@ catch (IllegalArgumentException e) { // recast normalizedString exception as token exception throw new IllegalArgumentException( - //Messages.getMessage("badNameType00") + - "data=[" +stValue + "]"); + //Messages.getMessage("badNameType00") + + "data=[" + stValue + "]"); } } /** - * * validates the data and sets the value for the object. + * * @param stValue String value * @throws IllegalArgumentException if invalid format */ public void setValue(String stValue) throws IllegalArgumentException { if (!Name.isValid(stValue)) throw new IllegalArgumentException( - //Messages.getMessage("badNameType00") + - " data=[" + stValue + "]"); + //Messages.getMessage("badNameType00") + + " data=[" + stValue + "]"); m_value = stValue; } /** - * - * validate the value against the xsd definition - * Name ::= (Letter | '_' | ':') ( NameChar)* - * NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender + * validate the value against the xsd definition Name ::= (Letter | '_' | ':') ( + * NameChar)* NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | + * Extender */ //todo - Fix this public static boolean isValid(String stValue) { int scan; boolean bValid = true; - for (scan=0; scan < stValue.length(); scan++) { - if (scan == 0){ - bValid = XMLChar.isNameStart(stValue.charAt(scan)); - }else{ - bValid = XMLChar.isName(stValue.charAt(scan)); - } - if (!bValid) - break; + for (scan = 0; scan < stValue.length(); scan++) { + if (scan == 0) { + bValid = XMLChar.isNameStart(stValue.charAt(scan)); + } else { + bValid = XMLChar.isName(stValue.charAt(scan)); + } + if (!bValid) + break; } return bValid;
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NegativeInteger.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NegativeInteger.java?view=diff&rev=523794&r1=523793&r2=523794 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NegativeInteger.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NegativeInteger.java Thu Mar 29 11:49:12 2007 @@ -22,20 +22,19 @@ /** * Custom class for supporting primitive XSD data type negativeinteger - * - * negativeInteger is derived from nonPositiveInteger by setting the - * value of maxInclusive to be -1. This results in the standard - * mathematical concept of the negative integers. The value space of - * negativeInteger is the infinite set {...,-2,-1}. - * The base type of negativeInteger is nonPositiveInteger. + * <p/> + * negativeInteger is derived from nonPositiveInteger by setting the value of maxInclusive to be -1. + * This results in the standard mathematical concept of the negative integers. The value space of + * negativeInteger is the infinite set {...,-2,-1}. The base type of negativeInteger is + * nonPositiveInteger. * * @see <a href="http://www.w3.org/TR/xmlschema-2/#negativeInteger";>XML Schema 3.3.15</a> */ public class NegativeInteger extends NonPositiveInteger { private static final long serialVersionUID = -2295928715693639427L; - - public NegativeInteger(byte[] val) { + + public NegativeInteger(byte[] val) { super(val); checkValidity(); } // ctor @@ -65,33 +64,35 @@ checkValidity(); } // ctor - /** - * validate the value against the xsd definition - */ + /** validate the value against the xsd definition */ private BigInteger zero = new BigInteger("0"); + private void checkValidity() { if (compareTo(zero) >= 0) { throw new NumberFormatException( - // Messages.getMessage("badnegInt00") + + // Messages.getMessage("badnegInt00") + ": " + this); } } // checkValidity /** * Work-around for http://developer.java.sun.com/developer/bugParade/bugs/4378370.html + * * @return BigIntegerRep * @throws java.io.ObjectStreamException - */ + */ public Object writeReplace() throws ObjectStreamException { return new BigIntegerRep(toByteArray()); } - + protected static class BigIntegerRep implements java.io.Serializable { private static final long serialVersionUID = 1209618487031404110L; - private byte[] array; + private byte[] array; + protected BigIntegerRep(byte[] array) { this.array = array; } + protected Object readResolve() throws java.io.ObjectStreamException { return new NegativeInteger(array); } Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NonNegativeInteger.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NonNegativeInteger.java?view=diff&rev=523794&r1=523793&r2=523794 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NonNegativeInteger.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NonNegativeInteger.java Thu Mar 29 11:49:12 2007 @@ -27,7 +27,8 @@ public class NonNegativeInteger extends BigInteger { private static final long serialVersionUID = -484577860351406054L; - public NonNegativeInteger(byte[] val) { + + public NonNegativeInteger(byte[] val) { super(val); checkValidity(); } // ctor @@ -57,33 +58,35 @@ checkValidity(); } // ctor - /** - * validate the value against the xsd definition - */ + /** validate the value against the xsd definition */ private BigInteger zero = new BigInteger("0"); + private void checkValidity() { if (compareTo(zero) < 0) { throw new NumberFormatException( // Messages.getMessage("badNonNegInt00") + - ": " + this); +": " + this); } } // checkValidity - + /** * Work-around for http://developer.java.sun.com/developer/bugParade/bugs/4378370.html + * * @return BigIntegerRep * @throws ObjectStreamException - */ + */ public Object writeReplace() throws ObjectStreamException { return new BigIntegerRep(toByteArray()); } - + protected static class BigIntegerRep implements java.io.Serializable { private static final long serialVersionUID = -6135065605514678689L; - private byte[] array; + private byte[] array; + protected BigIntegerRep(byte[] array) { this.array = array; } + protected Object readResolve() throws java.io.ObjectStreamException { return new NonNegativeInteger(array); } Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NonPositiveInteger.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NonPositiveInteger.java?view=diff&rev=523794&r1=523793&r2=523794 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NonPositiveInteger.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NonPositiveInteger.java Thu Mar 29 11:49:12 2007 @@ -21,19 +21,18 @@ /** * Custom class for supporting primitive XSD data type nonPositiveInteger - * - * nonPositiveInteger is derived from integer by setting the value of - * maxInclusive to be 0. This results in the standard mathematical - * concept of the non-positive integers. The value space of - * nonPositiveInteger is the infinite set {...,-2,-1,0}. + * <p/> + * nonPositiveInteger is derived from integer by setting the value of maxInclusive to be 0. This + * results in the standard mathematical concept of the non-positive integers. The value space of + * nonPositiveInteger is the infinite set {...,-2,-1,0}. * * @see <a href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger";>XML Schema 3.3.14</a> */ public class NonPositiveInteger extends BigInteger { private static final long serialVersionUID = -8609051961838117600L; - - public NonPositiveInteger(byte[] val) { + + public NonPositiveInteger(byte[] val) { super(val); checkValidity(); } // ctor @@ -63,33 +62,35 @@ checkValidity(); } // ctor - /** - * validate the value against the xsd definition - */ + /** validate the value against the xsd definition */ private BigInteger zero = new BigInteger("0"); + private void checkValidity() { if (compareTo(zero) > 0) { throw new NumberFormatException( //Messages.getMessage("badNonPosInt00") + - ": " + this); + ": " + this); } } // checkValidity /** * Work-around for http://developer.java.sun.com/developer/bugParade/bugs/4378370.html + * * @return BigIntegerRep * @throws java.io.ObjectStreamException - */ + */ public Object writeReplace() throws ObjectStreamException { return new BigIntegerRep(toByteArray()); } - + protected static class BigIntegerRep implements java.io.Serializable { private static final long serialVersionUID = -3601357690365698517L; - private byte[] array; + private byte[] array; + protected BigIntegerRep(byte[] array) { this.array = array; } + protected Object readResolve() throws java.io.ObjectStreamException { return new NonPositiveInteger(array); } Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NormalizedString.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NormalizedString.java?view=diff&rev=523794&r1=523793&r2=523794 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NormalizedString.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/NormalizedString.java Thu Mar 29 11:49:12 2007 @@ -17,25 +17,25 @@ /** - * Custom class for supporting XSD data type NormalizedString. - * normalizedString represents white space normalized strings. - * The base type of normalizedString is string. + * Custom class for supporting XSD data type NormalizedString. normalizedString represents white + * space normalized strings. The base type of normalizedString is string. * - * @see <a href="http://www.w3.org/TR/xmlschema-2/#normalizedString";>XML Schema Part 2: Datatypes 3.3.1</a> + * @see <a href="http://www.w3.org/TR/xmlschema-2/#normalizedString";>XML Schema Part 2: Datatypes + * 3.3.1</a> */ public class NormalizedString implements java.io.Serializable { private static final long serialVersionUID = -290878151870399401L; - - String m_value; // JAX-RPC maps xsd:string to java.lang.String + + String m_value; // JAX-RPC maps xsd:string to java.lang.String public NormalizedString() { super(); } /** - * * ctor for NormalizedString + * * @param stValue is the String value * @throws IllegalArgumentException if invalid format */ @@ -44,8 +44,8 @@ } /** - * * validates the data and sets the value for the object. + * * @param stValue String value * @throws IllegalArgumentException if invalid format */ @@ -53,32 +53,30 @@ if (!NormalizedString.isValid(stValue)) throw new IllegalArgumentException( // Messages.getMessage("badNormalizedString00") + - " data=[" + stValue + "]"); +" data=[" + stValue + "]"); m_value = stValue; } - public String toString(){ + public String toString() { return m_value; } - public int hashCode(){ + public int hashCode() { return m_value.hashCode(); } /** - * * validate the value against the xsd definition for the object - * - * The value space of normalizedString is the set of strings that - * do not contain the carriage return (#xD), line feed (#xA) nor - * tab (#x9) characters. The lexical space of normalizedString is - * the set of strings that do not contain the carriage return (#xD) - * nor tab (#x9) characters. + * <p/> + * The value space of normalizedString is the set of strings that do not contain the carriage + * return (#xD), line feed (#xA) nor tab (#x9) characters. The lexical space of normalizedString + * is the set of strings that do not contain the carriage return (#xD) nor tab (#x9) + * characters. * * @param stValue the String to test * @return Returns true if valid normalizedString. */ - public static boolean isValid(String stValue) { + public static boolean isValid(String stValue) { int scan; for (scan = 0; scan < stValue.length(); scan++) { @@ -95,7 +93,7 @@ return true; } - public boolean equals(Object object) { + public boolean equals(Object object) { String s1 = object.toString(); return s1.equals(m_value); } Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Notation.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Notation.java?view=diff&rev=523794&r1=523793&r2=523794 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Notation.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Notation.java Thu Mar 29 11:49:12 2007 @@ -19,14 +19,15 @@ /** * Custom class for supporting XSD data type NOTATION. * - * @see <a href="http://www.w3.org/TR/xmlschema-1/#element-notation";>XML Schema Part 1: 3.12 Notation Declarations</a> + * @see <a href="http://www.w3.org/TR/xmlschema-1/#element-notation";>XML Schema Part 1: 3.12 + * Notation Declarations</a> */ public class Notation implements java.io.Serializable { - + private static final long serialVersionUID = 2393074651972192536L; - - NCName name; + + NCName name; URI publicURI; URI systemURI; @@ -66,7 +67,7 @@ public boolean equals(Object obj) { if (obj == null || !(obj instanceof Notation)) return false; - Notation other = (Notation) obj; + Notation other = (Notation)obj; if (name == null) { if (other.name != null) { return false; @@ -92,10 +93,9 @@ } /** - * Returns the sum of the hashcodes of {name,publicURI,systemURI} - * for whichever properties in that set is non null. This is - * consistent with the implementation of equals, as required by - * [EMAIL PROTECTED] java.lang.Object#hashCode() Object.hashCode}. + * Returns the sum of the hashcodes of {name,publicURI,systemURI} for whichever properties in + * that set is non null. This is consistent with the implementation of equals, as required by + * [EMAIL PROTECTED] Object#hashCode() Object.hashCode}. * * @return an <code>int</code> value */ Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/PositiveInteger.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/PositiveInteger.java?view=diff&rev=523794&r1=523793&r2=523794 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/PositiveInteger.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/PositiveInteger.java Thu Mar 29 11:49:12 2007 @@ -22,18 +22,18 @@ /** * Custom class for supporting primitive XSD data type positiveInteger - * - * positiveInteger is derived from nonNegativeInteger by setting the value of minInclusive to be 1. - * This results in the standard mathematical concept of the positive integer numbers. The value space - * of positiveInteger is the infinite set {1,2,...}. + * <p/> + * positiveInteger is derived from nonNegativeInteger by setting the value of minInclusive to be 1. + * This results in the standard mathematical concept of the positive integer numbers. The value + * space of positiveInteger is the infinite set {1,2,...}. * * @see <a href="http://www.w3.org/TR/xmlschema-2/#positiveInteger";>XML Schema 3.3.25</a> */ public class PositiveInteger extends NonNegativeInteger { private static final long serialVersionUID = -4562301423231920813L; - - public PositiveInteger(byte[] val) { + + public PositiveInteger(byte[] val) { super(val); checkValidity(); } // ctor @@ -63,10 +63,9 @@ checkValidity(); } // ctor - /** - * validate the value against the xsd definition - */ + /** validate the value against the xsd definition */ private BigInteger iMinInclusive = new BigInteger("1"); + private void checkValidity() { if (compareTo(iMinInclusive) < 0) { throw new NumberFormatException( @@ -77,19 +76,22 @@ /** * Work-around for http://developer.java.sun.com/developer/bugParade/bugs/4378370.html + * * @return BigIntegerRep * @throws java.io.ObjectStreamException - */ + */ public Object writeReplace() throws ObjectStreamException { return new BigIntegerRep(toByteArray()); } - + protected static class BigIntegerRep implements java.io.Serializable { private static final long serialVersionUID = 1251664160936150499L; - private byte[] array; + private byte[] array; + protected BigIntegerRep(byte[] array) { this.array = array; } + protected Object readResolve() throws java.io.ObjectStreamException { return new PositiveInteger(array); } Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Time.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Time.java?view=diff&rev=523794&r1=523793&r2=523794 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Time.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Time.java Thu Mar 29 11:49:12 2007 @@ -16,15 +16,13 @@ package org.apache.axis2.databinding.types; -import java.text.SimpleDateFormat; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -/** - * Class that represents the xsd:time XML Schema type - */ +/** Class that represents the xsd:time XML Schema type */ public class Time implements java.io.Serializable { private static final long serialVersionUID = -9022201555535589908L; @@ -34,8 +32,8 @@ private String originalString; /** - * a shared java.text.SimpleDateFormat instance used for parsing the basic - * component of the timestamp + * a shared java.text.SimpleDateFormat instance used for parsing the basic component of the + * timestamp */ private static SimpleDateFormat zulu = new SimpleDateFormat("HH:mm:ss.SSS'Z'"); @@ -44,17 +42,13 @@ zulu.setTimeZone(TimeZone.getTimeZone("GMT")); } - /** - * Initializes with a Calender. Year, month and date are ignored. - */ + /** Initializes with a Calender. Year, month and date are ignored. */ public Time(Calendar value) { this._value = value; _value.set(0, 0, 0); // ignore year, month, date } - /** - * Converts a string formatted as HH:mm:ss[.SSS][+/-offset] - */ + /** Converts a string formatted as HH:mm:ss[.SSS][+/-offset] */ public Time(String value) throws NumberFormatException { _value = makeValue(value); this.isFromString = true; @@ -90,9 +84,7 @@ _value.set(0, 0, 0); // ignore year, month, date } - /** - * Utility function that parses xsd:time strings and returns a Date object - */ + /** Utility function that parses xsd:time strings and returns a Date object */ private Calendar makeValue(String source) throws NumberFormatException { // cannonical form of the times is hh ':' mm ':' ss ('.' s+)? (zzzzzz)? @@ -160,8 +152,8 @@ /** - * Returns the time as it would be in GMT. This is accurate to the - * seconds. Milliseconds probably gets lost. + * Returns the time as it would be in GMT. This is accurate to the seconds. Milliseconds + * probably gets lost. * * @return Returns String. */ @@ -183,7 +175,7 @@ public boolean equals(Object obj) { if (obj == null) return false; if (!(obj instanceof Time)) return false; - Time other = (Time) obj; + Time other = (Time)obj; if (this == obj) return true; boolean _equals; Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Token.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Token.java?view=diff&rev=523794&r1=523793&r2=523794 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Token.java (original) +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/types/Token.java Thu Mar 29 11:49:12 2007 @@ -16,8 +16,7 @@ package org.apache.axis2.databinding.types; /** - * Custom class for supporting primitive XSD data type Token. - * token represents tokenized strings. + * Custom class for supporting primitive XSD data type Token. token represents tokenized strings. * The base type of token is normalizedString. * * @see <a href="http://www.w3.org/TR/xmlschema-2/#token";>XML Schema 3.3.2</a> @@ -26,13 +25,14 @@ private static final long serialVersionUID = -7370524740514465467L; - public Token() { + public Token() { super(); } /** * ctor for Token - * @exception IllegalArgumentException will be thrown if validation fails + * + * @throws IllegalArgumentException will be thrown if validation fails */ public Token(String stValue) throws IllegalArgumentException { try { @@ -42,29 +42,25 @@ // recast normalizedString exception as token exception throw new IllegalArgumentException( //Messages.getMessage("badToken00") + - "data=[" + stValue + "]"); + "data=[" + stValue + "]"); } } /** - * * validate the value against the xsd definition - * - * The value space of token is the set of strings that do not - * contain the line feed (#xA) nor tab (#x9) characters, that - * have no leading or trailing spaces (#x20) and that have no - * internal sequences of two or more spaces. The lexical space - * of token is the set of strings that do not contain the line - * feed (#xA) nor tab (#x9) characters, that have no leading or - * trailing spaces (#x20) and that have no internal sequences of two - * or more spaces. + * <p/> + * The value space of token is the set of strings that do not contain the line feed (#xA) nor + * tab (#x9) characters, that have no leading or trailing spaces (#x20) and that have no + * internal sequences of two or more spaces. The lexical space of token is the set of strings + * that do not contain the line feed (#xA) nor tab (#x9) characters, that have no leading or + * trailing spaces (#x20) and that have no internal sequences of two or more spaces. */ public static boolean isValid(String stValue) { int scan; // check to see if we have a string to review - if ( (stValue == null) || (stValue.length() == 0) ) + if ((stValue == null) || (stValue.length() == 0)) return true; - + // no leading space if (stValue.charAt(0) == 0x20) return false; @@ -73,15 +69,15 @@ if (stValue.charAt(stValue.length() - 1) == 0x20) return false; - for (scan=0; scan < stValue.length(); scan++) { + for (scan = 0; scan < stValue.length(); scan++) { char cDigit = stValue.charAt(scan); switch (cDigit) { case 0x09: case 0x0A: return false; case 0x20: - // no doublspace - if (scan+1 < stValue.length()) + // no doublspace + if (scan + 1 < stValue.length()) if (stValue.charAt(scan + 1) == 0x20) { return false; } @@ -91,18 +87,18 @@ } return true; } - + /** - * * validates the data and sets the value for the object. + * * @param stValue String value * @throws IllegalArgumentException if invalid format */ public void setValue(String stValue) throws IllegalArgumentException { if (!Token.isValid(stValue)) throw new IllegalArgumentException( - //Messages.getMessage("badToken00") + - " data=[" + stValue + "]"); + //Messages.getMessage("badToken00") + + " data=[" + stValue + "]"); m_value = stValue; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
