Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java Sun Dec 14 15:18:54 2008 @@ -23,17 +23,16 @@ import org.apache.ws.commons.schema.constants.Enum; /** - * Enumerations for the content model of the complex type. This - * represents the content in the post-schema-validation infoset. + * Enumerations for the content model of the complex type. This represents the content in the + * post-schema-validation infoset. */ public class XmlSchemaContentType extends Enum { - static String[] members = new String[]{ - Constants.BlockConstants.ELEMENT_ONLY, - Constants.BlockConstants.EMPTY, - Constants.BlockConstants.MIXED, - Constants.BlockConstants.TEXT_ONLY}; + static String[] members = new String[] { + Constants.BlockConstants.ELEMENT_ONLY, Constants.BlockConstants.EMPTY, + Constants.BlockConstants.MIXED, Constants.BlockConstants.TEXT_ONLY + }; /** * Creates new XmlSchemaContentType
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java Sun Dec 14 15:18:54 2008 @@ -25,15 +25,11 @@ * Provides different methods for preventing derivation. */ public class XmlSchemaDerivationMethod extends org.apache.ws.commons.schema.constants.Enum { - static String[] members = new String[]{ - Constants.BlockConstants.ALL, - Constants.BlockConstants.EMPTY, - Constants.BlockConstants.EXTENSION, - Constants.BlockConstants.LIST, - Constants.BlockConstants.NONE, - Constants.BlockConstants.RESTRICTION, - Constants.BlockConstants.SUBSITUTION, - Constants.BlockConstants.UNION}; + static String[] members = new String[] { + Constants.BlockConstants.ALL, Constants.BlockConstants.EMPTY, Constants.BlockConstants.EXTENSION, + Constants.BlockConstants.LIST, Constants.BlockConstants.NONE, Constants.BlockConstants.RESTRICTION, + Constants.BlockConstants.SUBSITUTION, Constants.BlockConstants.UNION + }; /** * Creates new XmlSeverityType @@ -50,5 +46,4 @@ return members; } - } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDocumentation.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDocumentation.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDocumentation.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDocumentation.java Sun Dec 14 15:18:54 2008 @@ -22,9 +22,8 @@ import org.w3c.dom.NodeList; /** - * Class that specifies information to be read or used by humans - * within an annotation. Represents the World Wide Web Consortium - * (W3C) documentation element. + * Class that specifies information to be read or used by humans within an annotation. Represents the World + * Wide Web Consortium (W3C) documentation element. */ public class XmlSchemaDocumentation extends XmlSchemaObject { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java Sun Dec 14 15:18:54 2008 @@ -23,7 +23,6 @@ import javax.xml.namespace.QName; - /** * Class for elements. Represents the World Wide Web Consortium (W3C) element element. */ @@ -36,22 +35,21 @@ XmlSchemaDerivationMethod block; /** - * The value after an element has been compiled to post-schema infoset. - * This value is either from the type itself or, if not defined on the type, taken from the schema element. + * The value after an element has been compiled to post-schema infoset. This value is either from the type + * itself or, if not defined on the type, taken from the schema element. */ XmlSchemaDerivationMethod blockResolved; XmlSchemaObjectCollection constraints; /** - * Provides the default value of the element if its content - * is a simple type or the element's content is textOnly. + * Provides the default value of the element if its content is a simple type or the element's content is + * textOnly. */ String defaultValue; String fixedValue; /** - * Returns the correct common runtime library - * object based upon the SchemaType for the element. + * Returns the correct common runtime library object based upon the SchemaType for the element. */ Object elementType; @@ -59,8 +57,8 @@ XmlSchemaDerivationMethod finalDerivationResolved; /** - * The default value is the value of the elementFormDefault attribute for the schema element containing the attribute. - * The default is Unqualified. + * The default value is the value of the elementFormDefault attribute for the schema element containing + * the attribute. The default is Unqualified. */ XmlSchemaForm form; boolean isAbstract; @@ -70,14 +68,13 @@ QName refName; /** - * Returns the type of the element. - * This can either be a complex type or a simple type. + * Returns the type of the element. This can either be a complex type or a simple type. */ XmlSchemaType schemaType; /** - * QName of a built-in data type defined in this schema or another - * schema indicated by the specified namespace. + * QName of a built-in data type defined in this schema or another schema indicated by the specified + * namespace. */ QName schemaTypeName; @@ -220,42 +217,52 @@ public String toString(String prefix, int tab) { String xml = new String(); - if (!prefix.equals("") && prefix.indexOf(":") == -1) + if (!prefix.equals("") && prefix.indexOf(":") == -1) { prefix += ":"; + } - for (int i = 0; i < tab; i++) + for (int i = 0; i < tab; i++) { xml += "\t"; + } xml += "<" + prefix + "element "; - if (!name.equals("")) + if (!name.equals("")) { xml += "name=\"" + name + "\" "; + } - if (schemaTypeName != null) + if (schemaTypeName != null) { xml += "type=\"" + schemaTypeName + "\""; + } - if (refName != null) + if (refName != null) { xml += "ref=\"" + refName + "\" "; + } - if (minOccurs != 1) + if (minOccurs != 1) { xml += "minOccurs=\"" + minOccurs + "\" "; + } - if (maxOccurs != 1) + if (maxOccurs != 1) { xml += "maxOccurs=\"" + maxOccurs + "\" "; - - if (isNillable) - xml += "nillable=\"" + isNillable + "\" "; + } + + if (isNillable) { + xml += "nillable=\"" + isNillable + "\" "; + } xml += ">\n"; - if (constraints != null) + if (constraints != null) { xml += constraints.toString(prefix, (tab + 1)); + } if (schemaType != null) { xml += schemaType.toString(prefix, (tab + 1)); } - for (int i = 0; i < tab; i++) + for (int i = 0; i < tab; i++) { xml += "\t"; + } xml += "</" + prefix + "element>\n"; Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Class for defining enumeration facets. Represents the World Wide - * Web Consortium (W3C) enumeration facet. + * Class for defining enumeration facets. Represents the World Wide Web Consortium (W3C) enumeration facet. */ public class XmlSchemaEnumerationFacet extends XmlSchemaFacet { @@ -44,7 +43,7 @@ xml.append("<enumeration value=\""); xml.append(super.getValue()); xml.append("\" "); - + xml.append("fixed=\""); xml.append(super.isFixed()); xml.append("\"/>\n"); Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java Sun Dec 14 15:18:54 2008 @@ -19,7 +19,6 @@ package org.apache.ws.commons.schema; - /** * Returns detailed information about the schema exception. */ @@ -29,9 +28,9 @@ /** * */ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** + /** * Creates new XmlSchemaException */ public XmlSchemaException() { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java Sun Dec 14 15:18:54 2008 @@ -51,4 +51,3 @@ this.schemaLocation = schemaLocation; } } - Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java Sun Dec 14 15:18:54 2008 @@ -22,8 +22,7 @@ import org.w3c.dom.Element; /** - * Abstract class for all facets that are used when simple types are - * derived by restriction. + * Abstract class for all facets that are used when simple types are derived by restriction. */ public abstract class XmlSchemaFacet extends XmlSchemaAnnotated { @@ -32,7 +31,6 @@ * Creates new XmlSchemaFacet */ - protected XmlSchemaFacet() { } @@ -93,10 +91,11 @@ } else if (name.equals("whiteSpace")) { facet = new XmlSchemaWhiteSpaceFacet(); } else { - throw new XmlSchemaException("Incorrect facet with name \"" - + name + "\" found."); + throw new XmlSchemaException("Incorrect facet with name \"" + name + "\" found."); + } + if (el.hasAttribute("id")) { + facet.setId(el.getAttribute("id")); } - if (el.hasAttribute("id"))facet.setId(el.getAttribute("id")); facet.setFixed(fixed); facet.setValue(el.getAttribute("value")); return facet; Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaForm.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaForm.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaForm.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaForm.java Sun Dec 14 15:18:54 2008 @@ -30,8 +30,10 @@ public static final String QUALIFIED = "qualified"; public static final String UNQUALIFIED = "unqualified"; public static final String NONE = "none"; - - static String[] members = new String[]{NONE, QUALIFIED, UNQUALIFIED}; + + static String[] members = new String[] { + NONE, QUALIFIED, UNQUALIFIED + }; /** * Creates new XmlSchemaForm Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,8 @@ package org.apache.ws.commons.schema; /** - * Class for defining fractionDigits facets. Represents the World Wide - * Web Consortium (W3C) fractionDigits facet. + * Class for defining fractionDigits facets. Represents the World Wide Web Consortium (W3C) fractionDigits + * facet. */ public class XmlSchemaFractionDigitsFacet extends XmlSchemaNumericFacet { @@ -44,7 +44,7 @@ xml.append("<fractionDigits value=\""); xml.append(super.getValue()); xml.append("\" "); - + xml.append("fixed=\""); xml.append(super.isFixed()); xml.append("\"/>\n"); Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java Sun Dec 14 15:18:54 2008 @@ -22,10 +22,9 @@ import javax.xml.namespace.QName; /** - * Class that defines groups at the schema level that are referenced - * from the complex types. Groups a set of element declarations so that - * they can be incorporated as a group into complex type definitions. - * Represents the World Wide Web Consortium (W3C) group element. + * Class that defines groups at the schema level that are referenced from the complex types. Groups a set of + * element declarations so that they can be incorporated as a group into complex type definitions. Represents + * the World Wide Web Consortium (W3C) group element. */ public class XmlSchemaGroup extends XmlSchemaAnnotated { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java Sun Dec 14 15:18:54 2008 @@ -21,11 +21,9 @@ import javax.xml.namespace.QName; - /** - * Class used within complex types that defines the reference to - * groups defined at the schema level. Represents the World Wide - * Web Consortium (W3C) group element with ref attribute. + * Class used within complex types that defines the reference to groups defined at the schema level. + * Represents the World Wide Web Consortium (W3C) group element with ref attribute. */ public class XmlSchemaGroupRef extends XmlSchemaParticle { @@ -52,5 +50,4 @@ this.refName = refName; } - } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaIdentityConstraint.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaIdentityConstraint.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaIdentityConstraint.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaIdentityConstraint.java Sun Dec 14 15:18:54 2008 @@ -58,5 +58,4 @@ this.selector = selector; } - } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaImport.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaImport.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaImport.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaImport.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,8 @@ package org.apache.ws.commons.schema; /** - * The class to import schema components from any schema. - * Represents the World Wide Web Consortium (W3C) import element. + * The class to import schema components from any schema. Represents the World Wide Web Consortium (W3C) + * import element. */ public class XmlSchemaImport extends XmlSchemaExternal { @@ -43,5 +43,4 @@ this.namespace = namespace; } - } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaInclude.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaInclude.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaInclude.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaInclude.java Sun Dec 14 15:18:54 2008 @@ -20,9 +20,8 @@ package org.apache.ws.commons.schema; /** - * Class to include declarations and definitions from an external schema. - * Allows them to be available for processing in the containing schema. - * Represents the World Wide Web Consortium (W3C) include element. + * Class to include declarations and definitions from an external schema. Allows them to be available for + * processing in the containing schema. Represents the World Wide Web Consortium (W3C) include element. */ public class XmlSchemaInclude extends XmlSchemaExternal { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKey.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKey.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKey.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKey.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Identifies a key constraint. Represents the World Wide Web Consortium - * (W3C) key element. + * Identifies a key constraint. Represents the World Wide Web Consortium (W3C) key element. */ public class XmlSchemaKey extends XmlSchemaIdentityConstraint { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKeyref.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKeyref.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKeyref.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKeyref.java Sun Dec 14 15:18:54 2008 @@ -21,10 +21,8 @@ import javax.xml.namespace.QName; - /** - * Identifies a keyref constraint. Represents the World Wide Web - * Consortium (W3C) keyref element. + * Identifies a keyref constraint. Represents the World Wide Web Consortium (W3C) keyref element. */ public class XmlSchemaKeyref extends XmlSchemaIdentityConstraint { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Class for defining length facets. Represents the World Wide Web - * Consortium (W3C) length facet. + * Class for defining length facets. Represents the World Wide Web Consortium (W3C) length facet. */ public class XmlSchemaLengthFacet extends XmlSchemaNumericFacet { @@ -35,7 +34,7 @@ public XmlSchemaLengthFacet(Object value, boolean fixed) { super(value, fixed); } - + public String toString(String prefix, int tab) { StringBuffer xml = new StringBuffer(); for (int i = 0; i < tab; i++) { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Class for defining maxExclusive facets. Represents the World Wide - * Web Consortium (W3C) maxExclusive facet. + * Class for defining maxExclusive facets. Represents the World Wide Web Consortium (W3C) maxExclusive facet. */ public class XmlSchemaMaxExclusiveFacet extends XmlSchemaFacet { @@ -35,7 +34,7 @@ public XmlSchemaMaxExclusiveFacet(Object value, boolean fixed) { super(value, fixed); } - + public String toString(String prefix, int tab) { StringBuffer xml = new StringBuffer(); for (int i = 0; i < tab; i++) { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Class for defining maxInclusive facets. Represents the World - * Wide Web Consortium (W3C) maxInclusive facet. + * Class for defining maxInclusive facets. Represents the World Wide Web Consortium (W3C) maxInclusive facet. */ public class XmlSchemaMaxInclusiveFacet extends XmlSchemaFacet { @@ -35,7 +34,7 @@ public XmlSchemaMaxInclusiveFacet(Object value, boolean fixed) { super(value, fixed); } - + public String toString(String prefix, int tab) { StringBuffer xml = new StringBuffer(); for (int i = 0; i < tab; i++) { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Class for defining maxLength facets. Represents the World Wide - * Web Consortium (W3C) maxLength facet. + * Class for defining maxLength facets. Represents the World Wide Web Consortium (W3C) maxLength facet. */ public class XmlSchemaMaxLengthFacet extends XmlSchemaNumericFacet { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Class for defining minExclusive facets. Represents the World - * Wide Web Consortium (W3C) minExclusive facet. + * Class for defining minExclusive facets. Represents the World Wide Web Consortium (W3C) minExclusive facet. */ public class XmlSchemaMinExclusiveFacet extends XmlSchemaFacet { @@ -41,7 +40,7 @@ for (int i = 0; i < tab; i++) { xml.append("\t"); } - xml.append("<minExclusive value=\"").append((String) super.getValue()).append("\" "); + xml.append("<minExclusive value=\"").append((String)super.getValue()).append("\" "); xml.append("fixed=\"" + super.isFixed() + "\"/>\n"); return xml.toString(); } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Class for defining minInclusive facets. Represents the World Wide - * Web Consortium (W3C) minInclusive facet. + * Class for defining minInclusive facets. Represents the World Wide Web Consortium (W3C) minInclusive facet. */ public class XmlSchemaMinInclusiveFacet extends XmlSchemaFacet { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Class for defining minLength facets. Represents the World Wide - * Web Consortium (W3C) minLength facet. + * Class for defining minLength facets. Represents the World Wide Web Consortium (W3C) minLength facet. */ public class XmlSchemaMinLengthFacet extends XmlSchemaNumericFacet { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNotation.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNotation.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNotation.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNotation.java Sun Dec 14 15:18:54 2008 @@ -20,11 +20,9 @@ package org.apache.ws.commons.schema; /** - * Class represents a notation. An XML Schema definition language (XSD) - * notation declaration is a reconstruction of XML 1.0 NOTATION - * declarations. The purpose of notations is to describe the format of - * non-XML data within an XML document. Represents the World Wide Web Consortium - * (W3C) notation element. + * Class represents a notation. An XML Schema definition language (XSD) notation declaration is a + * reconstruction of XML 1.0 NOTATION declarations. The purpose of notations is to describe the format of + * non-XML data within an XML document. Represents the World Wide Web Consortium (W3C) notation element. */ public class XmlSchemaNotation extends XmlSchemaAnnotated { @@ -61,5 +59,4 @@ this.system = system; } - } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNumericFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNumericFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNumericFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNumericFacet.java Sun Dec 14 15:18:54 2008 @@ -35,5 +35,4 @@ super(value, fixed); } - } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java Sun Dec 14 15:18:54 2008 @@ -28,16 +28,13 @@ String sourceURI; /** - * a map for holding meta information - * Initially set to null to gain some improvement - * in memory. will be initialized only if a - * user attempts + * a map for holding meta information Initially set to null to gain some improvement in memory. will be + * initialized only if a user attempts */ private Map metaInfoMap = null; /** - * returns the metainfo map. may be null - * if not utilized + * returns the metainfo map. may be null if not utilized */ public Map getMetaInfoMap() { return metaInfoMap; @@ -45,6 +42,7 @@ /** * Directly set the meta info map into the schema element + * * @param metaInfoMap */ public void setMetaInfoMap(Map metaInfoMap) { @@ -52,21 +50,19 @@ } /** - * Add a value to the meta info map - * will be initialized if not used - * previously + * Add a value to the meta info map will be initialized if not used previously + * * @param key * @param value */ - public void addMetaInfo(Object key,Object value){ - if (metaInfoMap==null){ - metaInfoMap = new LinkedHashMap(); - } + public void addMetaInfo(Object key, Object value) { + if (metaInfoMap == null) { + metaInfoMap = new LinkedHashMap(); + } - metaInfoMap.put(key,value); + metaInfoMap.put(key, value); } - /** * Creates new XmlSchemaObject */ @@ -102,12 +98,12 @@ return true; } - // note: instanceof returns false if its first operand is null + // note: instanceof returns false if its first operand is null if (!(what instanceof XmlSchemaObject)) { return false; } - XmlSchemaObject xso = (XmlSchemaObject) what; + XmlSchemaObject xso = (XmlSchemaObject)what; if (this.lineNumber != xso.lineNumber) { return false; @@ -132,8 +128,9 @@ public String toString(String prefix, int tab) { String xml = new String(); - for (int i = 0; i < tab; i++) + for (int i = 0; i < tab; i++) { xml += "\t"; + } xml += this.getClass().toString() + "\n"; return xml; Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java Sun Dec 14 15:18:54 2008 @@ -23,8 +23,7 @@ import java.util.Vector; /** - * An object collection class to handle XmlSchemaObjects when collections - * are returned from method calls. + * An object collection class to handle XmlSchemaObjects when collections are returned from method calls. */ public class XmlSchemaObjectCollection { @@ -42,7 +41,7 @@ } public XmlSchemaObject getItem(int i) { - return (XmlSchemaObject) objects.elementAt(i); + return (XmlSchemaObject)objects.elementAt(i); } public void setItem(int i, XmlSchemaObject item) { @@ -80,7 +79,6 @@ xml += getItem(i).toString(prefix, tab); } - return xml; } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java Sun Dec 14 15:18:54 2008 @@ -24,11 +24,9 @@ import java.util.Iterator; /** - * A collection class that provides read-only helpers for XmlSchemaObject - * objects. This class is used to provide the collections for contained - * elements that are within the schema as collections that are accessed - * from the XmlSchema class (for example, Attributes, AttributeGroups, - * Elements, and so on). + * A collection class that provides read-only helpers for XmlSchemaObject objects. This class is used to + * provide the collections for contained elements that are within the schema as collections that are accessed + * from the XmlSchema class (for example, Attributes, AttributeGroups, Elements, and so on). */ public class XmlSchemaObjectTable { @@ -47,7 +45,7 @@ } public XmlSchemaObject getItem(QName name) { - return (XmlSchemaObject) collection.get(name); + return (XmlSchemaObject)collection.get(name); } public Iterator getNames() { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaParticle.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaParticle.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaParticle.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaParticle.java Sun Dec 14 15:18:54 2008 @@ -31,11 +31,9 @@ String minOccursString; /** - * Creates new XmlSchemaParticle - * Particle types are usually interchangeable. - * A local element declaration or reference to a global element - * declaration (element), a compositor ( sequence, choice, or all), - * a reference to a named content model group (group), or an element wildcard (any). + * Creates new XmlSchemaParticle Particle types are usually interchangeable. A local element declaration + * or reference to a global element declaration (element), a compositor ( sequence, choice, or all), a + * reference to a named content model group (group), or an element wildcard (any). */ public XmlSchemaParticle() { } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java Sun Dec 14 15:18:54 2008 @@ -20,8 +20,7 @@ package org.apache.ws.commons.schema; /** - * Class for defining pattern facets. Represents the World Wide - * Web Consortium (W3C) pattern facet. + * Class for defining pattern facets. Represents the World Wide Web Consortium (W3C) pattern facet. */ public class XmlSchemaPatternFacet extends XmlSchemaFacet { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.java Sun Dec 14 15:18:54 2008 @@ -20,10 +20,9 @@ package org.apache.ws.commons.schema; /** - * Allows simple and complex types, groups, and attribute groups from - * external schema files to be redefined in the current schema. This - * class provides versioning for the schema elements. Represents the - * World Wide Web Consortium (W3C) redefine element. + * Allows simple and complex types, groups, and attribute groups from external schema files to be redefined in + * the current schema. This class provides versioning for the schema elements. Represents the World Wide Web + * Consortium (W3C) redefine element. */ public class XmlSchemaRedefine extends XmlSchemaExternal { Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java?rev=726576&r1=726575&r2=726576&view=diff ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java Sun Dec 14 15:18:54 2008 @@ -20,9 +20,8 @@ package org.apache.ws.commons.schema; /** - * Requires the elements in the group to appear in the specified sequence - * within the containing element. Represents the World Wide Web Consortium - * (W3C) sequence (compositor) element. + * Requires the elements in the group to appear in the specified sequence within the containing element. + * Represents the World Wide Web Consortium (W3C) sequence (compositor) element. */ public class XmlSchemaSequence extends XmlSchemaGroupBase { @@ -34,8 +33,7 @@ } /** - * The elements contained within the compositor. - * Collection of XmlSchemaElement, XmlSchemaGroupRef, + * The elements contained within the compositor. Collection of XmlSchemaElement, XmlSchemaGroupRef, * XmlSchemaChoice, XmlSchemaSequence, or XmlSchemaAny. */ public XmlSchemaObjectCollection getItems() { @@ -44,18 +42,21 @@ public String toString(String prefix, int tab) { String xml = new String(); - for (int i = 0; i < tab; i++) + for (int i = 0; i < tab; i++) { xml += "\t"; - if (!prefix.equals("") && prefix.indexOf(":") == -1) + } + if (!prefix.equals("") && prefix.indexOf(":") == -1) { prefix += ":"; + } xml += "<" + prefix + "sequence>\n"; for (int i = 0; i < items.getCount(); i++) { xml += items.getItem(i).toString(prefix, (tab + 1)); } - for (int i = 0; i < tab; i++) + for (int i = 0; i < tab; i++) { xml += "\t"; + } xml += "</" + prefix + "sequence>\n"; return xml;