Return-Path: X-Original-To: apmail-db-torque-dev-archive@www.apache.org Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E3307AAA for ; Mon, 31 Oct 2011 01:54:41 +0000 (UTC) Received: (qmail 90597 invoked by uid 500); 31 Oct 2011 01:54:41 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 90568 invoked by uid 500); 31 Oct 2011 01:54:40 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 90560 invoked by uid 500); 31 Oct 2011 01:54:40 -0000 Received: (qmail 90557 invoked by uid 99); 31 Oct 2011 01:54:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Oct 2011 01:54:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Oct 2011 01:54:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 88ADF23888CD; Mon, 31 Oct 2011 01:54:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1195300 - in /db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration: ./ controller/ outlet/ source/ Date: Mon, 31 Oct 2011 01:54:13 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111031015414.88ADF23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Mon Oct 31 01:54:13 2011 New Revision: 1195300 URL: http://svn.apache.org/viewvc?rev=1195300&view=rev Log: Make checkstyle happy: - removed trailing spaces - move license header to correct place Modified: 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/UnitConfiguration.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/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/outlet/ReflectionOutletSaxHandlerFactory.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/source/SourceTransformerSaxHandler.java 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=1195300&r1=1195299&r2=1195300&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 Oct 31 01:54:13 2011 @@ -43,7 +43,7 @@ public interface ConfigurationProvider /** * Returns the location of the control configuration as human readable * String for debugging and error tracking purposes. - * + * * @return the location of the control configuration, not null. * * @throws ConfigurationException if the location name can not be created. 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=1195300&r1=1195299&r2=1195300&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 Oct 31 01:54:13 2011 @@ -169,7 +169,7 @@ public class DirectoryConfigurationProvi throws ConfigurationException { File file = getFile(name, directory, description); - + InputStream inputStream; try { Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java?rev=1195300&r1=1195299&r2=1195300&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java Mon Oct 31 01:54:13 2011 @@ -113,7 +113,7 @@ public class JarConfigurationProvider im public String getControlConfigurationLocation() throws ConfigurationException { - return projectPaths.getConfigurationPath() + ":" + return projectPaths.getConfigurationPath() + ":" + configurationPaths.getConfigurationDirectory() + "/" + configurationPaths.getControlConfigurationFile(); } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java?rev=1195300&r1=1195299&r2=1195300&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java Mon Oct 31 01:54:13 2011 @@ -162,7 +162,7 @@ public class UnitConfiguration if (result == null) { throw new IllegalStateException( - "The output directory for the key " + outputDirKey + "The output directory for the key " + outputDirKey + "is not set"); } return result; Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java?rev=1195300&r1=1195299&r2=1195300&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java Mon Oct 31 01:54:13 2011 @@ -120,7 +120,7 @@ public class ControlConfigurationXmlPars catch (SAXParseException e) { throw new ConfigurationException( - "Error parsing controller Configuration " + "Error parsing controller Configuration " + configurationProvider .getControlConfigurationLocation() + " at line " Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java?rev=1195300&r1=1195299&r2=1195300&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java Mon Oct 31 01:54:13 2011 @@ -67,7 +67,7 @@ public class Output /** * The strategy how existing target files should be handled. */ - private String existingTargetStrategy + private String existingTargetStrategy = ReplaceTargetFileStrategy.STRATEGY_NAME; /** @@ -76,7 +76,7 @@ public class Output */ private String outputDirKey; - /** + /** * The character encoding of the generated file, or null for the platform * default encoding. */ @@ -240,7 +240,7 @@ public class Output /** * Returns the key for the output directory into which the output is * written. - * + * * @return the key for the output directory, or null for the default * output directory. */ @@ -252,7 +252,7 @@ public class Output /** * Sets the key for the output directory into which the output is * written. - * + * * @param outputKeyDir the key for the output directory, * or null for the default output directory. */ @@ -263,7 +263,7 @@ public class Output /** * Returns the character encoding of the generated file(s). - * + * * @return The character encoding of the generated file, * or null for the platform default encoding. */ @@ -274,7 +274,7 @@ public class Output /** * Sets the character encoding of the generated file(s). - * + * * @param encoding The character encoding of the generated file, * or null for the platform default encoding. */ Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java?rev=1195300&r1=1195299&r2=1195300&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java Mon Oct 31 01:54:13 2011 @@ -38,11 +38,11 @@ public final class OutputConfigurationTa public static final String NAME_ATTRIBUTE = "name"; /** Attribute name for the "existingTargetStrategy" attribute. */ - public static final String EXISTING_TARGET_STRATEGY_ATTRIBUTE + public static final String EXISTING_TARGET_STRATEGY_ATTRIBUTE = "existingTargetStrategy"; /** Attribute name for the "existingTargetStrategy" attribute. */ - public static final String OUTPUT_DIR_KEY_ATTRIBUTE + public static final String OUTPUT_DIR_KEY_ATTRIBUTE = "outputDirKey"; /** Attribute name for the "file" attribute. */ Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java?rev=1195300&r1=1195299&r2=1195300&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java Mon Oct 31 01:54:13 2011 @@ -40,26 +40,26 @@ public class ReflectionOutletSaxHandlerF /** * The suffix for SAX handler class names. */ - private static final String SAX_HANDLER_CLASSNAME_SUFFIX + private static final String SAX_HANDLER_CLASSNAME_SUFFIX = "SaxHandler"; - + /** * The default package for SAX handler class names. */ - private static final String DEFAULT_PACKAGE + private static final String DEFAULT_PACKAGE = "org.apache.torque.generator.configuration.outlet"; /** The class log. */ private static Log log = LogFactory.getLog( ReflectionOutletSaxHandlerFactory.class); - + /** * The package for the handler class. */ private String saxHandlerPackage = DEFAULT_PACKAGE; /** - * Creates a ReflectionOutletSaxHandlerFactory with the default + * Creates a ReflectionOutletSaxHandlerFactory with the default * sax handler package. */ public ReflectionOutletSaxHandlerFactory() @@ -67,9 +67,9 @@ public class ReflectionOutletSaxHandlerF } /** - * Creates a ReflectionOutletSaxHandlerFactory with the default + * Creates a ReflectionOutletSaxHandlerFactory with the default * sax handler package. - * + * * @param saxHandlerPackage the package where the Sax handlers reside. */ public ReflectionOutletSaxHandlerFactory(String saxHandlerPackage) @@ -114,17 +114,17 @@ public class ReflectionOutletSaxHandlerF ConfigurationHandlers configurationHandlers) throws SAXException { - String fullyQualifiedSaxHandlerName + String fullyQualifiedSaxHandlerName = getFullyQualifiedHandlerClassName(outletType); Class handlerClass; try { handlerClass = Class.forName(fullyQualifiedSaxHandlerName); - } + } catch (ClassNotFoundException e) { - // should not happen, because otherwise canHandle() would not + // should not happen, because otherwise canHandle() would not // have returned true throw new RuntimeException(e); } @@ -156,7 +156,7 @@ public class ReflectionOutletSaxHandlerF configurationProvider, projectPaths, configurationHandlers); - } + } catch (IllegalArgumentException e) { // should not happen, we have checked arguments before @@ -164,19 +164,19 @@ public class ReflectionOutletSaxHandlerF } catch (InstantiationException e) { - throw new SAXException("The class " + throw new SAXException("The class " + handlerClass.getName() + " is abstract", e); } catch (IllegalAccessException e) { - throw new SAXException("Constructor of class " + throw new SAXException("Constructor of class " + handlerClass.getName() + " is inaccessible", e); } catch (InvocationTargetException e) { - throw new SAXException("Constructor of class " + throw new SAXException("Constructor of class " + handlerClass.getName() + " has thrown an exception", e); } @@ -185,24 +185,24 @@ public class ReflectionOutletSaxHandlerF public boolean canHandle(String type) { - String fullyQualifiedSaxHandlerName + String fullyQualifiedSaxHandlerName = getFullyQualifiedHandlerClassName(type); - log.debug("canHandle: Using class name " + log.debug("canHandle: Using class name " + fullyQualifiedSaxHandlerName); Class handlerClass; try { handlerClass = Class.forName(fullyQualifiedSaxHandlerName); - } + } catch (ClassNotFoundException e) { log.debug("canHandle: class does not exist, returning false"); return false; } - if (! OutletSaxHandler.class.isAssignableFrom(handlerClass)) + if (!OutletSaxHandler.class.isAssignableFrom(handlerClass)) { - log.debug("canHandle: class is no OutletSaxHandler" + log.debug("canHandle: class is no OutletSaxHandler" + "returning false"); return false; } @@ -212,16 +212,16 @@ public class ReflectionOutletSaxHandlerF /** * Returns the fully qualified class name of the handler class * for a given type. - * + * * @param type the type to determine the handler for. - * + * * @return the fully qualified class name, not null. */ protected String getFullyQualifiedHandlerClassName(String type) { String saxHandlerClassName = StringUtils.capitalize(type) + SAX_HANDLER_CLASSNAME_SUFFIX; - String fullyQualifiedSaxHandlerName = saxHandlerPackage + "." + String fullyQualifiedSaxHandlerName = saxHandlerPackage + "." + saxHandlerClassName; return fullyQualifiedSaxHandlerName; } Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java?rev=1195300&r1=1195299&r2=1195300&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/UntypedOutletSaxHandlerFactory.java Mon Oct 31 01:54:13 2011 @@ -1,11 +1,5 @@ package org.apache.torque.generator.configuration.outlet; -import org.apache.torque.generator.configuration.ConfigurationHandlers; -import org.apache.torque.generator.configuration.ConfigurationProvider; -import org.apache.torque.generator.configuration.paths.ProjectPaths; -import org.apache.torque.generator.qname.QualifiedName; -import org.xml.sax.SAXException; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -25,6 +19,11 @@ import org.xml.sax.SAXException; * under the License. */ +import org.apache.torque.generator.configuration.ConfigurationHandlers; +import org.apache.torque.generator.configuration.ConfigurationProvider; +import org.apache.torque.generator.configuration.paths.ProjectPaths; +import org.apache.torque.generator.qname.QualifiedName; +import org.xml.sax.SAXException; /** * Classes implementing this interface can create creating Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceTransformerSaxHandler.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceTransformerSaxHandler.java?rev=1195300&r1=1195299&r2=1195300&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceTransformerSaxHandler.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceTransformerSaxHandler.java Mon Oct 31 01:54:13 2011 @@ -146,7 +146,7 @@ public class SourceTransformerSaxHandler else if (level == 2) { level++; - if (simplePropertyValue.length() > 0 + if (simplePropertyValue.length() > 0 && !StringUtils.isWhitespace(simplePropertyValue.toString())) { throw new SAXException( --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org