Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/BaseFactory.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/BaseFactory.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/BaseFactory.java (working copy) @@ -60,7 +60,7 @@ * the String to normalize * @return the given string, normalized, for use in comments. */ - protected String normalize(final String value) { + protected final String normalize(final String value) { if (value == null) { return null; } @@ -102,7 +102,7 @@ * Returns the group naming helper class for naming nested anonymous groups. * @return the group naming helper class for naming nested anonymous groups. */ - public GroupNaming getGroupNaming() { + public final GroupNaming getGroupNaming() { return _groupNaming; } @@ -110,7 +110,7 @@ * Sets the group naming helper class for naming nested anonymous groups. * @param groupNaming the group naming helper class for naming nested anonymous groups. */ - public void setGroupNaming(final GroupNaming groupNaming) { + public final void setGroupNaming(final GroupNaming groupNaming) { _groupNaming = groupNaming; } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/BuilderConfiguration.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/BuilderConfiguration.java (revision 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/BuilderConfiguration.java (working copy) @@ -271,7 +271,7 @@ * * @return The default configuration */ - public synchronized Properties getDefault() { + public final synchronized Properties getDefault() { if (_defaultProps == null) { load(); } @@ -288,7 +288,7 @@ * The property's default value * @return The property's value */ - public String getProperty(final String name, final String defValue) { + public final String getProperty(final String name, final String defValue) { return _localProps.getProperty(name, defValue); } //-- getProperty @@ -301,7 +301,7 @@ * * @return true if bound properties are enabled. */ - public boolean boundPropertiesEnabled() { + public final boolean boundPropertiesEnabled() { return TRUE.equalsIgnoreCase(_localProps.getProperty(Property.BOUND_PROPERTIES)); } //-- boundPropertiesEnabled @@ -314,7 +314,7 @@ * * @return true if bound properties are enabled. */ - public boolean equalsMethod() { + public final boolean equalsMethod() { return TRUE.equalsIgnoreCase(_localProps.getProperty(Property.EQUALS_METHOD)); } //-- equalsMethod @@ -323,7 +323,7 @@ * * @param equals The value we want to use. */ - public void setEqualsMethod(final boolean equals) { + public final void setEqualsMethod(final boolean equals) { String value = (equals) ? TRUE : FALSE; _localProps.setProperty(Property.EQUALS_METHOD, value); } //-- setEqualsMethod @@ -338,7 +338,7 @@ * * @return true if bound properties are enabled. */ - public boolean classDescFieldNames() { + public final boolean classDescFieldNames() { return _localProps.getProperty(Property.CLASS_DESC_FIELD_NAMES, "").equalsIgnoreCase(TRUE); } //-- classDescFieldNames @@ -353,7 +353,7 @@ * * @return true if extra collection methods are enabled. */ - public boolean generateExtraCollectionMethods() { + public final boolean generateExtraCollectionMethods() { return _localProps.getProperty(Property.EXTRA_COLLECTION_METHODS, "") .equalsIgnoreCase(TRUE); } //-- generateExtraCollectionMethods @@ -364,7 +364,7 @@ * @param classDescFieldNames * the value we want to ues */ - public void setClassDescFieldNames(final boolean classDescFieldNames) { + public final void setClassDescFieldNames(final boolean classDescFieldNames) { String value = (classDescFieldNames) ? TRUE : FALSE; _localProps.setProperty(Property.CLASS_DESC_FIELD_NAMES, value); } //-- setClassDescFieldNames @@ -374,7 +374,7 @@ * replacing float by java.lang.Float). * @return true if primitive types have to be used as Objects. */ - public boolean usePrimitiveWrapper() { + public final boolean usePrimitiveWrapper() { return _localProps.getProperty(Property.WRAPPER, "").equalsIgnoreCase(TRUE); } //-- usePrimitiveWrapper @@ -383,7 +383,7 @@ * * @param wrapper the value we want to use. */ - public void setPrimitiveWrapper(final boolean wrapper) { + public final void setPrimitiveWrapper(final boolean wrapper) { String value = (wrapper) ? TRUE : FALSE; _localProps.setProperty(Property.WRAPPER, value); } //-- setPrimitiveWrapper @@ -394,7 +394,7 @@ * * @return true if use enumerated type interface is enabled */ - public boolean useEnumeratedTypeInterface() { + public final boolean useEnumeratedTypeInterface() { return TRUE.equalsIgnoreCase(_localProps.getProperty(Property.ENUM_TYPE_ACCESS_INTERFACE)); } //-- useEnumeratedTypeInterface @@ -404,7 +404,7 @@ * * @return true if use enumerated type interface is enabled */ - public boolean useJava50() { + public final boolean useJava50() { return "5.0".equalsIgnoreCase(_localProps.getProperty(Property.JAVA_VERSION, "1.4")); } //-- useEnumeratedTypeInterface @@ -415,7 +415,7 @@ * @return the maximum number of static constant definitions acceptable within * one class file */ - public int getMaximumNumberOfConstants() { + public final int getMaximumNumberOfConstants() { String property = _localProps.getProperty(Property.MAX_CONSTANTS_PROPERTY, "1000"); return Integer.valueOf(property).intValue(); } @@ -425,7 +425,7 @@ * * @param flag the value we want to use */ - public void setUseEnumeratedTypeInterface(final boolean flag) { + public final void setUseEnumeratedTypeInterface(final boolean flag) { String value = (flag) ? TRUE : FALSE; _localProps.setProperty(Property.ENUM_TYPE_ACCESS_INTERFACE, value); } //-- setUseEnumeratedTypeInterface @@ -460,7 +460,7 @@ * @param properties * the Properties file */ - public void setDefaultProperties(final Properties properties) { + public final void setDefaultProperties(final Properties properties) { Properties defaults = null; if (properties == null) { defaults = _defaultProps; @@ -485,7 +485,7 @@ * @param ns the namespace URI to map * @param packageName the package name */ - public void setNamespacePackageMapping(final String ns, final String packageName) { + public final void setNamespacePackageMapping(final String ns, final String packageName) { _nspackages.put(ns, packageName); } //-- setNamespcaePackageMapping @@ -495,7 +495,7 @@ * @param schemaLocation the schemaLocation to map * @param packageName the package name to map to */ - public void setLocationPackageMapping(final String schemaLocation, final String packageName) { + public final void setLocationPackageMapping(final String schemaLocation, final String packageName) { _locpackages.put(schemaLocation, packageName); } @@ -505,7 +505,7 @@ * the default directories, but if it cannot find the JAR's configuration * file, will throw a run time exception. */ - protected synchronized void load() { + protected final synchronized void load() { if (_defaultProps == null) { //-- load defaults from JAR _defaultProps = Configuration.loadProperties( @@ -569,7 +569,7 @@ * @param nsURL the XML namespace URL to convert into a Java package name * @return a Java package name */ - public String lookupPackageByNamespace(final String nsURL) { + public final String lookupPackageByNamespace(final String nsURL) { String namespaceURL = (nsURL == null) ? "" : nsURL; // Lookup Java package via NS @@ -587,7 +587,7 @@ * the Schema location to use to look up the Java package * @return a Java package name */ - public String lookupPackageByLocation(final String schemaLocation) { + public final String lookupPackageByLocation(final String schemaLocation) { if (schemaLocation == null) { return ""; } @@ -627,7 +627,7 @@ * * @param mappings the namespace-to-package mappings */ - protected void processNamespacePackageMappings(final String mappings) { + protected final void processNamespacePackageMappings(final String mappings) { if (mappings == null) { return; } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/EnumerationFactory.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/EnumerationFactory.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/EnumerationFactory.java (working copy) @@ -44,7 +44,7 @@ * @author Werner Guttmann * @version $Revision: 6287 $ $Date: 2006-04-25 15:08:23 -0600 (Tue, 25 Apr 2006) $ */ -public class EnumerationFactory extends BaseFactory { +public final class EnumerationFactory extends BaseFactory { /** * The TypeConversion instance to use for mapping SimpleTypes into XSTypes. Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/FieldInfoFactory.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/FieldInfoFactory.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/FieldInfoFactory.java (working copy) @@ -65,7 +65,7 @@ * @author Arnaud Blandin * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ */ -public class FieldInfoFactory { +public final class FieldInfoFactory { /** The default collection name. */ private String _default = null; Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/GroupNaming.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/GroupNaming.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/GroupNaming.java (working copy) @@ -59,7 +59,7 @@ * @author Keith Visco * @version $Revision$ $Date: 2006-04-25 15:08:23 -0600 (Tue, 25 Apr 2006) $ */ -public class GroupNaming { +public final class GroupNaming { /** * A HashTable of HashTables that keeps track of group names for each Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MappingFileSourceFactory.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MappingFileSourceFactory.java (revision 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MappingFileSourceFactory.java (working copy) @@ -65,7 +65,7 @@ * @author Keith Visco * @version $Revision$ $Date: 2006-04-13 07:37:49 -0600 (Thu, 13 Apr 2006) $ */ -public class MappingFileSourceFactory { +public final class MappingFileSourceFactory { /** * Creates a new MappingFileSourceFactory with the given configuration. Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MemberFactory.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MemberFactory.java (revision 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/MemberFactory.java (working copy) @@ -85,7 +85,7 @@ * @author Keith Visco * @version $Revision$ $Date: 2006-04-25 15:08:23 -0600 (Tue, 25 Apr 2006) $ */ -public class MemberFactory extends BaseFactory { +public final class MemberFactory extends BaseFactory { /** * Creates a new MemberFactory using the given FieldInfo factory. Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SGStateInfo.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SGStateInfo.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SGStateInfo.java (working copy) @@ -70,7 +70,7 @@ * @author Keith Visco * @version $Revision$ $Date: 2005-06-22 22:13:21 -0600 (Wed, 22 Jun 2005) $ */ -public class SGStateInfo extends ClassInfoResolverImpl { +public final class SGStateInfo extends ClassInfoResolverImpl { /** An empty Enumeration to be returned whenever we need an empty Enumeration. */ private static final Enumeration EMPTY_ENUMERATION = new Vector(0).elements(); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SingleClassGenerator.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SingleClassGenerator.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SingleClassGenerator.java (working copy) @@ -73,7 +73,7 @@ * @author Edward Kuns - Separated from SourceGenerator * @version $Revision: 0000 $ $Date: $ */ -public class SingleClassGenerator { +public final class SingleClassGenerator { /** * The default code header. Please leave "$" and "Id" separated with "+" so * that the CVS server does not expand it here. */ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceFactory.java (working copy) @@ -106,7 +106,7 @@ * @author Arnaud Blandin * @version $Revision$ $Date: 2006-04-25 15:08:23 -0600 (Tue, 25 Apr 2006) $ */ -public class SourceFactory extends BaseFactory { +public final class SourceFactory extends BaseFactory { private static final String ENUM_ACCESS_INTERFACE = "org.exolab.castor.types.EnumeratedTypeAccess"; Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceGenerator.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceGenerator.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/SourceGenerator.java (working copy) @@ -226,7 +226,7 @@ * Sets the filename of the mapping file. * @param filename filename of the mapping file */ - public void setMappingFilename(final String filename) { + public final void setMappingFilename(final String filename) { _mappingFilename = filename; } @@ -236,7 +236,7 @@ * @param nameConflictStrategy the name of the stretegy to use for handling * name conflicts. */ - public void setNameConflictStrategy(final String nameConflictStrategy) { + public final void setNameConflictStrategy(final String nameConflictStrategy) { _nameConflictStrategy = nameConflictStrategy; _singleClassGenerator.setNameConflictStrategy(nameConflictStrategy); } @@ -253,7 +253,7 @@ * Set to true if SAX1 should be used in the marshal method. * @param sax1 true if SAX1 should be used in the marshal method */ - public void setSAX1(final boolean sax1) { + public final void setSAX1(final boolean sax1) { _sax1 = sax1; } @@ -264,7 +264,7 @@ * @param caseInsensitive when true, enumerated type lookups will be * performed in a case insensitive manner. */ - public void setCaseInsensitive(final boolean caseInsensitive) { + public final void setCaseInsensitive(final boolean caseInsensitive) { _caseInsensitive = caseInsensitive; } @@ -275,7 +275,7 @@ * @param failOnFirstError if true, the source generator will fail on the * first error encountered. */ - public void setFailOnFirstError(final boolean failOnFirstError) { + public final void setFailOnFirstError(final boolean failOnFirstError) { _failOnFirstError = failOnFirstError; } @@ -284,7 +284,7 @@ * source generation. * @param suppress true if non-fatal warnings should be suppressed. */ - public void setSuppressNonFatalWarnings(final boolean suppress) { + public final void setSuppressNonFatalWarnings(final boolean suppress) { _singleClassGenerator.setPromptForOverwrite(!suppress); _suppressNonFatalWarnings = suppress; } //-- setSuppressNonFatalWarnings @@ -296,7 +296,7 @@ * @param verbose a boolean, when true indicates to print additional * messages */ - public void setVerbose(final boolean verbose) { + public final void setVerbose(final boolean verbose) { _verbose = verbose; } //-- setVerbose @@ -308,7 +308,7 @@ * ClassDescriptors * */ - public void setDescriptorCreation(final boolean createDescriptors) { + public final void setDescriptorCreation(final boolean createDescriptors) { _createDescriptors = createDescriptors; _singleClassGenerator.setDescriptorCreation(createDescriptors); } //-- setDescriptorCreation @@ -318,7 +318,7 @@ * * @param destDir the destination directory. */ - public void setDestDir(final String destDir) { + public final void setDestDir(final String destDir) { _singleClassGenerator.setDestDir(destDir); } @@ -330,7 +330,7 @@ * @param createMarshalMethods a boolean, when true indicates to generated * the marshaling framework methods */ - public void setCreateMarshalMethods(final boolean createMarshalMethods) { + public final void setCreateMarshalMethods(final boolean createMarshalMethods) { _createMarshalMethods = createMarshalMethods; } //-- setCreateMarshalMethods @@ -340,7 +340,7 @@ * * @param generate true to generate the java classes for the imported XML Schema */ - public void setGenerateImportedSchemas(final boolean generate) { + public final void setGenerateImportedSchemas(final boolean generate) { _generateImported = generate; } @@ -352,7 +352,7 @@ * @param generateMapping a flag that indicates whether or not a mapping * file should be generated. */ - public void setGenerateMappingFile(final boolean generateMapping) { + public final void setGenerateMappingFile(final boolean generateMapping) { _generateMapping = generateMapping; } //-- setGenerateMappingFile @@ -362,7 +362,7 @@ * @param testable * a boolean, when true indicates to implement CastorTestable */ - public void setTestable(final boolean testable) { + public final void setTestable(final boolean testable) { _testable = testable; } //-- setTestable @@ -373,7 +373,7 @@ * the binding to use, null indicates that the default binding * will be used. */ - public void setBinding(final ExtendedBinding binding) { + public final void setBinding(final ExtendedBinding binding) { if (binding != null) { processNamespaces(binding.getPackage()); } @@ -386,7 +386,7 @@ * * @param fileName the file that represents a Binding */ - public void setBinding(final String fileName) { + public final void setBinding(final String fileName) { try { ExtendedBinding binding = BindingLoader.createBinding(fileName); setBinding(binding); @@ -404,7 +404,7 @@ * * @param source an InputSource identifying a Castor Binding File. */ - public void setBinding(final InputSource source) { + public final void setBinding(final InputSource source) { try { ExtendedBinding binding = BindingLoader.createBinding(source); setBinding(binding); @@ -433,7 +433,7 @@ * platform, but will be compiling the source on a different * platform. */ - public void setLineSeparator(final String lineSeparator) { + public final void setLineSeparator(final String lineSeparator) { _singleClassGenerator.setLineSeparator(lineSeparator); } //-- setLineSeparator @@ -444,7 +444,7 @@ * @return True if the Source Generator is mapping schema elements to Java * classes. */ - public boolean mappingSchemaElement2Java() { + public final boolean mappingSchemaElement2Java() { if (_bindingComponent != null) { ExtendedBinding binding = _bindingComponent.getBinding(); if (binding != null) { @@ -464,7 +464,7 @@ * @return True if the Source Generator is mapping schema types to Java * classes. */ - public boolean mappingSchemaType2Java() { + public final boolean mappingSchemaType2Java() { if (_bindingComponent != null) { ExtendedBinding binding = _bindingComponent.getBinding(); if (binding != null) { @@ -486,7 +486,7 @@ * @param packageName the package for the generated source files * @throws IOException if an IOException occurs writing the new source files */ - public void generateSource(final String filename, final String packageName) throws IOException { + public final void generateSource(final String filename, final String packageName) throws IOException { final File schemaFile; if (filename.startsWith("./")) { schemaFile = new File(filename.substring(2)); @@ -518,7 +518,7 @@ * @param packageName the package for the generated source files * @throws IOException if an IOException occurs writing the new source files */ - public void generateSource(final Reader reader, final String packageName) throws IOException { + public final void generateSource(final Reader reader, final String packageName) throws IOException { InputSource source = new InputSource(reader); generateSource(source, packageName); } //-- generateSource @@ -609,7 +609,7 @@ * @see #generateSource(InputSource, String) to provide an InputSource for * the schema */ - public void generateSource(final Schema schema, final String packageName) throws IOException { + public final void generateSource(final Schema schema, final String packageName) throws IOException { if (schema == null) { throw new IllegalArgumentException("The argument 'schema' must not be null."); } @@ -670,7 +670,7 @@ * @param sInfo source generator state information * @throws IOException if this Exception occurs while processing an import schema */ - private void generateAllClassFiles(final Schema schema, final SGStateInfo sInfo) + private final void generateAllClassFiles(final Schema schema, final SGStateInfo sInfo) throws IOException { // Before processing the current schema, process its imported schemas if (!_suppressNonFatalWarnings || _generateImported) { @@ -720,7 +720,7 @@ * @param sInfo source generator state information * @throws IOException if this Exception occurs while processing an import schema */ - private void processImportedSchemas(final Schema schema, final SGStateInfo sInfo) + private final void processImportedSchemas(final Schema schema, final SGStateInfo sInfo) throws IOException { Enumeration enumeration = schema.getImportedSchema(); while (enumeration.hasMoreElements()) { @@ -751,7 +751,7 @@ * @param sInfo Source Generator current state * @throws IOException if this Exception occurs while generating the mapping file */ - private void generateMappingFile(final String packageName, final SGStateInfo sInfo) + private final void generateMappingFile(final String packageName, final SGStateInfo sInfo) throws IOException { String pkg = (packageName != null) ? packageName : ""; MappingRoot mapping = sInfo.getMapping(pkg); @@ -780,7 +780,7 @@ * @param sInfo our state information * @throws IOException if this exception occurs while writing source files */ - private void createClasses(final ElementDecl elementDecl, final SGStateInfo sInfo) + private final void createClasses(final ElementDecl elementDecl, final SGStateInfo sInfo) throws IOException { if (sInfo.getStatusCode() == SGStateInfo.STOP_STATUS || elementDecl == null) { return; @@ -843,7 +843,7 @@ * @param sInfo our state information * @throws IOException if this exception occurs while writing source files */ - private void createClasses(final Group group, final SGStateInfo sInfo) + private final void createClasses(final Group group, final SGStateInfo sInfo) throws IOException { if (group == null) { return; @@ -879,7 +879,7 @@ * @param sInfo our state information * @throws IOException if this exception occurs while writing source files */ - private void processComplexType(final ComplexType complexType, final SGStateInfo sInfo) + private final void processComplexType(final ComplexType complexType, final SGStateInfo sInfo) throws IOException { if (sInfo.getStatusCode() == SGStateInfo.STOP_STATUS || complexType == null) { return; @@ -929,7 +929,7 @@ * @throws IOException if this Exception occurs while generating source * files */ - private void processAttributes(final ComplexType complexType, final SGStateInfo sInfo) + private final void processAttributes(final ComplexType complexType, final SGStateInfo sInfo) throws IOException { if (sInfo.getStatusCode() == SGStateInfo.STOP_STATUS || complexType == null) { return; @@ -949,7 +949,7 @@ * @param sInfo the current source generator state information * @throws IOException if this Exception occurs while generating source files */ - private void processContentModel(final ContentModelGroup cmGroup, final SGStateInfo sInfo) + private final void processContentModel(final ContentModelGroup cmGroup, final SGStateInfo sInfo) throws IOException { if (sInfo.getStatusCode() == SGStateInfo.STOP_STATUS || cmGroup == null) { return; @@ -990,7 +990,7 @@ * @param sInfo the current source generator state information * @throws IOException if this Exception occurs while generating source files */ - private void processSimpleType(final SimpleType simpleType, final SGStateInfo sInfo) + private final void processSimpleType(final SimpleType simpleType, final SGStateInfo sInfo) throws IOException { if (sInfo.getStatusCode() == SGStateInfo.STOP_STATUS || simpleType == null || simpleType.getSchema() != sInfo.getSchema()) { @@ -1019,7 +1019,7 @@ * @param packages * the array of package element */ - private void processNamespaces(final PackageType[] packages) { + private final void processNamespaces(final PackageType[] packages) { if (packages.length == 0) { return; } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/TypeConversion.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/TypeConversion.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/TypeConversion.java (working copy) @@ -104,7 +104,7 @@ * @author Arnaud Blandin * @version $Revision$ $Date: 2006-01-21 04:43:28 -0700 (Sat, 21 Jan 2006) $ */ -public class TypeConversion { +public final class TypeConversion { /** Jakarta's common-logging logger. */ private static final Log LOG = LogFactory.getLog(TypeConversion.class); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/XMLFieldHandlerFactory.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/XMLFieldHandlerFactory.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/XMLFieldHandlerFactory.java (working copy) @@ -34,7 +34,7 @@ * @author Werner Guttmann * @version $Revision: 6469 $ $Date: 2006-04-13 07:37:49 -0600 (Thu, 13 Apr 2006) $ */ -public class XMLFieldHandlerFactory { +public final class XMLFieldHandlerFactory { /** * The XML code generator configuration. 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Binding.java (working copy) @@ -111,7 +111,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding( + public final void addAttributeBinding( final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) throws java.lang.IndexOutOfBoundsException { this._attributeBindingList.add(vAttributeBinding); @@ -125,7 +125,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addAttributeBinding( + public final void addAttributeBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) throws java.lang.IndexOutOfBoundsException { @@ -139,7 +139,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addComplexTypeBinding( + public final 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( + public final void addComplexTypeBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) throws java.lang.IndexOutOfBoundsException { @@ -167,7 +167,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding( + public final void addElementBinding( final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) throws java.lang.IndexOutOfBoundsException { this._elementBindingList.add(vElementBinding); @@ -181,7 +181,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addElementBinding( + public final void addElementBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) throws java.lang.IndexOutOfBoundsException { @@ -195,7 +195,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding( + public final void addEnumBinding( final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) throws java.lang.IndexOutOfBoundsException { this._enumBindingList.add(vEnumBinding); @@ -209,7 +209,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addEnumBinding( + public final void addEnumBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) throws java.lang.IndexOutOfBoundsException { @@ -223,7 +223,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding( + public final void addGroupBinding( final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) throws java.lang.IndexOutOfBoundsException { this._groupBindingList.add(vGroupBinding); @@ -237,7 +237,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addGroupBinding( + public final void addGroupBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) throws java.lang.IndexOutOfBoundsException { @@ -251,7 +251,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addInclude( + public final void addInclude( final org.exolab.castor.builder.binding.IncludeType vInclude) throws java.lang.IndexOutOfBoundsException { this._includeList.add(vInclude); @@ -265,7 +265,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addInclude( + public final void addInclude( final int index, final org.exolab.castor.builder.binding.IncludeType vInclude) throws java.lang.IndexOutOfBoundsException { @@ -279,7 +279,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addPackage( + public final void addPackage( final org.exolab.castor.builder.binding.PackageType vPackage) throws java.lang.IndexOutOfBoundsException { this._packageList.add(vPackage); @@ -293,7 +293,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addPackage( + public final void addPackage( final int index, final org.exolab.castor.builder.binding.PackageType vPackage) throws java.lang.IndexOutOfBoundsException { @@ -307,7 +307,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding( + public final void addSimpleTypeBinding( final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) throws java.lang.IndexOutOfBoundsException { this._simpleTypeBindingList.add(vSimpleTypeBinding); @@ -321,7 +321,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void addSimpleTypeBinding( + public final void addSimpleTypeBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) throws java.lang.IndexOutOfBoundsException { @@ -334,7 +334,7 @@ * @return an Enumeration over all possible elements of this * collection */ - public java.util.Enumeration enumerateAttributeBinding() { + public final java.util.Enumeration enumerateAttributeBinding() { return java.util.Collections.enumeration(this._attributeBindingList); } //-- java.util.Enumeration enumerateAttributeBinding() @@ -344,7 +344,7 @@ * @return an Enumeration over all possible elements of this * collection */ - public java.util.Enumeration enumerateComplexTypeBinding() { + public final java.util.Enumeration enumerateComplexTypeBinding() { return java.util.Collections.enumeration(this._complexTypeBindingList); } //-- java.util.Enumeration enumerateComplexTypeBinding() @@ -354,7 +354,7 @@ * @return an Enumeration over all possible elements of this * collection */ - public java.util.Enumeration enumerateElementBinding() { + public final java.util.Enumeration enumerateElementBinding() { return java.util.Collections.enumeration(this._elementBindingList); } //-- java.util.Enumeration enumerateElementBinding() @@ -364,7 +364,7 @@ * @return an Enumeration over all possible elements of this * collection */ - public java.util.Enumeration enumerateEnumBinding() { + public final java.util.Enumeration enumerateEnumBinding() { return java.util.Collections.enumeration(this._enumBindingList); } //-- java.util.Enumeration enumerateEnumBinding() @@ -374,7 +374,7 @@ * @return an Enumeration over all possible elements of this * collection */ - public java.util.Enumeration enumerateGroupBinding() { + public final java.util.Enumeration enumerateGroupBinding() { return java.util.Collections.enumeration(this._groupBindingList); } //-- java.util.Enumeration enumerateGroupBinding() @@ -384,7 +384,7 @@ * @return an Enumeration over all possible elements of this * collection */ - public java.util.Enumeration enumerateInclude() { + public final java.util.Enumeration enumerateInclude() { return java.util.Collections.enumeration(this._includeList); } //-- java.util.Enumeration enumerateInclude() @@ -394,7 +394,7 @@ * @return an Enumeration over all possible elements of this * collection */ - public java.util.Enumeration enumeratePackage() { + public final java.util.Enumeration enumeratePackage() { return java.util.Collections.enumeration(this._packageList); } //-- java.util.Enumeration enumeratePackage() @@ -404,7 +404,7 @@ * @return an Enumeration over all possible elements of this * collection */ - public java.util.Enumeration enumerateSimpleTypeBinding() { + public final java.util.Enumeration enumerateSimpleTypeBinding() { return java.util.Collections.enumeration(this._simpleTypeBindingList); } //-- java.util.Enumeration enumerateSimpleTypeBinding() @@ -418,7 +418,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding( + public final org.exolab.castor.builder.binding.ComponentBindingType getAttributeBinding( final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -437,7 +437,7 @@ * * @return this collection as an Array */ - public org.exolab.castor.builder.binding.ComponentBindingType[] getAttributeBinding() { + public final org.exolab.castor.builder.binding.ComponentBindingType[] getAttributeBinding() { int size = this._attributeBindingList.size(); org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; @@ -454,7 +454,7 @@ * * @return the size of this collection */ - public int getAttributeBindingCount() { + public final int getAttributeBindingCount() { return this._attributeBindingList.size(); } //-- int getAttributeBindingCount() @@ -468,7 +468,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding( + public final org.exolab.castor.builder.binding.ComponentBindingType getComplexTypeBinding( final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -487,7 +487,7 @@ * * @return this collection as an Array */ - public org.exolab.castor.builder.binding.ComponentBindingType[] getComplexTypeBinding() { + public final org.exolab.castor.builder.binding.ComponentBindingType[] getComplexTypeBinding() { int size = this._complexTypeBindingList.size(); org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; @@ -504,7 +504,7 @@ * * @return the size of this collection */ - public int getComplexTypeBindingCount() { + public final int getComplexTypeBindingCount() { return this._complexTypeBindingList.size(); } //-- int getComplexTypeBindingCount() @@ -513,7 +513,7 @@ * * @return the value of field 'DefaultBindingType'. */ - public org.exolab.castor.builder.binding.types.BindingType getDefaultBindingType() { + public final org.exolab.castor.builder.binding.types.BindingType getDefaultBindingType() { return this._defaultBindingType; } //-- org.exolab.castor.builder.binding.types.BindingType getDefaultBindingType() @@ -527,8 +527,9 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getElementBinding(final int index) - throws java.lang.IndexOutOfBoundsException { + public final org.exolab.castor.builder.binding.ComponentBindingType getElementBinding( + final int index) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._elementBindingList.size()) { throw new IndexOutOfBoundsException( @@ -545,7 +546,7 @@ * * @return this collection as an Array */ - public org.exolab.castor.builder.binding.ComponentBindingType[] getElementBinding() { + public final org.exolab.castor.builder.binding.ComponentBindingType[] getElementBinding() { int size = this._elementBindingList.size(); org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; @@ -562,7 +563,7 @@ * * @return the size of this collection */ - public int getElementBindingCount() { + public final int getElementBindingCount() { return this._elementBindingList.size(); } //-- int getElementBindingCount() @@ -576,8 +577,9 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getEnumBinding(final int index) - throws java.lang.IndexOutOfBoundsException { + public final org.exolab.castor.builder.binding.ComponentBindingType getEnumBinding( + final int index) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._enumBindingList.size()) { throw new IndexOutOfBoundsException( @@ -593,7 +595,7 @@ * * @return this collection as an Array */ - public org.exolab.castor.builder.binding.ComponentBindingType[] getEnumBinding() { + public final org.exolab.castor.builder.binding.ComponentBindingType[] getEnumBinding() { int size = this._enumBindingList.size(); org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; @@ -610,7 +612,7 @@ * * @return the size of this collection */ - public int getEnumBindingCount() { + public final int getEnumBindingCount() { return this._enumBindingList.size(); } //-- int getEnumBindingCount() @@ -624,8 +626,9 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getGroupBinding(final int index) - throws java.lang.IndexOutOfBoundsException { + public final org.exolab.castor.builder.binding.ComponentBindingType getGroupBinding( + final int index) + throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._groupBindingList.size()) { throw new IndexOutOfBoundsException( @@ -642,7 +645,7 @@ * * @return this collection as an Array */ - public org.exolab.castor.builder.binding.ComponentBindingType[] getGroupBinding() { + public final org.exolab.castor.builder.binding.ComponentBindingType[] getGroupBinding() { int size = this._groupBindingList.size(); org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; @@ -659,7 +662,7 @@ * * @return the size of this collection */ - public int getGroupBindingCount() { + public final int getGroupBindingCount() { return this._groupBindingList.size(); } //-- int getGroupBindingCount() @@ -673,7 +676,7 @@ * org.exolab.castor.builder.binding.IncludeType at the given * index */ - public org.exolab.castor.builder.binding.IncludeType getInclude(final int index) + public final org.exolab.castor.builder.binding.IncludeType getInclude(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._includeList.size()) { @@ -690,7 +693,7 @@ * * @return this collection as an Array */ - public org.exolab.castor.builder.binding.IncludeType[] getInclude() { + public final org.exolab.castor.builder.binding.IncludeType[] getInclude() { int size = this._includeList.size(); org.exolab.castor.builder.binding.IncludeType[] array = new org.exolab.castor.builder.binding.IncludeType[size]; @@ -707,7 +710,7 @@ * * @return the size of this collection */ - public int getIncludeCount() { + public final int getIncludeCount() { return this._includeList.size(); } //-- int getIncludeCount() @@ -716,7 +719,7 @@ * * @return the value of field 'NamingXML'. */ - public org.exolab.castor.builder.binding.NamingXMLType getNamingXML() { + public final org.exolab.castor.builder.binding.NamingXMLType getNamingXML() { return this._namingXML; } //-- org.exolab.castor.builder.binding.NamingXMLType getNamingXML() @@ -730,7 +733,7 @@ * org.exolab.castor.builder.binding.PackageType at the given * index */ - public org.exolab.castor.builder.binding.PackageType getPackage(final int index) + public final org.exolab.castor.builder.binding.PackageType getPackage(final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index if (index < 0 || index >= this._packageList.size()) { @@ -747,7 +750,7 @@ * * @return this collection as an Array */ - public org.exolab.castor.builder.binding.PackageType[] getPackage() { + public final org.exolab.castor.builder.binding.PackageType[] getPackage() { int size = this._packageList.size(); org.exolab.castor.builder.binding.PackageType[] array = new org.exolab.castor.builder.binding.PackageType[size]; @@ -764,7 +767,7 @@ * * @return the size of this collection */ - public int getPackageCount() { + public final int getPackageCount() { return this._packageList.size(); } //-- int getPackageCount() @@ -778,7 +781,7 @@ * org.exolab.castor.builder.binding.ComponentBindingType at * the given index */ - public org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding( + public final org.exolab.castor.builder.binding.ComponentBindingType getSimpleTypeBinding( final int index) throws java.lang.IndexOutOfBoundsException { // check bounds for index @@ -797,7 +800,7 @@ * * @return this collection as an Array */ - public org.exolab.castor.builder.binding.ComponentBindingType[] getSimpleTypeBinding() { + public final org.exolab.castor.builder.binding.ComponentBindingType[] getSimpleTypeBinding() { int size = this._simpleTypeBindingList.size(); org.exolab.castor.builder.binding.ComponentBindingType[] array = new org.exolab.castor.builder.binding.ComponentBindingType[size]; @@ -814,7 +817,7 @@ * * @return the size of this collection */ - public int getSimpleTypeBindingCount() { + public final int getSimpleTypeBindingCount() { return this._simpleTypeBindingList.size(); } //-- int getSimpleTypeBindingCount() @@ -823,7 +826,7 @@ * * @return true if this object is valid according to the schema */ - public boolean isValid() { + public final boolean isValid() { try { validate(); } catch (org.exolab.castor.xml.ValidationException vex) { @@ -838,7 +841,7 @@ * @return an Iterator over all possible elements in this * collection */ - public java.util.Iterator iterateAttributeBinding() { + public final java.util.Iterator iterateAttributeBinding() { return this._attributeBindingList.iterator(); } //-- java.util.Iterator iterateAttributeBinding() @@ -848,7 +851,7 @@ * @return an Iterator over all possible elements in this * collection */ - public java.util.Iterator iterateComplexTypeBinding() { + public final java.util.Iterator iterateComplexTypeBinding() { return this._complexTypeBindingList.iterator(); } //-- java.util.Iterator iterateComplexTypeBinding() @@ -858,7 +861,7 @@ * @return an Iterator over all possible elements in this * collection */ - public java.util.Iterator iterateElementBinding() { + public final java.util.Iterator iterateElementBinding() { return this._elementBindingList.iterator(); } //-- java.util.Iterator iterateElementBinding() @@ -868,7 +871,7 @@ * @return an Iterator over all possible elements in this * collection */ - public java.util.Iterator iterateEnumBinding() { + public final java.util.Iterator iterateEnumBinding() { return this._enumBindingList.iterator(); } //-- java.util.Iterator iterateEnumBinding() @@ -878,7 +881,7 @@ * @return an Iterator over all possible elements in this * collection */ - public java.util.Iterator iterateGroupBinding() { + public final java.util.Iterator iterateGroupBinding() { return this._groupBindingList.iterator(); } //-- java.util.Iterator iterateGroupBinding() @@ -888,7 +891,7 @@ * @return an Iterator over all possible elements in this * collection */ - public java.util.Iterator iterateInclude() { + public final java.util.Iterator iterateInclude() { return this._includeList.iterator(); } //-- java.util.Iterator iterateInclude() @@ -898,7 +901,7 @@ * @return an Iterator over all possible elements in this * collection */ - public java.util.Iterator iteratePackage() { + public final java.util.Iterator iteratePackage() { return this._packageList.iterator(); } //-- java.util.Iterator iteratePackage() @@ -908,7 +911,7 @@ * @return an Iterator over all possible elements in this * collection */ - public java.util.Iterator iterateSimpleTypeBinding() { + public final java.util.Iterator iterateSimpleTypeBinding() { return this._simpleTypeBindingList.iterator(); } //-- java.util.Iterator iterateSimpleTypeBinding() @@ -921,7 +924,7 @@ * @throws org.exolab.castor.xml.ValidationException if this * object is an invalid instance according to the schema */ - public void marshal(final java.io.Writer out) + public final void marshal(final java.io.Writer out) throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, out); } //-- void marshal(java.io.Writer) @@ -937,7 +940,7 @@ * @throws org.exolab.castor.xml.MarshalException if object is * null or if any SAXException is thrown during marshaling */ - public void marshal(final org.xml.sax.ContentHandler handler) + public final void marshal(final org.xml.sax.ContentHandler handler) throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException { Marshaller.marshal(this, handler); @@ -945,7 +948,7 @@ /** */ - public void removeAllAttributeBinding() { + public final void removeAllAttributeBinding() { this._attributeBindingList.clear(); } //-- void removeAllAttributeBinding() @@ -951,7 +954,7 @@ /** */ - public void removeAllComplexTypeBinding() { + public final void removeAllComplexTypeBinding() { this._complexTypeBindingList.clear(); } //-- void removeAllComplexTypeBinding() @@ -957,7 +960,7 @@ /** */ - public void removeAllElementBinding() { + public final void removeAllElementBinding() { this._elementBindingList.clear(); } //-- void removeAllElementBinding() @@ -963,7 +966,7 @@ /** */ - public void removeAllEnumBinding() { + public final void removeAllEnumBinding() { this._enumBindingList.clear(); } //-- void removeAllEnumBinding() @@ -969,7 +972,7 @@ /** */ - public void removeAllGroupBinding() { + public final void removeAllGroupBinding() { this._groupBindingList.clear(); } //-- void removeAllGroupBinding() @@ -975,7 +978,7 @@ /** */ - public void removeAllInclude() { + public final void removeAllInclude() { this._includeList.clear(); } //-- void removeAllInclude() @@ -981,7 +984,7 @@ /** */ - public void removeAllPackage() { + public final void removeAllPackage() { this._packageList.clear(); } //-- void removeAllPackage() @@ -987,7 +990,7 @@ /** */ - public void removeAllSimpleTypeBinding() { + public final void removeAllSimpleTypeBinding() { this._simpleTypeBindingList.clear(); } //-- void removeAllSimpleTypeBinding() @@ -997,7 +1000,7 @@ * @param vAttributeBinding * @return true if the object was removed from the collection. */ - public boolean removeAttributeBinding( + public final boolean removeAttributeBinding( final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) { boolean removed = _attributeBindingList.remove(vAttributeBinding); return removed; @@ -1009,7 +1012,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt( + public final org.exolab.castor.builder.binding.ComponentBindingType removeAttributeBindingAt( final int index) { Object obj = this._attributeBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; @@ -1021,7 +1024,7 @@ * @param vComplexTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeComplexTypeBinding( + public final boolean removeComplexTypeBinding( final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) { boolean removed = _complexTypeBindingList.remove(vComplexTypeBinding); return removed; @@ -1033,7 +1036,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt( + public final org.exolab.castor.builder.binding.ComponentBindingType removeComplexTypeBindingAt( final int index) { Object obj = this._complexTypeBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; @@ -1045,7 +1048,7 @@ * @param vElementBinding * @return true if the object was removed from the collection. */ - public boolean removeElementBinding( + public final boolean removeElementBinding( final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) { boolean removed = _elementBindingList.remove(vElementBinding); return removed; @@ -1057,7 +1060,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt( + public final org.exolab.castor.builder.binding.ComponentBindingType removeElementBindingAt( final int index) { Object obj = this._elementBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; @@ -1069,7 +1072,7 @@ * @param vEnumBinding * @return true if the object was removed from the collection. */ - public boolean removeEnumBinding( + public final boolean removeEnumBinding( final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) { boolean removed = _enumBindingList.remove(vEnumBinding); return removed; @@ -1081,7 +1084,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt( + public final org.exolab.castor.builder.binding.ComponentBindingType removeEnumBindingAt( final int index) { Object obj = this._enumBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; @@ -1093,7 +1096,7 @@ * @param vGroupBinding * @return true if the object was removed from the collection. */ - public boolean removeGroupBinding( + public final boolean removeGroupBinding( final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) { boolean removed = _groupBindingList.remove(vGroupBinding); return removed; @@ -1105,7 +1108,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt( + public final org.exolab.castor.builder.binding.ComponentBindingType removeGroupBindingAt( final int index) { Object obj = this._groupBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; @@ -1117,7 +1120,7 @@ * @param vInclude * @return true if the object was removed from the collection. */ - public boolean removeInclude( + public final boolean removeInclude( final org.exolab.castor.builder.binding.IncludeType vInclude) { boolean removed = _includeList.remove(vInclude); return removed; @@ -1129,7 +1132,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.IncludeType removeIncludeAt( + public final org.exolab.castor.builder.binding.IncludeType removeIncludeAt( final int index) { Object obj = this._includeList.remove(index); return (org.exolab.castor.builder.binding.IncludeType) obj; @@ -1141,7 +1144,7 @@ * @param vPackage * @return true if the object was removed from the collection. */ - public boolean removePackage( + public final boolean removePackage( final org.exolab.castor.builder.binding.PackageType vPackage) { boolean removed = _packageList.remove(vPackage); return removed; @@ -1153,7 +1156,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.PackageType removePackageAt( + public final org.exolab.castor.builder.binding.PackageType removePackageAt( final int index) { Object obj = this._packageList.remove(index); return (org.exolab.castor.builder.binding.PackageType) obj; @@ -1165,7 +1168,7 @@ * @param vSimpleTypeBinding * @return true if the object was removed from the collection. */ - public boolean removeSimpleTypeBinding( + public final boolean removeSimpleTypeBinding( final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) { boolean removed = _simpleTypeBindingList.remove(vSimpleTypeBinding); return removed; @@ -1177,7 +1180,7 @@ * @param index * @return the element removed from the collection */ - public org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt( + public final org.exolab.castor.builder.binding.ComponentBindingType removeSimpleTypeBindingAt( final int index) { Object obj = this._simpleTypeBindingList.remove(index); return (org.exolab.castor.builder.binding.ComponentBindingType) obj; @@ -1191,7 +1194,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setAttributeBinding( + public final void setAttributeBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vAttributeBinding) throws java.lang.IndexOutOfBoundsException { @@ -1210,7 +1213,7 @@ * * @param vAttributeBindingArray */ - public void setAttributeBinding( + public final void setAttributeBinding( final org.exolab.castor.builder.binding.ComponentBindingType[] vAttributeBindingArray) { //-- copy array _attributeBindingList.clear(); @@ -1228,7 +1231,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setComplexTypeBinding( + public final void setComplexTypeBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vComplexTypeBinding) throws java.lang.IndexOutOfBoundsException { @@ -1247,7 +1250,7 @@ * * @param vComplexTypeBindingArray */ - public void setComplexTypeBinding( + public final void setComplexTypeBinding( final org.exolab.castor.builder.binding.ComponentBindingType[] vComplexTypeBindingArray) { //-- copy array @@ -1264,7 +1267,7 @@ * @param defaultBindingType the value of field * 'defaultBindingType'. */ - public void setDefaultBindingType( + public final void setDefaultBindingType( final org.exolab.castor.builder.binding.types.BindingType defaultBindingType) { this._defaultBindingType = defaultBindingType; } //-- void setDefaultBindingType(org.exolab.castor.builder.binding.types.BindingType) @@ -1277,7 +1280,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setElementBinding( + public final void setElementBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vElementBinding) throws java.lang.IndexOutOfBoundsException { @@ -1296,7 +1299,7 @@ * * @param vElementBindingArray */ - public void setElementBinding( + public final void setElementBinding( final org.exolab.castor.builder.binding.ComponentBindingType[] vElementBindingArray) { //-- copy array _elementBindingList.clear(); @@ -1314,7 +1317,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setEnumBinding( + public final void setEnumBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vEnumBinding) throws java.lang.IndexOutOfBoundsException { @@ -1333,7 +1336,7 @@ * * @param vEnumBindingArray */ - public void setEnumBinding( + public final void setEnumBinding( final org.exolab.castor.builder.binding.ComponentBindingType[] vEnumBindingArray) { //-- copy array _enumBindingList.clear(); @@ -1351,7 +1354,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setGroupBinding( + public final void setGroupBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vGroupBinding) throws java.lang.IndexOutOfBoundsException { @@ -1370,7 +1373,7 @@ * * @param vGroupBindingArray */ - public void setGroupBinding( + public final void setGroupBinding( final org.exolab.castor.builder.binding.ComponentBindingType[] vGroupBindingArray) { //-- copy array _groupBindingList.clear(); @@ -1388,7 +1391,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setInclude( + public final void setInclude( final int index, final org.exolab.castor.builder.binding.IncludeType vInclude) throws java.lang.IndexOutOfBoundsException { @@ -1407,7 +1410,7 @@ * * @param vIncludeArray */ - public void setInclude( + public final void setInclude( final org.exolab.castor.builder.binding.IncludeType[] vIncludeArray) { //-- copy array _includeList.clear(); @@ -1422,7 +1425,7 @@ * * @param namingXML the value of field 'namingXML'. */ - public void setNamingXML( + public final void setNamingXML( final org.exolab.castor.builder.binding.NamingXMLType namingXML) { this._namingXML = namingXML; } //-- void setNamingXML(org.exolab.castor.builder.binding.NamingXMLType) @@ -1435,7 +1438,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setPackage( + public final void setPackage( final int index, final org.exolab.castor.builder.binding.PackageType vPackage) throws java.lang.IndexOutOfBoundsException { @@ -1454,7 +1457,7 @@ * * @param vPackageArray */ - public void setPackage( + public final void setPackage( final org.exolab.castor.builder.binding.PackageType[] vPackageArray) { //-- copy array _packageList.clear(); @@ -1472,7 +1475,7 @@ * @throws java.lang.IndexOutOfBoundsException if the index * given is outside the bounds of the collection */ - public void setSimpleTypeBinding( + public final void setSimpleTypeBinding( final int index, final org.exolab.castor.builder.binding.ComponentBindingType vSimpleTypeBinding) throws java.lang.IndexOutOfBoundsException { @@ -1491,7 +1494,7 @@ * * @param vSimpleTypeBindingArray */ - public void setSimpleTypeBinding( + public final void setSimpleTypeBinding( final org.exolab.castor.builder.binding.ComponentBindingType[] vSimpleTypeBindingArray) { //-- copy array @@ -1526,7 +1529,7 @@ * @throws org.exolab.castor.xml.ValidationException if this * object is an invalid instance according to the schema */ - public void validate() + public final void validate() throws org.exolab.castor.xml.ValidationException { org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator(); validator.validate(this); 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingDescriptor.java (working copy) @@ -12,7 +12,8 @@ * * @version $Revision$ $Date$ */ -public class BindingDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class BindingDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingException.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingException.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingException.java (working copy) @@ -52,7 +52,7 @@ * @author Arnaud Blandin * @version $Version:$ $Date: 2006-04-25 15:08:23 -0600 (Tue, 25 Apr 2006) $ */ -public class BindingException extends Exception { +public final class BindingException extends Exception { /** We add this field because an Exception is serializable. */ private static final long serialVersionUID = 1726983206974247107L; 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/BindingLoader.java (working copy) @@ -69,7 +69,7 @@ * @author Arnaud Blandin * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ */ -public class BindingLoader { +public final class BindingLoader { /** * The Source Generator Binding File loaded by this BindingLoader. 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassType.java (working copy) @@ -30,7 +30,7 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class ClassType implements java.io.Serializable { +public final class ClassType implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ClassTypeDescriptor.java (working copy) @@ -21,7 +21,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class ClassTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class ClassTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingType.java (working copy) @@ -28,7 +28,7 @@ * * @version $Revision$ $Date$ */ -public class ComponentBindingType implements java.io.Serializable { +public final class ComponentBindingType implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoice.java (working copy) @@ -19,7 +19,7 @@ * * @version $Revision$ $Date$ */ -public class ComponentBindingTypeChoice implements java.io.Serializable { +public final class ComponentBindingTypeChoice implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeChoiceDescriptor.java (working copy) @@ -12,7 +12,7 @@ * * @version $Revision$ $Date$ */ -public class ComponentBindingTypeChoiceDescriptor +public final class ComponentBindingTypeChoiceDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ComponentBindingTypeDescriptor.java (working copy) @@ -12,7 +12,7 @@ * * @version $Revision$ $Date$ */ -public class ComponentBindingTypeDescriptor +public final class ComponentBindingTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingType.java (working copy) @@ -25,7 +25,7 @@ * * @version $Revision$ $Date$ */ -public class EnumBindingType implements java.io.Serializable { +public final class EnumBindingType implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumBindingTypeDescriptor.java (working copy) @@ -12,7 +12,8 @@ * * @version $Revision$ $Date$ */ -public class EnumBindingTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class EnumBindingTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassName.java (working copy) @@ -19,7 +19,7 @@ * * @version $Revision$ $Date$ */ -public class EnumClassName implements java.io.Serializable { +public final class EnumClassName implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumClassNameDescriptor.java (working copy) @@ -12,7 +12,8 @@ * * @version $Revision$ $Date$ */ -public class EnumClassNameDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class EnumClassNameDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMember.java (working copy) @@ -19,7 +19,7 @@ * * @version $Revision$ $Date$ */ -public class EnumMember implements java.io.Serializable { +public final class EnumMember implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/EnumMemberDescriptor.java (working copy) @@ -12,7 +12,8 @@ * * @version $Revision$ $Date$ */ -public class EnumMemberDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class EnumMemberDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/ExtendedBinding.java (working copy) @@ -86,7 +86,7 @@ * @author Arnaud Blandin * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ */ -public class ExtendedBinding extends Binding { +public final class ExtendedBinding extends Binding { /** * Constants needed to create the XPath. 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldType.java (working copy) @@ -27,7 +27,7 @@ * * @version $Revision$ $Date$ */ -public class FieldType implements java.io.Serializable { +public final class FieldType implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/FieldTypeDescriptor.java (working copy) @@ -12,7 +12,8 @@ * * @version $Revision$ $Date$ */ -public class FieldTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class FieldTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeType.java (working copy) @@ -22,7 +22,7 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class IncludeType implements java.io.Serializable { +public final class IncludeType implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/IncludeTypeDescriptor.java (working copy) @@ -20,7 +20,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class IncludeTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class IncludeTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/Interface.java (working copy) @@ -18,7 +18,7 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class Interface implements java.io.Serializable { +public final class Interface implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/InterfaceDescriptor.java (working copy) @@ -21,7 +21,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class InterfaceDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class InterfaceDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingType.java (working copy) @@ -18,7 +18,7 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class NamingType implements java.io.Serializable { +public final class NamingType implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingTypeDescriptor.java (working copy) @@ -21,7 +21,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class NamingTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class NamingTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLType.java (working copy) @@ -26,7 +26,7 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class NamingXMLType implements java.io.Serializable { +public final class NamingXMLType implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/NamingXMLTypeDescriptor.java (working copy) @@ -20,7 +20,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class NamingXMLTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class NamingXMLTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageType.java (working copy) @@ -24,7 +24,7 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class PackageType implements java.io.Serializable { +public final class PackageType implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoice.java (working copy) @@ -18,7 +18,7 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class PackageTypeChoice implements java.io.Serializable { +public final class PackageTypeChoice implements java.io.Serializable { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeChoiceDescriptor.java (working copy) @@ -21,7 +21,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class PackageTypeChoiceDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class PackageTypeChoiceDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ 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 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PackageTypeDescriptor.java (working copy) @@ -21,7 +21,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class PackageTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class PackageTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PathTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PathTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/PathTypeDescriptor.java (working copy) @@ -17,7 +17,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class PathTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class PathTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java (revision 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java (working copy) @@ -104,7 +104,7 @@ * @author Keith Visco * @version $Revision$ $Date: 2006-04-25 15:08:23 -0600 (Tue, 25 Apr 2006) $ */ -public class XMLBindingComponent implements BindingComponent { +public final class XMLBindingComponent implements BindingComponent { /** * The Extended Binding used to retrieve the ComponentBindingType. Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/BindingTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/BindingTypeDescriptor.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/BindingTypeDescriptor.java (working copy) @@ -17,7 +17,8 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class BindingTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { +public final class BindingTypeDescriptor +extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { //--------------------------/ Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionTypeDescriptor.java (revision 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeCollectionTypeDescriptor.java (working copy) @@ -17,7 +17,7 @@ * * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ **/ -public class FieldTypeCollectionTypeDescriptor +public final class FieldTypeCollectionTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityTypeDescriptor.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityTypeDescriptor.java (revision 6677) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/binding/types/FieldTypeVisibilityTypeDescriptor.java (working copy) @@ -12,7 +12,7 @@ * * @version $Revision$ $Date$ */ -public class FieldTypeVisibilityTypeDescriptor +public final class FieldTypeVisibilityTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl { Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/conflictresolution/BaseClassNameCRStrategy.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/conflictresolution/BaseClassNameCRStrategy.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/conflictresolution/BaseClassNameCRStrategy.java (working copy) @@ -36,7 +36,7 @@ * @see org.exolab.castor.builder.conflictresolution.ClassNameCRStrategy * #setSingleClassGenerator(org.exolab.castor.builder.SingleClassGenerator) */ - public void setSingleClassGenerator(final SingleClassGenerator generator) { + public final void setSingleClassGenerator(final SingleClassGenerator generator) { this._generator = generator; } @@ -47,7 +47,7 @@ * * @return the current caller of this strategy implementation. */ - protected SingleClassGenerator getSingleClassGenerator() { + protected final SingleClassGenerator getSingleClassGenerator() { return this._generator; } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/conflictresolution/InformViaLogClassNameCRStrategy.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/conflictresolution/InformViaLogClassNameCRStrategy.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/conflictresolution/InformViaLogClassNameCRStrategy.java (working copy) @@ -36,8 +36,8 @@ * @author Werner Guttmann * @since 1.1 */ -public class InformViaLogClassNameCRStrategy - extends BaseClassNameCRStrategy implements ClassNameCRStrategy { +public final class InformViaLogClassNameCRStrategy +extends BaseClassNameCRStrategy implements ClassNameCRStrategy { /** Logger instance used for logging naming conflicts. */ private static final Log LOG = LogFactory.getLog(InformViaLogClassNameCRStrategy.class); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/conflictresolution/WarningViaDialogClassNameCRStrategy.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/conflictresolution/WarningViaDialogClassNameCRStrategy.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/conflictresolution/WarningViaDialogClassNameCRStrategy.java (working copy) @@ -34,8 +34,8 @@ * @author Werner Guttmann * @since 1.1 */ -public class WarningViaDialogClassNameCRStrategy - extends BaseClassNameCRStrategy implements ClassNameCRStrategy { +public final class WarningViaDialogClassNameCRStrategy +extends BaseClassNameCRStrategy implements ClassNameCRStrategy { /** * Name of this strategy. Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/info/CollectionInfo.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/info/CollectionInfo.java (revision 6676) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/info/CollectionInfo.java (working copy) @@ -134,7 +134,7 @@ * @see org.exolab.castor.builder.info.FieldInfo * #createAccessMethods(org.exolab.javasource.JClass, boolean) */ - public void createAccessMethods(final JClass jClass, final boolean useJava50) { + public final void createAccessMethods(final JClass jClass, final boolean useJava50) { this.createAddAndRemoveMethods(jClass); this.createGetAndSetMethods(jClass, useJava50); this.createGetCountMethod(jClass); @@ -160,7 +160,7 @@ * Return the contents of the collection. * @return the contents of the collection. */ - public FieldInfo getContent() { + public final FieldInfo getContent() { return this._content; } @@ -168,7 +168,7 @@ * Returns the variable name for the content of the collection. * @return the variable name for the content of the collection. */ - public String getContentName() { + public final String getContentName() { return this.getContent().getName(); } @@ -176,9 +176,8 @@ * Returns the type of content in this collection. * @return the type of content in this collection. */ - public XSType getContentType() { + public final XSType getContentType() { return this.getContent().getSchemaType(); - } /** @@ -188,7 +187,7 @@ * @return the name to be used when referring to the elements of this * collection. */ - public String getElementName() { + public final String getElementName() { return this._elementName; } @@ -196,7 +195,7 @@ * Returns the schema type represented by this collection. * @return the schema type represented by this collection. */ - public XSList getXSList() { + public final XSList getXSList() { return (XSList) this.getSchemaType(); } @@ -205,7 +204,7 @@ * * @see org.exolab.castor.builder.info.XMLInfo#isMultivalued() */ - public boolean isMultivalued() { + public final boolean isMultivalued() { return true; } @@ -218,7 +217,7 @@ * accessor methods should be created. False by default. * @see #setReferenceMethodSuffix */ - public void setCreateExtraMethods(final boolean extraMethods) { + public final void setCreateExtraMethods(final boolean extraMethods) { this._extraMethods = extraMethods; } // -- setCreateExtraMethods @@ -232,7 +231,7 @@ * DEFAULT_REFERENCE_SUFFIX will used. * @see #setCreateExtraMethods */ - public void setReferenceMethodSuffix(final String suffix) { + public final void setReferenceMethodSuffix(final String suffix) { if (suffix == null || suffix.length() == 0) { this._referenceSuffix = DEFAULT_REFERENCE_SUFFIX; } else { @@ -240,7 +239,7 @@ } } // -- setReferenceMethodSuffix - private void addIndexCheck(final JSourceCode sourceCode, final String methodName) { + private final void addIndexCheck(final JSourceCode sourceCode, final String methodName) { sourceCode.add("// check bounds for index"); sourceCode.add("if (index < 0 || index >= this."); sourceCode.append(this.getName()); @@ -257,7 +256,7 @@ sourceCode.add(""); } - protected void addMaxSizeCheck(final String methodName, final JSourceCode sourceCode) { + protected final void addMaxSizeCheck(final String methodName, final JSourceCode sourceCode) { if (this.getXSList().getMaximumSize() > 0) { final String size = Integer.toString(getXSList().getMaximumSize()); @@ -310,7 +309,7 @@ * @param sourceCode * the JSourceCode to add the new source code to. */ - protected void createBoundPropertyCode(final JSourceCode sourceCode) { + protected final void createBoundPropertyCode(final JSourceCode sourceCode) { sourceCode.add("notifyPropertyChangeListeners(\""); sourceCode.append(getName()); sourceCode.append("\", null, "); @@ -342,7 +341,7 @@ return this._extraMethods; } // -- extraMethods - protected void createGetAsArrayMethod(final JClass jClass, final boolean useJava50) { + protected final void createGetAsArrayMethod(final JClass jClass, final boolean useJava50) { JType baseType = this.getContentType().getJType(); JType arrayType = new JArrayType(baseType, useJava50); JMethod method = new JMethod(this.getReadMethodName(), arrayType, @@ -402,7 +401,7 @@ jClass.addMethod(method); } - protected void createGetAsReferenceMethod(final JClass jClass) { + protected final void createGetAsReferenceMethod(final JClass jClass) { JMethod method = new JMethod(this.getReadMethodName() + this.getReferenceMethodSuffix(), this.getXSList().getJType(), "a reference to the Vector backing this class"); @@ -450,7 +449,7 @@ jClass.addMethod(method); } - protected void createAddAndRemoveMethods(final JClass jClass) { + protected final void createAddAndRemoveMethods(final JClass jClass) { // create add methods this.createAddMethod(jClass); this.createAddByIndexMethod(jClass); @@ -466,7 +465,7 @@ * @param useJava50 * true if source code is supposed to be generated for Java 5 */ - protected void createGetAndSetMethods(final JClass jClass, final boolean useJava50) { + protected final void createGetAndSetMethods(final JClass jClass, final boolean useJava50) { // create get methods this.createGetByIndexMethod(jClass); this.createGetAsArrayMethod(jClass, useJava50); @@ -483,7 +482,7 @@ } } - protected void createGetCountMethod(final JClass jClass) { + protected final void createGetCountMethod(final JClass jClass) { JMethod method = new JMethod(this.getReadMethodName() + "Count", JType.INT, "the size of this collection"); @@ -534,7 +533,7 @@ jClass.addMethod(method); } - protected void createIteratorMethod(final JClass jClass, final boolean useJava50) { + protected final void createIteratorMethod(final JClass jClass, final boolean useJava50) { JMethod method = new JMethod("iterate" + this.getMethodSuffix(), SGTypes.createIterator(this.getContentType().getJType(), useJava50), "an Iterator over all possible elements in this collection"); @@ -552,7 +551,7 @@ * * @param jClass the JClass to which we add this method */ - protected void createRemoveAllMethod(final JClass jClass) { + protected final void createRemoveAllMethod(final JClass jClass) { JMethod method = new JMethod("removeAll" + this.getMethodSuffix()); JSourceCode sourceCode = method.getSourceCode(); @@ -606,7 +605,7 @@ * * @param jClass the JClass to which we add this method */ - protected void createRemoveObjectMethod(final JClass jClass) { + protected final void createRemoveObjectMethod(final JClass jClass) { JMethod method = new JMethod("remove" + this.getMethodSuffix(), JType.BOOLEAN, "true if the object was removed from the collection."); @@ -630,7 +629,7 @@ jClass.addMethod(method); } - protected void createSetAsArrayMethod(final JClass jClass, final boolean useJava50) { + protected final void createSetAsArrayMethod(final JClass jClass, final boolean useJava50) { JMethod method = new JMethod("set" + this.getMethodSuffix()); final JParameter parameter = new JParameter(new JArrayType( this.getContentType().getJType(), useJava50), this.getContentName() + "Array"); @@ -679,7 +678,7 @@ * * @param jClass */ - protected void createSetAsCopyMethod(final JClass jClass) { + protected final void createSetAsCopyMethod(final JClass jClass) { JMethod method = new JMethod("set" + this.getMethodSuffix()); JParameter parameter = new JParameter(this.getXSList().getJType(), this.getContentName() + "List"); @@ -724,7 +723,7 @@ * @param jClass * @param useJava50 true if source code is supposed to be generated for Java 5 */ - protected void createSetAsReferenceMethod(final JClass jClass, final boolean useJava50) { + protected final void createSetAsReferenceMethod(final JClass jClass, final boolean useJava50) { JMethod method = new JMethod("set" + this.getMethodSuffix() + _referenceSuffix); final JType collectionJType = getSchemaType().getJType(); JParameter parameter = new JParameter( @@ -756,7 +755,7 @@ jClass.addMethod(method); } - private String getParameterPrefix() { + private final String getParameterPrefix() { return _parameterPrefix; } @@ -790,7 +789,7 @@ * * @see org.exolab.castor.builder.info.FieldInfo#getMethodSuffix() */ - public String getMethodSuffix() { + public final String getMethodSuffix() { return this._methodSuffix; } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/info/FieldInfo.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/info/FieldInfo.java (revision 6673) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/info/FieldInfo.java (working copy) @@ -153,7 +153,7 @@ * more than one java field for this FieldInfo. * @param jClass JClass object the Java Fields will be added to */ - public void createJavaField(final JClass jClass) { + public final void createJavaField(final JClass jClass) { XSType type = getSchemaType(); JType jType = type.getJType(); JField field = new JField(type.getJType(), _name); @@ -252,7 +252,7 @@ * @param jDocComment * the JDocComment to add the Javadoc comments to. */ - public void createGetterComment(final JDocComment jDocComment) { + public final void createGetterComment(final JDocComment jDocComment) { String fieldName = this._name; //-- remove '_' if necessary if (fieldName.indexOf('_') == 0) { @@ -280,7 +280,7 @@ * @param useJava50 * true if source code is supposed to be generated for Java 5 */ - public void createGetterMethod(final JClass jClass, final boolean useJava50) { + public final void createGetterMethod(final JClass jClass, final boolean useJava50) { JMethod method = null; JSourceCode jsc = null; @@ -329,7 +329,7 @@ * @param jClass * the JClass to add the methods to */ - public void createHasAndDeleteMethods(final JClass jClass) { + public final void createHasAndDeleteMethods(final JClass jClass) { JMethod method = null; JSourceCode jsc = null; @@ -374,7 +374,7 @@ * @param jDocComment * the JDocComment to add the Javadoc comments to. */ - public void createSetterComment(final JDocComment jDocComment) { + public final void createSetterComment(final JDocComment jDocComment) { String fieldName = this._name; //-- remove '_' if necessary if (fieldName.indexOf('_') == 0) { @@ -413,7 +413,7 @@ * @param useJava50 * true if source code is supposed to be generated for Java 5 */ - public void createSetterMethod(final JClass jClass, final boolean useJava50) { + public final void createSetterMethod(final JClass jClass, final boolean useJava50) { JMethod method = null; JSourceCode jsc = null; @@ -510,7 +510,7 @@ * @return the default value for this FieldInfo, or null if no default value * was set; */ - public String getDefaultValue() { + public final String getDefaultValue() { return _default; } //-- getDefaultValue @@ -522,7 +522,7 @@ * * @return the fixed value for this FieldInfo */ - public String getFixedValue() { + public final String getFixedValue() { return _fixed; } //-- getFixedValue @@ -530,7 +530,7 @@ * Returns the name of the delete method for this FieldInfo. * @return the name of the delete method for this FieldInfo. */ - public String getDeleteMethodName() { + public final String getDeleteMethodName() { return METHOD_PREFIX_DELETE + getMethodSuffix(); } //-- getDeleteMethodName @@ -538,7 +538,7 @@ * Returns the name of the has method for this FieldInfo. * @return the name of the has method for this FieldInfo. */ - public String getHasMethodName() { + public final String getHasMethodName() { return METHOD_PREFIX_HAS + getMethodSuffix(); } //-- getHasMethodName @@ -546,7 +546,7 @@ * Returns the name of the read method for this FieldInfo. * @return the name of the read method for this FieldInfo. */ - public String getReadMethodName() { + public final String getReadMethodName() { return METHOD_PREFIX_GET + getMethodSuffix(); } //-- getReadMethodName @@ -555,7 +555,7 @@ * * @return the fully qualified name of the Validator to use. */ - public String getValidator() { + public final String getValidator() { return _validator; } @@ -563,7 +563,7 @@ * Returns the name of the write method for this FieldInfo. * @return the name of the write method for this FieldInfo. */ - public String getWriteMethodName() { + public final String getWriteMethodName() { if (isMultivalued()) { return METHOD_PREFIX_ADD + getMethodSuffix(); } @@ -575,7 +575,7 @@ * * @return the fully qualified name of the XMLFieldHandler to use. */ - public String getXMLFieldHandler() { + public final String getXMLFieldHandler() { return _fieldHandler; } @@ -624,7 +624,7 @@ * @return the comment associated with this Member, or null. * if one has not been set. */ - public String getComment() { + public final String getComment() { return _comment; } //-- getComment @@ -635,7 +635,7 @@ * * @return the methods flag */ - public int getMethods() { + public final int getMethods() { return _methods; } //-- getMethods @@ -644,7 +644,7 @@ * * @return the name of this FieldInfo. */ - public String getName() { + public final String getName() { return this._name; } //-- getName @@ -653,7 +653,7 @@ * * @return true if this FieldInfo represents a bound property. */ - public boolean isBound() { + public final boolean isBound() { return _bound; } //-- isBound @@ -664,7 +664,7 @@ * * @return true if this ClassInfo describes a container class. */ - public boolean isContainer() { + public final boolean isContainer() { return _isContainer; } //-- isContainer @@ -674,7 +674,7 @@ * * @return true if the has and delete methods are needed. */ - public boolean isHasAndDeleteMethods() { + public final boolean isHasAndDeleteMethods() { XSType xsType = getSchemaType(); JType jType = xsType.getJType(); return ((!xsType.isEnumerated()) && jType.isPrimitive()); @@ -688,7 +688,7 @@ * @return true if nillable, otherwise false. * @see #setNillable(boolean) */ - public boolean isNillable() { + public final boolean isNillable() { return _nillable; } //-- isNillable @@ -698,7 +698,7 @@ * * @return true if this FieldInfo is transient. */ - public boolean isTransient() { + public final boolean isTransient() { return (_transient || _final || _static); } //-- isTransient @@ -706,7 +706,7 @@ * Sets the comment for this Member. * @param comment the comment or description for this Member */ - public void setComment(final String comment) { + public final void setComment(final String comment) { _comment = comment; } //-- setComment @@ -714,7 +714,7 @@ * Returns the ClassInfo to which this Member was declared, for inheritance reasons. * @return the ClassInfo to which this Member was declared. */ - public ClassInfo getDeclaringClassInfo() { + public final ClassInfo getDeclaringClassInfo() { return this._declaringClassInfo; } //-- getDeclaringClassInfo @@ -724,7 +724,7 @@ * @param bound the flag when true indicates that this FieldInfo represents a * bound property. */ - public void setBound(final boolean bound) { + public final void setBound(final boolean bound) { _bound = bound; } //-- setBound @@ -737,11 +737,11 @@ * the boolean value when true indicates this class should be a * container class. */ - public void setContainer(final boolean isContainer) { + public final void setContainer(final boolean isContainer) { _isContainer = isContainer; } //-- setContainer - public void setDeclaringClassInfo(final ClassInfo declaringClassInfo) { + public final void setDeclaringClassInfo(final ClassInfo declaringClassInfo) { this._declaringClassInfo = declaringClassInfo; } //-- setDeclaringClassInfo @@ -749,7 +749,7 @@ * Sets the default value for this FieldInfo. * @param defaultValue the default value */ - public void setDefaultValue(final String defaultValue) { + public final void setDefaultValue(final String defaultValue) { this._default = defaultValue; } //-- setDefaultValue; @@ -761,7 +761,7 @@ * the boolean indicating the final status, if true this * FieldInfo will be treated as final. */ - public void setFinal(final boolean isFinal) { + public final void setFinal(final boolean isFinal) { this._final = isFinal; } //-- isFinal @@ -772,7 +772,7 @@ * @param fixedValue * the fixed production for this FieldInfo */ - public void setFixedValue(final String fixedValue) { + public final void setFixedValue(final String fixedValue) { this._fixed = fixedValue; } //-- setFixedValue @@ -782,7 +782,7 @@ * * @param methods a flag describing which methods to create. */ - public void setMethods(final int methods) { + public final void setMethods(final int methods) { _methods = methods; } //-- setMethods @@ -793,7 +793,7 @@ * a boolean that when true means the field may be nil. * @see #isNillable() */ - public void setNillable(final boolean nillable) { + public final void setNillable(final boolean nillable) { _nillable = nillable; } //-- setNillable @@ -803,7 +803,7 @@ * * @param fieldInfo */ - public void setFieldInfoReference(final FieldInfo fieldInfo) { + public final void setFieldInfoReference(final FieldInfo fieldInfo) { _fieldInfoReference = fieldInfo; } //-- setReference @@ -814,7 +814,7 @@ * @param isStatic the boolean indicating the static status, if true this * FieldInfo will be treated as static */ - public void setStatic(final boolean isStatic) { + public final void setStatic(final boolean isStatic) { this._static = isStatic; } //-- setStatic @@ -824,7 +824,7 @@ * @param isTransient the boolean indicating the transient status, if true this * FieldInfo will be treated as transient */ - public void setTransient(final boolean isTransient) { + public final void setTransient(final boolean isTransient) { this._transient = isTransient; } //-- setTransient @@ -833,7 +833,7 @@ * * @param validator the fully qualified name of the validator to use. */ - public void setValidator(final String validator) { + public final void setValidator(final String validator) { _validator = validator; } @@ -842,7 +842,7 @@ * * @param handler the fully qualified name of the handler to use. */ - public void setXMLFieldHandler(final String handler) { + public final void setXMLFieldHandler(final String handler) { _fieldHandler = handler; } @@ -863,7 +863,7 @@ * * @param visibility the visibility of this FieldInfo. */ - public void setVisibility(final String visibility) { + public final void setVisibility(final String visibility) { _visibility = visibility; } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/info/XMLInfo.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/info/XMLInfo.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/info/XMLInfo.java (working copy) @@ -116,7 +116,7 @@ * @return the XML name for the object described by this XMLInfo, or null if * no name has been set */ - public String getNodeName() { + public final String getNodeName() { return _name; } //-- getNodeName @@ -125,7 +125,7 @@ * * @return the namespace prefix of the object described by this XMLInfo */ - public String getNamespacePrefix() { + public final String getNamespacePrefix() { return _nsPrefix; } //-- getNamespacePrefix @@ -134,7 +134,7 @@ * * @return the namespace URI of the object described by this XMLInfo */ - public String getNamespaceURI() { + public final String getNamespaceURI() { return _nsURI; } //-- getNamespaceURI @@ -143,7 +143,7 @@ * * @return true if xsd is element */ - public boolean isElementDefinition() { + public final boolean isElementDefinition() { return _elementDef; } //-- isElementDefinition @@ -152,7 +152,7 @@ * * @return the node type for the object described by this XMLInfo */ - public short getNodeType() { + public final short getNodeType() { return _nodeType; } //-- getNodeType @@ -163,7 +163,7 @@ * @return the name of the node-type of the object described by this * XMLInfo. */ - public String getNodeTypeName() { + public final String getNodeTypeName() { switch (_nodeType) { case ATTRIBUTE_TYPE: return "attribute"; @@ -181,7 +181,7 @@ * * @return the XML Schema type. */ - public XSType getSchemaType() { + public final XSType getSchemaType() { return _xsType; } //-- getXSType @@ -201,7 +201,7 @@ * * @return true if the XML object must appear at least once. */ - public boolean isRequired() { + public final boolean isRequired() { return _required; } //-- isRequired @@ -211,7 +211,7 @@ * @param multivalued The boolean indicating whether or not the object can appear * more than once. */ - public void setMultivalued(final boolean multivalued) { + public final void setMultivalued(final boolean multivalued) { this._multivalued = multivalued; } //-- setMultivalued @@ -220,7 +220,7 @@ * * @param name the XML node name of the described object. */ - public void setNodeName(final String name) { + public final void setNodeName(final String name) { this._name = name; } //-- setName @@ -230,7 +230,7 @@ * * @param nsPrefix the desired namespace prefix */ - public void setNamespacePrefix(final String nsPrefix) { + public final void setNamespacePrefix(final String nsPrefix) { this._nsPrefix = nsPrefix; } //-- setNamespacePrefix @@ -239,7 +239,7 @@ * * @param nsURI the Namespace URI for this XMLInfo */ - public void setNamespaceURI(final String nsURI) { + public final void setNamespaceURI(final String nsURI) { this._nsURI = nsURI; } //-- setNamespaceURI @@ -249,7 +249,7 @@ * @param elementDef The flag indicating whether or not XSD is global * element, element with anonymous type or not. */ - public void setElementDefinition(final boolean elementDef) { + public final void setElementDefinition(final boolean elementDef) { this._elementDef = elementDef; } //-- setElementDefinition @@ -258,7 +258,7 @@ * * @param nodeType the node type of the described object */ - public void setNodeType(final short nodeType) { + public final void setNodeType(final short nodeType) { this._nodeType = nodeType; } //-- setNodeType @@ -267,7 +267,7 @@ * * @param xsType the XML Schema type */ - public void setSchemaType(final XSType xsType) { + public final void setSchemaType(final XSType xsType) { this._xsType = xsType; } //-- setSchemaType @@ -277,7 +277,7 @@ * @param required the flag indicating whether or not this XML object is * required */ - public void setRequired(final boolean required) { + public final void setRequired(final boolean required) { this._required = required; } //-- setRequired Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSByte.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSByte.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSByte.java (working copy) @@ -57,7 +57,7 @@ * @author Arnaud Blandin * @version $Revision$ $Date: 2006-04-25 15:08:23 -0600 (Tue, 25 Apr 2006) $ */ -public class XSByte extends XSPatternBase { +public final class XSByte extends XSPatternBase { /** Maximum byte (inclusive). */ private Byte _maxInclusive = null; Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSClass.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSClass.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSClass.java (working copy) @@ -54,7 +54,7 @@ * @author Keith Visco * @version $Revision$ $Date: 2003-03-03 00:05:44 -0700 (Mon, 03 Mar 2003) $ */ -public class XSClass extends XSType { +public final class XSClass extends XSType { /** The JClass represented by this type. */ private final JClass _jClass; Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGDay.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGDay.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGDay.java (working copy) @@ -58,7 +58,7 @@ * @author Arnaud Blandin * @version $Revision $ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ */ -public class XSGDay extends XSPatternBase { +public final class XSGDay extends XSPatternBase { /** Jakarta's common-logging logger. */ private static final Log LOG = LogFactory.getLog(XSGDay.class); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGMonth.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGMonth.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGMonth.java (working copy) @@ -58,7 +58,7 @@ * @author Arnaud Blandin * @version $Revision$ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ */ -public class XSGMonth extends XSPatternBase { +public final class XSGMonth extends XSPatternBase { /** Jakarta's common-logging logger. */ private static final Log LOG = LogFactory.getLog(XSGMonth.class); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGMonthDay.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGMonthDay.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGMonthDay.java (working copy) @@ -58,7 +58,7 @@ * @author Arnaud Blandin * @version $Revision $ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ */ -public class XSGMonthDay extends XSPatternBase { +public final class XSGMonthDay extends XSPatternBase { /** Jakarta's common-logging logger. */ private static final Log LOG = LogFactory.getLog(XSGMonthDay.class); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGYear.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGYear.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGYear.java (working copy) @@ -58,7 +58,7 @@ * @author Arnaud Blandin * @version $Revision $ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ */ -public class XSGYear extends XSPatternBase { +public final class XSGYear extends XSPatternBase { /** Jakarta's common-logging logger. */ private static final Log LOG = LogFactory.getLog(XSGYear.class); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGYearMonth.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGYearMonth.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSGYearMonth.java (working copy) @@ -58,7 +58,7 @@ * @author Arnaud Blandin * @version $Revision $ $Date: 2005-03-05 06:42:06 -0700 (Sat, 05 Mar 2005) $ */ -public class XSGYearMonth extends XSPatternBase { +public final class XSGYearMonth extends XSPatternBase { /** Jakarta's common-logging logger. */ private static final Log LOG = LogFactory.getLog(XSGYearMonth.class); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSInt.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSInt.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSInt.java (working copy) @@ -117,7 +117,7 @@ * Returns the JType that this XSType represents. * @return the JType that this XSType represents. */ - public JType getJType() { + public final JType getJType() { return _jType; } @@ -128,7 +128,7 @@ * maximum exclusive value has been set, Null will be returned * @see #getMaxInclusive */ - public Integer getMaxExclusive() { + public final Integer getMaxExclusive() { return _maxExclusive; } // -- getMaxExclusive @@ -139,7 +139,7 @@ * maximum inclusive value has been set, Null will be returned * @see #getMaxExclusive */ - public Integer getMaxInclusive() { + public final Integer getMaxInclusive() { return _maxInclusive; } // -- getMaxInclusive @@ -151,7 +151,7 @@ * @see #getMinInclusive() * @see #setMaxInclusive(int) */ - public Integer getMinExclusive() { + public final Integer getMinExclusive() { return _minExclusive; } // -- getMinExclusive @@ -162,7 +162,7 @@ * minimum inclusive value has been set, Null will be returned * @see #getMinExclusive */ - public Integer getMinInclusive() { + public final Integer getMinInclusive() { return _minInclusive; } // -- getMinInclusive @@ -170,7 +170,7 @@ * Returns the totalDigits facet value of this XSInteger. * @return the totalDigits facet value of this XSInteger. */ - public int getTotalDigits() { + public final int getTotalDigits() { return _totalDigits; } @@ -178,7 +178,7 @@ * Returns true if a maximum (inclusive or exclusive) has been set. * @return true if a maximum (inclusive or exclusive) has been set. */ - public boolean hasMaximum() { + public final boolean hasMaximum() { return _maxInclusive != null || _maxExclusive != null; } //-- hasMaximum @@ -186,7 +186,7 @@ * Returns true if a minimum (inclusive or exclusive) has been set. * @return true if a minimum (inclusive or exclusive) has been set. */ - public boolean hasMinimum() { + public final boolean hasMinimum() { return _minInclusive != null || _minExclusive != null; } //-- hasMinimum @@ -197,7 +197,7 @@ * the maximum exclusive value this XSInt can be * @see #setMaxInclusive(Integer) */ - public void setMaxExclusive(final int max) { + public final void setMaxExclusive(final int max) { _maxExclusive = new Integer(max); _maxInclusive = null; } // -- setMaxExclusive @@ -209,7 +209,7 @@ * the maximum exclusive value this XSInt can be * @see #setMaxInclusive(int) */ - public void setMaxExclusive(final Integer max) { + public final void setMaxExclusive(final Integer max) { _maxExclusive = max; _maxInclusive = null; } // -- setMaxExclusive @@ -221,7 +221,7 @@ * the maximum inclusive value this XSInt can be * @see #setMaxExclusive(Integer) */ - public void setMaxInclusive(final int max) { + public final void setMaxInclusive(final int max) { _maxInclusive = new Integer(max); _maxExclusive = null; } // -- setMaxInclusive @@ -233,7 +233,7 @@ * the maximum inclusive value this XSInt can be * @see #setMaxExclusive(int) */ - public void setMaxInclusive(final Integer max) { + public final void setMaxInclusive(final Integer max) { _maxInclusive = max; _maxExclusive = null; } // -- setMaxInclusive @@ -245,7 +245,7 @@ * the minimum exclusive value this XSInt can be * @see #setMinInclusive(Integer) */ - public void setMinExclusive(final int min) { + public final void setMinExclusive(final int min) { _minExclusive = new Integer(min); _minInclusive = null; } // -- setMinExclusive @@ -257,7 +257,7 @@ * the minimum exclusive value this XSInt can be * @see #setMinInclusive(int) */ - public void setMinExclusive(final Integer min) { + public final void setMinExclusive(final Integer min) { _minExclusive = min; _minInclusive = null; } // -- setMinExclusive @@ -269,7 +269,7 @@ * the minimum inclusive value this XSInt can be * @see #setMinExclusive(Integer) */ - public void setMinInclusive(final int min) { + public final void setMinInclusive(final int min) { _minInclusive = new Integer(min); _minExclusive = null; } // -- setMinInclusive @@ -281,7 +281,7 @@ * the minimum inclusive value this XSInt can be * @see #setMinExclusive(int) */ - public void setMinInclusive(final Integer min) { + public final void setMinInclusive(final Integer min) { _minInclusive = min; _minExclusive = null; } // -- setMinInclusive @@ -290,7 +290,7 @@ * Sets the totalDigits facet for this XSInteger. * @param totalDig the value of totalDigits (must be > 0) */ - public void setTotalDigits(final int totalDig) { + public final void setTotalDigits(final int totalDig) { if (totalDig <= 0) { throw new IllegalArgumentException(this.getName() + ": the totalDigits facet must be positive"); @@ -305,7 +305,7 @@ * The SimpleType containing our facets. * @see org.exolab.castor.builder.types.XSType#getFacets */ - public void setFacets(final SimpleType simpleType) { + public final void setFacets(final SimpleType simpleType) { // -- copy valid facets Enumeration enumeration = getFacets(simpleType); while (enumeration.hasMoreElements()) { @@ -350,7 +350,7 @@ * @return the String necessary to convert an instance of this XSType to an * Object */ - public String createToJavaObjectCode(final String variableName) { + public final String createToJavaObjectCode(final String variableName) { if (_asWrapper) { return super.createToJavaObjectCode(variableName); } @@ -367,7 +367,7 @@ * @return the String necessary to convert an Object to an instance of this * XSType */ - public String createFromJavaObjectCode(final String variableName) { + public final String createFromJavaObjectCode(final String variableName) { StringBuffer sb = new StringBuffer("((java.lang.Integer) "); sb.append(variableName); sb.append(")"); @@ -391,7 +391,7 @@ * the name of the FieldValidator that the configured * TypeValidator should be added to. */ - public void validationCode(final JSourceCode jsc, final String fixedValue, + public final void validationCode(final JSourceCode jsc, final String fixedValue, final String fieldValidatorInstanceName) { jsc.add("org.exolab.castor.xml.validators.IntValidator typeValidator" + " = new org.exolab.castor.xml.validators.IntValidator();"); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSInteger.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSInteger.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSInteger.java (working copy) @@ -119,7 +119,7 @@ * Returns the JType that this XSType represents. * @return the JType that this XSType represents. */ - public JType getJType() { + public final JType getJType() { return _jType; } @@ -129,7 +129,7 @@ * no maximum exclusive value has been set, Null will be returned * @see #getMaxInclusive */ - public Long getMaxExclusive() { + public final Long getMaxExclusive() { return _maxExclusive; } //-- getMaxExclusive @@ -139,7 +139,7 @@ * no maximum inclusive value has been set, Null will be returned * @see #getMaxExclusive */ - public Long getMaxInclusive() { + public final Long getMaxInclusive() { return _maxInclusive; } //-- getMaxInclusive @@ -150,7 +150,7 @@ * @see #getMinInclusive() * @see #setMaxInclusive(int) */ - public Long getMinExclusive() { + public final Long getMinExclusive() { return _minExclusive; } //-- getMinExclusive @@ -160,7 +160,7 @@ * no minimum inclusive value has been set, Null will be returned * @see #getMinExclusive */ - public Long getMinInclusive() { + public final Long getMinInclusive() { return _minInclusive; } //-- getMinInclusive @@ -168,7 +168,7 @@ * Returns the totalDigits facet value of this XSInteger. * @return the totalDigits facet value of this XSInteger. */ - public int getTotalDigits() { + public final int getTotalDigits() { return _totalDigits; } @@ -176,7 +176,7 @@ * Returns true if a maximum (inclusive or exclusive) has been set. * @return true if a maximum (inclusive or exclusive) has been set. */ - public boolean hasMaximum() { + public final boolean hasMaximum() { return _maxInclusive != null || _maxExclusive != null; } //-- hasMaximum @@ -184,7 +184,7 @@ * Returns true if a minimum (inclusive or exclusive) has been set. * @return true if a minimum (inclusive or exclusive) has been set. */ - public boolean hasMinimum() { + public final boolean hasMinimum() { return _minInclusive != null || _minExclusive != null; } //-- hasMinimum @@ -193,7 +193,7 @@ * @param max the maximum exclusive value this XSInteger can be * @see #setMaxInclusive(Integer) */ - public void setMaxExclusive(final long max) { + public final void setMaxExclusive(final long max) { _maxExclusive = new Long(max); _maxInclusive = null; } //-- setMaxExclusive @@ -203,7 +203,7 @@ * @param max the maximum exclusive value this XSInteger can be * @see #setMaxInclusive(int) */ - public void setMaxExclusive(final Long max) { + public final void setMaxExclusive(final Long max) { _maxExclusive = max; _maxInclusive = null; } //-- setMaxExclusive @@ -213,7 +213,7 @@ * @param max the maximum inclusive value this XSInteger can be * @see #setMaxExclusive(Integer) */ - public void setMaxInclusive(final long max) { + public final void setMaxInclusive(final long max) { _maxInclusive = new Long(max); _maxExclusive = null; } //-- setMaxInclusive @@ -223,7 +223,7 @@ * @param max the maximum inclusive value this XSInteger can be * @see #setMaxExclusive(int) */ - public void setMaxInclusive(final Long max) { + public final void setMaxInclusive(final Long max) { _maxInclusive = max; _maxExclusive = null; } //-- setMaxInclusive @@ -233,7 +233,7 @@ * @param min the minimum exclusive value this XSInteger can be * @see #setMinInclusive(Integer) */ - public void setMinExclusive(final long min) { + public final void setMinExclusive(final long min) { _minExclusive = new Long(min); _minInclusive = null; } //-- setMinExclusive @@ -243,7 +243,7 @@ * @param min the minimum exclusive value this XSInteger can be * @see #setMinInclusive(int) */ - public void setMinExclusive(final Long min) { + public final void setMinExclusive(final Long min) { _minExclusive = min; _minInclusive = null; } //-- setMinExclusive @@ -253,7 +253,7 @@ * @param min the minimum inclusive value this XSInteger can be * @see #setMinExclusive(Integer) */ - public void setMinInclusive(final long min) { + public final void setMinInclusive(final long min) { _minInclusive = new Long(min); _minExclusive = null; } //-- setMinInclusive @@ -263,7 +263,7 @@ * @param min the minimum inclusive value this XSInteger can be * @see #setMinExclusive(int) */ - public void setMinInclusive(final Long min) { + public final void setMinInclusive(final Long min) { _minInclusive = min; _minExclusive = null; } //-- setMinInclusive @@ -272,7 +272,7 @@ * Sets the totalDigits facet for this XSInteger. * @param totalDig the value of totalDigits (must be > 0) */ - public void setTotalDigits(final int totalDig) { + public final void setTotalDigits(final int totalDig) { if (totalDig <= 0) { throw new IllegalArgumentException(this.getName() + ": the totalDigits facet must be positive"); @@ -287,7 +287,7 @@ * The SimpleType containing our facets. * @see org.exolab.castor.builder.types.XSType#getFacets */ - public void setFacets(final SimpleType simpleType) { + public final void setFacets(final SimpleType simpleType) { Enumeration enumeration = getFacets(simpleType); while (enumeration.hasMoreElements()) { Facet facet = (Facet) enumeration.nextElement(); @@ -329,7 +329,7 @@ * @return the String necessary to convert an instance of this XSType * to an Object */ - public String createToJavaObjectCode(final String variableName) { + public final String createToJavaObjectCode(final String variableName) { if (_asWrapper) { return super.createToJavaObjectCode(variableName); } @@ -346,7 +346,7 @@ * @return the String necessary to convert an Object to an instance of this * XSType */ - public String createFromJavaObjectCode(final String variableName) { + public final String createFromJavaObjectCode(final String variableName) { StringBuffer sb = new StringBuffer("((java.lang.Long) "); sb.append(variableName); sb.append(")"); @@ -366,7 +366,7 @@ * @param fieldValidatorInstanceName the name of the FieldValidator * that the configured TypeValidator should be added to. */ - public void validationCode(final JSourceCode jsc, final String fixedValue, + public final void validationCode(final JSourceCode jsc, final String fixedValue, final String fieldValidatorInstanceName) { jsc.add("org.exolab.castor.xml.validators.IntegerValidator typeValidator" + " = new org.exolab.castor.xml.validators.IntegerValidator();"); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSList.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSList.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSList.java (working copy) @@ -93,7 +93,7 @@ * Returns the minimum allowed size for this list. * @return the minimum allowed size for this list. */ - public int getMinimumSize() { + public final int getMinimumSize() { return _minSize; } //-- getMinimumSize @@ -101,7 +101,7 @@ * Returns the maximum allowed size for this list. * @return the maximum allowed size for this list. */ - public int getMaximumSize() { + public final int getMaximumSize() { return _maxSize; } //-- getMaximumSize @@ -109,7 +109,7 @@ * Returns the type contained in the list. * @return the type contained in the list. */ - public XSType getContentType() { + public final XSType getContentType() { return _contentType; } @@ -117,7 +117,7 @@ * Sets the maximum allowed size for this list. * @param size new maximum size for this list */ - public void setMaximumSize(final int size) { + public final void setMaximumSize(final int size) { _maxSize = size; } //-- setMaximumSize @@ -125,7 +125,7 @@ * Sets the minimum allowed size for this list. * @param size new minimum size for this list */ - public void setMinimumSize(final int size) { + public final void setMinimumSize(final int size) { _minSize = size; } //-- setMinimumSize @@ -136,7 +136,7 @@ * The SimpleType containing our facets. * @see org.exolab.castor.builder.types.XSType#getFacets */ - public void setFacets(final SimpleType simpleType) { + public final void setFacets(final SimpleType simpleType) { // Not implemented } @@ -154,7 +154,7 @@ * the name of the FieldValidator that the configured * TypeValidator should be added to. */ - public void validationCode(final JSourceCode jsc, final String fixedValue, + public final void validationCode(final JSourceCode jsc, final String fixedValue, final String fieldValidatorInstanceName) { //--TBD } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSListJ2.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSListJ2.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSListJ2.java (working copy) @@ -43,7 +43,7 @@ * @author Assaf Arkin * @version $Revision$ $Date: 2005-12-13 14:58:48 -0700 (Tue, 13 Dec 2005) $ */ -public class XSListJ2 extends XSList { +public final class XSListJ2 extends XSList { /** The JType represented by this XSType. */ private final JType _jType; Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSListODMG30.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSListODMG30.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSListODMG30.java (working copy) @@ -51,7 +51,7 @@ * @author Frank Thelen * @version $Revision$ $Date: 2005-12-13 14:58:48 -0700 (Tue, 13 Dec 2005) $ */ -public class XSListODMG30 extends XSList { +public final class XSListODMG30 extends XSList { /** The JType represented by this XSType. */ private static final JType JTYPE = new JClass("org.odmg.DArray"); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSPatternBase.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSPatternBase.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSPatternBase.java (working copy) @@ -73,7 +73,7 @@ * facets, only one branch needs to pass. * @param pattern the regular expression for this XSType. */ - public void addPattern(final String pattern) { + public final void addPattern(final String pattern) { _patterns.add(pattern); } //-- setPattern @@ -86,7 +86,7 @@ * the name of the TypeValidator that the patterns should be * added to. */ - public void codePatternFacet(final JSourceCode jsc, final String validatorName) { + public final void codePatternFacet(final JSourceCode jsc, final String validatorName) { for (Iterator i = _patterns.iterator(); i.hasNext(); ) { jsc.add(validatorName + ".addPattern(\"" + escapePattern((String) i.next()) + "\");"); } Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSShort.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSShort.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSShort.java (working copy) @@ -101,7 +101,7 @@ * Returns the JType that this XSType represents. * @return the JType that this XSType represents. */ - public JType getJType() { + public final JType getJType() { return _jType; } @@ -112,7 +112,7 @@ * maximum exclusive value has been set, Null will be returned * @see #getMaxInclusive */ - public Short getMaxExclusive() { + public final Short getMaxExclusive() { return _maxExclusive; } //-- getMaxExclusive @@ -123,7 +123,7 @@ * maximum inclusive value has been set, Null will be returned * @see #getMaxExclusive */ - public Short getMaxInclusive() { + public final Short getMaxInclusive() { return _maxInclusive; } //-- getMaxInclusive @@ -135,7 +135,7 @@ * @see #getMinInclusive() * @see #setMaxInclusive(short) */ - public Short getMinExclusive() { + public final Short getMinExclusive() { return _minExclusive; } //-- getMinExclusive @@ -146,7 +146,7 @@ * minimum inclusive value has been set, Null will be returned * @see #getMinExclusive */ - public Short getMinInclusive() { + public final Short getMinInclusive() { return _minInclusive; } //-- getMinInclusive @@ -154,7 +154,7 @@ * Returns the totalDigits facet value of this XSInteger. * @return the totalDigits facet value of this XSInteger. */ - public int getTotalDigits() { + public final int getTotalDigits() { return _totalDigits; } @@ -162,7 +162,7 @@ * Returns true if a maximum (inclusive or exclusive) has been set. * @return true if a maximum (inclusive or exclusive) has been set. */ - public boolean hasMaximum() { + public final boolean hasMaximum() { return _maxInclusive != null || _maxExclusive != null; } //-- hasMaximum @@ -170,7 +170,7 @@ * Returns true if a minimum (inclusive or exclusive) has been set. * @return true if a minimum (inclusive or exclusive) has been set. */ - public boolean hasMinimum() { + public final boolean hasMinimum() { return _minInclusive != null || _minExclusive != null; } //-- hasMinimum @@ -179,7 +179,7 @@ * @param max the maximum exclusive value this XSShort can be * @see #setMaxInclusive(Short) */ - public void setMaxExclusive(final short max) { + public final void setMaxExclusive(final short max) { _maxExclusive = new Short(max); _maxInclusive = null; } //-- setMaxExclusive @@ -189,7 +189,7 @@ * @param max the maximum exclusive value this XSShort can be * @see #setMaxInclusive(short) */ - public void setMaxExclusive(final Short max) { + public final void setMaxExclusive(final Short max) { _maxExclusive = max; _maxInclusive = null; } //-- setMaxExclusive @@ -199,7 +199,7 @@ * @param max the maximum inclusive value this XSShort can be * @see #setMaxExclusive(Short) */ - public void setMaxInclusive(final short max) { + public final void setMaxInclusive(final short max) { _maxInclusive = new Short(max); _maxExclusive = null; } //-- setMaxInclusive @@ -209,7 +209,7 @@ * @param max the maximum inclusive value this XSShort can be * @see #setMaxExclusive(short) */ - public void setMaxInclusive(final Short max) { + public final void setMaxInclusive(final Short max) { _maxInclusive = max; _maxExclusive = null; } //-- setMaxInclusive @@ -219,7 +219,7 @@ * @param min the minimum exclusive value this XSShort can be * @see #setMinInclusive(Short) */ - public void setMinExclusive(final short min) { + public final void setMinExclusive(final short min) { _minExclusive = new Short(min); _minInclusive = null; } //-- setMinExclusive @@ -229,7 +229,7 @@ * @param min the minimum exclusive value this XSShort can be * @see #setMinInclusive(short) */ - public void setMinExclusive(final Short min) { + public final void setMinExclusive(final Short min) { _minExclusive = min; _minInclusive = null; } //-- setMinExclusive @@ -239,7 +239,7 @@ * @param min the minimum inclusive value this XSShort can be * @see #setMinExclusive(Short) */ - public void setMinInclusive(final short min) { + public final void setMinInclusive(final short min) { _minInclusive = new Short(min); _minExclusive = null; } //-- setMinInclusive @@ -249,7 +249,7 @@ * @param min the minimum inclusive value this XSShort can be * @see #setMinExclusive(short) */ - public void setMinInclusive(final Short min) { + public final void setMinInclusive(final Short min) { _minInclusive = min; _minExclusive = null; } //-- setMinInclusive @@ -258,7 +258,7 @@ * Sets the totalDigits facet for this XSShort. * @param totalDig the value of totalDigits (must be > 0) */ - public void setTotalDigits(final int totalDig) { + public final void setTotalDigits(final int totalDig) { if (totalDig <= 0) { throw new IllegalArgumentException(this.getName() + ": the totalDigits facet must be positive"); @@ -273,7 +273,7 @@ * The SimpleType containing our facets. * @see org.exolab.castor.builder.types.XSType#getFacets */ - public void setFacets(final SimpleType simpleType) { + public final void setFacets(final SimpleType simpleType) { Enumeration enumeration = getFacets(simpleType); while (enumeration.hasMoreElements()) { Facet facet = (Facet) enumeration.nextElement(); @@ -317,7 +317,7 @@ * @return the String necessary to convert an instance of this XSType to an * Object */ - public String createToJavaObjectCode(final String variableName) { + public final String createToJavaObjectCode(final String variableName) { if (_asWrapper) { return super.createToJavaObjectCode(variableName); } @@ -337,7 +337,7 @@ * @return the String necessary to convert an Object to an instance of this * XSType */ - public String createFromJavaObjectCode(final String variableName) { + public final String createFromJavaObjectCode(final String variableName) { StringBuffer sb = new StringBuffer("((java.lang.Short) "); sb.append(variableName); sb.append(")"); @@ -361,7 +361,7 @@ * the name of the FieldValidator that the configured * TypeValidator should be added to. */ - public void validationCode(final JSourceCode jsc, final String fixedValue, + public final void validationCode(final JSourceCode jsc, final String fixedValue, final String fieldValidatorInstanceName) { jsc.add("org.exolab.castor.xml.validators.ShortValidator typeValidator" + " = new org.exolab.castor.xml.validators.ShortValidator();"); Index: C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSUnsignedLong.java =================================================================== --- C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSUnsignedLong.java (revision 6672) +++ C:/Java/castor-1/codegen/src/main/java/org/exolab/castor/builder/types/XSUnsignedLong.java (working copy) @@ -58,7 +58,7 @@ * @author Keith Visco * @version $Revision: 6317 $ $Date: 2006-04-25 15:08:23 -0600 (Tue, 25 Apr 2006) $ */ -public class XSUnsignedLong extends XSPatternBase { +public final class XSUnsignedLong extends XSPatternBase { /** Maximum Unsigned Long (inclusive). */ private BigInteger _maxInclusive = null; Index: C:/Java/castor-1/src/doc/release-notes.xml =================================================================== --- C:/Java/castor-1/src/doc/release-notes.xml (revision 6677) +++ C:/Java/castor-1/src/doc/release-notes.xml (working copy) @@ -34,6 +34,26 @@ + + + Cleaned up 929 'Design For Extension' 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 351 'Maximum Line Length' warnings at builder package. Index: C:/Java/castor-1/src/etc/CHANGELOG =================================================================== --- C:/Java/castor-1/src/etc/CHANGELOG (revision 6677) +++ C:/Java/castor-1/src/etc/CHANGELOG (working copy) @@ -1,6 +1,11 @@ SVN ------------------------------- +XML: Resolved issue CASTOR-1797 using contribution from Ralf Joachim [Ralf.joachim@syscon-world.de] + Cleaned up 929 'Design For Extension' warnings at builder package. + Details: http://jira.codehaus.org/browse/CASTOR-1797 + (Ralf - 20070102) + XML: Resolved issue CASTOR-1796 using contribution from Ralf Joachim [Ralf.joachim@syscon-world.de] Cleaned up 351 'Maximum Line Length' warnings at builder package. Details: http://jira.codehaus.org/browse/CASTOR-1796