Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/BuilderConfiguration.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/BuilderConfiguration.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/BuilderConfiguration.java (working copy) @@ -81,7 +81,8 @@ * org.exolab.castor.builder.boundproperties * */ - public static final String BOUND_PROPERTIES = "org.exolab.castor.builder.boundproperties"; + public static final String BOUND_PROPERTIES = + "org.exolab.castor.builder.boundproperties"; /** * Property specifying whether to implement EnumeratedTypeAccess @@ -91,7 +92,8 @@ * org.exolab.castor.builder.enumTypeAccessInterface * */ - public static final String ENUM_TYPE_ACCESS_INTERFACE = "org.exolab.castor.builder.enumTypeAccessInterface"; + public static final String ENUM_TYPE_ACCESS_INTERFACE = + "org.exolab.castor.builder.enumTypeAccessInterface"; /** * Property specifying whether or not to generate source code for extra @@ -101,7 +103,8 @@ * org.exolab.castor.builder.extraCollectionMethods * */ - public static final String EXTRA_COLLECTION_METHODS = "org.exolab.castor.builder.extraCollectionMethods"; + public static final String EXTRA_COLLECTION_METHODS = + "org.exolab.castor.builder.extraCollectionMethods"; /** * Property specifying the super class for all generated classes. @@ -110,7 +113,8 @@ * org.exolab.castor.builder.superclass * */ - public static final String SUPER_CLASS = "org.exolab.castor.builder.superclass"; + public static final String SUPER_CLASS = + "org.exolab.castor.builder.superclass"; /** * Property specifying how element's and type's are mapped into a Java @@ -124,7 +128,8 @@ * org.exolab.castor.builder.javaclassmapping * */ - public static final String JAVA_CLASS_MAPPING = "org.exolab.castor.builder.javaclassmapping"; + public static final String JAVA_CLASS_MAPPING = + "org.exolab.castor.builder.javaclassmapping"; /** * Property listing mapping between XML namespaces and Java packages. @@ -129,7 +134,8 @@ /** * Property listing mapping between XML namespaces and Java packages. */ - public static final String NAMESPACE_PACKAGES_OLD = "org.exolab.castor.builder.nspackages"; + public static final String NAMESPACE_PACKAGES_OLD = + "org.exolab.castor.builder.nspackages"; /** * Property listing mapping between XML namespaces and Java packages. @@ -134,7 +140,8 @@ /** * Property listing mapping between XML namespaces and Java packages. */ - public static final String NAMESPACE_PACKAGES = "org.exolab.castor.xml.nspackages"; + public static final String NAMESPACE_PACKAGES = + "org.exolab.castor.xml.nspackages"; /** * Property specifying if we want to have the equals method generated @@ -140,7 +147,8 @@ * Property specifying if we want to have the equals method generated * for each generated class. */ - public static final String EQUALS_METHOD = "org.exolab.castor.builder.equalsmethod"; + public static final String EQUALS_METHOD = + "org.exolab.castor.builder.equalsmethod"; /** * Property specifying if we want to use Wrapper Objects instead of @@ -146,7 +154,8 @@ * Property specifying if we want to use Wrapper Objects instead of * primitives (eg java.lang.Float instead of float). */ - public static final String WRAPPER = "org.exolab.castor.builder.primitivetowrapper"; + public static final String WRAPPER = + "org.exolab.castor.builder.primitivetowrapper"; /** * Property specifying if we want to have a 'public static final String' @@ -153,7 +162,8 @@ * generated for each attribute and element name used within a class * descriptor. */ - public static final String CLASS_DESC_FIELD_NAMES = "org.exolab.castor.builder.classdescfieldnames"; + public static final String CLASS_DESC_FIELD_NAMES = + "org.exolab.castor.builder.classdescfieldnames"; /** * Property specifying whether the Java sources generated should be 1.4 @@ -159,7 +169,8 @@ * Property specifying whether the Java sources generated should be 1.4 * or 5.0 compliant. */ - public static final String JAVA_VERSION = "org.exolab.castor.builder.javaVersion"; + public static final String JAVA_VERSION = + "org.exolab.castor.builder.javaVersion"; /** * The name of the configuration file. @@ -168,7 +179,8 @@ * castor.properties * */ - public static final String CONFIG_FILENAME_PROPERTY = "castorbuilder.properties"; + public static final String CONFIG_FILENAME_PROPERTY = + "castorbuilder.properties"; /** * Maximum number of constant definitions within one file. This property @@ -181,7 +193,8 @@ * org.exolab.castor.builder.maxNumberOfConstants * */ - public static final String MAX_CONSTANTS_PROPERTY = "org.exolab.castor.builder.maxNumberOfConstants"; + public static final String MAX_CONSTANTS_PROPERTY = + "org.exolab.castor.builder.maxNumberOfConstants"; /** * Resource to load from the JAR file to load our defaults. @@ -186,7 +199,8 @@ /** * Resource to load from the JAR file to load our defaults. */ - static final String RESOURCE_NAME = "/org/exolab/castor/builder/castorbuilder.properties"; + static final String RESOURCE_NAME = + "/org/exolab/castor/builder/castorbuilder.properties"; /** * Registered class name conflict resolution strategies. @@ -195,7 +209,8 @@ * org.exolab.castor.builder.nameConflictStrategies * */ - public static final String NAME_CONFLICT_STRATEGIES = "org.exolab.castor.builder.nameConflictStrategies"; + public static final String NAME_CONFLICT_STRATEGIES = + "org.exolab.castor.builder.nameConflictStrategies"; } //--Property /** @@ -458,8 +473,10 @@ } } _localProps = new Properties(defaults); - processNamespacePackageMappings(_localProps.getProperty(Property.NAMESPACE_PACKAGES_OLD, "")); - processNamespacePackageMappings(_localProps.getProperty(Property.NAMESPACE_PACKAGES, "")); + processNamespacePackageMappings( + _localProps.getProperty(Property.NAMESPACE_PACKAGES_OLD, "")); + processNamespacePackageMappings( + _localProps.getProperty(Property.NAMESPACE_PACKAGES, "")); } //-- setDefaultProperties /** @@ -491,7 +508,8 @@ protected synchronized void load() { if (_defaultProps == null) { //-- load defaults from JAR - _defaultProps = Configuration.loadProperties(Property.RESOURCE_NAME, Property.CONFIG_FILENAME_PROPERTY); + _defaultProps = Configuration.loadProperties( + Property.RESOURCE_NAME, Property.CONFIG_FILENAME_PROPERTY); //-- load local defaults @@ -500,7 +518,8 @@ // Get overriding configuration from the classpath, ignore if not found. // If found, merge any existing properties. try { - InputStream is = SourceGenerator.class.getResourceAsStream("/" + Property.CONFIG_FILENAME_PROPERTY); + InputStream is = SourceGenerator.class.getResourceAsStream( + "/" + Property.CONFIG_FILENAME_PROPERTY); if (is != null) { found = true; _defaultProps.load(is); @@ -532,11 +551,14 @@ // castorbuilder.properties processNamespacePackageMappings(rtconf.getProperty(Property.NAMESPACE_PACKAGES_OLD, "")); processNamespacePackageMappings(rtconf.getProperty(Property.NAMESPACE_PACKAGES, "")); - processNamespacePackageMappings(_defaultProps.getProperty(Property.NAMESPACE_PACKAGES_OLD, "")); - processNamespacePackageMappings(_defaultProps.getProperty(Property.NAMESPACE_PACKAGES, "")); + processNamespacePackageMappings(_defaultProps.getProperty( + Property.NAMESPACE_PACKAGES_OLD, "")); + processNamespacePackageMappings(_defaultProps.getProperty( + Property.NAMESPACE_PACKAGES, "")); //-- backward compatibility with 0.9.3.9 - String prop = _defaultProps.getProperty(JavaNaming.UPPER_CASE_AFTER_UNDERSCORE_PROPERTY, null); + String prop = _defaultProps.getProperty( + JavaNaming.UPPER_CASE_AFTER_UNDERSCORE_PROPERTY, null); if (prop != null) { JavaNaming.upperCaseAfterUnderscore = Boolean.valueOf(prop).booleanValue(); } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MappingFileSourceFactory.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MappingFileSourceFactory.java (revision 6673) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MappingFileSourceFactory.java (working copy) @@ -263,8 +263,9 @@ fieldMap.setContainer(true); } - //-- Handle namespaces. FieldInfo namespace has higher priority than ClassInfo namespace. - //-- TODO: Need to add better namespace support to bind-xml element, it's not very good at the moment + // Handle namespaces. FieldInfo namespace has higher priority than ClassInfo namespace. + // TODO Need to add better namespace support to bind-xml element, + // it's not very good at the moment // nsURI = member.getNamespaceURI(); // if (nsURI != null) { // jsc.add("desc.setNameSpaceURI(\""); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MemberFactory.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MemberFactory.java (revision 6673) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MemberFactory.java (working copy) @@ -406,7 +406,8 @@ String nsURI = component.getTargetNamespace(); if ((nsURI != null) && (nsURI.length() > 0)) { fieldInfo.setNamespaceURI(nsURI); - // TODO: set the prefix used in the XML Schema in order to use it inside the Marshaling Framework + // TODO set the prefix used in the XML Schema + // in order to use it inside the Marshaling Framework } // handle default value (if any is set) @@ -491,7 +492,8 @@ if (xsType.isDateTime()) { // Castor marshals DATETIME_TYPE into java.util.Date(), so we need to convert it if (xsType.getType() == XSType.DATETIME_TYPE) { - // FIXME: This fails if the DateTIme has a time zone because we throw away the time zone in toDate() + // FIXME This fails if the DateTIme has a time zone + // because we throw away the time zone in toDate() value = "new org.exolab.castor.types.DateTime(\"" + value + "\").toDate()"; } else { value = "new " + xsType.getJType().getName() + "(\"" + value + "\")"; @@ -497,7 +499,7 @@ value = "new " + xsType.getJType().getName() + "(\"" + value + "\")"; } } else { - // FIXME: This works only if a constructor with String as parameter exists + // FIXME This works only if a constructor with String as parameter exists value = "new " + xsType.getJType().getName() + "(\"" + value + "\")"; } } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SGTypes.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SGTypes.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SGTypes.java (working copy) @@ -71,11 +71,14 @@ //- org.exolab.castor types -/ //---------------------------/ - public static final JClass UnmarshalException = new JClass("org.exolab.castor.xml.UnmarshalException"); + public static final JClass UnmarshalException = + new JClass("org.exolab.castor.xml.UnmarshalException"); - public static final JClass MarshalException = new JClass("org.exolab.castor.xml.MarshalException"); + public static final JClass MarshalException = + new JClass("org.exolab.castor.xml.MarshalException"); - public static final JClass ValidationException = new JClass("org.exolab.castor.xml.ValidationException"); + public static final JClass ValidationException = + new JClass("org.exolab.castor.xml.ValidationException"); //---------------/ //- JDK Objects -/ @@ -82,35 +85,31 @@ //---------------/ //-- java.lang - public static final JClass IllegalStateException = new JClass("java.lang.IllegalStateException"); + public static final JClass IllegalStateException = + new JClass("java.lang.IllegalStateException"); - public static final JClass IndexOutOfBoundsException = new JClass("java.lang.IndexOutOfBoundsException"); + public static final JClass IndexOutOfBoundsException = + new JClass("java.lang.IndexOutOfBoundsException"); - public static final JClass InstantiationException = new JClass("java.lang.InstantiationException"); + public static final JClass InstantiationException = + new JClass("java.lang.InstantiationException"); - public static final JClass Class = new JClass("java.lang.Class"); - public static final JClass Object = new JClass("java.lang.Object"); - public static final JClass String = new JClass("java.lang.String"); - public static final JClass StringBuffer = new JClass("java.lang.StringBuffer"); + public static final JClass Class = new JClass("java.lang.Class"); + public static final JClass Object = new JClass("java.lang.Object"); + public static final JClass String = new JClass("java.lang.String"); + public static final JClass StringBuffer = new JClass("java.lang.StringBuffer"); //-- java.io - public static final JClass FileReader = new JClass("java.io.FileReader"); - public static final JClass FileWriter = new JClass("java.io.FileWriter"); - public static final JClass IOException = new JClass("java.io.IOException"); - public static final JClass PrintWriter = new JClass("java.io.PrintWriter"); - public static final JClass Reader = new JClass("java.io.Reader"); - public static final JClass Writer = new JClass("java.io.Writer"); - - //-- java.util -// public static final JClass ArrayList = new JClass("java.util.ArrayList"); -// public static final JClass Enumeration = new JClass("java.util.Enumeration"); -// public static final JClass Iterator = new JClass("java.util.Iterator"); -// public static final JClass Hashtable = new JClass("java.util.Hashtable"); -// public static final JClass Stack = new JClass("java.util.Stack"); -// public static final JClass Vector = new JClass("java.util.Vector"); + public static final JClass FileReader = new JClass("java.io.FileReader"); + public static final JClass FileWriter = new JClass("java.io.FileWriter"); + public static final JClass IOException = new JClass("java.io.IOException"); + public static final JClass PrintWriter = new JClass("java.io.PrintWriter"); + public static final JClass Reader = new JClass("java.io.Reader"); + public static final JClass Writer = new JClass("java.io.Writer"); //-- java.beans - public static final JClass PropertyChangeSupport = new JClass("java.beans.PropertyChangeSupport"); + public static final JClass PropertyChangeSupport = + new JClass("java.beans.PropertyChangeSupport"); public static final JType createEnumeration(final JType jType, final boolean usejava50) { return new JCollectionType("java.util.Enumeration", jType, usejava50); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceFactory.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceFactory.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceFactory.java (working copy) @@ -385,7 +385,8 @@ //By default a nested group Item can occur only once fInfo = _infoFactory.createFieldInfo(new XSClass(jClass), fname); } else { - fInfo = _infoFactory.createCollection(new XSClass(jClass), "_items", fname, _config.useJava50()); + fInfo = _infoFactory.createCollection( + new XSClass(jClass), "_items", fname, _config.useJava50()); } fInfo.setContainer(true); String newClassName = className.substring(0, className.length() - 4); @@ -401,7 +402,8 @@ processAttributes(component.getBinding(), complexType, state); component.setView(saved); if (complexType.getContentType() == ContentType.mixed) { - FieldInfo fieldInfo = memberFactory.createFieldInfoForContent(new XSString(), _config.useJava50()); + FieldInfo fieldInfo = memberFactory.createFieldInfoForContent( + new XSString(), _config.useJava50()); handleField(fieldInfo, state); } else if (complexType.getContentType().getType() == ContentType.SIMPLE) { SimpleContent simpleContent = (SimpleContent) complexType.getContentType(); @@ -406,8 +408,10 @@ } else if (complexType.getContentType().getType() == ContentType.SIMPLE) { SimpleContent simpleContent = (SimpleContent) complexType.getContentType(); SimpleType temp = simpleContent.getSimpleType(); - XSType xsType = _typeConversion.convertType(temp, packageName, _config.useJava50()); - FieldInfo fieldInfo = memberFactory.createFieldInfoForContent(xsType, _config.useJava50()); + XSType xsType = _typeConversion.convertType( + temp, packageName, _config.useJava50()); + FieldInfo fieldInfo = memberFactory.createFieldInfoForContent( + xsType, _config.useJava50()); handleField(fieldInfo, state); temp = null; } else { @@ -495,8 +499,12 @@ * @param jClass * @param baseClass */ - private void makeMethods(final XMLBindingComponent component, final SGStateInfo sgState, - final FactoryState state, final JClass jClass, final String baseClass) { + private void makeMethods( + final XMLBindingComponent component, + final SGStateInfo sgState, + final FactoryState state, + final JClass jClass, + final String baseClass) { //NOTE: be careful with the derivation stuff when generating bounds properties if (_createMarshalMethods) { @@ -588,7 +596,8 @@ XMLType type = component.getXMLType(); ClassInfo classInfo = state._classInfo; JClass jClass = state._jClass; - boolean creatingForAnElement = (component.getAnnotated().getStructureType() == Structure.ELEMENT); + boolean creatingForAnElement = + (component.getAnnotated().getStructureType() == Structure.ELEMENT); ComplexType complexType = (ComplexType) type; if (complexType.isTopLevel() && creatingForAnElement) { @@ -702,7 +711,8 @@ Structure attrDeclParent = ((AttributeDecl) struct).getParent(); if (attrDeclParent != null && attrDeclParent.getStructureType() == Structure.ATTRIBUTE_GROUP) { - typeName = JavaNaming.toJavaClassName(((AttributeGroupDecl) attrDeclParent).getName() + typeName); + typeName = JavaNaming.toJavaClassName( + ((AttributeGroupDecl) attrDeclParent).getName() + typeName); } else { typeName = fstate._jClass.getLocalName() + typeName; } @@ -832,7 +842,8 @@ JDocDescriptor jdDesc = null; String desc = null; - desc = "Notifies all registered PropertyChangeListeners when a bound property's value changes."; + desc = "Notifies all registered PropertyChangeListeners " + + "when a bound property's value changes."; jdc.appendComment(desc); jMethod.addParameter(new JParameter(SGTypes.String, "fieldName")); @@ -892,7 +903,8 @@ jMethod = new JMethod("removePropertyChangeListener", JType.BOOLEAN, "always returns true if pcl != null"); - desc = "Removes the given PropertyChangeListener from this classes list of ProperyChangeListeners."; + desc = "Removes the given PropertyChangeListener " + + "from this classes list of ProperyChangeListeners."; jdc = jMethod.getJDocComment(); jdc.appendComment(desc); @@ -930,9 +942,9 @@ //-- create main marshal method JMethod jMethod = new JMethod("marshal"); jMethod.addException(SGTypes.MarshalException, - "if object is null or if any SAXException is thrown during marshaling"); + "if object is null or if any SAXException is thrown during marshaling"); jMethod.addException(SGTypes.ValidationException, - "if this object is an invalid instance according to the schema"); + "if this object is an invalid instance according to the schema"); jMethod.addParameter(new JParameter(SGTypes.Writer, "out")); //if (_config.useJava50()) { @@ -960,9 +972,9 @@ jMethod.addException(SGTypes.IOException, "if an IOException occurs during marshaling"); } jMethod.addException(SGTypes.MarshalException, - "if object is null or if any SAXException is thrown during marshaling"); + "if object is null or if any SAXException is thrown during marshaling"); jMethod.addException(SGTypes.ValidationException, - "if this object is an invalid instance according to the schema"); + "if this object is an invalid instance according to the schema"); jMethod.addParameter(new JParameter(jc, "handler")); parent.addMethod(jMethod); @@ -993,9 +1005,9 @@ "the unmarshaled " + returnType.getName()); jMethod.getModifiers().setStatic(true); jMethod.addException(SGTypes.MarshalException, - "if object is null or if any SAXException is thrown during marshaling"); + "if object is null or if any SAXException is thrown during marshaling"); jMethod.addException(SGTypes.ValidationException, - "if this object is an invalid instance according to the schema"); + "if this object is an invalid instance according to the schema"); jMethod.addParameter(new JParameter(SGTypes.Reader, "reader")); parent.addMethod(jMethod); @@ -1086,7 +1098,8 @@ JMethod jMethod = new JMethod("hashCode", JType.INT, "a hash code value for the object."); jMethod.setComment("Overrides the java.lang.Object.hashCode method.\n" + "

