Author: tv Date: Mon Aug 27 09:48:33 2018 New Revision: 1839288 URL: http://svn.apache.org/viewvc?rev=1839288&view=rev Log: Run Eclipse cleanup
Modified: db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/AbstractConfigurationProvider.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4jLoggingAdapter.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionsSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/CopyOutletSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GroovyOutletSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/TypedOutletSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/ConfigurableClassSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/FileSourceSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/JdbcMetadataSourceSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/JdbcMetadataSourceSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Checksums.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerHelper.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/MergepointAction.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OptionAction.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OutputAction.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/SourceElementAttributeAction.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/AppendToTargetFileStrategy.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ExistingTargetStrategy.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/ReplaceTargetFileStrategy.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/SkipExistingTargetFileStrategy.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/outputtype/HtmlOutputType.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/outputtype/JavaOutputType.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/outputtype/PropertiesOutputType.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/outputtype/UnknownOutputType.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/outputtype/XmlOutputType.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/merge/ThreeWayMerger.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/DebuggingOutletWrapper.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletResult.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/copy/CopyOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavaFilenameOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletWithoutMergepoints.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/StringInputOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/Camelbacker.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/CharReplacer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/ConstantNameCreator.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessor.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/UnixLinefeedProcessor.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/WrapReservedJavaWords.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/ModelNodeFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/ModelPropertyPointer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/PostprocessorDefinition.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementAttributeIterator.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementAttributePointer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodeIterator.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointerFactory.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceImpl.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProcessConfiguration.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProvider.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceTransformerDefinition.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceProvider.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/skipDecider/StopGenerationDecider.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/CombinedFileSource.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/PropertiesSourceFormat.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/StreamSourceFormat.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceFormat.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceSaxHandler.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTransformer.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/StringToBooleanConverter.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutletImpl.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyScriptOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyTemplateOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/TorqueGenGroovy.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ClasspathConfigurationProviderTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestSkipDecider.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ConfigurationTestTransformer.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/DirectoryConfigurationProviderTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/JarConfigurationProviderTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestSkipDecider.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/OtherConfigurationTestTransformer.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FileTestUtils.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/OutletResultTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/JavadocOutletTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/UnixLinefeedProcessorTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/RichSourceElementImplTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/SourcePathTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/properties/PropertiesParserTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/CombinedFileSourceTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/FileSourceProviderTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/SourceToXmlTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/stream/XmlParserTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/AttributeTransformerTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformerTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/groovy/GroovyTest.java db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java db/torque/torque4/trunk/torque-maven-plugin/src/main/java/org/apache/torque/generator/maven/TorqueGeneratorMojo.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Database.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/Torque.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueRuntimeException.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/Adapter.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/Torque.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/avalon/TorqueComponent.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/FromElement.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/JoinType.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPart.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/PreparedStatementPartImpl.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/DataSourceFactory.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPool2DataSourceFactory.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPool2DataSourceFactory.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodCacheKey.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/DatabaseMap.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ForeignKeyMap.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/OptionSupport.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/AbstractIdGenerator.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDBroker.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IDGeneratorFactory.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/IdGenerator.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/oid/SequenceIdGenerator.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/BooleanKey.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/DateKey.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/NumberKey.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/ObjectKey.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/StringKey.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/BigDecimalMapper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/CompositeMapper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/DateMapper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/IntegerMapper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/LongMapper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/ObjectListMapper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/StringMapper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/JoinBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/OrderBy.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/Query.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/WhereClauseExpression.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectPsPartBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/PreparedStatementPartForSubselect.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/AbstractWhereClausePsPartBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CurrentDateTimePsPartBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/EnumValueBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/InBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/LikeBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NoReplacementsPreparedStatementPart.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NullValueBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/OnlyReplacementsPreparedStatementPart.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/StandardBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/VerbatimSqlConditionBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/WhereClausePsPartBuilder.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/AbstractPeerImpl.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ColumnValues.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/CountHelper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/JdbcTypedValue.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/LargeSelect.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/ListOrderedMapCI.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/SummaryHelper.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TorqueConnectionImpl.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/TransactionManagerImpl.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueColumnList.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/UniqueList.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AbstractFunction.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AggregateFunction.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/adapter/DBOracleTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/JoinTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/MethodResultCacheTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/TestManager.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/TestPersistent.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/UniqueListTest.java db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/functions/AbstractFunctionTest.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaElementName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Column.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Database.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Unique.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ViewColumn.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDefaultImpl.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformDerbyImpl.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformHsqldbImpl.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformMssqlImpl.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformOracleImpl.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/EnumSkipDecider.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/PeerInterfaceSkipDecider.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/CollectAttributeSetTrueTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaOptionName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/jdbc2schema/Jdbc2SchemaTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ColumnChildElementName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/DatabaseChildElementName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/EnumValueAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FindHelper.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ForeignKeyChildElementName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/InheritanceAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/JavaFieldAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyColumnTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMForeignKeyTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMInheritanceTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMJoinGetterTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMReferencingForeignKeyTableTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ReferenceChildElementName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/TableChildElementName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/mapInit/DatabaseMapInitTableTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/mapInit/DatabaseMapInitTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SqlAttributeName.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/ResultSetGetter.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/GenerateOmClassesFromJavaTest.java db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingInterface.java db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/OptimisticLockingPeerInterface.java db/torque/torque4/trunk/torque-test/src/main/java/org/apache/torque/TestInterface.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ByteTypeTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ClobTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsJoinTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/BaseOptimisticLockingTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ExecuteStatementsTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GroupByTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/QualifiedTableNameTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/DatabaseTools.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java Modified: db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java (original) +++ db/torque/torque4/trunk/torque-ant-tasks/src/main/java/org/apache/torque/ant/task/TorqueGeneratorTask.java Mon Aug 27 09:48:33 2018 @@ -111,7 +111,7 @@ public class TorqueGeneratorTask extends * The target directories for files which are not generated each time anew. * Default is modifiable -> "./src/main/generated-java" */ - private Map<String, File> outputDirMap = new HashMap<String, File>(); + private Map<String, File> outputDirMap = new HashMap<>(); /** * The filename of the jar file of the generation unit. @@ -174,7 +174,7 @@ public class TorqueGeneratorTask extends private Boolean combineFiles; /** The list of options for the generation task. */ - private final List<Option> options = new ArrayList<Option>(); + private final List<Option> options = new ArrayList<>(); /** * Creates a new option and adds it to the list of options. @@ -195,7 +195,7 @@ public class TorqueGeneratorTask extends public void execute() throws BuildException { Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + List<UnitDescriptor> unitDescriptors = new ArrayList<>(); UnitDescriptor.Packaging packaging; if ("jar".equals(this.packaging)) @@ -214,7 +214,7 @@ public class TorqueGeneratorTask extends { throw new IllegalArgumentException( "Unknown packaging " + this.packaging - + ", must be jar, directory or classpath"); + + ", must be jar, directory or classpath"); } log("Packaging is " + packaging, Project.MSG_DEBUG); @@ -222,32 +222,32 @@ public class TorqueGeneratorTask extends if (UnitDescriptor.Packaging.JAR == packaging) { defaultProjectPaths - = new Maven2JarProjectPaths(projectRootDir, jarFile); + = new Maven2JarProjectPaths(projectRootDir, jarFile); } else if (UnitDescriptor.Packaging.DIRECTORY == packaging) { defaultProjectPaths - = new Maven2DirectoryProjectPaths(projectRootDir); + = new Maven2DirectoryProjectPaths(projectRootDir); } else if (UnitDescriptor.Packaging.CLASSPATH == packaging) { defaultProjectPaths - = new Maven2DirectoryProjectPaths(projectRootDir); + = new Maven2DirectoryProjectPaths(projectRootDir); } else { - throw new IllegalStateException("Unknown packaging" + packaging); + throw new IllegalStateException("Unknown packaging" + packaging); } CustomProjectPaths projectPaths - = new CustomProjectPaths(defaultProjectPaths); + = new CustomProjectPaths(defaultProjectPaths); if (UnitDescriptor.Packaging.CLASSPATH == packaging) { if (configPackage == null) { throw new BuildException( - "configPackage must be set for packaging =\"classpath\""); + "configPackage must be set for packaging =\"classpath\""); } projectPaths.setConfigurationPackage(configPackage); projectPaths.setConfigurationDir(null); @@ -273,10 +273,10 @@ public class TorqueGeneratorTask extends if (sourceIncludes != null || sourceExcludes != null) { Fileset sourceFileset - = new Fileset( - projectPaths.getDefaultSourcePath(), - sourceIncludes, - sourceExcludes); + = new Fileset( + projectPaths.getDefaultSourcePath(), + sourceIncludes, + sourceExcludes); log("Setting source includes to " + sourceIncludes, Project.MSG_DEBUG); log("Setting source excludes to " + sourceExcludes, @@ -300,7 +300,7 @@ public class TorqueGeneratorTask extends projectPaths.setOutputDirectory(null, defaultOutputDir); log("Setting defaultOutputDir to " + defaultOutputDir.getAbsolutePath(), - Project.MSG_DEBUG); + Project.MSG_DEBUG); } if (outputDirMap != null) { @@ -310,9 +310,9 @@ public class TorqueGeneratorTask extends dirEntry.getKey(), dirEntry.getValue()); log("Setting output directory with key " + dirEntry.getKey() - + " to " - + dirEntry.getValue(), - Project.MSG_DEBUG); + + " to " + + dirEntry.getValue(), + Project.MSG_DEBUG); } } log("ProjectPaths = " + projectPaths, Project.MSG_DEBUG); @@ -320,7 +320,7 @@ public class TorqueGeneratorTask extends OptionsConfiguration optionConfiguration = null; if (!options.isEmpty()) { - Map<String, String> optionsMap = new HashMap<String, String>(); + Map<String, String> optionsMap = new HashMap<>(); for (Option option : options) { optionsMap.put(option.getKey(), option.getValue()); @@ -346,7 +346,7 @@ public class TorqueGeneratorTask extends if (overrideConfigDir != null) { CustomProjectPaths childProjectPaths - = new CustomProjectPaths(projectPaths); + = new CustomProjectPaths(projectPaths); childProjectPaths.setConfigurationDir(overrideConfigDir); UnitDescriptor parentUnitDescriptor = new UnitDescriptor( Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/AbstractConfigurationProvider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/AbstractConfigurationProvider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/AbstractConfigurationProvider.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/AbstractConfigurationProvider.java Mon Aug 27 09:48:33 2018 @@ -29,7 +29,7 @@ import org.apache.torque.generator.confi * @version $Id: $ */ public abstract class AbstractConfigurationProvider - implements ConfigurationProvider +implements ConfigurationProvider { /** * The internal directory structure of the Torque generator @@ -58,6 +58,7 @@ public abstract class AbstractConfigurat /** * @see ConfigurationProvider#getControlConfigurationInputStream() */ + @Override public InputStream getControlConfigurationInputStream() throws ConfigurationException { @@ -70,6 +71,7 @@ public abstract class AbstractConfigurat /** * @see ConfigurationProvider#getTemplateInputStream() */ + @Override public InputStream getTemplateInputStream(final String name) throws ConfigurationException { @@ -82,6 +84,7 @@ public abstract class AbstractConfigurat /** * @see ConfigurationProvider#getOutletConfigurationInputStream(String) */ + @Override public InputStream getOutletConfigurationInputStream(final String name) throws ConfigurationException { @@ -89,11 +92,12 @@ public abstract class AbstractConfigurat name, configurationPaths.getOutletDirectory(), "outlet configuration"); - } + } /** * @see ConfigurationProvider#getResourceInputStream(String) */ + @Override public InputStream getResourceInputStream(final String name) throws ConfigurationException { @@ -106,6 +110,7 @@ public abstract class AbstractConfigurat /** * @see ConfigurationProvider#getOptionsInputStream(String) */ + @Override public InputStream getOptionsInputStream(final String name) throws ConfigurationException { @@ -119,5 +124,5 @@ public abstract class AbstractConfigurat String name, String directory, String fileDescription) - throws ConfigurationException; + throws ConfigurationException; } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java Mon Aug 27 09:48:33 2018 @@ -46,10 +46,10 @@ public final class ClassHelper * or it is not an instance of <code>isInstanceOf</code> */ public static Object getInstance( - String className, - Class<?> isInstanceOf, - UnitDescriptor unitDescriptor) - throws ConfigurationException + String className, + Class<?> isInstanceOf, + UnitDescriptor unitDescriptor) + throws ConfigurationException { if (className == null) { @@ -69,26 +69,26 @@ public final class ClassHelper catch (ClassNotFoundException e) { throw new ConfigurationException("The class " - + className - + " could not be found.", + + className + + " could not be found.", e); } catch (IllegalAccessException e) { throw new ConfigurationException("Instantiating " - + className - + " is not allowed", + + className + + " is not allowed", e); } catch (InstantiationException e) { throw new ConfigurationException("The class " - + className - + " has no standard constructor.", + + className + + " has no standard constructor.", e); } if (isInstanceOf != null - && !(isInstanceOf.isInstance(result))) + && !(isInstanceOf.isInstance(result))) { throw new ConfigurationException("Classes with class : " + className Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java Mon Aug 27 09:48:33 2018 @@ -33,11 +33,11 @@ import org.apache.torque.generator.confi * jar file. */ public class ClasspathConfigurationProvider - extends AbstractConfigurationProvider +extends AbstractConfigurationProvider { /** The logger. */ private static Log log - = LogFactory.getLog(ClasspathConfigurationProvider.class); + = LogFactory.getLog(ClasspathConfigurationProvider.class); /** The description of the generation unit, not null. */ private final UnitDescriptor unitDescriptor; @@ -57,10 +57,11 @@ public class ClasspathConfigurationProvi /** * @see ConfigurationProvider#getControlConfigurationLocation() */ + @Override public String getControlConfigurationLocation() { TorqueGeneratorPaths configurationPaths - = unitDescriptor.getConfigurationPaths(); + = unitDescriptor.getConfigurationPaths(); return getFileName( configurationPaths.getControlConfigurationFile(), configurationPaths.getConfigurationDirectory()); @@ -71,11 +72,11 @@ public class ClasspathConfigurationProvi final String directory) { String fileName - = getConfigResourceBase() - + "/" - + directory - + "/" - + name; + = getConfigResourceBase() + + "/" + + directory + + "/" + + name; // make double dots work for resources in jar files fileName = FilenameUtils.normalizeNoEndSeparator(fileName); fileName = FilenameUtils.separatorsToUnix(fileName); @@ -84,10 +85,10 @@ public class ClasspathConfigurationProvi @Override protected InputStream getInputStream( - final String name, - final String directory, - final String fileDescription) - throws ConfigurationException + final String name, + final String directory, + final String fileDescription) + throws ConfigurationException { String fileName = getFileName(name, directory); @@ -102,8 +103,8 @@ public class ClasspathConfigurationProvi { throw new ConfigurationException( "Could not read " + fileDescription + " file " - + fileName - + " in classpath"); + + fileName + + " in classpath"); } BufferedInputStream bis = new BufferedInputStream(inputStream); if (log.isDebugEnabled()) @@ -115,6 +116,7 @@ public class ClasspathConfigurationProvi return bis; } + @Override public Collection<String> getOutletConfigurationNames() throws ConfigurationException { @@ -122,7 +124,7 @@ public class ClasspathConfigurationProvi + "/" + unitDescriptor.getConfigurationPaths().getOutletDirectory(); outletConfigurationSubdir - = outletConfigurationSubdir.replace('\\', '/'); + = outletConfigurationSubdir.replace('\\', '/'); PackageResources packageResources = new PackageResources( outletConfigurationSubdir, @@ -133,6 +135,7 @@ public class ClasspathConfigurationProvi /** * @see ConfigurationProvider#getTemplateNames() */ + @Override public Collection<String> getTemplateNames() throws ConfigurationException { @@ -140,7 +143,7 @@ public class ClasspathConfigurationProvi + "/" + unitDescriptor.getConfigurationPaths().getTemplateDirectory(); templatesConfigurationSubdir - = templatesConfigurationSubdir.replace('\\', '/'); + = templatesConfigurationSubdir.replace('\\', '/'); PackageResources packageResources = new PackageResources( templatesConfigurationSubdir, @@ -158,8 +161,8 @@ public class ClasspathConfigurationProvi private String getConfigResourceBase() { String configResourceBase - = unitDescriptor.getProjectPaths().getConfigurationPackage() - .replace('.', '/'); + = unitDescriptor.getProjectPaths().getConfigurationPackage() + .replace('.', '/'); return configResourceBase; } } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java Mon Aug 27 09:48:33 2018 @@ -37,7 +37,7 @@ public class Configuration * All known units of generation. */ private List<UnitDescriptor> unitDescriptors - = new ArrayList<UnitDescriptor>(); + = new ArrayList<>(); /** * The configurations for all known units of generation. @@ -48,7 +48,7 @@ public class Configuration * The available configuration handlers. */ private ConfigurationHandlers configurationHandlers - = new ConfigurationHandlers(); + = new ConfigurationHandlers(); /** * Whether the configuration has already been read. @@ -112,25 +112,25 @@ public class Configuration throw new IllegalStateException( "Configuration has already been read."); } - unitConfigurations = new ArrayList<UnitConfiguration>(); + unitConfigurations = new ArrayList<>(); Loglevel oldLoglevel = Loglevel.getCurrentLoglevel(); for (UnitDescriptor unitDescriptor : unitDescriptors) { - if (unitDescriptor.getLoglevel() != null) - { - unitDescriptor.getLoglevel().apply(); - } - else - { - oldLoglevel.apply(); - } - UnitConfigurationReader configurationReader - = new UnitConfigurationReader(); + if (unitDescriptor.getLoglevel() != null) + { + unitDescriptor.getLoglevel().apply(); + } + else + { + oldLoglevel.apply(); + } + UnitConfigurationReader configurationReader + = new UnitConfigurationReader(); UnitConfiguration unitConfiguration - = configurationReader.read( - unitDescriptor, - configurationHandlers); + = configurationReader.read( + unitDescriptor, + configurationHandlers); if (unitDescriptor.getLoglevel() != null) { unitConfiguration.setLoglevel(unitDescriptor.getLoglevel()); @@ -138,7 +138,7 @@ public class Configuration unitConfigurations.add(unitConfiguration); } read = true; - } + } /** * Returns the list of UnitConfigurations. Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java Mon Aug 27 09:48:33 2018 @@ -54,21 +54,21 @@ import org.xml.sax.SAXException; */ public class ConfigurationEntityResolver implements EntityResolver { - /** The SystemId of the configuration schema. */ + /** The SystemId of the configuration schema. */ public static final String CONFIGURATION_SCHEMA_SYSTEMID - = XMLConstants.GENERATOR_CONFIGURATION_NAMESPACE + ".xsd"; + = XMLConstants.GENERATOR_CONFIGURATION_NAMESPACE + ".xsd"; /** The SystemId of the configuration schema. */ public static final String OUTLET_SCHEMA_SYSTEMID - = "http://db.apache.org/torque/4.0/generator/outlet.xsd"; + = "http://db.apache.org/torque/4.0/generator/outlet.xsd"; /** Logging class from commons.logging */ private static Log log - = LogFactory.getLog(ConfigurationEntityResolver.class); + = LogFactory.getLog(ConfigurationEntityResolver.class); /** The class object of this class. */ private static final Class<ConfigurationEntityResolver> CLAZZ - = ConfigurationEntityResolver.class; + = ConfigurationEntityResolver.class; /** * An implementation of the SAX <code>EntityResolver</code> @@ -82,6 +82,7 @@ public class ConfigurationEntityResolver * @return An <code>InputSource</code> for the entity if the uri is known, * or null otherwise. */ + @Override public InputSource resolveEntity(String publicId, String systemId) throws IOException, SAXException { @@ -109,12 +110,12 @@ public class ConfigurationEntityResolver * @throws SAXException if the resource cannot be read. */ private InputSource readFromClasspath(String resourceName) - throws SAXException + throws SAXException { try { InputStream inputStream - = CLAZZ.getResourceAsStream(resourceName); + = CLAZZ.getResourceAsStream(resourceName); // getResource was buggy on many systems including Linux, // OSX, and some versions of windows in jdk1.3. @@ -124,7 +125,7 @@ public class ConfigurationEntityResolver String pkg = CLAZZ.getName().substring(0, CLAZZ.getName().lastIndexOf('.')); log.debug("Resolver: used " + resourceName + " from '" - + pkg + "' package"); + + pkg + "' package"); return new InputSource(inputStream); } else Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java Mon Aug 27 09:48:33 2018 @@ -53,31 +53,31 @@ public class ConfigurationHandlers * The known types of outputs. */ private Map<String, OutputType> outputTypes - = new HashMap<String, OutputType>(); + = new HashMap<>(); /** * The known (file) formats of stream sources (e.g. XML, properties). */ private Set<StreamSourceFormat> streamSourceFormats - = new HashSet<StreamSourceFormat>(); + = new HashSet<>(); /** * The known mergepoint action configuration handlers. */ private ActionSaxHandlerFactories actionSaxHandlerFactories - = new ActionSaxHandlerFactories(); + = new ActionSaxHandlerFactories(); /** * The known option configuration handlers. */ private OptionsSaxHandlerFactories optionsSaxHandlerFactories - = new OptionsSaxHandlerFactories(); + = new OptionsSaxHandlerFactories(); /** * The known source configuration handlers. */ private SourceSaxHandlerFactories sourceSaxHandlerFactories - = new SourceSaxHandlerFactories(); + = new SourceSaxHandlerFactories(); /** * Standard constructor. @@ -91,7 +91,7 @@ public class ConfigurationHandlers outputTypes.put(XmlOutputType.KEY, new XmlOutputType()); outputTypes.put(HtmlOutputType.KEY, new HtmlOutputType()); outputTypes.put(PropertiesOutputType.KEY, new PropertiesOutputType()); - } + } /** * Returns the known outlet types. Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java Mon Aug 27 09:48:33 2018 @@ -38,7 +38,7 @@ public interface ConfigurationProvider * @throws ConfigurationException if the reader can not be created. */ InputStream getControlConfigurationInputStream() - throws ConfigurationException; + throws ConfigurationException; /** * Returns the location of the control configuration as human readable @@ -63,7 +63,7 @@ public interface ConfigurationProvider * cannot be determined. */ Collection<String> getTemplateNames() - throws ConfigurationException; + throws ConfigurationException; /** * Creates a reader to access a template. @@ -76,7 +76,7 @@ public interface ConfigurationProvider * @throws ConfigurationException if the reader can not be created. */ InputStream getTemplateInputStream(String name) - throws ConfigurationException; + throws ConfigurationException; /** * Returns a list of all found outlet configuration files in the @@ -87,7 +87,7 @@ public interface ConfigurationProvider * @throws ConfigurationException if the configuration can not be read. */ Collection<String> getOutletConfigurationNames() - throws ConfigurationException; + throws ConfigurationException; /** * Creates a reader to access the configuration for one outlet. @@ -100,7 +100,7 @@ public interface ConfigurationProvider * @throws ConfigurationException if the reader can not be created. */ InputStream getOutletConfigurationInputStream(String name) - throws ConfigurationException; + throws ConfigurationException; /** * Creates a reader to access an options file. @@ -113,7 +113,7 @@ public interface ConfigurationProvider * @throws ConfigurationException if the reader can not be created. */ InputStream getOptionsInputStream(String name) - throws ConfigurationException; + throws ConfigurationException; /** @@ -127,5 +127,5 @@ public interface ConfigurationProvider * @throws ConfigurationException if the reader can not be created. */ InputStream getResourceInputStream(String path) - throws ConfigurationException; + throws ConfigurationException; } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java Mon Aug 27 09:48:33 2018 @@ -38,11 +38,11 @@ import org.apache.torque.generator.confi * Provides InputStreams to read the configuration from a directory. */ public class DirectoryConfigurationProvider - extends AbstractConfigurationProvider +extends AbstractConfigurationProvider { /** The logger. */ private static Log log - = LogFactory.getLog(DirectoryConfigurationProvider.class); + = LogFactory.getLog(DirectoryConfigurationProvider.class); /** * The paths needed to interact with the enclosing project, not null. @@ -79,6 +79,7 @@ public class DirectoryConfigurationProvi this.configurationPaths = configurationPaths; } + @Override public String getControlConfigurationLocation() throws ConfigurationException { @@ -89,10 +90,10 @@ public class DirectoryConfigurationProvi } private File getFile( - final String name, - final String directory, - final String description) - throws ConfigurationException + final String name, + final String directory, + final String description) + throws ConfigurationException { File file = null; try @@ -110,17 +111,17 @@ public class DirectoryConfigurationProvi throw new ConfigurationException("Canonical name for " + description + file + " could not be calculated", - e); + e); } return file; } @Override protected InputStream getInputStream( - final String name, - final String directory, - final String description) - throws ConfigurationException + final String name, + final String directory, + final String description) + throws ConfigurationException { File file = getFile(name, directory, description); @@ -134,7 +135,7 @@ public class DirectoryConfigurationProvi throw new ConfigurationException(description + " file " + file.getAbsolutePath() + " not found", - e); + e); } BufferedInputStream bis = new BufferedInputStream(inputStream); if (log.isDebugEnabled()) @@ -145,23 +146,24 @@ public class DirectoryConfigurationProvi return bis; } + @Override public Collection<String> getOutletConfigurationNames() - throws ConfigurationException + throws ConfigurationException { File outletConfigDir = new File( projectPaths.getConfigurationPath(), configurationPaths.getOutletDirectory()); - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); if (!outletConfigDir.isDirectory()) { log.info( "OutletsConfigDirectory " - + outletConfigDir.getAbsolutePath() - + "is not a directory, " - + "no outlet definitions will be read " - + "(template outlets may still be available " - + "through scanning the templates directory)"); + + outletConfigDir.getAbsolutePath() + + "is not a directory, " + + "no outlet definitions will be read " + + "(template outlets may still be available " + + "through scanning the templates directory)"); return result; } @@ -181,13 +183,14 @@ public class DirectoryConfigurationProvi /** * @see ConfigurationProvider#getTemplateNames() */ + @Override public Collection<String> getTemplateNames() throws ConfigurationException { File templatesConfigurationSubdir = new File( projectPaths.getConfigurationPath() - + "/" - + configurationPaths.getTemplateDirectory()); + + "/" + + configurationPaths.getTemplateDirectory()); return PackageResources.getFilesInDirectoryWithSuffix( templatesConfigurationSubdir, null, "", true); --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org