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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceFactory.java (working copy) @@ -1714,7 +1714,7 @@ * @param contentModel the ContentModelGroup to process * @param state the current FactoryState. */ - private void processContentModel(ContentModelGroup contentModel, final FactoryState state) { + private void processContentModel(final ContentModelGroup model, final FactoryState state) { //------------------------------/ //- handle elements and groups -/ //------------------------------/ @@ -1719,6 +1719,7 @@ //- handle elements and groups -/ //------------------------------/ + ContentModelGroup contentModel = model; Enumeration enumeration = contentModel.enumerate(); //-- handle choice item 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Binding.java (working copy) @@ -112,7 +112,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding(org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + public void addAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) throws java.lang.IndexOutOfBoundsException { this._attributeBindingList.add(vAttributeBinding); @@ -126,7 +126,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + public void addAttributeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) throws java.lang.IndexOutOfBoundsException { this._attributeBindingList.add(index, vAttributeBinding); @@ -139,7 +139,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addComplexTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + public void addComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) throws java.lang.IndexOutOfBoundsException { this._complexTypeBindingList.add(vComplexTypeBinding); @@ -153,7 +153,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addComplexTypeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + public void addComplexTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) throws java.lang.IndexOutOfBoundsException { this._complexTypeBindingList.add(index, vComplexTypeBinding); @@ -166,7 +166,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding(org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + public void addElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) throws java.lang.IndexOutOfBoundsException { this._elementBindingList.add(vElementBinding); @@ -180,7 +180,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + public void addElementBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) throws java.lang.IndexOutOfBoundsException { this._elementBindingList.add(index, vElementBinding); @@ -193,7 +193,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding(org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + public void addEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) throws java.lang.IndexOutOfBoundsException { this._enumBindingList.add(vEnumBinding); @@ -207,7 +207,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + public void addEnumBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) throws java.lang.IndexOutOfBoundsException { this._enumBindingList.add(index, vEnumBinding); @@ -220,7 +220,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding(org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + public void addGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) throws java.lang.IndexOutOfBoundsException { this._groupBindingList.add(vGroupBinding); @@ -234,7 +234,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + public void addGroupBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) throws java.lang.IndexOutOfBoundsException { this._groupBindingList.add(index, vGroupBinding); @@ -247,7 +247,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addInclude(org.exolab.castor.builder.binding.IncludeType vInclude) + public void addInclude(final org.exolab.castor.builder.binding.IncludeType vInclude) throws java.lang.IndexOutOfBoundsException { this._includeList.add(vInclude); @@ -261,7 +261,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addInclude(int index, org.exolab.castor.builder.binding.IncludeType vInclude) + public void addInclude(final int index, final org.exolab.castor.builder.binding.IncludeType vInclude) throws java.lang.IndexOutOfBoundsException { this._includeList.add(index, vInclude); @@ -274,7 +274,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addPackage(org.exolab.castor.builder.binding.PackageType vPackage) + public void addPackage(final org.exolab.castor.builder.binding.PackageType vPackage) throws java.lang.IndexOutOfBoundsException { this._packageList.add(vPackage); @@ -288,7 +288,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addPackage(int index, org.exolab.castor.builder.binding.PackageType vPackage) + public void addPackage(final int index, final org.exolab.castor.builder.binding.PackageType vPackage) throws java.lang.IndexOutOfBoundsException { this._packageList.add(index, vPackage); @@ -301,7 +301,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + public void addSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) throws java.lang.IndexOutOfBoundsException { this._simpleTypeBindingList.add(vSimpleTypeBinding); @@ -315,7 +315,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + public void addSimpleTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) throws java.lang.IndexOutOfBoundsException { this._simpleTypeBindingList.add(index, vSimpleTypeBinding); @@ -419,7 +419,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -467,7 +467,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -525,7 +525,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getElementBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getElementBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -573,7 +573,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getEnumBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getEnumBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -621,7 +621,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getGroupBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getGroupBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -669,7 +669,7 @@ * org.exolab.castor.builder.binding.IncludeType at the given * index */ - public org.exolab.castor.builder.binding.IncludeType getInclude(int index) + public org.exolab.castor.builder.binding.IncludeType getInclude(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -727,7 +727,7 @@ * org.exolab.castor.builder.binding.PackageType at the given * index */ - public org.exolab.castor.builder.binding.PackageType getPackage(int index) + public org.exolab.castor.builder.binding.PackageType getPackage(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -775,7 +775,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -926,7 +926,7 @@ * @throws org.exolab.castor.xml.ValidationException if this * object is an invalid instance according to the schema */ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -944,7 +944,7 @@ * @throws org.exolab.castor.xml.MarshalException if object is * null or if any SAXException is thrown during marshaling */ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -1013,7 +1013,7 @@ * @param vAttributeBinding * @return true if the object was removed from the collection. */ - public boolean removeAttributeBinding(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; @@ -1025,7 +1025,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt(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; @@ -1037,7 +1037,7 @@ * @param vComplexTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeComplexTypeBinding(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; @@ -1049,7 +1049,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt(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; @@ -1061,7 +1061,7 @@ * @param vElementBinding * @return true if the object was removed from the collection. */ - public boolean removeElementBinding(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; @@ -1073,7 +1073,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt(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; @@ -1085,7 +1085,7 @@ * @param vEnumBinding * @return true if the object was removed from the collection. */ - public boolean removeEnumBinding(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; @@ -1097,7 +1097,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt(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; @@ -1109,7 +1109,7 @@ * @param vGroupBinding * @return true if the object was removed from the collection. */ - public boolean removeGroupBinding(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; @@ -1121,7 +1121,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt(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; @@ -1133,7 +1133,7 @@ * @param vInclude * @return true if the object was removed from the collection. */ - public boolean removeInclude(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; @@ -1145,7 +1145,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.IncludeType removeIncludeAt(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; @@ -1157,7 +1157,7 @@ * @param vPackage * @return true if the object was removed from the collection. */ - public boolean removePackage(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; @@ -1169,7 +1169,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.PackageType removePackageAt(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; @@ -1181,7 +1181,7 @@ * @param vSimpleTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeSimpleTypeBinding(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; @@ -1193,7 +1193,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt(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; @@ -1207,7 +1207,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setAttributeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + public void setAttributeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1223,7 +1223,7 @@ * * @param vAttributeBindingArray */ - public void setAttributeBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vAttributeBindingArray) + public void setAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vAttributeBindingArray) { //-- copy array _attributeBindingList.clear(); @@ -1241,7 +1241,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setComplexTypeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + public void setComplexTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1257,7 +1257,7 @@ * * @param vComplexTypeBindingArray */ - public void setComplexTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vComplexTypeBindingArray) + public void setComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vComplexTypeBindingArray) { //-- copy array _complexTypeBindingList.clear(); @@ -1273,7 +1273,7 @@ * @param defaultBindingType the value of field * 'defaultBindingType'. */ - public void setDefaultBindingType(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) @@ -1286,7 +1286,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setElementBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + public void setElementBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1302,7 +1302,7 @@ * * @param vElementBindingArray */ - public void setElementBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vElementBindingArray) + public void setElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vElementBindingArray) { //-- copy array _elementBindingList.clear(); @@ -1320,7 +1320,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setEnumBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + public void setEnumBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1336,7 +1336,7 @@ * * @param vEnumBindingArray */ - public void setEnumBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vEnumBindingArray) + public void setEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vEnumBindingArray) { //-- copy array _enumBindingList.clear(); @@ -1354,7 +1354,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setGroupBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + public void setGroupBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1370,7 +1370,7 @@ * * @param vGroupBindingArray */ - public void setGroupBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vGroupBindingArray) + public void setGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vGroupBindingArray) { //-- copy array _groupBindingList.clear(); @@ -1388,7 +1388,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setInclude(int index, org.exolab.castor.builder.binding.IncludeType vInclude) + public void setInclude(final int index, final org.exolab.castor.builder.binding.IncludeType vInclude) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1404,7 +1404,7 @@ * * @param vIncludeArray */ - public void setInclude(org.exolab.castor.builder.binding.IncludeType[] vIncludeArray) + public void setInclude(final org.exolab.castor.builder.binding.IncludeType[] vIncludeArray) { //-- copy array _includeList.clear(); @@ -1419,7 +1419,7 @@ * * @param namingXML the value of field 'namingXML'. */ - public void setNamingXML(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) @@ -1432,7 +1432,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setPackage(int index, 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 @@ -1448,7 +1448,7 @@ * * @param vPackageArray */ - public void setPackage(org.exolab.castor.builder.binding.PackageType[] vPackageArray) + public void setPackage(final org.exolab.castor.builder.binding.PackageType[] vPackageArray) { //-- copy array _packageList.clear(); @@ -1466,7 +1466,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setSimpleTypeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + public void setSimpleTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1482,7 +1482,7 @@ * * @param vSimpleTypeBindingArray */ - public void setSimpleTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vSimpleTypeBindingArray) + public void setSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vSimpleTypeBindingArray) { //-- copy array _simpleTypeBindingList.clear(); @@ -1503,7 +1503,7 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.Binding */ - public static org.exolab.castor.builder.binding.Binding unmarshalBinding(java.io.Reader 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); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingDescriptor.java (working copy) @@ -66,7 +66,7 @@ //-- _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); handler = new org.exolab.castor.xml.XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -72,7 +72,7 @@ Binding target = (Binding) object; return target.getDefaultBindingType(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -83,7 +83,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -103,7 +103,7 @@ //-- _includeList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -109,7 +109,7 @@ Binding target = (Binding) object; return target.getInclude(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -120,7 +120,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllInclude(); @@ -128,7 +128,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.IncludeType(); } }; @@ -146,7 +146,7 @@ //-- _packageList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -152,7 +152,7 @@ Binding target = (Binding) object; return target.getPackage(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -163,7 +163,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllPackage(); @@ -171,7 +171,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.PackageType(); } }; @@ -189,7 +189,7 @@ //-- _namingXML 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -195,7 +195,7 @@ Binding target = (Binding) object; return target.getNamingXML(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -206,7 +206,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.NamingXMLType(); } }; @@ -223,7 +223,7 @@ //-- _elementBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -229,7 +229,7 @@ Binding target = (Binding) object; return target.getElementBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -240,7 +240,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllElementBinding(); @@ -248,7 +248,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -266,7 +266,7 @@ //-- _attributeBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -272,7 +272,7 @@ Binding target = (Binding) object; return target.getAttributeBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -283,7 +283,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllAttributeBinding(); @@ -291,7 +291,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -309,7 +309,7 @@ //-- _complexTypeBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -315,7 +315,7 @@ Binding target = (Binding) object; return target.getComplexTypeBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -326,7 +326,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllComplexTypeBinding(); @@ -334,7 +334,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -352,7 +352,7 @@ //-- _groupBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -358,7 +358,7 @@ Binding target = (Binding) object; return target.getGroupBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -369,7 +369,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllGroupBinding(); @@ -377,7 +377,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -395,7 +395,7 @@ //-- _enumBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -401,7 +401,7 @@ Binding target = (Binding) object; return target.getEnumBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -412,7 +412,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllEnumBinding(); @@ -420,7 +420,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -438,7 +438,7 @@ //-- _simpleTypeBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Binding target = (Binding) object; @@ -444,7 +444,7 @@ Binding target = (Binding) object; return target.getSimpleTypeBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -455,7 +455,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { Binding target = (Binding) object; target.removeAllSimpleTypeBinding(); @@ -463,7 +463,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingLoader.java (working copy) @@ -88,7 +88,7 @@ // Nothing to do } - public void loadBinding(String url) throws BindingException { + public void loadBinding(final String url) throws BindingException { InputSource source; try { source = _resolver.resolveEntity(null, url); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassType.java (working copy) @@ -93,7 +93,7 @@ * * @param vImplements **/ - public void addImplements(java.lang.String vImplements) + public void addImplements(final java.lang.String vImplements) throws java.lang.IndexOutOfBoundsException { _implementsList.addElement(vImplements); @@ -105,7 +105,7 @@ * @param index * @param vImplements **/ - public void addImplements(int index, java.lang.String vImplements) + public void addImplements(final int index, final java.lang.String vImplements) throws java.lang.IndexOutOfBoundsException { _implementsList.insertElementAt(vImplements, index); @@ -201,7 +201,7 @@ * * @param index **/ - public java.lang.String getImplements(int index) + public java.lang.String getImplements(final int index) throws java.lang.IndexOutOfBoundsException { //-- check bounds for index @@ -297,7 +297,7 @@ * * @param out **/ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -309,7 +309,7 @@ * * @param handler **/ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -328,7 +328,7 @@ * * @param index **/ - public java.lang.String removeImplements(int index) + public java.lang.String removeImplements(final int index) { java.lang.Object obj = _implementsList.elementAt(index); _implementsList.removeElementAt(index); @@ -340,7 +340,7 @@ * * @param _abstract the value of field 'abstract'. **/ - public void setAbstract(boolean _abstract) + public void setAbstract(final boolean _abstract) { this._abstract = _abstract; this._has_abstract = true; @@ -351,7 +351,7 @@ * * @param bound the value of field 'bound'. **/ - public void setBound(boolean bound) + public void setBound(final boolean bound) { this._bound = bound; this._has_bound = true; @@ -362,7 +362,7 @@ * * @param equals the value of field 'equals'. **/ - public void setEquals(boolean equals) + public void setEquals(final boolean equals) { this._equals = equals; this._has_equals = true; @@ -373,7 +373,7 @@ * * @param _extends the value of field 'extends'. **/ - public void setExtends(java.lang.String _extends) + public void setExtends(final java.lang.String _extends) { this._extends = _extends; } //-- void setExtends(java.lang.String) @@ -383,7 +383,7 @@ * * @param _final the value of field 'final'. **/ - public void setFinal(boolean _final) + public void setFinal(final boolean _final) { this._final = _final; this._has_final = true; @@ -395,7 +395,7 @@ * @param index * @param vImplements **/ - public void setImplements(int index, java.lang.String vImplements) + public void setImplements(final int index, final java.lang.String vImplements) throws java.lang.IndexOutOfBoundsException { //-- check bounds for index @@ -410,7 +410,7 @@ * * @param _implementsArray **/ - public void setImplements(java.lang.String[] _implementsArray) + public void setImplements(final java.lang.String[] _implementsArray) { //-- copy array _implementsList.removeAllElements(); @@ -424,7 +424,7 @@ * * @param name the value of field 'name'. **/ - public void setName(java.lang.String name) + public void setName(final java.lang.String name) { this._name = name; } //-- void setName(java.lang.String) @@ -434,7 +434,7 @@ * * @param _package the value of field 'package'. **/ - public void setPackage(java.lang.String _package) + public void setPackage(final java.lang.String _package) { this._package = _package; } //-- void setPackage(java.lang.String) @@ -444,7 +444,7 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.ClassType unmarshalClassType(java.io.Reader 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); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassTypeDescriptor.java (working copy) @@ -57,7 +57,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_package", "package", NodeType.Attribute); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ClassType target = (ClassType) object; @@ -63,7 +63,7 @@ ClassType target = (ClassType) object; return target.getPackage(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -74,7 +74,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -94,7 +94,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", NodeType.Attribute); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ClassType target = (ClassType) object; @@ -100,7 +100,7 @@ ClassType target = (ClassType) object; return target.getName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -111,7 +111,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -130,7 +130,7 @@ //-- _final desc = new XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_final", "final", NodeType.Attribute); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ClassType target = (ClassType) object; @@ -138,7 +138,7 @@ return null; return new Boolean(target.getFinal()); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -154,7 +154,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -172,7 +172,7 @@ //-- _abstract desc = new XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_abstract", "abstract", NodeType.Attribute); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ClassType target = (ClassType) object; @@ -180,7 +180,7 @@ return null; return new Boolean(target.getAbstract()); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -196,7 +196,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -214,7 +214,7 @@ //-- _equals desc = new XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_equals", "equals", NodeType.Attribute); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ClassType target = (ClassType) object; @@ -222,7 +222,7 @@ return null; return new Boolean(target.getEquals()); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -238,7 +238,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -256,7 +256,7 @@ //-- _bound desc = new XMLFieldDescriptorImpl(java.lang.Boolean.TYPE, "_bound", "bound", NodeType.Attribute); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ClassType target = (ClassType) object; @@ -264,7 +264,7 @@ return null; return new Boolean(target.getBound()); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -280,7 +280,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -301,7 +301,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_implementsList", "implements", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ClassType target = (ClassType) object; @@ -307,7 +307,7 @@ ClassType target = (ClassType) object; return target.getImplements(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -318,7 +318,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -341,7 +341,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_extends", "extends", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ClassType target = (ClassType) object; @@ -347,7 +347,7 @@ ClassType target = (ClassType) object; return target.getExtends(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -358,7 +358,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingType.java (working copy) @@ -103,7 +103,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding(org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + public void addAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) throws java.lang.IndexOutOfBoundsException { this._attributeBindingList.add(vAttributeBinding); @@ -117,7 +117,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + public void addAttributeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) throws java.lang.IndexOutOfBoundsException { this._attributeBindingList.add(index, vAttributeBinding); @@ -130,7 +130,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addComplexTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + public void addComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) throws java.lang.IndexOutOfBoundsException { this._complexTypeBindingList.add(vComplexTypeBinding); @@ -144,7 +144,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addComplexTypeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + public void addComplexTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) throws java.lang.IndexOutOfBoundsException { this._complexTypeBindingList.add(index, vComplexTypeBinding); @@ -157,7 +157,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding(org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + public void addElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) throws java.lang.IndexOutOfBoundsException { this._elementBindingList.add(vElementBinding); @@ -171,7 +171,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + public void addElementBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) throws java.lang.IndexOutOfBoundsException { this._elementBindingList.add(index, vElementBinding); @@ -184,7 +184,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding(org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + public void addEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) throws java.lang.IndexOutOfBoundsException { this._enumBindingList.add(vEnumBinding); @@ -198,7 +198,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + public void addEnumBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) throws java.lang.IndexOutOfBoundsException { this._enumBindingList.add(index, vEnumBinding); @@ -211,7 +211,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding(org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + public void addGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) throws java.lang.IndexOutOfBoundsException { this._groupBindingList.add(vGroupBinding); @@ -225,7 +225,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + public void addGroupBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) throws java.lang.IndexOutOfBoundsException { this._groupBindingList.add(index, vGroupBinding); @@ -238,7 +238,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + public void addSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) throws java.lang.IndexOutOfBoundsException { this._simpleTypeBindingList.add(vSimpleTypeBinding); @@ -252,7 +252,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + public void addSimpleTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) throws java.lang.IndexOutOfBoundsException { this._simpleTypeBindingList.add(index, vSimpleTypeBinding); @@ -334,7 +334,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -382,7 +382,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -440,7 +440,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getElementBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getElementBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -488,7 +488,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getEnumBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getEnumBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -536,7 +536,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getGroupBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getGroupBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -594,7 +594,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding(int index) + public org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -723,7 +723,7 @@ * @throws org.exolab.castor.xml.ValidationException if this * object is an invalid instance according to the schema */ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -741,7 +741,7 @@ * @throws org.exolab.castor.xml.MarshalException if object is * null or if any SAXException is thrown during marshaling */ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -796,7 +796,7 @@ * @param vAttributeBinding * @return true if the object was removed from the collection. */ - public boolean removeAttributeBinding(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; @@ -808,7 +808,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt(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; @@ -820,7 +820,7 @@ * @param vComplexTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeComplexTypeBinding(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; @@ -832,7 +832,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt(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; @@ -844,7 +844,7 @@ * @param vElementBinding * @return true if the object was removed from the collection. */ - public boolean removeElementBinding(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; @@ -856,7 +856,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt(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; @@ -868,7 +868,7 @@ * @param vEnumBinding * @return true if the object was removed from the collection. */ - public boolean removeEnumBinding(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; @@ -880,7 +880,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt(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; @@ -892,7 +892,7 @@ * @param vGroupBinding * @return true if the object was removed from the collection. */ - public boolean removeGroupBinding(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; @@ -904,7 +904,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt(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; @@ -916,7 +916,7 @@ * @param vSimpleTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeSimpleTypeBinding(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; @@ -928,7 +928,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt(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; @@ -942,7 +942,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setAttributeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) + public void setAttributeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -958,7 +958,7 @@ * * @param vAttributeBindingArray */ - public void setAttributeBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vAttributeBindingArray) + public void setAttributeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vAttributeBindingArray) { //-- copy array _attributeBindingList.clear(); @@ -976,7 +976,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setComplexTypeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) + public void setComplexTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -992,7 +992,7 @@ * * @param vComplexTypeBindingArray */ - public void setComplexTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vComplexTypeBindingArray) + public void setComplexTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vComplexTypeBindingArray) { //-- copy array _complexTypeBindingList.clear(); @@ -1008,7 +1008,7 @@ * @param componentBindingTypeChoice the value of field * 'componentBindingTypeChoice'. */ - public void setComponentBindingTypeChoice(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) @@ -1021,7 +1021,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setElementBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) + public void setElementBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1037,7 +1037,7 @@ * * @param vElementBindingArray */ - public void setElementBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vElementBindingArray) + public void setElementBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vElementBindingArray) { //-- copy array _elementBindingList.clear(); @@ -1055,7 +1055,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setEnumBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) + public void setEnumBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1071,7 +1071,7 @@ * * @param vEnumBindingArray */ - public void setEnumBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vEnumBindingArray) + public void setEnumBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vEnumBindingArray) { //-- copy array _enumBindingList.clear(); @@ -1089,7 +1089,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setGroupBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) + public void setGroupBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1105,7 +1105,7 @@ * * @param vGroupBindingArray */ - public void setGroupBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vGroupBindingArray) + public void setGroupBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vGroupBindingArray) { //-- copy array _groupBindingList.clear(); @@ -1120,7 +1120,7 @@ * * @param name the value of field 'name'. */ - public void setName(java.lang.String name) + public void setName(final java.lang.String name) { this._name = name; } //-- void setName(java.lang.String) @@ -1133,7 +1133,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setSimpleTypeBinding(int index, org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) + public void setSimpleTypeBinding(final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -1149,7 +1149,7 @@ * * @param vSimpleTypeBindingArray */ - public void setSimpleTypeBinding(org.exolab.castor.builder.binding.ComponentBindingType[] vSimpleTypeBindingArray) + public void setSimpleTypeBinding(final org.exolab.castor.builder.binding.ComponentBindingType[] vSimpleTypeBindingArray) { //-- copy array _simpleTypeBindingList.clear(); @@ -1170,7 +1170,7 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.ComponentBindingType */ - public static org.exolab.castor.builder.binding.ComponentBindingType unmarshalComponentBindingType(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); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoice.java (working copy) @@ -126,7 +126,7 @@ * @throws org.exolab.castor.xml.ValidationException if this * object is an invalid instance according to the schema */ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -144,7 +144,7 @@ * @throws org.exolab.castor.xml.MarshalException if object is * null or if any SAXException is thrown during marshaling */ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -156,7 +156,7 @@ * * @param enumDef the value of field 'enumDef'. */ - public void setEnumDef(org.exolab.castor.builder.binding.EnumBindingType enumDef) + public void setEnumDef(final org.exolab.castor.builder.binding.EnumBindingType enumDef) { this._enumDef = enumDef; } //-- void setEnumDef(org.exolab.castor.builder.binding.EnumBindingType) @@ -167,7 +167,7 @@ * @param _interface * @param interface the value of field 'interface'. */ - public void setInterface(org.exolab.castor.builder.binding.Interface _interface) + public void setInterface(final org.exolab.castor.builder.binding.Interface _interface) { this._interface = _interface; } //-- void setInterface(org.exolab.castor.builder.binding.Interface) @@ -177,7 +177,7 @@ * * @param javaClass the value of field 'javaClass'. */ - public void setJavaClass(org.exolab.castor.builder.binding.ClassType javaClass) + public void setJavaClass(final org.exolab.castor.builder.binding.ClassType javaClass) { this._javaClass = javaClass; } //-- void setJavaClass(org.exolab.castor.builder.binding.ClassType) @@ -187,7 +187,7 @@ * * @param member the value of field 'member'. */ - public void setMember(org.exolab.castor.builder.binding.FieldType member) + public void setMember(final org.exolab.castor.builder.binding.FieldType member) { this._member = member; } //-- void setMember(org.exolab.castor.builder.binding.FieldType) @@ -203,7 +203,7 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.ComponentBindingTypeChoice */ - public static org.exolab.castor.builder.binding.ComponentBindingTypeChoice unmarshalComponentBindingTypeChoice(java.io.Reader 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoiceDescriptor.java (working copy) @@ -67,7 +67,7 @@ //-- _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); handler = new org.exolab.castor.xml.XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingTypeChoice target = (ComponentBindingTypeChoice) object; @@ -73,7 +73,7 @@ ComponentBindingTypeChoice target = (ComponentBindingTypeChoice) object; return target.getJavaClass(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -84,7 +84,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ClassType(); } }; @@ -103,7 +103,7 @@ //-- _interface 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingTypeChoice target = (ComponentBindingTypeChoice) object; @@ -109,7 +109,7 @@ ComponentBindingTypeChoice target = (ComponentBindingTypeChoice) object; return target.getInterface(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -120,7 +120,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.Interface(); } }; @@ -139,7 +139,7 @@ //-- _member 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingTypeChoice target = (ComponentBindingTypeChoice) object; @@ -145,7 +145,7 @@ ComponentBindingTypeChoice target = (ComponentBindingTypeChoice) object; return target.getMember(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -156,7 +156,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.FieldType(); } }; @@ -175,7 +175,7 @@ //-- _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); handler = new org.exolab.castor.xml.XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingTypeChoice target = (ComponentBindingTypeChoice) object; @@ -181,7 +181,7 @@ ComponentBindingTypeChoice target = (ComponentBindingTypeChoice) object; return target.getEnumDef(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -192,7 +192,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.EnumBindingType(); } }; 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeDescriptor.java (working copy) @@ -67,7 +67,7 @@ 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingType target = (ComponentBindingType) object; @@ -73,7 +73,7 @@ ComponentBindingType target = (ComponentBindingType) object; return target.getName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -84,7 +84,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -107,7 +107,7 @@ //-- _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); handler = new org.exolab.castor.xml.XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingType target = (ComponentBindingType) object; @@ -113,7 +113,7 @@ ComponentBindingType target = (ComponentBindingType) object; return target.getComponentBindingTypeChoice(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -124,7 +124,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingTypeChoice(); } }; @@ -145,7 +145,7 @@ //-- _elementBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingType target = (ComponentBindingType) object; @@ -151,7 +151,7 @@ ComponentBindingType target = (ComponentBindingType) object; return target.getElementBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -162,7 +162,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllElementBinding(); @@ -170,7 +170,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -188,7 +188,7 @@ //-- _attributeBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingType target = (ComponentBindingType) object; @@ -194,7 +194,7 @@ ComponentBindingType target = (ComponentBindingType) object; return target.getAttributeBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -205,7 +205,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllAttributeBinding(); @@ -213,7 +213,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -231,7 +231,7 @@ //-- _complexTypeBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingType target = (ComponentBindingType) object; @@ -237,7 +237,7 @@ ComponentBindingType target = (ComponentBindingType) object; return target.getComplexTypeBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -248,7 +248,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllComplexTypeBinding(); @@ -256,7 +256,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -274,7 +274,7 @@ //-- _groupBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingType target = (ComponentBindingType) object; @@ -280,7 +280,7 @@ ComponentBindingType target = (ComponentBindingType) object; return target.getGroupBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -291,7 +291,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllGroupBinding(); @@ -299,7 +299,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -317,7 +317,7 @@ //-- _enumBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingType target = (ComponentBindingType) object; @@ -323,7 +323,7 @@ ComponentBindingType target = (ComponentBindingType) object; return target.getEnumBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -334,7 +334,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllEnumBinding(); @@ -342,7 +342,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; @@ -360,7 +360,7 @@ //-- _simpleTypeBindingList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { ComponentBindingType target = (ComponentBindingType) object; @@ -366,7 +366,7 @@ ComponentBindingType target = (ComponentBindingType) object; return target.getSimpleTypeBinding(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -377,7 +377,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { ComponentBindingType target = (ComponentBindingType) object; target.removeAllSimpleTypeBinding(); @@ -385,7 +385,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.ComponentBindingType(); } }; 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingType.java (working copy) @@ -65,7 +65,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumMember(org.exolab.castor.builder.binding.EnumMember vEnumMember) + public void addEnumMember(final org.exolab.castor.builder.binding.EnumMember vEnumMember) throws java.lang.IndexOutOfBoundsException { this._enumMemberList.add(vEnumMember); @@ -79,7 +79,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumMember(int index, org.exolab.castor.builder.binding.EnumMember vEnumMember) + public void addEnumMember(final int index, final org.exolab.castor.builder.binding.EnumMember vEnumMember) throws java.lang.IndexOutOfBoundsException { this._enumMemberList.add(index, vEnumMember); @@ -116,7 +116,7 @@ * org.exolab.castor.builder.binding.EnumMember at the given * index */ - public org.exolab.castor.builder.binding.EnumMember getEnumMember(int index) + public org.exolab.castor.builder.binding.EnumMember getEnumMember(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -190,7 +190,7 @@ * @throws org.exolab.castor.xml.ValidationException if this * object is an invalid instance according to the schema */ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -208,7 +208,7 @@ * @throws org.exolab.castor.xml.MarshalException if object is * null or if any SAXException is thrown during marshaling */ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -228,7 +228,7 @@ * @param vEnumMember * @return true if the object was removed from the collection. */ - public boolean removeEnumMember(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; @@ -240,7 +240,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.EnumMember removeEnumMemberAt(int index) + public org.exolab.castor.builder.binding.EnumMember removeEnumMemberAt(final int index) { Object obj = this._enumMemberList.remove(index); return (org.exolab.castor.builder.binding.EnumMember) obj; @@ -251,7 +251,7 @@ * * @param enumClassName the value of field 'enumClassName'. */ - public void setEnumClassName(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) @@ -264,7 +264,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setEnumMember(int index, org.exolab.castor.builder.binding.EnumMember vEnumMember) + public void setEnumMember(final int index, final org.exolab.castor.builder.binding.EnumMember vEnumMember) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -280,7 +280,7 @@ * * @param vEnumMemberArray */ - public void setEnumMember(org.exolab.castor.builder.binding.EnumMember[] vEnumMemberArray) + public void setEnumMember(final org.exolab.castor.builder.binding.EnumMember[] vEnumMemberArray) { //-- copy array _enumMemberList.clear(); @@ -301,7 +301,7 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.EnumBindingType */ - public static org.exolab.castor.builder.binding.EnumBindingType unmarshalEnumBindingType(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); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingTypeDescriptor.java (working copy) @@ -68,7 +68,7 @@ //-- _enumClassName 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { EnumBindingType target = (EnumBindingType) object; @@ -74,7 +74,7 @@ EnumBindingType target = (EnumBindingType) object; return target.getEnumClassName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -85,7 +85,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.EnumClassName(); } }; @@ -102,7 +102,7 @@ //-- _enumMemberList 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { EnumBindingType target = (EnumBindingType) object; @@ -108,7 +108,7 @@ EnumBindingType target = (EnumBindingType) object; return target.getEnumMember(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -119,7 +119,7 @@ throw new IllegalStateException(ex.toString()); } } - public void resetValue(Object object) throws IllegalStateException, IllegalArgumentException { + public void resetValue(final Object object) throws IllegalStateException, IllegalArgumentException { try { EnumBindingType target = (EnumBindingType) object; target.removeAllEnumMember(); @@ -127,7 +127,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new org.exolab.castor.builder.binding.EnumMember(); } }; 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassName.java (working copy) @@ -98,7 +98,7 @@ * @throws org.exolab.castor.xml.ValidationException if this * object is an invalid instance according to the schema */ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -116,7 +116,7 @@ * @throws org.exolab.castor.xml.MarshalException if object is * null or if any SAXException is thrown during marshaling */ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -129,7 +129,7 @@ * * @param content the value of field 'content'. */ - public void setContent(java.lang.String content) + public void setContent(final java.lang.String content) { this._content = content; } //-- void setContent(java.lang.String) @@ -140,7 +140,7 @@ * @param _package * @param package the value of field 'package'. */ - public void setPackage(java.lang.String _package) + public void setPackage(final java.lang.String _package) { this._package = _package; } //-- void setPackage(java.lang.String) @@ -156,7 +156,7 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.EnumClassName */ - public static org.exolab.castor.builder.binding.EnumClassName unmarshalEnumClassName(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); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassNameDescriptor.java (working copy) @@ -62,7 +62,7 @@ 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { EnumClassName target = (EnumClassName) object; @@ -68,7 +68,7 @@ EnumClassName target = (EnumClassName) object; return target.getContent(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -79,7 +79,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -100,7 +100,7 @@ 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { EnumClassName target = (EnumClassName) object; @@ -106,7 +106,7 @@ EnumClassName target = (EnumClassName) object; return target.getPackage(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -117,7 +117,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMember.java (working copy) @@ -96,7 +96,7 @@ * @throws org.exolab.castor.xml.ValidationException if this * object is an invalid instance according to the schema */ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -114,7 +114,7 @@ * @throws org.exolab.castor.xml.MarshalException if object is * null or if any SAXException is thrown during marshaling */ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -126,7 +126,7 @@ * * @param javaName the value of field 'javaName'. */ - public void setJavaName(java.lang.String javaName) + public void setJavaName(final java.lang.String javaName) { this._javaName = javaName; } //-- void setJavaName(java.lang.String) @@ -136,7 +136,7 @@ * * @param value the value of field 'value'. */ - public void setValue(java.lang.String value) + public void setValue(final java.lang.String value) { this._value = value; } //-- void setValue(java.lang.String) @@ -152,7 +152,7 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.EnumMember */ - public static org.exolab.castor.builder.binding.EnumMember unmarshalEnumMember(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); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMemberDescriptor.java (working copy) @@ -69,7 +69,7 @@ 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { EnumMember target = (EnumMember) object; @@ -75,7 +75,7 @@ EnumMember target = (EnumMember) object; return target.getValue(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -86,7 +86,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -109,7 +109,7 @@ 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { EnumMember target = (EnumMember) object; @@ -115,7 +115,7 @@ EnumMember target = (EnumMember) object; return target.getJavaName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -126,7 +126,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ExtendedBinding.java (working copy) @@ -275,7 +275,7 @@ * * @param binding the ComponentBindingType for which we want to process the * children. - * @param xPath the current XPath location that points to the parent of the + * @param currentPath the current XPath location that points to the parent of the * given ComponentBindingType. * @param type an integer that indicates the type of the given * ComponentBindingType @@ -280,7 +280,7 @@ * @param type an integer that indicates the type of the given * ComponentBindingType */ - private void handleComponent(final ComponentBindingType binding, String xPath, final int type) { + private void handleComponent(final ComponentBindingType binding, final String xPath, final int type) { if (binding == null) { return; } @@ -285,8 +285,9 @@ return; } - if (xPath == null) { - xPath = new String(); + String currentPath = xPath; + if (currentPath == null) { + currentPath = new String(); } String name = binding.getName(); @@ -296,10 +297,10 @@ case ATTRIBUTE : //--handle attributes if (!xpathUsed) { - xPath = xPath + PATH_SEPARATOR + ATTRIBUTE_PREFIX; + currentPath = currentPath + PATH_SEPARATOR + ATTRIBUTE_PREFIX; } - xPath += name; - _componentBindings.put(xPath, binding); + currentPath += name; + _componentBindings.put(currentPath, binding); break; case SIMPLETYPE : @@ -305,10 +306,10 @@ case SIMPLETYPE : //--handle simpleType if (!xpathUsed) { - xPath += SIMPLETYPE_ID; + currentPath += SIMPLETYPE_ID; } - xPath += name; - _componentBindings.put(xPath, binding); + currentPath += name; + _componentBindings.put(currentPath, binding); break; case ELEMENT : @@ -314,10 +315,10 @@ case ELEMENT : //--handle element if (!xpathUsed) { - xPath += PATH_SEPARATOR; + currentPath += PATH_SEPARATOR; } - xPath += name; - _componentBindings.put(xPath, binding); + currentPath += name; + _componentBindings.put(currentPath, binding); break; case COMPLEXTYPE : @@ -323,10 +324,10 @@ case COMPLEXTYPE : //--handle complexType if (!xpathUsed) { - xPath += COMPLEXTYPE_ID; + currentPath += COMPLEXTYPE_ID; } - xPath += name; - _componentBindings.put(xPath, binding); + currentPath += name; + _componentBindings.put(currentPath, binding); break; case ENUM_TYPE : @@ -332,10 +333,10 @@ case ENUM_TYPE : //--handle enum if (!xpathUsed) { - xPath += ENUMTYPE_ID; + currentPath += ENUMTYPE_ID; } - xPath += name; - _componentBindings.put(xPath, binding); + currentPath += name; + _componentBindings.put(currentPath, binding); break; case GROUP : @@ -341,10 +342,10 @@ case GROUP : //--handle group if (!xpathUsed) { - xPath += GROUP_ID; + currentPath += GROUP_ID; } - xPath += name; - _componentBindings.put(xPath, binding); + currentPath += name; + _componentBindings.put(currentPath, binding); break; default : @@ -361,7 +362,7 @@ for (int i = 0; i < tempBindings.length; i++) { temp = tempBindings[i]; //--top-level attribute --> no location computation - handleComponent(temp, xPath, ATTRIBUTE); + handleComponent(temp, currentPath, ATTRIBUTE); } //2--complexTypes @@ -368,7 +369,7 @@ tempBindings = binding.getComplexTypeBinding(); for (int i = 0; i < tempBindings.length; i++) { temp = tempBindings[i]; - handleComponent(temp, xPath, COMPLEXTYPE); + handleComponent(temp, currentPath, COMPLEXTYPE); } //X--simpleTypes @@ -375,7 +376,7 @@ tempBindings = binding.getSimpleTypeBinding(); for (int i = 0; i < tempBindings.length; i++) { temp = tempBindings[i]; - handleComponent(temp, xPath, SIMPLETYPE); + handleComponent(temp, currentPath, SIMPLETYPE); } //3--elements @@ -382,7 +383,7 @@ tempBindings = binding.getElementBinding(); for (int i = 0; i < tempBindings.length; i++) { temp = tempBindings[i]; - handleComponent(temp, xPath, ELEMENT); + handleComponent(temp, currentPath, ELEMENT); } //4--groups @@ -389,7 +390,7 @@ tempBindings = binding.getGroupBinding(); for (int i = 0; i < tempBindings.length; i++) { temp = tempBindings[i]; - handleComponent(temp, xPath, GROUP); + handleComponent(temp, currentPath, GROUP); } //5--enums @@ -396,7 +397,7 @@ tempBindings = binding.getEnumBinding(); for (int i = 0; i < tempBindings.length; i++) { temp = tempBindings[i]; - handleComponent(temp, xPath, ENUM_TYPE); + handleComponent(temp, currentPath, ENUM_TYPE); } temp = null; 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldType.java (working copy) @@ -211,7 +211,7 @@ * @throws org.exolab.castor.xml.ValidationException if this * object is an invalid instance according to the schema */ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -229,7 +229,7 @@ * @throws org.exolab.castor.xml.MarshalException if object is * null or if any SAXException is thrown during marshaling */ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -241,7 +241,7 @@ * * @param collection the value of field 'collection'. */ - public void setCollection(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) @@ -251,7 +251,7 @@ * * @param handler the value of field 'handler'. */ - public void setHandler(java.lang.String handler) + public void setHandler(final java.lang.String handler) { this._handler = handler; } //-- void setHandler(java.lang.String) @@ -261,7 +261,7 @@ * * @param javaType the value of field 'javaType'. */ - public void setJavaType(java.lang.String javaType) + public void setJavaType(final java.lang.String javaType) { this._javaType = javaType; } //-- void setJavaType(java.lang.String) @@ -271,7 +271,7 @@ * * @param name the value of field 'name'. */ - public void setName(java.lang.String name) + public void setName(final java.lang.String name) { this._name = name; } //-- void setName(java.lang.String) @@ -281,7 +281,7 @@ * * @param validator the value of field 'validator'. */ - public void setValidator(java.lang.String validator) + public void setValidator(final java.lang.String validator) { this._validator = validator; } //-- void setValidator(java.lang.String) @@ -291,7 +291,7 @@ * * @param visibility the value of field 'visibility'. */ - public void setVisibility(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) @@ -301,7 +301,7 @@ * * @param wrapper the value of field 'wrapper'. */ - public void setWrapper(boolean wrapper) + public void setWrapper(final boolean wrapper) { this._wrapper = wrapper; this._has_wrapper = true; @@ -318,7 +318,7 @@ * @return the unmarshaled * org.exolab.castor.builder.binding.FieldType */ - public static org.exolab.castor.builder.binding.FieldType unmarshal(java.io.Reader reader) + 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); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldTypeDescriptor.java (working copy) @@ -64,7 +64,7 @@ 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { FieldType target = (FieldType) object; @@ -70,7 +70,7 @@ FieldType target = (FieldType) object; return target.getName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -81,7 +81,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -101,7 +101,7 @@ 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { FieldType target = (FieldType) object; @@ -107,7 +107,7 @@ FieldType target = (FieldType) object; return target.getJavaType(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -118,7 +118,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -137,7 +137,7 @@ //-- _wrapper 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { FieldType target = (FieldType) object; @@ -145,7 +145,7 @@ return null; return (target.getWrapper() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -161,7 +161,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -180,7 +180,7 @@ 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { FieldType target = (FieldType) object; @@ -186,7 +186,7 @@ FieldType target = (FieldType) object; return target.getHandler(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -197,7 +197,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -216,7 +216,7 @@ //-- _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); handler = new org.exolab.castor.xml.XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { FieldType target = (FieldType) object; @@ -222,7 +222,7 @@ FieldType target = (FieldType) object; return target.getCollection(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -233,7 +233,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -251,7 +251,7 @@ //-- _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); handler = new org.exolab.castor.xml.XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { FieldType target = (FieldType) object; @@ -257,7 +257,7 @@ FieldType target = (FieldType) object; return target.getVisibility(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -268,7 +268,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; @@ -287,7 +287,7 @@ 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(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { FieldType target = (FieldType) object; @@ -293,7 +293,7 @@ FieldType target = (FieldType) object; return target.getValidator(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -304,7 +304,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }; 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeType.java (working copy) @@ -73,7 +73,7 @@ * * @param out **/ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -85,7 +85,7 @@ * * @param handler **/ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -97,7 +97,7 @@ * * @param URI the value of field 'URI'. **/ - public void setURI(java.lang.String URI) + public void setURI(final java.lang.String URI) { this._URI = URI; } //-- void setURI(java.lang.String) @@ -107,7 +107,7 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.IncludeType unmarshalIncludeType(java.io.Reader 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); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeTypeDescriptor.java (working copy) @@ -52,7 +52,7 @@ //-- _URI desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_URI", "URI", NodeType.Attribute); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { IncludeType target = (IncludeType) object; @@ -58,7 +58,7 @@ IncludeType target = (IncludeType) object; return target.getURI(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -69,7 +69,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new java.lang.String(); } }); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Interface.java (working copy) @@ -69,7 +69,7 @@ * * @param out **/ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -81,7 +81,7 @@ * * @param handler **/ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -93,7 +93,7 @@ * * @param name the value of field 'name'. **/ - public void setName(java.lang.String name) + public void setName(final java.lang.String name) { this._name = name; } //-- void setName(java.lang.String) @@ -103,7 +103,7 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.Interface unmarshalInterface(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); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/InterfaceDescriptor.java (working copy) @@ -54,7 +54,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", NodeType.Attribute); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { Interface target = (Interface) object; @@ -60,7 +60,7 @@ Interface target = (Interface) object; return target.getName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -71,7 +71,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingType.java (working copy) @@ -81,7 +81,7 @@ * * @param out **/ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -93,7 +93,7 @@ * * @param handler **/ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -105,7 +105,7 @@ * * @param prefix the value of field 'prefix'. **/ - public void setPrefix(java.lang.String prefix) + public void setPrefix(final java.lang.String prefix) { this._prefix = prefix; } //-- void setPrefix(java.lang.String) @@ -115,7 +115,7 @@ * * @param suffix the value of field 'suffix'. **/ - public void setSuffix(java.lang.String suffix) + public void setSuffix(final java.lang.String suffix) { this._suffix = suffix; } //-- void setSuffix(java.lang.String) @@ -125,7 +125,7 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.NamingType unmarshalNamingType(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); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingTypeDescriptor.java (working copy) @@ -59,7 +59,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_prefix", "prefix", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { NamingType target = (NamingType) object; @@ -65,7 +65,7 @@ NamingType target = (NamingType) object; return target.getPrefix(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -76,7 +76,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -98,7 +98,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_suffix", "suffix", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { NamingType target = (NamingType) object; @@ -104,7 +104,7 @@ NamingType target = (NamingType) object; return target.getSuffix(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -115,7 +115,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLType.java (working copy) @@ -101,7 +101,7 @@ * * @param out **/ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -113,7 +113,7 @@ * * @param handler **/ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -125,7 +125,7 @@ * * @param complexTypeName the value of field 'complexTypeName'. **/ - public void setComplexTypeName(NamingType complexTypeName) + public void setComplexTypeName(final NamingType complexTypeName) { this._complexTypeName = complexTypeName; } //-- void setComplexTypeName(NamingType) @@ -135,7 +135,7 @@ * * @param elementName the value of field 'elementName'. **/ - public void setElementName(NamingType elementName) + public void setElementName(final NamingType elementName) { this._elementName = elementName; } //-- void setElementName(NamingType) @@ -145,7 +145,7 @@ * * @param modelGroupName the value of field 'modelGroupName'. **/ - public void setModelGroupName(NamingType modelGroupName) + public void setModelGroupName(final NamingType modelGroupName) { this._modelGroupName = modelGroupName; } //-- void setModelGroupName(NamingType) @@ -155,7 +155,7 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.NamingXMLType unmarshalNamingXMLType(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); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLTypeDescriptor.java (working copy) @@ -57,7 +57,7 @@ //-- _elementName desc = new XMLFieldDescriptorImpl(NamingType.class, "_elementName", "elementName", NodeType.Element); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { NamingXMLType target = (NamingXMLType) object; @@ -63,7 +63,7 @@ NamingXMLType target = (NamingXMLType) object; return target.getElementName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -74,7 +74,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new NamingType(); } }); @@ -90,7 +90,7 @@ //-- _complexTypeName desc = new XMLFieldDescriptorImpl(NamingType.class, "_complexTypeName", "complexTypeName", NodeType.Element); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { NamingXMLType target = (NamingXMLType) object; @@ -96,7 +96,7 @@ NamingXMLType target = (NamingXMLType) object; return target.getComplexTypeName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -107,7 +107,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new NamingType(); } }); @@ -123,7 +123,7 @@ //-- _modelGroupName desc = new XMLFieldDescriptorImpl(NamingType.class, "_modelGroupName", "modelGroupName", NodeType.Element); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { NamingXMLType target = (NamingXMLType) object; @@ -129,7 +129,7 @@ NamingXMLType target = (NamingXMLType) object; return target.getModelGroupName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -140,7 +140,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new NamingType(); } }); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageType.java (working copy) @@ -87,7 +87,7 @@ * * @param out **/ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -99,7 +99,7 @@ * * @param handler **/ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -111,7 +111,7 @@ * * @param name the value of field 'name'. **/ - public void setName(java.lang.String name) + public void setName(final java.lang.String name) { this._name = name; } //-- void setName(java.lang.String) @@ -122,7 +122,7 @@ * @param packageTypeChoice the value of field * 'packageTypeChoice'. **/ - public void setPackageTypeChoice(PackageTypeChoice packageTypeChoice) + public void setPackageTypeChoice(final PackageTypeChoice packageTypeChoice) { this._packageTypeChoice = packageTypeChoice; } //-- void setPackageTypeChoice(PackageTypeChoice) @@ -132,7 +132,7 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.PackageType unmarshalPackageType(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); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoice.java (working copy) @@ -81,7 +81,7 @@ * * @param out **/ - public void marshal(java.io.Writer out) + public void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -93,7 +93,7 @@ * * @param handler **/ - public void marshal(org.xml.sax.ContentHandler handler) + public void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { @@ -105,7 +105,7 @@ * * @param namespace the value of field 'namespace'. **/ - public void setNamespace(java.lang.String namespace) + public void setNamespace(final java.lang.String namespace) { this._namespace = namespace; } //-- void setNamespace(java.lang.String) @@ -115,7 +115,7 @@ * * @param schemaLocation the value of field 'schemaLocation'. **/ - public void setSchemaLocation(java.lang.String schemaLocation) + public void setSchemaLocation(final java.lang.String schemaLocation) { this._schemaLocation = schemaLocation; } //-- void setSchemaLocation(java.lang.String) @@ -125,7 +125,7 @@ * * @param reader **/ - public static org.exolab.castor.builder.binding.PackageTypeChoice unmarshalPackageTypeChoice(java.io.Reader 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoiceDescriptor.java (working copy) @@ -57,7 +57,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_namespace", "namespace", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { PackageTypeChoice target = (PackageTypeChoice) object; @@ -63,7 +63,7 @@ PackageTypeChoice target = (PackageTypeChoice) object; return target.getNamespace(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -74,7 +74,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -98,7 +98,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_schemaLocation", "schemaLocation", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { PackageTypeChoice target = (PackageTypeChoice) object; @@ -104,7 +104,7 @@ PackageTypeChoice target = (PackageTypeChoice) object; return target.getSchemaLocation(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -115,7 +115,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); 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 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeDescriptor.java (working copy) @@ -59,7 +59,7 @@ desc = new XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", NodeType.Element); desc.setImmutable(true); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { PackageType target = (PackageType) object; @@ -65,7 +65,7 @@ PackageType target = (PackageType) object; return target.getName(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -76,7 +76,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return null; } }); @@ -99,7 +99,7 @@ //-- _packageTypeChoice desc = new XMLFieldDescriptorImpl(PackageTypeChoice.class, "_packageTypeChoice", "-error-if-this-is-used-", NodeType.Element); handler = (new XMLFieldHandler() { - public java.lang.Object getValue(java.lang.Object object) + public java.lang.Object getValue(final java.lang.Object object) throws IllegalStateException { PackageType target = (PackageType) object; @@ -105,7 +105,7 @@ PackageType target = (PackageType) object; return target.getPackageTypeChoice(); } - public void setValue(java.lang.Object object, java.lang.Object value) + public void setValue(final java.lang.Object object, final java.lang.Object value) throws IllegalStateException, IllegalArgumentException { try { @@ -116,7 +116,7 @@ throw new IllegalStateException(ex.toString()); } } - public java.lang.Object newInstance(java.lang.Object parent) { + public java.lang.Object newInstance(final java.lang.Object parent) { return new PackageTypeChoice(); } }); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/BindingType.java (working copy) @@ -61,7 +61,7 @@ //- Constructors -/ //----------------/ - private BindingType(int type, java.lang.String value) { + private BindingType(final int type, final java.lang.String value) { super(); this.type = type; this.stringValue = value; @@ -112,7 +112,7 @@ * * @param string **/ - public static org.exolab.castor.builder.binding.types.BindingType valueOf(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); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionType.java (working copy) @@ -136,7 +136,7 @@ //- Constructors -/ //----------------/ - private FieldTypeCollectionType(int type, java.lang.String value) { + private FieldTypeCollectionType(final int type, final java.lang.String value) { super(); this.type = type; this.stringValue = value; @@ -197,7 +197,7 @@ * * @param string **/ - public static org.exolab.castor.builder.binding.types.FieldTypeCollectionType valueOf(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); 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 6674) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityType.java (working copy) @@ -75,7 +75,7 @@ //- Constructors -/ //----------------/ - private FieldTypeVisibilityType(int type, java.lang.String value) + private FieldTypeVisibilityType(final int type, final java.lang.String value) { super(); this.type = type; @@ -164,7 +164,7 @@ * @return the FieldTypeVisibilityType value of parameter * 'string' */ - public static org.exolab.castor.builder.binding.types.FieldTypeVisibilityType valueOf(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); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JParameter.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JParameter.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/javasource/JParameter.java (working copy) @@ -124,9 +124,11 @@ * by the name of the parameter. */ public String toString() { - StringBuffer sb = new StringBuffer(this._type.toString()); + StringBuffer sb = new StringBuffer(); + sb.append("final "); + sb.append(_type.toString()); sb.append(' '); - sb.append(this._name); + sb.append(_name); return sb.toString(); } Index: C:/Java/castor-1/src/doc/release-notes.xml =================================================================== --- C:/Java/castor-1/src/doc/release-notes.xml (revision 6674) +++ C:/Java/castor-1/src/doc/release-notes.xml (working copy) @@ -34,6 +34,26 @@ + + + Cleaned up 466 'Final Parameters' 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 316 'Style Javadoc' warnings at builder package. Index: C:/Java/castor-1/src/etc/CHANGELOG =================================================================== --- C:/Java/castor-1/src/etc/CHANGELOG (revision 6674) +++ C:/Java/castor-1/src/etc/CHANGELOG (working copy) @@ -1,6 +1,11 @@ SVN ------------------------------- +XML: Resolved issue CASTOR-1795 using contribution from Ralf Joachim [Ralf.joachim@syscon-world.de] + Cleaned up 466 'Final Parameters' warnings at builder package. + Details: http://jira.codehaus.org/browse/CASTOR-1795 + (Ralf - 20070102) + XML: Resolved issue CASTOR-1794 using contribution from Ralf Joachim [Ralf.joachim@syscon-world.de] Cleaned up 316 'Style Javadoc' warnings at builder package. Details: http://jira.codehaus.org/browse/CASTOR-1794