\n" - + "The following steps came from Effective Java Programming Language Guide " + + "The following steps came from " + + "Effective Java Programming Language Guide " + "by Joshua Bloch, Chapter 3"); // The hashCode method has no arguments @@ -1106,7 +1119,8 @@ String name = temp.getName(); if (type.isPrimitive()) { if (type == JType.BOOLEAN) { - // Skip the _has_* variables only if they represent a primitive that may or may not be present + // Skip the _has_* variables only if they represent + // a primitive that may or may not be present if (!name.startsWith("_has_") || jclass.getField(name.substring(5)) != null) { jsc.add("result = 37 * result + (" + name + "?0:1);"); } @@ -1571,7 +1585,8 @@ } } - FieldInfo fieldInfo = memberFactory.createFieldInfo(component, state, _config.useJava50()); + FieldInfo fieldInfo = memberFactory.createFieldInfo( + component, state, _config.useJava50()); handleField(fieldInfo, state); } } @@ -1646,9 +1661,10 @@ //--if the content type is a simpleType create a field info for it. if (complexType.getContentType().getType() == ContentType.SIMPLE) { SimpleContent simpleContent = (SimpleContent) complexType.getContentType(); - SimpleType temp = simpleContent.getSimpleType(); - SimpleType baseType = (SimpleType) temp.getBaseType(); - XSType xsType = _typeConversion.convertType(temp, state._packageName, _config.useJava50()); + SimpleType temp = simpleContent.getSimpleType(); + SimpleType baseType = (SimpleType) temp.getBaseType(); + XSType xsType = _typeConversion.convertType( + temp, state._packageName, _config.useJava50()); FieldInfo fieldInfo = null; if ((baseType != null) && extendsSimpleType(state._jClass, baseType, state)) { @@ -1653,7 +1669,8 @@ FieldInfo fieldInfo = null; if ((baseType != null) && extendsSimpleType(state._jClass, baseType, state)) { if (xsType.isEnumerated()) { - fieldInfo = memberFactory.createFieldInfoForContent(xsType, _config.useJava50()); + fieldInfo = memberFactory.createFieldInfoForContent( + xsType, _config.useJava50()); fieldInfo.setBound(false); handleField(fieldInfo, state); @@ -1679,8 +1696,10 @@ while (temp.getBaseType() != null) { temp = (SimpleType) temp.getBaseType(); } - xsType = _typeConversion.convertType(temp, state._packageName, _config.useJava50()); - fieldInfo = memberFactory.createFieldInfoForContent(xsType, _config.useJava50()); + xsType = _typeConversion.convertType( + temp, state._packageName, _config.useJava50()); + fieldInfo = memberFactory.createFieldInfoForContent( + xsType, _config.useJava50()); handleField(fieldInfo, state); } } @@ -1696,7 +1715,8 @@ //--reset the view on the current ComplexType component.setView(complexType); if (complexType.getContentType() == ContentType.mixed) { - FieldInfo fieldInfo = memberFactory.createFieldInfoForContent(new XSString(), _config.useJava50()); + FieldInfo fieldInfo = memberFactory.createFieldInfoForContent( + new XSString(), _config.useJava50()); handleField(fieldInfo, state); } } @@ -1739,7 +1759,8 @@ switch(annotated.getStructureType()) { case Structure.ELEMENT: //-- handle element declarations - fieldInfo = memberFactory.createFieldInfo(component, state, _config.useJava50()); + fieldInfo = memberFactory.createFieldInfo( + component, state, _config.useJava50()); //-- Fix for element declarations being used in //-- a group with minOccurs = 0; //-- (kvisco - 20021007) @@ -1751,7 +1772,8 @@ case Structure.GROUP: //-- handle groups Group group = (Group) annotated; //set the compositor - if ((contentModel instanceof ComplexType) || (contentModel instanceof ModelGroup)) { + if ((contentModel instanceof ComplexType) + || (contentModel instanceof ModelGroup)) { if (group.getOrder() == Order.choice) { state._classInfo.getGroupInfo().setAsChoice(); } else if (group.getOrder() == Order.all) { @@ -1762,7 +1784,8 @@ } //-- create class member,if necessary - if (!((contentModel instanceof ComplexType) || (contentModel instanceof ModelGroup))) { + if (!((contentModel instanceof ComplexType) + || (contentModel instanceof ModelGroup))) { if (contentModel instanceof ModelGroup) { ModelGroup mg = (ModelGroup) contentModel; if (mg.isReference()) { @@ -1796,7 +1819,8 @@ } if (modelgroup.getParticleCount() > 0) { - fieldInfo = memberFactory.createFieldInfo(component, state.getSGStateInfo(), _config.useJava50()); + fieldInfo = memberFactory.createFieldInfo( + component, state.getSGStateInfo(), _config.useJava50()); handleField(fieldInfo, state); } break; @@ -1807,7 +1831,8 @@ case Structure.WILDCARD: Wildcard wildcard = (Wildcard) annotated; - FieldInfo fieldForAny = memberFactory.createFieldInfoForAny(wildcard, _config.useJava50()); + FieldInfo fieldForAny = memberFactory.createFieldInfoForAny( + wildcard, _config.useJava50()); handleField(fieldForAny, state); break; Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceGeneratorMain.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceGeneratorMain.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceGeneratorMain.java (working copy) @@ -101,28 +101,66 @@ //-------------------------/ /** Message used when descriptor creation is disabled. */ - private static final String DISABLE_DESCRIPTORS_MSG = "Disabling generation of Class descriptors."; + private static final String DISABLE_DESCRIPTORS_MSG = + "Disabling generation of Class descriptors."; + /** Message used when marshalling methods creation is disabled. */ - private static final String DISABLE_MARSHALL_MSG = "Disabling generation of Marshalling framework methods (marshall, unmarshall, validate)."; + private static final String DISABLE_MARSHALL_MSG = + "Disabling generation of Marshalling framework methods (marshall, unmarshall, validate)."; + /** Message used when implementing CastorTestable. */ - private static final String CASTOR_TESTABLE_MSG = "The generated classes will implement org.exolab.castor.tests.CastorTestable."; + private static final String CASTOR_TESTABLE_MSG = + "The generated classes will implement org.exolab.castor.tests.CastorTestable."; + /** Message used when using SAX1. */ - private static final String SAX1_MSG = "The generated classes will use SAX 1."; - private static final String GENERATE_IMPORT_MSG = "Imported XML Schemas will be processed automatically."; - private static final String CASE_INSENSITIVE_MSG = "The generated classes will use a case insensitive method for looking up enumerated type values."; - private static final String TYPE_FACTORY_ARG_MSG = "The argument '-type-factory' is deprecated; please use '-types' in its place."; - private static final String SUPPRESS_NON_FATAL_WARN_MSG = "Suppressing non fatal warnings."; - private static final String GENERATING_MAPPING_FILE_MSG = "Generating mapping file: "; - private static final String BINDING_FILE_ERROR1_MSG = "Unable to load binding file "; - private static final String BINDING_FILE_ERROR2_MSG = " due to the following Exception:"; - private static final String BINDING_FILE_ERROR3_MSG = "No binding file will be used."; - private static final String INVALID_TYPES_OPTION_MSG = "Invalid option for '-types': "; - private static final String DEFAULT_FIELD_INFO_MSG = "Using default source generator types."; - private static final String LINE_SEPARATION_WIN_MSG = "Using Windows style line separation."; - private static final String LINE_SEPARATION_UNIX_MSG = "Using UNIX style line separation."; - private static final String LINE_SEPARATION_MAC_MSG = "Using Macintosh style line separation."; - private static final String DEFAULT_LINE_SEPARATOR_MSG = "Using default line separator for this platform"; - private static final String INVALID_LINE_SEPARATOR_MSG = "Invalid option for line-separator: "; + private static final String SAX1_MSG = + "The generated classes will use SAX 1."; + + private static final String GENERATE_IMPORT_MSG = + "Imported XML Schemas will be processed automatically."; + + private static final String CASE_INSENSITIVE_MSG = + "The generated classes will use a case insensitive method " + + "for looking up enumerated type values."; + + private static final String TYPE_FACTORY_ARG_MSG = + "The argument '-type-factory' is deprecated; please use '-types' in its place."; + + private static final String SUPPRESS_NON_FATAL_WARN_MSG = + "Suppressing non fatal warnings."; + + private static final String GENERATING_MAPPING_FILE_MSG = + "Generating mapping file: "; + + private static final String BINDING_FILE_ERROR1_MSG = + "Unable to load binding file "; + + private static final String BINDING_FILE_ERROR2_MSG = + " due to the following Exception:"; + + private static final String BINDING_FILE_ERROR3_MSG = + "No binding file will be used."; + + private static final String INVALID_TYPES_OPTION_MSG = + "Invalid option for '-types': "; + + private static final String DEFAULT_FIELD_INFO_MSG = + "Using default source generator types."; + + private static final String LINE_SEPARATION_WIN_MSG = + "Using Windows style line separation."; + + private static final String LINE_SEPARATION_UNIX_MSG = + "Using UNIX style line separation."; + + private static final String LINE_SEPARATION_MAC_MSG = + "Using Macintosh style line separation."; + + private static final String DEFAULT_LINE_SEPARATOR_MSG = + "Using default line separator for this platform"; + + private static final String INVALID_LINE_SEPARATOR_MSG = + "Invalid option for line-separator: "; /** The full set of command-line options. */ private static final CommandLineOptions ALL_OPTIONS = setupCommandLineOptions(); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Binding.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Binding.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Binding.java (working copy) @@ -111,8 +111,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addAttributeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + throws java.lang.IndexOutOfBoundsException { this._attributeBindingList.add(vAttributeBinding); } //-- void addAttributeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -124,8 +125,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addAttributeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + throws java.lang.IndexOutOfBoundsException { this._attributeBindingList.add(index, vAttributeBinding); } //-- void addAttributeBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -136,8 +139,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addComplexTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + throws java.lang.IndexOutOfBoundsException { this._complexTypeBindingList.add(vComplexTypeBinding); } //-- void addComplexTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -149,8 +153,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addComplexTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addComplexTypeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + throws java.lang.IndexOutOfBoundsException { this._complexTypeBindingList.add(index, vComplexTypeBinding); } //-- void addComplexTypeBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -161,8 +167,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) - throws java.lang.IndexOutOfBoundsException { + public void addElementBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + throws java.lang.IndexOutOfBoundsException { this._elementBindingList.add(vElementBinding); } //-- void addElementBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -174,8 +181,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) - throws java.lang.IndexOutOfBoundsException { + public void addElementBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + throws java.lang.IndexOutOfBoundsException { this._elementBindingList.add(index, vElementBinding); } //-- void addElementBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -186,8 +195,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) - throws java.lang.IndexOutOfBoundsException { + public void addEnumBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + throws java.lang.IndexOutOfBoundsException { this._enumBindingList.add(vEnumBinding); } //-- void addEnumBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -199,8 +209,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) - throws java.lang.IndexOutOfBoundsException { + public void addEnumBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + throws java.lang.IndexOutOfBoundsException { this._enumBindingList.add(index, vEnumBinding); } //-- void addEnumBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -211,8 +223,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) - throws java.lang.IndexOutOfBoundsException { + public void addGroupBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + throws java.lang.IndexOutOfBoundsException { this._groupBindingList.add(vGroupBinding); } //-- void addGroupBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -224,8 +237,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) - throws java.lang.IndexOutOfBoundsException { + public void addGroupBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + throws java.lang.IndexOutOfBoundsException { this._groupBindingList.add(index, vGroupBinding); } //-- void addGroupBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -236,8 +251,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addInclude(final org.exolab.castor.builder.binding.IncludeType vInclude) - throws java.lang.IndexOutOfBoundsException { + public void addInclude( + final org.exolab.castor.builder.binding.IncludeType vInclude) + throws java.lang.IndexOutOfBoundsException { this._includeList.add(vInclude); } //-- void addInclude(org.exolab.castor.builder.binding.IncludeType) @@ -249,8 +265,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addInclude(final int index, final org.exolab.castor.builder.binding.IncludeType vInclude) - throws java.lang.IndexOutOfBoundsException { + public void addInclude( + final int index, + final org.exolab.castor.builder.binding.IncludeType vInclude) + throws java.lang.IndexOutOfBoundsException { this._includeList.add(index, vInclude); } //-- void addInclude(int, org.exolab.castor.builder.binding.IncludeType) @@ -261,8 +279,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addPackage(final org.exolab.castor.builder.binding.PackageType vPackage) - throws java.lang.IndexOutOfBoundsException { + public void addPackage( + final org.exolab.castor.builder.binding.PackageType vPackage) + throws java.lang.IndexOutOfBoundsException { this._packageList.add(vPackage); } //-- void addPackage(org.exolab.castor.builder.binding.PackageType) @@ -274,8 +293,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addPackage(final int index, final org.exolab.castor.builder.binding.PackageType vPackage) - throws java.lang.IndexOutOfBoundsException { + public void addPackage( + final int index, + final org.exolab.castor.builder.binding.PackageType vPackage) + throws java.lang.IndexOutOfBoundsException { this._packageList.add(index, vPackage); } //-- void addPackage(int, org.exolab.castor.builder.binding.PackageType) @@ -286,8 +307,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addSimpleTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + throws java.lang.IndexOutOfBoundsException { this._simpleTypeBindingList.add(vSimpleTypeBinding); } //-- void addSimpleTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -299,8 +321,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addSimpleTypeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + throws java.lang.IndexOutOfBoundsException { this._simpleTypeBindingList.add(index, vSimpleTypeBinding); } //-- void addSimpleTypeBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -394,14 +418,18 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding(final int index) - throws java.lang.IndexOutOfBoundsException { + public org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding( + final int index) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._attributeBindingList.size()) { - throw new IndexOutOfBoundsException("getAttributeBinding: Index value '" + index + "' not in range [0.." + (this._attributeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getAttributeBinding: Index value '" + index + + "' not in range [0.." + (this._attributeBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _attributeBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _attributeBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding(int) /** @@ -411,7 +439,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getAttributeBinding() { int size = this._attributeBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _attributeBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -439,14 +468,18 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding(final int index) - throws java.lang.IndexOutOfBoundsException { + public org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding( + final int index) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._complexTypeBindingList.size()) { - throw new IndexOutOfBoundsException("getComplexTypeBinding: Index value '" + index + "' not in range [0.." + (this._complexTypeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getComplexTypeBinding: Index value '" + index + + "' not in range [0.." + (this._complexTypeBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _complexTypeBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _complexTypeBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding(int) /** @@ -456,7 +489,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getComplexTypeBinding() { int size = this._complexTypeBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _complexTypeBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -497,10 +531,13 @@ throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._elementBindingList.size()) { - throw new IndexOutOfBoundsException("getElementBinding: Index value '" + index + "' not in range [0.." + (this._elementBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getElementBinding: Index value '" + index + + "' not in range [0.." + (this._elementBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _elementBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _elementBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getElementBinding(int) /** @@ -510,7 +547,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getElementBinding() { int size = this._elementBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _elementBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -542,7 +580,9 @@ throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._enumBindingList.size()) { - throw new IndexOutOfBoundsException("getEnumBinding: Index value '" + index + "' not in range [0.." + (this._enumBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getEnumBinding: Index value '" + index + + "' not in range [0.." + (this._enumBindingList.size() - 1) + "]"); } return (org.exolab.castor.builder.binding.ComponentBindingType) _enumBindingList.get(index); @@ -555,7 +595,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getEnumBinding() { int size = this._enumBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _enumBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -587,10 +628,13 @@ throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._groupBindingList.size()) { - throw new IndexOutOfBoundsException("getGroupBinding: Index value '" + index + "' not in range [0.." + (this._groupBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getGroupBinding: Index value '" + index + + "' not in range [0.." + (this._groupBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _groupBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _groupBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getGroupBinding(int) /** @@ -600,7 +644,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getGroupBinding() { int size = this._groupBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _groupBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -632,7 +677,9 @@ throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._includeList.size()) { - throw new IndexOutOfBoundsException("getInclude: Index value '" + index + "' not in range [0.." + (this._includeList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getInclude: Index value '" + index + + "' not in range [0.." + (this._includeList.size() - 1) + "]"); } return (org.exolab.castor.builder.binding.IncludeType) _includeList.get(index); @@ -645,7 +692,8 @@ */ public org.exolab.castor.builder.binding.IncludeType[] getInclude() { int size = this._includeList.size(); - org.exolab.castor.builder.binding.IncludeType[] array = new org.exolab.castor.builder.binding.IncludeType[size]; + org.exolab.castor.builder.binding.IncludeType[] array = + new org.exolab.castor.builder.binding.IncludeType[size]; java.util.Iterator iter = _includeList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.IncludeType) iter.next(); @@ -686,7 +734,9 @@ throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._packageList.size()) { - throw new IndexOutOfBoundsException("getPackage: Index value '" + index + "' not in range [0.." + (this._packageList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getPackage: Index value '" + index + + "' not in range [0.." + (this._packageList.size() - 1) + "]"); } return (org.exolab.castor.builder.binding.PackageType) _packageList.get(index); @@ -699,7 +749,8 @@ */ public org.exolab.castor.builder.binding.PackageType[] getPackage() { int size = this._packageList.size(); - org.exolab.castor.builder.binding.PackageType[] array = new org.exolab.castor.builder.binding.PackageType[size]; + org.exolab.castor.builder.binding.PackageType[] array = + new org.exolab.castor.builder.binding.PackageType[size]; java.util.Iterator iter = _packageList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.PackageType) iter.next(); @@ -727,14 +778,18 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding(final int index) - throws java.lang.IndexOutOfBoundsException { + public org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding( + final int index) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._simpleTypeBindingList.size()) { - throw new IndexOutOfBoundsException("getSimpleTypeBinding: Index value '" + index + "' not in range [0.." + (this._simpleTypeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getSimpleTypeBinding: Index value '" + index + + "' not in range [0.." + (this._simpleTypeBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _simpleTypeBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _simpleTypeBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding(int) /** @@ -744,7 +799,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getSimpleTypeBinding() { int size = this._simpleTypeBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _simpleTypeBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -866,8 +922,7 @@ * object is an invalid instance according to the schema */ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -883,8 +938,8 @@ * null or if any SAXException is thrown during marshaling */ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -942,7 +997,8 @@ * @param vAttributeBinding * @return true if the object was removed from the collection. */ - public boolean removeAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) { + public boolean removeAttributeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) { boolean removed = _attributeBindingList.remove(vAttributeBinding); return removed; } //-- boolean removeAttributeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -953,7 +1009,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt( + final int index) { Object obj = this._attributeBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt(int) @@ -964,7 +1021,8 @@ * @param vComplexTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) { + public boolean removeComplexTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) { boolean removed = _complexTypeBindingList.remove(vComplexTypeBinding); return removed; } //-- boolean removeComplexTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -975,7 +1033,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt( + final int index) { Object obj = this._complexTypeBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt(int) @@ -986,7 +1045,8 @@ * @param vElementBinding * @return true if the object was removed from the collection. */ - public boolean removeElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) { + public boolean removeElementBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) { boolean removed = _elementBindingList.remove(vElementBinding); return removed; } //-- boolean removeElementBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -997,7 +1057,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt( + final int index) { Object obj = this._elementBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt(int) @@ -1008,7 +1069,8 @@ * @param vEnumBinding * @return true if the object was removed from the collection. */ - public boolean removeEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) { + public boolean removeEnumBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) { boolean removed = _enumBindingList.remove(vEnumBinding); return removed; } //-- boolean removeEnumBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -1019,7 +1081,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt( + final int index) { Object obj = this._enumBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt(int) @@ -1030,7 +1093,8 @@ * @param vGroupBinding * @return true if the object was removed from the collection. */ - public boolean removeGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) { + public boolean removeGroupBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) { boolean removed = _groupBindingList.remove(vGroupBinding); return removed; } //-- boolean removeGroupBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -1041,7 +1105,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt( + final int index) { Object obj = this._groupBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt(int) @@ -1052,7 +1117,8 @@ * @param vInclude * @return true if the object was removed from the collection. */ - public boolean removeInclude(final org.exolab.castor.builder.binding.IncludeType vInclude) { + public boolean removeInclude( + final org.exolab.castor.builder.binding.IncludeType vInclude) { boolean removed = _includeList.remove(vInclude); return removed; } //-- boolean removeInclude(org.exolab.castor.builder.binding.IncludeType) @@ -1063,7 +1129,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.IncludeType removeIncludeAt(final int index) { + public org.exolab.castor.builder.binding.IncludeType removeIncludeAt( + final int index) { Object obj = this._includeList.remove(index); return (org.exolab.castor.builder.binding.IncludeType) obj; } //-- org.exolab.castor.builder.binding.IncludeType removeIncludeAt(int) @@ -1074,7 +1141,8 @@ * @param vPackage * @return true if the object was removed from the collection. */ - public boolean removePackage(final org.exolab.castor.builder.binding.PackageType vPackage) { + public boolean removePackage( + final org.exolab.castor.builder.binding.PackageType vPackage) { boolean removed = _packageList.remove(vPackage); return removed; } //-- boolean removePackage(org.exolab.castor.builder.binding.PackageType) @@ -1085,7 +1153,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.PackageType removePackageAt(final int index) { + public org.exolab.castor.builder.binding.PackageType removePackageAt( + final int index) { Object obj = this._packageList.remove(index); return (org.exolab.castor.builder.binding.PackageType) obj; } //-- org.exolab.castor.builder.binding.PackageType removePackageAt(int) @@ -1096,7 +1165,8 @@ * @param vSimpleTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) { + public boolean removeSimpleTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) { boolean removed = _simpleTypeBindingList.remove(vSimpleTypeBinding); return removed; } //-- boolean removeSimpleTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -1107,7 +1177,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt( + final int index) { Object obj = this._simpleTypeBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt(int) @@ -1120,11 +1191,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setAttributeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) - throws java.lang.IndexOutOfBoundsException { + public void setAttributeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._attributeBindingList.size()) { - throw new IndexOutOfBoundsException("setAttributeBinding: Index value '" + index + "' not in range [0.." + (this._attributeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setAttributeBinding: Index value '" + index + + "' not in range [0.." + (this._attributeBindingList.size() - 1) + "]"); } this._attributeBindingList.set(index, vAttributeBinding); @@ -1135,7 +1210,8 @@ * * @param vAttributeBindingArray */ - public void setAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vAttributeBindingArray) { + public void setAttributeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] vAttributeBindingArray) { //-- copy array _attributeBindingList.clear(); @@ -1152,11 +1228,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setComplexTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void setComplexTypeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._complexTypeBindingList.size()) { - throw new IndexOutOfBoundsException("setComplexTypeBinding: Index value '" + index + "' not in range [0.." + (this._complexTypeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setComplexTypeBinding: Index value '" + index + + "' not in range [0.." + (this._complexTypeBindingList.size() - 1) + "]"); } this._complexTypeBindingList.set(index, vComplexTypeBinding); @@ -1167,7 +1247,9 @@ * * @param vComplexTypeBindingArray */ - public void setComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vComplexTypeBindingArray) { + public void setComplexTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] + vComplexTypeBindingArray) { //-- copy array _complexTypeBindingList.clear(); @@ -1182,7 +1264,8 @@ * @param defaultBindingType the value of field * 'defaultBindingType'. */ - public void setDefaultBindingType(final org.exolab.castor.builder.binding.types.BindingType defaultBindingType) { + public void setDefaultBindingType( + final org.exolab.castor.builder.binding.types.BindingType defaultBindingType) { this._defaultBindingType = defaultBindingType; } //-- void setDefaultBindingType(org.exolab.castor.builder.binding.types.BindingType) @@ -1194,11 +1277,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setElementBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) - throws java.lang.IndexOutOfBoundsException { + public void setElementBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._elementBindingList.size()) { - throw new IndexOutOfBoundsException("setElementBinding: Index value '" + index + "' not in range [0.." + (this._elementBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setElementBinding: Index value '" + index + + "' not in range [0.." + (this._elementBindingList.size() - 1) + "]"); } this._elementBindingList.set(index, vElementBinding); @@ -1209,7 +1296,8 @@ * * @param vElementBindingArray */ - public void setElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vElementBindingArray) { + public void setElementBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] vElementBindingArray) { //-- copy array _elementBindingList.clear(); @@ -1226,11 +1314,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setEnumBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) - throws java.lang.IndexOutOfBoundsException { + public void setEnumBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._enumBindingList.size()) { - throw new IndexOutOfBoundsException("setEnumBinding: Index value '" + index + "' not in range [0.." + (this._enumBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setEnumBinding: Index value '" + index + + "' not in range [0.." + (this._enumBindingList.size() - 1) + "]"); } this._enumBindingList.set(index, vEnumBinding); @@ -1241,7 +1333,8 @@ * * @param vEnumBindingArray */ - public void setEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vEnumBindingArray) { + public void setEnumBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] vEnumBindingArray) { //-- copy array _enumBindingList.clear(); @@ -1258,11 +1351,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setGroupBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) - throws java.lang.IndexOutOfBoundsException { + public void setGroupBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._groupBindingList.size()) { - throw new IndexOutOfBoundsException("setGroupBinding: Index value '" + index + "' not in range [0.." + (this._groupBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setGroupBinding: Index value '" + index + + "' not in range [0.." + (this._groupBindingList.size() - 1) + "]"); } this._groupBindingList.set(index, vGroupBinding); @@ -1273,7 +1370,8 @@ * * @param vGroupBindingArray */ - public void setGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vGroupBindingArray) { + public void setGroupBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] vGroupBindingArray) { //-- copy array _groupBindingList.clear(); @@ -1290,11 +1388,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setInclude(final int index, final org.exolab.castor.builder.binding.IncludeType vInclude) - throws java.lang.IndexOutOfBoundsException { + public void setInclude( + final int index, + final org.exolab.castor.builder.binding.IncludeType vInclude) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._includeList.size()) { - throw new IndexOutOfBoundsException("setInclude: Index value '" + index + "' not in range [0.." + (this._includeList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setInclude: Index value '" + index + + "' not in range [0.." + (this._includeList.size() - 1) + "]"); } this._includeList.set(index, vInclude); @@ -1305,7 +1407,8 @@ * * @param vIncludeArray */ - public void setInclude(final org.exolab.castor.builder.binding.IncludeType[] vIncludeArray) { + public void setInclude( + final org.exolab.castor.builder.binding.IncludeType[] vIncludeArray) { //-- copy array _includeList.clear(); @@ -1319,7 +1422,8 @@ * * @param namingXML the value of field 'namingXML'. */ - public void setNamingXML(final org.exolab.castor.builder.binding.NamingXMLType namingXML) { + public void setNamingXML( + final org.exolab.castor.builder.binding.NamingXMLType namingXML) { this._namingXML = namingXML; } //-- void setNamingXML(org.exolab.castor.builder.binding.NamingXMLType) @@ -1331,11 +1435,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setPackage(final int index, final org.exolab.castor.builder.binding.PackageType vPackage) + public void setPackage( + final int index, + final org.exolab.castor.builder.binding.PackageType vPackage) throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._packageList.size()) { - throw new IndexOutOfBoundsException("setPackage: Index value '" + index + "' not in range [0.." + (this._packageList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setPackage: Index value '" + index + + "' not in range [0.." + (this._packageList.size() - 1) + "]"); } this._packageList.set(index, vPackage); @@ -1346,7 +1454,8 @@ * * @param vPackageArray */ - public void setPackage(final org.exolab.castor.builder.binding.PackageType[] vPackageArray) { + public void setPackage( + final org.exolab.castor.builder.binding.PackageType[] vPackageArray) { //-- copy array _packageList.clear(); @@ -1363,11 +1472,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setSimpleTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void setSimpleTypeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._simpleTypeBindingList.size()) { - throw new IndexOutOfBoundsException("setSimpleTypeBinding: Index value '" + index + "' not in range [0.." + (this._simpleTypeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setSimpleTypeBinding: Index value '" + index + + "' not in range [0.." + (this._simpleTypeBindingList.size() - 1) + "]"); } this._simpleTypeBindingList.set(index, vSimpleTypeBinding); @@ -1378,7 +1491,9 @@ * * @param vSimpleTypeBindingArray */ - public void setSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vSimpleTypeBindingArray) { + public void setSimpleTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] + vSimpleTypeBindingArray) { //-- copy array _simpleTypeBindingList.clear(); @@ -1398,9 +1513,11 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.Binding */ - public static org.exolab.castor.builder.binding.Binding unmarshalBinding(final java.io.Reader reader) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.Binding) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.Binding.class, reader); + public static org.exolab.castor.builder.binding.Binding unmarshalBinding( + final java.io.Reader reader) + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { + return (org.exolab.castor.builder.binding.Binding) + Unmarshaller.unmarshal(org.exolab.castor.builder.binding.Binding.class, reader); } //-- org.exolab.castor.builder.binding.Binding unmarshalBinding(java.io.Reader) /** Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingDescriptor.java (working copy) @@ -63,7 +63,10 @@ //-- initialize attribute descriptors //-- _defaultBindingType - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.types.BindingType.class, "_defaultBindingType", "defaultBindingType", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.types.BindingType.class, + "_defaultBindingType", "defaultBindingType", + org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -74,7 +77,8 @@ throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; - target.setDefaultBindingType((org.exolab.castor.builder.binding.types.BindingType) value); + target.setDefaultBindingType( + (org.exolab.castor.builder.binding.types.BindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -83,7 +87,8 @@ return null; } }; - handler = new org.exolab.castor.xml.handlers.EnumFieldHandler(org.exolab.castor.builder.binding.types.BindingType.class, handler); + handler = new org.exolab.castor.xml.handlers.EnumFieldHandler( + org.exolab.castor.builder.binding.types.BindingType.class, handler); desc.setImmutable(true); desc.setHandler(handler); desc.setMultivalued(false); @@ -97,10 +102,12 @@ //-- initialize element descriptors //-- _includeList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.IncludeType.class, "_includeList", "include", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.IncludeType.class, + "_includeList", "include", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) - throws IllegalStateException { + throws IllegalStateException { Binding target = (Binding) object; return target.getInclude(); } @@ -105,7 +112,7 @@ return target.getInclude(); } public void setValue(final java.lang.Object object, final java.lang.Object value) - throws IllegalStateException, IllegalArgumentException { + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.addInclude((org.exolab.castor.builder.binding.IncludeType) value); @@ -113,7 +120,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllInclude(); @@ -137,10 +145,12 @@ } desc.setValidator(fieldValidator); //-- _packageList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.PackageType.class, "_packageList", "package", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.PackageType.class, + "_packageList", "package", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) - throws IllegalStateException { + throws IllegalStateException { Binding target = (Binding) object; return target.getPackage(); } @@ -145,7 +155,7 @@ return target.getPackage(); } public void setValue(final java.lang.Object object, final java.lang.Object value) - throws IllegalStateException, IllegalArgumentException { + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.addPackage((org.exolab.castor.builder.binding.PackageType) value); @@ -153,7 +163,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllPackage(); @@ -177,10 +188,12 @@ } desc.setValidator(fieldValidator); //-- _namingXML - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.NamingXMLType.class, "_namingXML", "namingXML", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.NamingXMLType.class, + "_namingXML", "namingXML", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) - throws IllegalStateException { + throws IllegalStateException { Binding target = (Binding) object; return target.getNamingXML(); } @@ -185,7 +198,7 @@ return target.getNamingXML(); } public void setValue(final java.lang.Object object, final java.lang.Object value) - throws IllegalStateException, IllegalArgumentException { + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.setNamingXML((org.exolab.castor.builder.binding.NamingXMLType) value); @@ -208,10 +221,12 @@ } desc.setValidator(fieldValidator); //-- _elementBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_elementBindingList", "elementBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_elementBindingList", "elementBinding", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) - throws IllegalStateException { + throws IllegalStateException { Binding target = (Binding) object; return target.getElementBinding(); } @@ -216,10 +231,11 @@ return target.getElementBinding(); } public void setValue(final java.lang.Object object, final java.lang.Object value) - throws IllegalStateException, IllegalArgumentException { + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; - target.addElementBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addElementBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -224,7 +240,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllElementBinding(); @@ -248,10 +265,13 @@ } desc.setValidator(fieldValidator); //-- _attributeBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_attributeBindingList", "attributeBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_attributeBindingList", "attributeBinding", + org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) - throws IllegalStateException { + throws IllegalStateException { Binding target = (Binding) object; return target.getAttributeBinding(); } @@ -256,10 +276,11 @@ return target.getAttributeBinding(); } public void setValue(final java.lang.Object object, final java.lang.Object value) - throws IllegalStateException, IllegalArgumentException { + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; - target.addAttributeBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addAttributeBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -264,7 +285,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllAttributeBinding(); @@ -288,10 +310,13 @@ } desc.setValidator(fieldValidator); //-- _complexTypeBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_complexTypeBindingList", "complexTypeBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_complexTypeBindingList", "complexTypeBinding", + org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) - throws IllegalStateException { + throws IllegalStateException { Binding target = (Binding) object; return target.getComplexTypeBinding(); } @@ -296,10 +321,11 @@ return target.getComplexTypeBinding(); } public void setValue(final java.lang.Object object, final java.lang.Object value) - throws IllegalStateException, IllegalArgumentException { + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; - target.addComplexTypeBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addComplexTypeBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -304,7 +330,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllComplexTypeBinding(); @@ -328,10 +355,12 @@ } desc.setValidator(fieldValidator); //-- _groupBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_groupBindingList", "groupBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_groupBindingList", "groupBinding", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) - throws IllegalStateException { + throws IllegalStateException { Binding target = (Binding) object; return target.getGroupBinding(); } @@ -336,10 +365,11 @@ return target.getGroupBinding(); } public void setValue(final java.lang.Object object, final java.lang.Object value) - throws IllegalStateException, IllegalArgumentException { + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; - target.addGroupBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addGroupBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -344,7 +374,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllGroupBinding(); @@ -368,10 +399,12 @@ } desc.setValidator(fieldValidator); //-- _enumBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_enumBindingList", "enumBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_enumBindingList", "enumBinding", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) - throws IllegalStateException { + throws IllegalStateException { Binding target = (Binding) object; return target.getEnumBinding(); } @@ -376,10 +409,11 @@ return target.getEnumBinding(); } public void setValue(final java.lang.Object object, final java.lang.Object value) - throws IllegalStateException, IllegalArgumentException { + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; - target.addEnumBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addEnumBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -384,7 +418,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllEnumBinding(); @@ -408,7 +443,10 @@ } desc.setValidator(fieldValidator); //-- _simpleTypeBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_simpleTypeBindingList", "simpleTypeBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_simpleTypeBindingList", "simpleTypeBinding", + org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -419,7 +457,8 @@ throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; - target.addSimpleTypeBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addSimpleTypeBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -424,7 +463,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllSimpleTypeBinding(); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingLoader.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingLoader.java (revision 6675) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingLoader.java (working copy) @@ -256,9 +256,12 @@ } class BindingResolver implements EntityResolver { - private static final String BINDING_PUBLICID = "-//EXOLAB/Castor Binding Schema Version 1.0//EN"; - private static final String BINDING_SYSTEMID = "http://exolab.castor.org/binding.xsd"; - private static final String BINDING_RESOURCE = "/org/exolab/castor/builder/binding/binding.xsd"; + private static final String BINDING_PUBLICID = + "-//EXOLAB/Castor Binding Schema Version 1.0//EN"; + private static final String BINDING_SYSTEMID = + "http://exolab.castor.org/binding.xsd"; + private static final String BINDING_RESOURCE = + "/org/exolab/castor/builder/binding/binding.xsd"; /** * Base URL, if known. Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassType.java (working copy) @@ -286,7 +286,8 @@ * @param handler **/ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -408,9 +409,11 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.ClassType unmarshalClassType(final java.io.Reader reader) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.ClassType) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.ClassType.class, reader); + public static org.exolab.castor.builder.binding.ClassType unmarshalClassType( + final java.io.Reader reader) + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { + return (org.exolab.castor.builder.binding.ClassType) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.ClassType.class, reader); } //-- org.exolab.castor.builder.binding.ClassType unmarshalClassType(java.io.Reader) /** Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassTypeDescriptor.java (working copy) @@ -54,7 +54,8 @@ //-- initialize attribute descriptors //-- _package - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_package", "package", NodeType.Attribute); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_package", "package", NodeType.Attribute); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -88,7 +89,8 @@ desc.setValidator(fieldValidator); //-- _name - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", NodeType.Attribute); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_name", "name", NodeType.Attribute); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -122,7 +124,8 @@ desc.setValidator(fieldValidator); //-- _final - desc = new XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_final", "final", NodeType.Attribute); + desc = new XMLFieldDescriptorImpl( + java.lang.Boolean.TYPE, "_final", "final", NodeType.Attribute); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -160,7 +163,8 @@ desc.setValidator(fieldValidator); //-- _abstract - desc = new XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_abstract", "abstract", NodeType.Attribute); + desc = new XMLFieldDescriptorImpl( + java.lang.Boolean.TYPE, "_abstract", "abstract", NodeType.Attribute); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -198,7 +202,8 @@ desc.setValidator(fieldValidator); //-- _equals - desc = new XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_equals", "equals", NodeType.Attribute); + desc = new XMLFieldDescriptorImpl( + java.lang.Boolean.TYPE, "_equals", "equals", NodeType.Attribute); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -236,7 +241,8 @@ desc.setValidator(fieldValidator); //-- _bound - desc = new XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_bound", "bound", NodeType.Attribute); + desc = new XMLFieldDescriptorImpl( + java.lang.Boolean.TYPE, "_bound", "bound", NodeType.Attribute); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -276,7 +282,8 @@ //-- initialize element descriptors //-- _implementsList - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_implementsList", "implements", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_implementsList", "implements", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -313,7 +320,8 @@ desc.setValidator(fieldValidator); //-- _extends - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_extends", "extends", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_extends", "extends", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingType.java (working copy) @@ -43,7 +43,8 @@ /** * Field _componentBindingTypeChoice. */ - private org.exolab.castor.builder.binding.ComponentBindingTypeChoice _componentBindingTypeChoice; + private org.exolab.castor.builder.binding.ComponentBindingTypeChoice + _componentBindingTypeChoice; /** * Field _elementBindingList. @@ -102,8 +103,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addAttributeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + throws java.lang.IndexOutOfBoundsException { this._attributeBindingList.add(vAttributeBinding); } //-- void addAttributeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -115,8 +117,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addAttributeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + throws java.lang.IndexOutOfBoundsException { this._attributeBindingList.add(index, vAttributeBinding); } //-- void addAttributeBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -127,8 +131,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addComplexTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + throws java.lang.IndexOutOfBoundsException { this._complexTypeBindingList.add(vComplexTypeBinding); } //-- void addComplexTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -140,8 +145,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addComplexTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addComplexTypeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + throws java.lang.IndexOutOfBoundsException { this._complexTypeBindingList.add(index, vComplexTypeBinding); } //-- void addComplexTypeBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -152,8 +159,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) - throws java.lang.IndexOutOfBoundsException { + public void addElementBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + throws java.lang.IndexOutOfBoundsException { this._elementBindingList.add(vElementBinding); } //-- void addElementBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -165,8 +173,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) - throws java.lang.IndexOutOfBoundsException { + public void addElementBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + throws java.lang.IndexOutOfBoundsException { this._elementBindingList.add(index, vElementBinding); } //-- void addElementBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -177,8 +187,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) - throws java.lang.IndexOutOfBoundsException { + public void addEnumBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + throws java.lang.IndexOutOfBoundsException { this._enumBindingList.add(vEnumBinding); } //-- void addEnumBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -190,8 +201,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) - throws java.lang.IndexOutOfBoundsException { + public void addEnumBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + throws java.lang.IndexOutOfBoundsException { this._enumBindingList.add(index, vEnumBinding); } //-- void addEnumBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -202,8 +215,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) - throws java.lang.IndexOutOfBoundsException { + public void addGroupBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + throws java.lang.IndexOutOfBoundsException { this._groupBindingList.add(vGroupBinding); } //-- void addGroupBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -215,8 +229,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) - throws java.lang.IndexOutOfBoundsException { + public void addGroupBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + throws java.lang.IndexOutOfBoundsException { this._groupBindingList.add(index, vGroupBinding); } //-- void addGroupBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -227,8 +243,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addSimpleTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + throws java.lang.IndexOutOfBoundsException { this._simpleTypeBindingList.add(vSimpleTypeBinding); } //-- void addSimpleTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -240,8 +257,10 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void addSimpleTypeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + throws java.lang.IndexOutOfBoundsException { this._simpleTypeBindingList.add(index, vSimpleTypeBinding); } //-- void addSimpleTypeBinding(int, org.exolab.castor.builder.binding.ComponentBindingType) @@ -315,14 +334,18 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding(final int index) - throws java.lang.IndexOutOfBoundsException { + public org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding( + final int index) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._attributeBindingList.size()) { - throw new IndexOutOfBoundsException("getAttributeBinding: Index value '" + index + "' not in range [0.." + (this._attributeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getAttributeBinding: Index value '" + index + + "' not in range [0.." + (this._attributeBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _attributeBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _attributeBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding(int) /** @@ -332,7 +355,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getAttributeBinding() { int size = this._attributeBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _attributeBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -360,14 +384,18 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding(final int index) - throws java.lang.IndexOutOfBoundsException { + public org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding( + final int index) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._complexTypeBindingList.size()) { - throw new IndexOutOfBoundsException("getComplexTypeBinding: Index value '" + index + "' not in range [0.." + (this._complexTypeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getComplexTypeBinding: Index value '" + index + + "' not in range [0.." + (this._complexTypeBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _complexTypeBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _complexTypeBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding(int) /** @@ -377,7 +405,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getComplexTypeBinding() { int size = this._complexTypeBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _complexTypeBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -400,9 +429,10 @@ * * @return the value of field 'ComponentBindingTypeChoice'. */ - public org.exolab.castor.builder.binding.ComponentBindingTypeChoice getComponentBindingTypeChoice() { + public org.exolab.castor.builder.binding.ComponentBindingTypeChoice + getComponentBindingTypeChoice() { return this._componentBindingTypeChoice; - } //-- org.exolab.castor.builder.binding.ComponentBindingTypeChoice getComponentBindingTypeChoice() + } /** * Method getElementBinding. @@ -418,10 +448,13 @@ throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._elementBindingList.size()) { - throw new IndexOutOfBoundsException("getElementBinding: Index value '" + index + "' not in range [0.." + (this._elementBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getElementBinding: Index value '" + index + + "' not in range [0.." + (this._elementBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _elementBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _elementBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getElementBinding(int) /** @@ -431,7 +464,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getElementBinding() { int size = this._elementBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _elementBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -463,7 +497,9 @@ throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._enumBindingList.size()) { - throw new IndexOutOfBoundsException("getEnumBinding: Index value '" + index + "' not in range [0.." + (this._enumBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getEnumBinding: Index value '" + index + + "' not in range [0.." + (this._enumBindingList.size() - 1) + "]"); } return (org.exolab.castor.builder.binding.ComponentBindingType) _enumBindingList.get(index); @@ -476,7 +512,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getEnumBinding() { int size = this._enumBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _enumBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -508,10 +545,13 @@ throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._groupBindingList.size()) { - throw new IndexOutOfBoundsException("getGroupBinding: Index value '" + index + "' not in range [0.." + (this._groupBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getGroupBinding: Index value '" + index + + "' not in range [0.." + (this._groupBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _groupBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _groupBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getGroupBinding(int) /** @@ -521,7 +561,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getGroupBinding() { int size = this._groupBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _groupBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -558,14 +599,18 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding(final int index) - throws java.lang.IndexOutOfBoundsException { + public org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding( + final int index) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._simpleTypeBindingList.size()) { - throw new IndexOutOfBoundsException("getSimpleTypeBinding: Index value '" + index + "' not in range [0.." + (this._simpleTypeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getSimpleTypeBinding: Index value '" + index + + "' not in range [0.." + (this._simpleTypeBindingList.size() - 1) + "]"); } - return (org.exolab.castor.builder.binding.ComponentBindingType) _simpleTypeBindingList.get(index); + return (org.exolab.castor.builder.binding.ComponentBindingType) + _simpleTypeBindingList.get(index); } //-- org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding(int) /** @@ -575,7 +620,8 @@ */ public org.exolab.castor.builder.binding.ComponentBindingType[] getSimpleTypeBinding() { int size = this._simpleTypeBindingList.size(); - org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; + org.exolab.castor.builder.binding.ComponentBindingType[] array = + new org.exolab.castor.builder.binding.ComponentBindingType[size]; java.util.Iterator iter = _simpleTypeBindingList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.ComponentBindingType) iter.next(); @@ -677,8 +723,7 @@ * object is an invalid instance according to the schema */ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -694,8 +739,8 @@ * null or if any SAXException is thrown during marshaling */ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -741,7 +786,8 @@ * @param vAttributeBinding * @return true if the object was removed from the collection. */ - public boolean removeAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) { + public boolean removeAttributeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) { boolean removed = _attributeBindingList.remove(vAttributeBinding); return removed; } //-- boolean removeAttributeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -752,7 +798,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt( + final int index) { Object obj = this._attributeBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt(int) @@ -763,7 +810,8 @@ * @param vComplexTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) { + public boolean removeComplexTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) { boolean removed = _complexTypeBindingList.remove(vComplexTypeBinding); return removed; } //-- boolean removeComplexTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -774,7 +822,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt( + final int index) { Object obj = this._complexTypeBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt(int) @@ -785,7 +834,8 @@ * @param vElementBinding * @return true if the object was removed from the collection. */ - public boolean removeElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) { + public boolean removeElementBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) { boolean removed = _elementBindingList.remove(vElementBinding); return removed; } //-- boolean removeElementBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -796,7 +846,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt( + final int index) { Object obj = this._elementBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt(int) @@ -807,7 +858,8 @@ * @param vEnumBinding * @return true if the object was removed from the collection. */ - public boolean removeEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) { + public boolean removeEnumBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) { boolean removed = _enumBindingList.remove(vEnumBinding); return removed; } //-- boolean removeEnumBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -818,7 +870,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt( + final int index) { Object obj = this._enumBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt(int) @@ -829,7 +882,8 @@ * @param vGroupBinding * @return true if the object was removed from the collection. */ - public boolean removeGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) { + public boolean removeGroupBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) { boolean removed = _groupBindingList.remove(vGroupBinding); return removed; } //-- boolean removeGroupBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -840,7 +894,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt( + final int index) { Object obj = this._groupBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt(int) @@ -851,7 +906,8 @@ * @param vSimpleTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) { + public boolean removeSimpleTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) { boolean removed = _simpleTypeBindingList.remove(vSimpleTypeBinding); return removed; } //-- boolean removeSimpleTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType) @@ -862,7 +918,8 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt(final int index) { + public org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt( + final int index) { Object obj = this._simpleTypeBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; } //-- org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt(int) @@ -875,11 +932,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setAttributeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) - throws java.lang.IndexOutOfBoundsException { + public void setAttributeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._attributeBindingList.size()) { - throw new IndexOutOfBoundsException("setAttributeBinding: Index value '" + index + "' not in range [0.." + (this._attributeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setAttributeBinding: Index value '" + index + + "' not in range [0.." + (this._attributeBindingList.size() - 1) + "]"); } this._attributeBindingList.set(index, vAttributeBinding); @@ -890,7 +951,8 @@ * * @param vAttributeBindingArray */ - public void setAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vAttributeBindingArray) { + public void setAttributeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] vAttributeBindingArray) { //-- copy array _attributeBindingList.clear(); @@ -907,11 +969,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setComplexTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void setComplexTypeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._complexTypeBindingList.size()) { - throw new IndexOutOfBoundsException("setComplexTypeBinding: Index value '" + index + "' not in range [0.." + (this._complexTypeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setComplexTypeBinding: Index value '" + index + + "' not in range [0.." + (this._complexTypeBindingList.size() - 1) + "]"); } this._complexTypeBindingList.set(index, vComplexTypeBinding); @@ -922,7 +988,9 @@ * * @param vComplexTypeBindingArray */ - public void setComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vComplexTypeBindingArray) { + public void setComplexTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] + vComplexTypeBindingArray) { //-- copy array _complexTypeBindingList.clear(); @@ -937,9 +1005,11 @@ * @param componentBindingTypeChoice the value of field * 'componentBindingTypeChoice'. */ - public void setComponentBindingTypeChoice(final org.exolab.castor.builder.binding.ComponentBindingTypeChoice componentBindingTypeChoice) { + public void setComponentBindingTypeChoice( + final org.exolab.castor.builder.binding.ComponentBindingTypeChoice + componentBindingTypeChoice) { this._componentBindingTypeChoice = componentBindingTypeChoice; - } //-- void setComponentBindingTypeChoice(org.exolab.castor.builder.binding.ComponentBindingTypeChoice) + } /** * @@ -949,11 +1019,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setElementBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) - throws java.lang.IndexOutOfBoundsException { + public void setElementBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._elementBindingList.size()) { - throw new IndexOutOfBoundsException("setElementBinding: Index value '" + index + "' not in range [0.." + (this._elementBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setElementBinding: Index value '" + index + + "' not in range [0.." + (this._elementBindingList.size() - 1) + "]"); } this._elementBindingList.set(index, vElementBinding); @@ -964,7 +1038,8 @@ * * @param vElementBindingArray */ - public void setElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vElementBindingArray) { + public void setElementBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] vElementBindingArray) { //-- copy array _elementBindingList.clear(); @@ -981,11 +1056,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setEnumBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) - throws java.lang.IndexOutOfBoundsException { + public void setEnumBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._enumBindingList.size()) { - throw new IndexOutOfBoundsException("setEnumBinding: Index value '" + index + "' not in range [0.." + (this._enumBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setEnumBinding: Index value '" + index + + "' not in range [0.." + (this._enumBindingList.size() - 1) + "]"); } this._enumBindingList.set(index, vEnumBinding); @@ -996,7 +1075,8 @@ * * @param vEnumBindingArray */ - public void setEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vEnumBindingArray) { + public void setEnumBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] vEnumBindingArray) { //-- copy array _enumBindingList.clear(); @@ -1013,11 +1093,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setGroupBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) - throws java.lang.IndexOutOfBoundsException { + public void setGroupBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._groupBindingList.size()) { - throw new IndexOutOfBoundsException("setGroupBinding: Index value '" + index + "' not in range [0.." + (this._groupBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setGroupBinding: Index value '" + index + + "' not in range [0.." + (this._groupBindingList.size() - 1) + "]"); } this._groupBindingList.set(index, vGroupBinding); @@ -1028,7 +1112,8 @@ * * @param vGroupBindingArray */ - public void setGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vGroupBindingArray) { + public void setGroupBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] vGroupBindingArray) { //-- copy array _groupBindingList.clear(); @@ -1054,11 +1139,15 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setSimpleTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) - throws java.lang.IndexOutOfBoundsException { + public void setSimpleTypeBinding( + final int index, + final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._simpleTypeBindingList.size()) { - throw new IndexOutOfBoundsException("setSimpleTypeBinding: Index value '" + index + "' not in range [0.." + (this._simpleTypeBindingList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setSimpleTypeBinding: Index value '" + index + + "' not in range [0.." + (this._simpleTypeBindingList.size() - 1) + "]"); } this._simpleTypeBindingList.set(index, vSimpleTypeBinding); @@ -1069,7 +1158,9 @@ * * @param vSimpleTypeBindingArray */ - public void setSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vSimpleTypeBindingArray) { + public void setSimpleTypeBinding( + final org.exolab.castor.builder.binding.ComponentBindingType[] + vSimpleTypeBindingArray) { //-- copy array _simpleTypeBindingList.clear(); @@ -1089,10 +1180,12 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.ComponentBindingType */ - public static org.exolab.castor.builder.binding.ComponentBindingType unmarshalComponentBindingType(final java.io.Reader reader) + public static org.exolab.castor.builder.binding.ComponentBindingType + unmarshalComponentBindingType(final java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.ComponentBindingType) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.ComponentBindingType.class, reader); - } //-- org.exolab.castor.builder.binding.ComponentBindingType unmarshalComponentBindingType(java.io.Reader) + return (org.exolab.castor.builder.binding.ComponentBindingType) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.ComponentBindingType.class, reader); + } /** * Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoice.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoice.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoice.java (working copy) @@ -137,7 +137,8 @@ * null or if any SAXException is thrown during marshaling */ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -190,10 +191,13 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.ComponentBindingTypeChoice */ - public static org.exolab.castor.builder.binding.ComponentBindingTypeChoice unmarshalComponentBindingTypeChoice(final java.io.Reader reader) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.ComponentBindingTypeChoice) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.ComponentBindingTypeChoice.class, reader); - } //-- org.exolab.castor.builder.binding.ComponentBindingTypeChoice unmarshalComponentBindingTypeChoice(java.io.Reader) + public static org.exolab.castor.builder.binding.ComponentBindingTypeChoice + unmarshalComponentBindingTypeChoice(final java.io.Reader reader) + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { + return (org.exolab.castor.builder.binding.ComponentBindingTypeChoice) + Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.ComponentBindingTypeChoice.class, reader); + } /** * Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoiceDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoiceDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoiceDescriptor.java (working copy) @@ -12,7 +12,8 @@ * * @version $Revision$ $Date$ */ -public class ComponentBindingTypeChoiceDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public class ComponentBindingTypeChoiceDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ @@ -64,7 +65,9 @@ //-- initialize element descriptors //-- _javaClass - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ClassType.class, "_javaClass", "java-class", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ClassType.class, + "_javaClass", "java-class", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -97,7 +100,9 @@ } desc.setValidator(fieldValidator); //-- _interface - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.Interface.class, "_interface", "interface", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.Interface.class, + "_interface", "interface", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -130,7 +135,9 @@ } desc.setValidator(fieldValidator); //-- _member - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.FieldType.class, "_member", "member", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.FieldType.class, + "_member", "member", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -163,7 +170,9 @@ } desc.setValidator(fieldValidator); //-- _enumDef - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.EnumBindingType.class, "_enumDef", "enum-def", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.EnumBindingType.class, + "_enumDef", "enum-def", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeDescriptor.java (working copy) @@ -12,7 +12,8 @@ * * @version $Revision$ $Date$ */ -public class ComponentBindingTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public class ComponentBindingTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ @@ -63,7 +64,8 @@ //-- initialize attribute descriptors //-- _name - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute); desc.setImmutable(true); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -93,7 +95,8 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator = + new org.exolab.castor.xml.validators.StringValidator(); typeValidator.setWhiteSpace("preserve"); fieldValidator.setValidator(typeValidator); } @@ -101,7 +104,10 @@ //-- initialize element descriptors //-- _componentBindingTypeChoice - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingTypeChoice.class, "_componentBindingTypeChoice", "-error-if-this-is-used-", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingTypeChoice.class, + "_componentBindingTypeChoice", "-error-if-this-is-used-", + org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -112,7 +118,8 @@ throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; - target.setComponentBindingTypeChoice((org.exolab.castor.builder.binding.ComponentBindingTypeChoice) value); + target.setComponentBindingTypeChoice( + (org.exolab.castor.builder.binding.ComponentBindingTypeChoice) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -123,7 +130,8 @@ }; desc.setHandler(handler); desc.setContainer(true); - desc.setClassDescriptor(new org.exolab.castor.builder.binding.ComponentBindingTypeChoiceDescriptor()); + desc.setClassDescriptor( + new org.exolab.castor.builder.binding.ComponentBindingTypeChoiceDescriptor()); desc.setNameSpaceURI("http://www.castor.org/SourceGenerator/Binding"); desc.setRequired(true); desc.setMultivalued(false); @@ -136,7 +144,9 @@ } desc.setValidator(fieldValidator); //-- _elementBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_elementBindingList", "elementBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_elementBindingList", "elementBinding", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -147,7 +157,8 @@ throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; - target.addElementBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addElementBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -152,7 +163,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllElementBinding(); @@ -176,7 +188,10 @@ } desc.setValidator(fieldValidator); //-- _attributeBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_attributeBindingList", "attributeBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_attributeBindingList", "attributeBinding", + org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -187,7 +202,8 @@ throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; - target.addAttributeBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addAttributeBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -192,7 +208,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllAttributeBinding(); @@ -216,7 +233,10 @@ } desc.setValidator(fieldValidator); //-- _complexTypeBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_complexTypeBindingList", "complexTypeBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_complexTypeBindingList", "complexTypeBinding", + org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -227,7 +247,8 @@ throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; - target.addComplexTypeBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addComplexTypeBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -232,7 +253,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllComplexTypeBinding(); @@ -256,7 +278,9 @@ } desc.setValidator(fieldValidator); //-- _groupBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_groupBindingList", "groupBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_groupBindingList", "groupBinding", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -267,7 +291,8 @@ throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; - target.addGroupBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addGroupBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -272,7 +297,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllGroupBinding(); @@ -296,7 +322,9 @@ } desc.setValidator(fieldValidator); //-- _enumBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_enumBindingList", "enumBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_enumBindingList", "enumBinding", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -307,7 +335,8 @@ throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; - target.addEnumBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addEnumBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -312,7 +341,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllEnumBinding(); @@ -336,7 +366,10 @@ } desc.setValidator(fieldValidator); //-- _simpleTypeBindingList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.ComponentBindingType.class, "_simpleTypeBindingList", "simpleTypeBinding", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.ComponentBindingType.class, + "_simpleTypeBindingList", "simpleTypeBinding", + org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -347,7 +380,8 @@ throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; - target.addSimpleTypeBinding((org.exolab.castor.builder.binding.ComponentBindingType) value); + target.addSimpleTypeBinding( + (org.exolab.castor.builder.binding.ComponentBindingType) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -352,7 +386,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllSimpleTypeBinding(); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingType.java (working copy) @@ -77,8 +77,9 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumMember(final int index, final org.exolab.castor.builder.binding.EnumMember vEnumMember) - throws java.lang.IndexOutOfBoundsException { + public void addEnumMember( + final int index, final org.exolab.castor.builder.binding.EnumMember vEnumMember) + throws java.lang.IndexOutOfBoundsException { this._enumMemberList.add(index, vEnumMember); } //-- void addEnumMember(int, org.exolab.castor.builder.binding.EnumMember) @@ -115,7 +116,9 @@ throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._enumMemberList.size()) { - throw new IndexOutOfBoundsException("getEnumMember: Index value '" + index + "' not in range [0.." + (this._enumMemberList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "getEnumMember: Index value '" + index + + "' not in range [0.." + (this._enumMemberList.size() - 1) + "]"); } return (org.exolab.castor.builder.binding.EnumMember) _enumMemberList.get(index); @@ -128,7 +131,8 @@ */ public org.exolab.castor.builder.binding.EnumMember[] getEnumMember() { int size = this._enumMemberList.size(); - org.exolab.castor.builder.binding.EnumMember[] array = new org.exolab.castor.builder.binding.EnumMember[size]; + org.exolab.castor.builder.binding.EnumMember[] array = + new org.exolab.castor.builder.binding.EnumMember[size]; java.util.Iterator iter = _enumMemberList.iterator(); for (int index = 0; index < size; index++) { array[index] = (org.exolab.castor.builder.binding.EnumMember) iter.next(); @@ -180,8 +184,7 @@ * object is an invalid instance according to the schema */ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -197,8 +200,8 @@ * null or if any SAXException is thrown during marshaling */ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -214,7 +217,8 @@ * @param vEnumMember * @return true if the object was removed from the collection. */ - public boolean removeEnumMember(final org.exolab.castor.builder.binding.EnumMember vEnumMember) { + public boolean removeEnumMember( + final org.exolab.castor.builder.binding.EnumMember vEnumMember) { boolean removed = _enumMemberList.remove(vEnumMember); return removed; } //-- boolean removeEnumMember(org.exolab.castor.builder.binding.EnumMember) @@ -235,7 +239,8 @@ * * @param enumClassName the value of field 'enumClassName'. */ - public void setEnumClassName(final org.exolab.castor.builder.binding.EnumClassName enumClassName) { + public void setEnumClassName( + final org.exolab.castor.builder.binding.EnumClassName enumClassName) { this._enumClassName = enumClassName; } //-- void setEnumClassName(org.exolab.castor.builder.binding.EnumClassName) @@ -247,11 +252,14 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setEnumMember(final int index, final org.exolab.castor.builder.binding.EnumMember vEnumMember) - throws java.lang.IndexOutOfBoundsException { + public void setEnumMember( + final int index, final org.exolab.castor.builder.binding.EnumMember vEnumMember) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._enumMemberList.size()) { - throw new IndexOutOfBoundsException("setEnumMember: Index value '" + index + "' not in range [0.." + (this._enumMemberList.size() - 1) + "]"); + throw new IndexOutOfBoundsException( + "setEnumMember: Index value '" + index + + "' not in range [0.." + (this._enumMemberList.size() - 1) + "]"); } this._enumMemberList.set(index, vEnumMember); @@ -262,7 +270,8 @@ * * @param vEnumMemberArray */ - public void setEnumMember(final org.exolab.castor.builder.binding.EnumMember[] vEnumMemberArray) { + public void setEnumMember( + final org.exolab.castor.builder.binding.EnumMember[] vEnumMemberArray) { //-- copy array _enumMemberList.clear(); @@ -282,10 +291,12 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.EnumBindingType */ - public static org.exolab.castor.builder.binding.EnumBindingType unmarshalEnumBindingType(final java.io.Reader reader) + public static org.exolab.castor.builder.binding.EnumBindingType unmarshalEnumBindingType( + final java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.EnumBindingType) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.EnumBindingType.class, reader); - } //-- org.exolab.castor.builder.binding.EnumBindingType unmarshalEnumBindingType(java.io.Reader) + return (org.exolab.castor.builder.binding.EnumBindingType) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.EnumBindingType.class, reader); + } /** * Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingTypeDescriptor.java (working copy) @@ -65,7 +65,9 @@ //-- initialize element descriptors //-- _enumClassName - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.EnumClassName.class, "_enumClassName", "enumClassName", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.EnumClassName.class, + "_enumClassName", "enumClassName", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -76,7 +78,8 @@ throws IllegalStateException, IllegalArgumentException { try { EnumBindingType target = (EnumBindingType) object; - target.setEnumClassName((org.exolab.castor.builder.binding.EnumClassName) value); + target.setEnumClassName( + (org.exolab.castor.builder.binding.EnumClassName) value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -96,7 +99,9 @@ } desc.setValidator(fieldValidator); //-- _enumMemberList - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.EnumMember.class, "_enumMemberList", "enumMember", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.EnumMember.class, + "_enumMemberList", "enumMember", org.exolab.castor.xml.NodeType.Element); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -112,7 +117,8 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) + throws IllegalStateException, IllegalArgumentException { try { EnumBindingType target = (EnumBindingType) object; target.removeAllEnumMember(); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassName.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassName.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassName.java (working copy) @@ -94,8 +94,7 @@ * object is an invalid instance according to the schema */ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -111,9 +110,8 @@ * null or if any SAXException is thrown during marshaling */ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException - { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -148,10 +146,12 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.EnumClassName */ - public static org.exolab.castor.builder.binding.EnumClassName unmarshalEnumClassName(final java.io.Reader reader) + public static org.exolab.castor.builder.binding.EnumClassName unmarshalEnumClassName( + final java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.EnumClassName) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.EnumClassName.class, reader); - } //-- org.exolab.castor.builder.binding.EnumClassName unmarshalEnumClassName(java.io.Reader) + return (org.exolab.castor.builder.binding.EnumClassName) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.EnumClassName.class, reader); + } /** * Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassNameDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassNameDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassNameDescriptor.java (working copy) @@ -58,7 +58,9 @@ org.exolab.castor.mapping.FieldHandler handler = null; org.exolab.castor.xml.FieldValidator fieldValidator = null; //-- _content - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_content", "PCDATA", org.exolab.castor.xml.NodeType.Text); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + java.lang.String.class, "_content", "PCDATA", + org.exolab.castor.xml.NodeType.Text); desc.setImmutable(true); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -85,7 +87,8 @@ //-- validation code for: _content fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator = + new org.exolab.castor.xml.validators.StringValidator(); typeValidator.setWhiteSpace("preserve"); fieldValidator.setValidator(typeValidator); } @@ -93,7 +96,9 @@ //-- initialize attribute descriptors //-- _package - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_package", "package", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + java.lang.String.class, "_package", "package", + org.exolab.castor.xml.NodeType.Attribute); desc.setImmutable(true); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -121,7 +126,8 @@ //-- validation code for: _package fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator = + new org.exolab.castor.xml.validators.StringValidator(); typeValidator.setWhiteSpace("preserve"); fieldValidator.setValidator(typeValidator); } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMember.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMember.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMember.java (working copy) @@ -92,8 +92,7 @@ * object is an invalid instance according to the schema */ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -109,8 +108,8 @@ * null or if any SAXException is thrown during marshaling */ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -143,9 +142,11 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.EnumMember */ - public static org.exolab.castor.builder.binding.EnumMember unmarshalEnumMember(final java.io.Reader reader) + public static org.exolab.castor.builder.binding.EnumMember unmarshalEnumMember( + final java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.EnumMember) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.EnumMember.class, reader); + return (org.exolab.castor.builder.binding.EnumMember) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.EnumMember.class, reader); } //-- org.exolab.castor.builder.binding.EnumMember unmarshalEnumMember(java.io.Reader) /** Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMemberDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMemberDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMemberDescriptor.java (working copy) @@ -65,7 +65,9 @@ //-- initialize element descriptors //-- _value - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_value", "value", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + java.lang.String.class, "_value", "value", + org.exolab.castor.xml.NodeType.Element); desc.setImmutable(true); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -96,7 +98,8 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator = + new org.exolab.castor.xml.validators.StringValidator(); typeValidator.setWhiteSpace("preserve"); fieldValidator.setValidator(typeValidator); } @@ -102,7 +105,9 @@ } desc.setValidator(fieldValidator); //-- _javaName - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_javaName", "javaName", org.exolab.castor.xml.NodeType.Element); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + java.lang.String.class, "_javaName", "javaName", + org.exolab.castor.xml.NodeType.Element); desc.setImmutable(true); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -133,7 +138,8 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator = + new org.exolab.castor.xml.validators.StringValidator(); typeValidator.setWhiteSpace("preserve"); fieldValidator.setValidator(typeValidator); } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ExtendedBinding.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ExtendedBinding.java (revision 6675) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ExtendedBinding.java (working copy) @@ -280,7 +280,8 @@ * @param type an integer that indicates the type of the given * ComponentBindingType */ - private void handleComponent(final ComponentBindingType binding, final String xPath, final int type) { + private void handleComponent( + final ComponentBindingType binding, final String xPath, final int type) { if (binding == null) { return; } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldType.java (working copy) @@ -199,8 +199,7 @@ * object is an invalid instance according to the schema */ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -216,8 +215,8 @@ * null or if any SAXException is thrown during marshaling */ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -226,7 +225,8 @@ * * @param collection the value of field 'collection'. */ - public void setCollection(final org.exolab.castor.builder.binding.types.FieldTypeCollectionType collection) { + public void setCollection( + final org.exolab.castor.builder.binding.types.FieldTypeCollectionType collection) { this._collection = collection; } //-- void setCollection(org.exolab.castor.builder.binding.types.FieldTypeCollectionType) @@ -271,7 +271,8 @@ * * @param visibility the value of field 'visibility'. */ - public void setVisibility(final org.exolab.castor.builder.binding.types.FieldTypeVisibilityType visibility) { + public void setVisibility( + final org.exolab.castor.builder.binding.types.FieldTypeVisibilityType visibility) { this._visibility = visibility; } //-- void setVisibility(org.exolab.castor.builder.binding.types.FieldTypeVisibilityType) @@ -298,7 +299,8 @@ */ public static org.exolab.castor.builder.binding.FieldType unmarshal(final java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.FieldType) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.FieldType.class, reader); + return (org.exolab.castor.builder.binding.FieldType) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.FieldType.class, reader); } //-- org.exolab.castor.builder.binding.FieldType unmarshal(java.io.Reader) /** Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldTypeDescriptor.java (working copy) @@ -60,7 +60,9 @@ //-- initialize attribute descriptors //-- _name - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + java.lang.String.class, "_name", "name", + org.exolab.castor.xml.NodeType.Attribute); desc.setImmutable(true); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -88,7 +90,8 @@ //-- validation code for: _name fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator = + new org.exolab.castor.xml.validators.StringValidator(); typeValidator.setWhiteSpace("preserve"); fieldValidator.setValidator(typeValidator); } @@ -94,7 +97,9 @@ } desc.setValidator(fieldValidator); //-- _javaType - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_javaType", "java-type", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + java.lang.String.class, "_javaType", "java-type", + org.exolab.castor.xml.NodeType.Attribute); desc.setImmutable(true); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -122,7 +127,8 @@ //-- validation code for: _javaType fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator = + new org.exolab.castor.xml.validators.StringValidator(); typeValidator.setWhiteSpace("preserve"); fieldValidator.setValidator(typeValidator); } @@ -128,7 +134,9 @@ } desc.setValidator(fieldValidator); //-- _wrapper - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(Boolean.TYPE, "_wrapper", "wrapper", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + Boolean.TYPE, "_wrapper", "wrapper", + org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -161,7 +169,8 @@ //-- validation code for: _wrapper fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.BooleanValidator typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); + org.exolab.castor.xml.validators.BooleanValidator typeValidator = + new org.exolab.castor.xml.validators.BooleanValidator(); fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); @@ -166,7 +175,9 @@ } desc.setValidator(fieldValidator); //-- _handler - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_handler", "handler", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + java.lang.String.class, "_handler", "handler", + org.exolab.castor.xml.NodeType.Attribute); desc.setImmutable(true); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -194,7 +205,8 @@ //-- validation code for: _handler fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator = + new org.exolab.castor.xml.validators.StringValidator(); typeValidator.setWhiteSpace("preserve"); fieldValidator.setValidator(typeValidator); } @@ -200,7 +212,9 @@ } desc.setValidator(fieldValidator); //-- _collection - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.types.FieldTypeCollectionType.class, "_collection", "collection", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.types.FieldTypeCollectionType.class, + "_collection", "collection", org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -211,7 +225,9 @@ throws IllegalStateException, IllegalArgumentException { try { FieldType target = (FieldType) object; - target.setCollection((org.exolab.castor.builder.binding.types.FieldTypeCollectionType) value); + target.setCollection( + (org.exolab.castor.builder.binding.types.FieldTypeCollectionType) + value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -220,7 +236,8 @@ return null; } }; - handler = new org.exolab.castor.xml.handlers.EnumFieldHandler(org.exolab.castor.builder.binding.types.FieldTypeCollectionType.class, handler); + handler = new org.exolab.castor.xml.handlers.EnumFieldHandler( + org.exolab.castor.builder.binding.types.FieldTypeCollectionType.class, handler); desc.setImmutable(true); desc.setHandler(handler); desc.setMultivalued(false); @@ -232,7 +249,9 @@ } desc.setValidator(fieldValidator); //-- _visibility - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.exolab.castor.builder.binding.types.FieldTypeVisibilityType.class, "_visibility", "visibility", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + org.exolab.castor.builder.binding.types.FieldTypeVisibilityType.class, + "_visibility", "visibility", org.exolab.castor.xml.NodeType.Attribute); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -243,7 +262,9 @@ throws IllegalStateException, IllegalArgumentException { try { FieldType target = (FieldType) object; - target.setVisibility((org.exolab.castor.builder.binding.types.FieldTypeVisibilityType) value); + target.setVisibility( + (org.exolab.castor.builder.binding.types.FieldTypeVisibilityType) + value); } catch (java.lang.Exception ex) { throw new IllegalStateException(ex.toString()); } @@ -252,7 +273,8 @@ return null; } }; - handler = new org.exolab.castor.xml.handlers.EnumFieldHandler(org.exolab.castor.builder.binding.types.FieldTypeVisibilityType.class, handler); + handler = new org.exolab.castor.xml.handlers.EnumFieldHandler( + org.exolab.castor.builder.binding.types.FieldTypeVisibilityType.class, handler); desc.setImmutable(true); desc.setHandler(handler); desc.setMultivalued(false); @@ -264,7 +286,9 @@ } desc.setValidator(fieldValidator); //-- _validator - desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_validator", "validator", org.exolab.castor.xml.NodeType.Attribute); + desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl( + java.lang.String.class, "_validator", "validator", + org.exolab.castor.xml.NodeType.Attribute); desc.setImmutable(true); handler = new org.exolab.castor.xml.XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -292,7 +316,8 @@ //-- validation code for: _validator fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator = + new org.exolab.castor.xml.validators.StringValidator(); typeValidator.setWhiteSpace("preserve"); fieldValidator.setValidator(typeValidator); } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeType.java (working copy) @@ -71,8 +71,7 @@ * @param out **/ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -82,8 +81,8 @@ * @param handler **/ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -101,9 +100,11 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.IncludeType unmarshalIncludeType(final java.io.Reader reader) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.IncludeType) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.IncludeType.class, reader); + public static org.exolab.castor.builder.binding.IncludeType unmarshalIncludeType( + final java.io.Reader reader) + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { + return (org.exolab.castor.builder.binding.IncludeType) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.IncludeType.class, reader); } //-- org.exolab.castor.builder.binding.IncludeType unmarshalIncludeType(java.io.Reader) /** Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeTypeDescriptor.java (working copy) @@ -50,7 +50,8 @@ //-- initialize attribute descriptors //-- _URI - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_URI", "URI", NodeType.Attribute); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_URI", "URI", NodeType.Attribute); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Interface.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Interface.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Interface.java (working copy) @@ -67,8 +67,7 @@ * @param out **/ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -78,8 +77,8 @@ * @param handler **/ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -97,9 +96,11 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.Interface unmarshalInterface(final java.io.Reader reader) + public static org.exolab.castor.builder.binding.Interface unmarshalInterface( + final java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.Interface) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.Interface.class, reader); + return (org.exolab.castor.builder.binding.Interface) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.Interface.class, reader); } //-- org.exolab.castor.builder.binding.Interface unmarshalInterface(java.io.Reader) /** Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/InterfaceDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/InterfaceDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/InterfaceDescriptor.java (working copy) @@ -51,7 +51,8 @@ //-- initialize attribute descriptors //-- _name - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", NodeType.Attribute); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_name", "name", NodeType.Attribute); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingType.java (working copy) @@ -78,8 +78,7 @@ * @param out **/ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -89,8 +88,8 @@ * @param handler **/ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -117,9 +116,11 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.NamingType unmarshalNamingType(final java.io.Reader reader) + public static org.exolab.castor.builder.binding.NamingType unmarshalNamingType( + final java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.NamingType) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.NamingType.class, reader); + return (org.exolab.castor.builder.binding.NamingType) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.NamingType.class, reader); } //-- org.exolab.castor.builder.binding.NamingType unmarshalNamingType(java.io.Reader) /** Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingTypeDescriptor.java (working copy) @@ -56,7 +56,8 @@ //-- initialize element descriptors //-- _prefix - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_prefix", "prefix", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_prefix", "prefix", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -92,7 +93,8 @@ desc.setValidator(fieldValidator); //-- _suffix - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_suffix", "suffix", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_suffix", "suffix", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLType.java (working copy) @@ -97,8 +97,7 @@ * @param out **/ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -108,8 +107,8 @@ * @param handler **/ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -145,9 +144,11 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.NamingXMLType unmarshalNamingXMLType(final java.io.Reader reader) + public static org.exolab.castor.builder.binding.NamingXMLType unmarshalNamingXMLType( + final java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.NamingXMLType) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.NamingXMLType.class, reader); + return (org.exolab.castor.builder.binding.NamingXMLType) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.NamingXMLType.class, reader); } //-- org.exolab.castor.builder.binding.NamingXMLType unmarshalNamingXMLType(java.io.Reader) /** Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLTypeDescriptor.java (working copy) @@ -55,7 +55,8 @@ //-- initialize element descriptors //-- _elementName - desc = new XMLFieldDescriptorImpl(NamingType.class, "_elementName", "elementName", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + NamingType.class, "_elementName", "elementName", NodeType.Element); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -85,7 +86,8 @@ desc.setValidator(fieldValidator); //-- _complexTypeName - desc = new XMLFieldDescriptorImpl(NamingType.class, "_complexTypeName", "complexTypeName", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + NamingType.class, "_complexTypeName", "complexTypeName", NodeType.Element); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { @@ -115,7 +117,8 @@ desc.setValidator(fieldValidator); //-- _modelGroupName - desc = new XMLFieldDescriptorImpl(NamingType.class, "_modelGroupName", "modelGroupName", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + NamingType.class, "_modelGroupName", "modelGroupName", NodeType.Element); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageType.java (working copy) @@ -84,8 +84,7 @@ * @param out **/ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -95,8 +94,8 @@ * @param handler **/ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -124,9 +123,11 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.PackageType unmarshalPackageType(final java.io.Reader reader) + public static org.exolab.castor.builder.binding.PackageType unmarshalPackageType( + final java.io.Reader reader) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.PackageType) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.PackageType.class, reader); + return (org.exolab.castor.builder.binding.PackageType) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.PackageType.class, reader); } //-- org.exolab.castor.builder.binding.PackageType unmarshalPackageType(java.io.Reader) /** Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoice.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoice.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoice.java (working copy) @@ -78,8 +78,7 @@ * @param out **/ public void marshal(final java.io.Writer out) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -89,8 +88,8 @@ * @param handler **/ public void marshal(final org.xml.sax.ContentHandler handler) - throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - + throws java.io.IOException, org.exolab.castor.xml.MarshalException, + org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); } //-- void marshal(org.xml.sax.ContentHandler) @@ -117,10 +116,12 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.PackageTypeChoice unmarshalPackageTypeChoice(final java.io.Reader reader) - throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { - return (org.exolab.castor.builder.binding.PackageTypeChoice) Unmarshaller.unmarshal(org.exolab.castor.builder.binding.PackageTypeChoice.class, reader); - } //-- org.exolab.castor.builder.binding.PackageTypeChoice unmarshalPackageTypeChoice(java.io.Reader) + public static org.exolab.castor.builder.binding.PackageTypeChoice unmarshalPackageTypeChoice( + final java.io.Reader reader) + throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { + return (org.exolab.castor.builder.binding.PackageTypeChoice) Unmarshaller.unmarshal( + org.exolab.castor.builder.binding.PackageTypeChoice.class, reader); + } /** **/ Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoiceDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoiceDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoiceDescriptor.java (working copy) @@ -54,7 +54,8 @@ //-- initialize element descriptors //-- _namespace - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_namespace", "namespace", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_namespace", "namespace", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -92,7 +93,8 @@ desc.setValidator(fieldValidator); //-- _schemaLocation - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_schemaLocation", "schemaLocation", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_schemaLocation", "schemaLocation", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeDescriptor.java (working copy) @@ -56,7 +56,8 @@ //-- initialize element descriptors //-- _name - desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + java.lang.String.class, "_name", "name", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) @@ -94,7 +95,9 @@ desc.setValidator(fieldValidator); //-- _packageTypeChoice - desc = new XMLFieldDescriptorImpl(PackageTypeChoice.class, "_packageTypeChoice", "-error-if-this-is-used-", NodeType.Element); + desc = new XMLFieldDescriptorImpl( + PackageTypeChoice.class, "_packageTypeChoice", "-error-if-this-is-used-", + NodeType.Element); handler = (new XMLFieldHandler() { public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java (working copy) @@ -868,7 +868,8 @@ if (result == null && (_annotated.getStructureType() == Structure.GROUP || _annotated.getStructureType() == Structure.MODELGROUP)) { - result = getGroupNaming().createClassName((Group) _annotated, getJavaPackage()); + result = getGroupNaming().createClassName( + (Group) _annotated, getJavaPackage()); if (result == null) { String err = "Unable to create name for group."; throw new IllegalStateException(err); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/BindingType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/BindingType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/BindingType.java (working copy) @@ -108,7 +108,8 @@ * * @param string **/ - public static org.exolab.castor.builder.binding.types.BindingType valueOf(final java.lang.String string) { + public static org.exolab.castor.builder.binding.types.BindingType valueOf( + final java.lang.String string) { java.lang.Object obj = null; if (string != null) { obj = _memberTable.get(string); } if (obj == null) { Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionType.java (working copy) @@ -33,7 +33,8 @@ /** * The instance of the array type. **/ - public static final FieldTypeCollectionType ARRAY = new FieldTypeCollectionType(ARRAY_TYPE, "array"); + public static final FieldTypeCollectionType ARRAY = + new FieldTypeCollectionType(ARRAY_TYPE, "array"); /** * The vector type. @@ -43,7 +44,8 @@ /** * The instance of the vector type. **/ - public static final FieldTypeCollectionType VECTOR = new FieldTypeCollectionType(VECTOR_TYPE, "vector"); + public static final FieldTypeCollectionType VECTOR = + new FieldTypeCollectionType(VECTOR_TYPE, "vector"); /** * The arraylist type. @@ -53,7 +55,8 @@ /** * The instance of the arraylist type. **/ - public static final FieldTypeCollectionType ARRAYLIST = new FieldTypeCollectionType(ARRAYLIST_TYPE, "arraylist"); + public static final FieldTypeCollectionType ARRAYLIST = + new FieldTypeCollectionType(ARRAYLIST_TYPE, "arraylist"); /** * The hashtable type. @@ -63,7 +66,8 @@ /** * The instance of the hashtable type. **/ - public static final FieldTypeCollectionType HASHTABLE = new FieldTypeCollectionType(HASHTABLE_TYPE, "hashtable"); + public static final FieldTypeCollectionType HASHTABLE = + new FieldTypeCollectionType(HASHTABLE_TYPE, "hashtable"); /** * The collection type. @@ -73,7 +77,8 @@ /** * The instance of the collection type. **/ - public static final FieldTypeCollectionType COLLECTION = new FieldTypeCollectionType(COLLECTION_TYPE, "collection"); + public static final FieldTypeCollectionType COLLECTION = + new FieldTypeCollectionType(COLLECTION_TYPE, "collection"); /** * The odmg type. @@ -83,7 +88,8 @@ /** * The instance of the odmg type. **/ - public static final FieldTypeCollectionType ODMG = new FieldTypeCollectionType(ODMG_TYPE, "odmg"); + public static final FieldTypeCollectionType ODMG = + new FieldTypeCollectionType(ODMG_TYPE, "odmg"); /** * The set type. @@ -93,7 +99,8 @@ /** * The instance of the set type. **/ - public static final FieldTypeCollectionType SET = new FieldTypeCollectionType(SET_TYPE, "set"); + public static final FieldTypeCollectionType SET = + new FieldTypeCollectionType(SET_TYPE, "set"); /** * The map type. @@ -103,7 +110,8 @@ /** * The instance of the map type. **/ - public static final FieldTypeCollectionType MAP = new FieldTypeCollectionType(MAP_TYPE, "map"); + public static final FieldTypeCollectionType MAP = + new FieldTypeCollectionType(MAP_TYPE, "map"); /** * The set type. @@ -113,7 +121,8 @@ /** * The instance of the sorted set type. **/ - public static final FieldTypeCollectionType SORTED_SET = new FieldTypeCollectionType(SORTED_SET_TYPE, "sortedset"); + public static final FieldTypeCollectionType SORTED_SET = + new FieldTypeCollectionType(SORTED_SET_TYPE, "sortedset"); /** * The sorted map type. @@ -123,7 +132,8 @@ /** * The instance of the sorted map type. **/ - public static final FieldTypeCollectionType SORTED_MAP = new FieldTypeCollectionType(SORTED_MAP_TYPE, "sortedmap"); + public static final FieldTypeCollectionType SORTED_MAP = + new FieldTypeCollectionType(SORTED_MAP_TYPE, "sortedmap"); private static java.util.Hashtable _memberTable = init(); @@ -193,7 +203,8 @@ * * @param string **/ - public static org.exolab.castor.builder.binding.types.FieldTypeCollectionType valueOf(final java.lang.String string) { + public static org.exolab.castor.builder.binding.types.FieldTypeCollectionType valueOf( + final java.lang.String string) { java.lang.Object obj = null; if (string != null) { obj = _memberTable.get(string); } if (obj == null) { @@ -201,6 +212,6 @@ throw new IllegalArgumentException(err); } return (FieldTypeCollectionType) obj; - } //-- org.exolab.castor.builder.binding.types.FieldTypeCollectionType valueOf(java.lang.String) + } } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionTypeDescriptor.java (working copy) @@ -17,7 +17,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class FieldTypeCollectionTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public class FieldTypeCollectionTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityType.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityType.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityType.java (working copy) @@ -33,7 +33,8 @@ /** * The instance of the public type. */ - public static final FieldTypeVisibilityType PUBLIC = new FieldTypeVisibilityType(PUBLIC_TYPE, "public"); + public static final FieldTypeVisibilityType PUBLIC = + new FieldTypeVisibilityType(PUBLIC_TYPE, "public"); /** * The protected type. @@ -43,7 +44,8 @@ /** * The instance of the protected type. */ - public static final FieldTypeVisibilityType PROTECTED = new FieldTypeVisibilityType(PROTECTED_TYPE, "protected"); + public static final FieldTypeVisibilityType PROTECTED = + new FieldTypeVisibilityType(PROTECTED_TYPE, "protected"); /** * The private type. @@ -53,7 +55,8 @@ /** * The instance of the private type. */ - public static final FieldTypeVisibilityType PRIVATE = new FieldTypeVisibilityType(PRIVATE_TYPE, "private"); + public static final FieldTypeVisibilityType PRIVATE = + new FieldTypeVisibilityType(PRIVATE_TYPE, "private"); /** * Field _memberTable. @@ -158,7 +161,8 @@ * @return the FieldTypeVisibilityType value of parameter * 'string' */ - public static org.exolab.castor.builder.binding.types.FieldTypeVisibilityType valueOf(final java.lang.String string) { + public static org.exolab.castor.builder.binding.types.FieldTypeVisibilityType valueOf( + final java.lang.String string) { java.lang.Object obj = null; if (string != null) { obj = _memberTable.get(string); } if (obj == null) { @@ -166,6 +170,6 @@ throw new IllegalArgumentException(err); } return (FieldTypeVisibilityType) obj; - } //-- org.exolab.castor.builder.binding.types.FieldTypeVisibilityType valueOf(java.lang.String) + } } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityTypeDescriptor.java (working copy) @@ -12,7 +12,8 @@ * * @version $Revision$ $Date$ */ -public class FieldTypeVisibilityTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public class FieldTypeVisibilityTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMethodSignature.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMethodSignature.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JMethodSignature.java (working copy) @@ -346,23 +346,13 @@ } jsw.write(' '); jsw.write(_name); - jsw.write('('); - - //-- any parameter annotations? - boolean parameterAnnotations = false; - for (int i = 0; i < _params.size(); i++) { - JParameter jParameter = (JParameter) _params.get(i); - if (jParameter.hasAnnotations()) { - parameterAnnotations = true; - break; - } - } + jsw.writeln('('); //-- print parameters - if (parameterAnnotations) { jsw.indent(); } + jsw.indent(); + jsw.indent(); for (int i = 0; i < _params.size(); i++) { - if (i > 0) { jsw.write(", "); } - if (parameterAnnotations) { jsw.writeln(); } + if (i > 0) { jsw.writeln(","); } JParameter jParameter = (JParameter) _params.get(i); jParameter.printAnnotations(jsw); String typeAndName = jParameter.toString(); @@ -368,7 +358,8 @@ String typeAndName = jParameter.toString(); jsw.write(typeAndName); } - if (parameterAnnotations) { jsw.unindent(); } + jsw.unindent(); + jsw.unindent(); jsw.write(")"); Index: C:/Java/castor-1/src/doc/release-notes.xml =================================================================== --- C:/Java/castor-1/src/doc/release-notes.xml (revision 6676) +++ C:/Java/castor-1/src/doc/release-notes.xml (working copy) @@ -34,6 +34,26 @@

+ + + Cleaned up 351 'Maximum Line Length' warnings at builder package. + + + Ralf Joachim + ralf.joachim@syscon-world.de + + + Ralf Joachim + ralf.joachim@syscon-world.de + + + Ralf Joachim + ralf.joachim@syscon-world.de + + Enh. + XML + 20070102 + Cleaned up 635 warnings with braces and whitespaces at builder package. Index: C:/Java/castor-1/src/etc/CHANGELOG =================================================================== --- C:/Java/castor-1/src/etc/CHANGELOG (revision 6676) +++ C:/Java/castor-1/src/etc/CHANGELOG (working copy) @@ -1,6 +1,11 @@ SVN ------------------------------- +XML: Resolved issue CASTOR-1796 using contribution from Ralf Joachim [Ralf.joachim@syscon-world.de] + Cleaned up 351 'Maximum Line Length' warnings at builder package. + Details: http://jira.codehaus.org/browse/CASTOR-1796 + (Ralf - 20070102) + XML: Resolved issue CASTOR-1793 using contribution from Ralf Joachim [Ralf.joachim@syscon-world.de] Cleaned up 635 warnings with braces and whitespaces at builder package. Details: http://jira.codehaus.org/browse/CASTOR-1793