You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tf...@apache.org on 2010/09/07 21:11:18 UTC
svn commit: r993487 - in
/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator:
configuration/ configuration/controller/ configuration/option/
configuration/paths/ configuration/source/ control/ file/ outlet/java/
qname/ s...
Author: tfischer
Date: Tue Sep 7 19:11:17 2010
New Revision: 993487
URL: http://svn.apache.org/viewvc?rev=993487&view=rev
Log:
- removed trailing spaces
- added missing license headers
Modified:
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/ConfigurationHandlers.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/controller/ControlConfigurationSaxHandler.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/paths/DefaultTorqueGeneratorPaths.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.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/control/Controller.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/outlet/java/CamelbackOutlet.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/OptionOutlet.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/source/SourceElement.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ColumnMetadata.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/stream/FileSourceProvider.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/template/velocity/TorqueGenVelocity.java
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=993487&r1=993486&r2=993487&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 Tue Sep 7 19:11:17 2010
@@ -51,7 +51,7 @@ public class ClasspathConfigurationProvi
private ProjectPaths projectPaths;
/**
- * The internal directory structure of the Torque generator
+ * The internal directory structure of the Torque generator
* configuration files, not null.
*/
private TorqueGeneratorPaths configurationPaths;
@@ -142,15 +142,15 @@ public class ClasspathConfigurationProvi
+ directory
+ "/"
+ name;
-
+
// make double dots work for resources in jar files
fileName = FilenameUtils.normalizeNoEndSeparator(fileName);
fileName = FilenameUtils.separatorsToUnix(fileName);
-
+
InputStream inputStream
= getClass().getClassLoader().getResourceAsStream(
fileName);
-
+
if (inputStream == null)
{
throw new ConfigurationException(
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=993487&r1=993486&r2=993487&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 Tue Sep 7 19:11:17 2010
@@ -44,7 +44,7 @@ public class ConfigurationHandlers
/**
* The known (file) formats of stream sources (e.g. XML, properties).
*/
- private Set<StreamSourceFormat> streamSourceFormats
+ private Set<StreamSourceFormat> streamSourceFormats
= new HashSet<StreamSourceFormat>();
/**
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=993487&r1=993486&r2=993487&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 Tue Sep 7 19:11:17 2010
@@ -43,11 +43,11 @@ public class UnitConfiguration
/** All options for the generation unit. */
private Options options;
-
- /** Overrides the source provider defined in the control file. */
+
+ /** Overrides the source provider defined in the control file. */
private SourceProvider overrideSourceProvider;
- /** Whether the overrideSourceProviderInitialized was initialized. */
+ /** Whether the overrideSourceProviderInitialized was initialized. */
private boolean overrideSourceProviderInitialized = false;
/** The configuration for the available outlets. */
@@ -286,7 +286,7 @@ public class UnitConfiguration
* Returns the source provider which overrides the source provider defined
* in the control file.
*
- * @return the overriding source provider, or null to use the
+ * @return the overriding source provider, or null to use the
* source provider defined in the control file.
*
* @throws NullPointerException if overrideSourceFileset was not yet set.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java Tue Sep 7 19:11:17 2010
@@ -201,7 +201,7 @@ class UnitConfigurationReader
UnitConfiguration unitConfiguration,
UnitConfiguration inheritedConfiguration)
{
- EntityReferences entityReferences
+ EntityReferences entityReferences
= unitConfiguration.getEntityReferences();
Map<String, byte[]> inheritedReferences
= inheritedConfiguration.getEntityReferences()
@@ -211,15 +211,15 @@ class UnitConfigurationReader
if (!entityReferences.containsSystemId(systemId))
{
entityReferences.addEntityReference(
- systemId,
+ systemId,
inheritedReferences.get(systemId));
- log.debug("entityReferences with system id "
+ log.debug("entityReferences with system id "
+ systemId
+ " is inherited from the parent.");
}
else
{
- log.debug("entityReferences with system id "
+ log.debug("entityReferences with system id "
+ systemId
+ " is overidden in the child.");
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java Tue Sep 7 19:11:17 2010
@@ -63,14 +63,14 @@ public class UnitDescriptor
*/
private UnitDescriptor inheritsFrom;
- /** Overrides the source defined in the control file. */
+ /** Overrides the source defined in the control file. */
private SourceProvider overrideSourceProvider;
-
+
/** Options to override the settings in the project Directory. */
private OptionsConfiguration overrideOptions;
- /**
- * The Loglevel to override the loglevel in the Torque
+ /**
+ * The Loglevel to override the loglevel in the Torque
* generator configuration.
*/
private Loglevel loglevel;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java Tue Sep 7 19:11:17 2010
@@ -276,7 +276,7 @@ public class ControlConfigurationSaxHand
.addEntityReference(
entityReferenceSaxHandler.getSystemId(),
entityReferenceSaxHandler.readResource());
- }
+ }
catch (ConfigurationException e)
{
throw new SAXException(
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java Tue Sep 7 19:11:17 2010
@@ -44,7 +44,7 @@ abstract class OptionsConfigurationBase
* Creates options from a Map and returns them.
*
* @param optionsMap the map containing the option qualified names as key
- * and the option value as value. optionsMap and the keys therein
+ * and the option value as value. optionsMap and the keys therein
* must not be null.
*
* @return the options, not null.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java Tue Sep 7 19:11:17 2010
@@ -39,7 +39,7 @@ public class DefaultTorqueGeneratorPaths
= "control.xml";
/**
- * The path to the template directory, relative to the torque-generator
+ * The path to the template directory, relative to the torque-generator
* root directory.
*/
private static final String TEMPLATES_DIRECTORY = "templates";
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.java Tue Sep 7 19:11:17 2010
@@ -35,9 +35,9 @@ public interface ProjectPaths
* The path must either be absolute or relative to the current working
* directory.
*
- * @return the path to the Torque generator configuration;
+ * @return the path to the Torque generator configuration;
* may (but must not) be null if no configuration is contained
- * in the surrounding project;
+ * in the surrounding project;
* must be null if the configuration is read from the class path.
*/
File getConfigurationPath();
@@ -53,11 +53,11 @@ public interface ProjectPaths
String getConfigurationPackage();
/**
- * Returns the path to the default source directory for the
+ * Returns the path to the default source directory for the
* Torque generator.
* The path must either be absolute or relative to the current working
* directory.
- * "Default" means that the setting can be overridden in a unit of
+ * "Default" means that the setting can be overridden in a unit of
* generation. This usually points to a subdirectory
* where the sources are located.
*
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferenceSaxHandler.java Tue Sep 7 19:11:17 2010
@@ -144,20 +144,20 @@ public class EntityReferenceSaxHandler e
public byte[] readResource()
throws ConfigurationException
{
- InputStream inputStream
+ InputStream inputStream
= configurationProvider.getResourceInputStream(resource);
byte[] content;
try
{
content = IOUtils.toByteArray(inputStream);
- }
+ }
catch (IOException e)
{
throw new ConfigurationException(
- "Could not read Stream from resource path " + resource,
+ "Could not read Stream from resource path " + resource,
e);
}
-
+
return content;
}
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/EntityReferences.java Tue Sep 7 19:11:17 2010
@@ -1,5 +1,24 @@
package org.apache.torque.generator.configuration.source;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.HashMap;
@@ -15,15 +34,15 @@ import org.xml.sax.SAXException;
public class EntityReferences implements EntityResolver
{
/** All known entity references. */
- private Map<String, byte[]> entityReferences
+ private Map<String, byte[]> entityReferences
= new HashMap<String, byte[]>();
/**
* Adds a new entity reference.
- *
+ *
* @param systemId the systemId of the entity, not null.
* @param content the content of the entity, not null.
- *
+ *
* @throws NullPointerException if systemId or content are null.
* @throws IllegalArgumentException if the systemId is already defined.
*/
@@ -46,9 +65,9 @@ public class EntityReferences implements
/**
* Returns whether the given system id is known.
- *
+ *
* @param systemId the system id to check.
- *
+ *
* @return true if the system id can be resolved, false otherwise.
*/
public boolean containsSystemId(String systemId)
@@ -58,14 +77,14 @@ public class EntityReferences implements
/**
* Returns a copy of the entity reference map.
- *
+ *
* @return a copy of the entity reference map.
*/
public Map<String, byte[]> getEntityReferences()
{
return new HashMap<String, byte[]>(entityReferences);
}
-
+
/**
* An implementation of the SAX <code>EntityResolver</code>
* interface to be called by the XML parser. If the systemId is known,
@@ -75,13 +94,13 @@ public class EntityReferences implements
*
* @param publicId The public identifier of the external entity
* @param systemId The system identifier of the external entity
- * @return An <code>InputSource</code> for the entity if the
+ * @return An <code>InputSource</code> for the entity if the
* systemId is known, or null otherwise.
*/
public InputSource resolveEntity(String publicId, String systemId)
throws IOException, SAXException
{
-
+
byte[] content = entityReferences.get(systemId);
if (content == null)
{
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java Tue Sep 7 19:11:17 2010
@@ -121,7 +121,7 @@ public class Controller
= unitConfiguration.getOverrideSourceProvider();
if (overrideSourceProvider != null)
{
- if (overrideSourceProvider.isInit())
+ if (overrideSourceProvider.isInit())
{
overrideSourceProvider.reset(
configuration.getConfigurationHandlers(),
@@ -151,7 +151,7 @@ public class Controller
controllerState);
controllerState.setRootElement(rootElement);
- String startElementsPath
+ String startElementsPath
= sourceProcessConfiguration.getStartElementsPath();
List<SourceElement> startElements
= SourcePath.getElementsFromRoot(
@@ -357,7 +357,7 @@ public class Controller
}
else
{
- log.debug("SkipDecider " + skipDecider.getClass().getName()
+ log.debug("SkipDecider " + skipDecider.getClass().getName()
+ " decided to proceed");
}
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java Tue Sep 7 19:11:17 2010
@@ -37,26 +37,26 @@ import org.apache.commons.logging.LogFac
* Selects Files in a directory and the subdirectories of the directory.
* From these files, all that match an include pattern and do not
* match an exclude pattern are selected.
- *
+ *
* @Version $Id: $
*/
-public class Fileset
+public class Fileset
{
/** The class logger. */
private static Log log = LogFactory.getLog(Fileset.class);
-
+
/** The base directory of the fileset. */
private File basedir;
- /**
+ /**
* The patterns for the files to include.
- * If null or empty, all Files are included.
+ * If null or empty, all Files are included.
*/
private Set<String> includes;
-
+
/**
* The patterns for the files to exclude.
- * If null or empty, no Files are excluded.
+ * If null or empty, no Files are excluded.
*/
private Set<String> excludes;
@@ -66,15 +66,15 @@ public class Fileset
public Fileset()
{
}
-
+
/**
* All-Args constructor.
- *
+ *
* @param the basedir, or null to use the current basedir.
* @param includes The patterns for the files to include.
- * If null or empty, all Files are included.
+ * If null or empty, all Files are included.
* @param excludes The patterns for the files to exclude.
- * If null or empty, no Files are excluded.
+ * If null or empty, no Files are excluded.
*/
public Fileset(File basedir, Set<String> includes, Set<String> excludes)
{
@@ -82,10 +82,10 @@ public class Fileset
this.includes = includes;
this.excludes = excludes;
}
-
+
/**
* Returns the base directory of the fileset.
- *
+ *
* @return the base directory, or null if no basedir is specified.
*/
public File getBasedir()
@@ -95,17 +95,17 @@ public class Fileset
/**
* Sets the base directory of the fileset.
- *
+ *
* @param basedir the base directory, or null.
*/
- public void setBasedir(File basedir)
+ public void setBasedir(File basedir)
{
this.basedir = basedir;
}
/**
* Returns the include patterns for the fileset.
- *
+ *
* @return the include patterns, or null if all files should be included.
*/
public Set<String> getIncludes()
@@ -115,7 +115,7 @@ public class Fileset
/**
* Sets the include patterns for the fileset.
- *
+ *
* @return the include patterns, or null if all files should be included.
*/
public void setIncludes(Set<String> includes)
@@ -125,7 +125,7 @@ public class Fileset
/**
* Returns the exclude patterns for the fileset.
- *
+ *
* @return the exclude patterns, or null if all files should be excluded.
*/
public Set<String> getExcludes()
@@ -135,7 +135,7 @@ public class Fileset
/**
* Sets the exclude patterns for the fileset.
- *
+ *
* @return the exclude patterns, or null if all files should be excluded.
*/
public void setExcludes(Set<String> excludes)
@@ -145,15 +145,15 @@ public class Fileset
/**
* Returns the names of all files matching this fileset.
- *
+ *
* @return the names of all matching files, not null.
- *
+ *
* @throws IOException if an error occurs reading the file names.
*/
public List<File> getFiles() throws IOException
{
List<File> result = new ArrayList<File>();
- if (includes == null || includes.isEmpty())
+ if (includes == null || includes.isEmpty())
{
getAllFiles(basedir, result);
return result;
@@ -161,14 +161,14 @@ public class Fileset
// process includes
for (String includePattern : includes)
{
- int wildcardFreeSeparatorPos
+ int wildcardFreeSeparatorPos
= getWildcardFreeSeparatorPos(includePattern);
String wildcardFreeIncludePart = getPathPartBefore(
- includePattern,
+ includePattern,
wildcardFreeSeparatorPos);
if (log.isTraceEnabled())
{
- log.trace("getFiles() : traversing directory "
+ log.trace("getFiles() : traversing directory "
+ wildcardFreeIncludePart
+ " in base dir "
+ basedir);
@@ -176,7 +176,7 @@ public class Fileset
File wildcardFreeBaseDir = new File(
basedir,
wildcardFreeIncludePart);
- String wildcardPattern
+ String wildcardPattern
= getPathPartAfter(includePattern, wildcardFreeSeparatorPos);
String[] wildcardParts = StringUtils.split(wildcardPattern, "\\/");
List<String> wildcardPartList = Arrays.asList(wildcardParts);
@@ -228,11 +228,11 @@ public class Fileset
{
if (currentBaseDir == null)
{
- currentBaseDir = new File(".");
+ currentBaseDir = new File(".");
}
if (log.isTraceEnabled())
{
- log.trace("getAllFiles() : traversing directory "
+ log.trace("getAllFiles() : traversing directory "
+ currentBaseDir.getAbsolutePath());
}
File[] filesInDir = currentBaseDir.listFiles(
@@ -246,15 +246,15 @@ public class Fileset
}
if (log.isTraceEnabled())
{
- log.trace("getAllFiles() : Adding files "
- + filesInDir
+ log.trace("getAllFiles() : Adding files "
+ + filesInDir
+ " to candidate list");
}
toAddTo.addAll(Arrays.asList(filesInDir));
-
+
File[] dirsInDir = currentBaseDir.listFiles(
new WildcardFilter("*", true, false));
-
+
for (File dir : dirsInDir)
{
getAllFiles(dir, toAddTo);
@@ -266,8 +266,8 @@ public class Fileset
*
* @param currentBaseDir the base directory from which the files are read,
* not null.
- * @param pathPartList the split path to the files (split where the path
- * separator appears). E.g. to access resources/x.properties,
+ * @param pathPartList the split path to the files (split where the path
+ * separator appears). E.g. to access resources/x.properties,
* the list would be ["resources", "x.properties"]
* @return the set of all files which match the pathPartList.
*
@@ -279,9 +279,9 @@ public class Fileset
{
if (log.isTraceEnabled())
{
- log.trace("getFiles(File, List) : traversing directory "
+ log.trace("getFiles(File, List) : traversing directory "
+ currentBaseDir.getAbsolutePath()
- + ", current path parts: "
+ + ", current path parts: "
+ pathPartList);
}
List<String> partsCopy = new ArrayList<String>(pathPartList);
@@ -300,7 +300,7 @@ public class Fileset
List<File> result = Arrays.asList(matches);
if (log.isTraceEnabled())
{
- log.trace("getFiles(File, List) : Returning files "
+ log.trace("getFiles(File, List) : Returning files "
+ result);
}
return result;
@@ -379,13 +379,13 @@ public class Fileset
/**
* Returns the part of the path before the cutPosition.
* If this part is empty or separatorPos is -1, "." is returned.
- * The character at cutPosition is not included in the result.
- *
+ * The character at cutPosition is not included in the result.
+ *
* @param path the path to get the part from.
* @param cutPosition the position where to cut.
- *
+ *
* @return the part of the path before cutPosition, or "." if this part
- * does not exist.
+ * does not exist.
*/
static String getPathPartBefore(String path, int cutPosition)
{
@@ -403,24 +403,24 @@ public class Fileset
return resultString;
}
}
-
+
/**
* Returns the part of the path after the separatorPos.
- * The character at cutPosition is not included in the result.
+ * The character at cutPosition is not included in the result.
*
* @param path the path to get the part from.
* @param cutPosition the position where to cut.
- *
+ *
* @return the part of the path before cutPosition, or "." if this part
- * does not exist.
+ * does not exist.
*/
static String getPathPartAfter(String path, int cutPosition)
{
String resultString = path.substring(cutPosition + 1);
return resultString;
}
-
+
static boolean matchesPattern(File file, String pattern)
{
String filePath = file.getPath();
@@ -440,24 +440,24 @@ public class Fileset
IOCase.SENSITIVE))
{
return false;
- }
+ }
}
return true;
}
/**
- * Splits a path in its parts and normalizes the path
+ * Splits a path in its parts and normalizes the path
* (i.e. removes . and ..), if possible.
- *
+ *
* @param path the path to normalize
- *
+ *
* @return the normalized path in its parts.
*/
- static List<String> splitAndNormalize(String path)
+ static List<String> splitAndNormalize(String path)
{
String[] parts = StringUtils.split(path, "\\/");
List<String> normalizedParts = new ArrayList<String>();
- for (String part : parts)
+ for (String part : parts)
{
if (".".equals(part))
{
@@ -479,7 +479,7 @@ public class Fileset
@Override
public String toString()
{
- return "Fileset [basedir=" + basedir
+ return "Fileset [basedir=" + basedir
+ ", excludes=" + excludes
+ ", includes=" + includes + "]";
}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java Tue Sep 7 19:11:17 2010
@@ -1,5 +1,24 @@
package org.apache.torque.generator.file;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.File;
import java.io.FileFilter;
@@ -76,4 +95,4 @@ public class WildcardFilter implements F
}
return false;
}
-}
\ No newline at end of file
+}
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java Tue Sep 7 19:11:17 2010
@@ -32,7 +32,7 @@ import org.apache.torque.generator.qname
* The name can be truncated before/after special characters, other
* special characters can be removed, and still other characters can be removed
* plus the next character is transformed into upper case.
- *
+ *
* If wrapReservedJavaWords is set to true, the result will be prepended with
* an underscore if the result of the transwormation would be a reserved word
* within the java syntax (e.g. int, for etc...)
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavadocOutlet.java Tue Sep 7 19:11:17 2010
@@ -31,17 +31,17 @@ import org.apache.torque.generator.qname
/**
* An outlet for creating correctly formatted javadoc.
- *
+ *
* @version $Id:$
*/
public class JavadocOutlet extends OutletImpl
{
/** The name of the mergepoint which output is used as javadoc body. */
public static final String BODY_MERGEPOINT_NAME = "body";
-
+
/** The name of the mergepoint which contains the javadoc attributes. */
public static final String ATTRIBUTES_MERGEPOINT_NAME = "attributes";
-
+
/** The first line of the javadoc. */
private static String START_LINE = "/**";
@@ -50,24 +50,24 @@ public class JavadocOutlet extends Outle
/** The character which starts a javadoc attribute. */
private static String JAVADOC_ATTRIBUTE_START = "@";
-
+
/** The line break string. */
private String lineBreak = "\n";
/** How long a line can be before it will be wrapped, -1 for no wrapping */
private int maxLineLength = 80;
-
+
/** The indent to use in front of each line. */
private String indent = " ";
/**
- * At which characters a line can be wrapped
+ * At which characters a line can be wrapped
* with the character removed.
*/
private String removableWrapCharacters = " ";
/**
- * After which characters a line can be wrapped
+ * After which characters a line can be wrapped
* without the character removed.
*/
private String wrapAfterCharacters = ".;,-";
@@ -81,7 +81,7 @@ public class JavadocOutlet extends Outle
{
super(qualifiedName);
}
-
+
@Override
public String execute(ControllerState controllerState)
throws GeneratorException
@@ -94,7 +94,7 @@ public class JavadocOutlet extends Outle
String attributes = mergepoint(
ATTRIBUTES_MERGEPOINT_NAME,
controllerState);
- if (!StringUtils.isEmpty(attributes)
+ if (!StringUtils.isEmpty(attributes)
&& !StringUtils.isEmpty(body))
{
result.append(indent).append(" *").append(lineBreak);
@@ -104,7 +104,7 @@ public class JavadocOutlet extends Outle
result.append(wrapLinesAndIndent(attributes));
}
}
-
+
result.append(indent).append(END_LINE).append(lineBreak);
return result.toString();
}
@@ -113,9 +113,9 @@ public class JavadocOutlet extends Outle
* Wraps the content string such that the line length is not longer than
* maxLineLength characters, if that can be achieved by wrapping at the
* wrap characters. All resulting lines are also indented.
- *
+ *
* @param content The content to wrap, may be null.
- *
+ *
* @return the wrapped and indented content, not null.
*/
String wrapLinesAndIndent(String content)
@@ -124,11 +124,11 @@ public class JavadocOutlet extends Outle
{
return "";
}
- StringTokenizer tokenizer
+ StringTokenizer tokenizer
= new StringTokenizer(
content.trim(),
- removableWrapCharacters
- + wrapAfterCharacters
+ removableWrapCharacters
+ + wrapAfterCharacters
+ "\r\n"
+ JAVADOC_ATTRIBUTE_START,
true);
@@ -143,7 +143,7 @@ public class JavadocOutlet extends Outle
String lastJavadocAttribute = null;
while (tokenizer.hasMoreTokens() || token!= null)
{
- if (token == null)
+ if (token == null)
{
// token has not been prefetched
token = tokenizer.nextToken();
@@ -173,11 +173,11 @@ public class JavadocOutlet extends Outle
{
if (tokenizer.hasMoreTokens())
{
-
+
token = tokenizer.nextToken();
- // 5 because of " * @" + space after attribute
+ // 5 because of " * @" + space after attribute
currentIndent = StringUtils.rightPad(
- indent + " * ",
+ indent + " * ",
indent.length() + 5 + token.length());
if (result.length() > indent.length() + 3)
{
@@ -250,7 +250,7 @@ public class JavadocOutlet extends Outle
}
int unbreakableChunkSize;
if (nextToken == null
- || "\r".equals(nextToken)
+ || "\r".equals(nextToken)
|| "\n".equals(nextToken)
|| wrapAfterCharacters.contains(token)
|| JAVADOC_ATTRIBUTE_START.equals(nextToken)
@@ -355,7 +355,7 @@ public class JavadocOutlet extends Outle
{
this.wrapAfterCharacters = wrapAfterCharacters;
}
-
+
static void removeEnd(StringBuilder stringBuilder, String removeChars)
{
Set<Character> removeCharSet = new HashSet<Character>();
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OptionOutlet.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OptionOutlet.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OptionOutlet.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OptionOutlet.java Tue Sep 7 19:11:17 2010
@@ -1,5 +1,24 @@
package org.apache.torque.generator.outlet.java;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.qname.QualifiedName;
@@ -16,7 +35,7 @@ public class OptionOutlet extends Outlet
/**
* Constructor.
- *
+ *
* @param name the name of the outlet.
*/
public OptionOutlet(QualifiedName name)
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java Tue Sep 7 19:11:17 2010
@@ -29,7 +29,7 @@ import org.apache.commons.lang.StringUti
* A qualified name is in the scope of its own namespace and all children
* namespaces of its own namespace (i.e. the namespaces "deeper down"
* the hierarchy). For example, the namespace org.apache.torque
- * is in the scope of org.apache but not in the scope of
+ * is in the scope of org.apache but not in the scope of
* org.apache.torque.generator.
* As a special case, if the namespace is the empty String,
* the name is valid in all namespaces.
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java Tue Sep 7 19:11:17 2010
@@ -129,10 +129,10 @@ public class SourceElement
{
return children;
}
-
+
/**
* Returns all children of this SourceElement which have the given name.
- * Modifications on the returned list have no effect
+ * Modifications on the returned list have no effect
* on the list of children of this SourceElement.
*
* @param name the name of the children to select, not null.
@@ -160,8 +160,8 @@ public class SourceElement
}
/**
- * Returns all children of this SourceElement which have the given name.
- * Modifications on the returned list have no effect
+ * Returns all children of this SourceElement which have the given name.
+ * Modifications on the returned list have no effect
* on the list of children of this SourceElement.
*
* @param sourceElementName contains the name of the child to select,
@@ -179,7 +179,7 @@ public class SourceElement
/**
* Returns the first child of this SourceElement which has
- * the given name.
+ * the given name.
*
* @param name the name of the child to select, not null.
*
@@ -386,7 +386,7 @@ public class SourceElement
/**
* Creates a deep copy of this RichSourceelementImpl object.
* All the elements in the source graph of this Element are copied as well
- * (i.e the copy contains the children, the children's children, ....,
+ * (i.e the copy contains the children, the children's children, ....,
* the parents, the parent's parents...)
*
* @return the copy, not null.
@@ -632,7 +632,7 @@ public class SourceElement
}
result.append("))");
}
-
+
/**
* Overrides the add and remove methods such that the parents of the
* source element are updated as well.
@@ -640,10 +640,10 @@ public class SourceElement
private static class ChildList extends AbstractList<SourceElement>
{
private SourceElement sourceElement;
-
- private List<SourceElement> children
+
+ private List<SourceElement> children
= new ArrayList<SourceElement>();
-
+
public ChildList(SourceElement sourceElement)
{
this.sourceElement = sourceElement;
@@ -714,10 +714,10 @@ public class SourceElement
private static class ParentList extends AbstractList<SourceElement>
{
private SourceElement sourceElement;
-
- private List<SourceElement> parents
+
+ private List<SourceElement> parents
= new ArrayList<SourceElement>();
-
+
public ParentList(SourceElement sourceElement)
{
this.sourceElement = sourceElement;
@@ -751,7 +751,7 @@ public class SourceElement
children.add(sourceElement);
}
}
-
+
@Override
public SourceElement remove(int index)
{
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java Tue Sep 7 19:11:17 2010
@@ -1,5 +1,24 @@
package org.apache.torque.generator.source;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.torque.generator.GeneratorException;
/*
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ColumnMetadata.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ColumnMetadata.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ColumnMetadata.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ColumnMetadata.java Tue Sep 7 19:11:17 2010
@@ -1,5 +1,24 @@
package org.apache.torque.generator.source.jdbc;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
public class ColumnMetadata
{
private String name;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/ForeignKeyMetadata.java Tue Sep 7 19:11:17 2010
@@ -1,5 +1,24 @@
package org.apache.torque.generator.source.jdbc;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.ArrayList;
import java.util.List;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java Tue Sep 7 19:11:17 2010
@@ -1,5 +1,24 @@
package org.apache.torque.generator.source.jdbc;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.File;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java Tue Sep 7 19:11:17 2010
@@ -66,7 +66,7 @@ public class FileSourceProvider extends
/** The Controller state. */
private ControllerState controllerState;
-
+
/**
* Constructor.
*
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceFormat.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceFormat.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceFormat.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceFormat.java Tue Sep 7 19:11:17 2010
@@ -111,7 +111,7 @@ public final class XmlSourceFormat imple
* correctly.
*/
public SourceElement parse(
- InputStream xmlStream,
+ InputStream xmlStream,
ControllerState controllerState)
throws SourceException
{
@@ -123,7 +123,7 @@ public final class XmlSourceFormat imple
{
SAXParser parser = SAX_FACTORY.newSAXParser();
- EntityReferences entityReferences
+ EntityReferences entityReferences
= controllerState.getUnitConfiguration()
.getEntityReferences();
XmlSourceSaxHandler handler = new XmlSourceSaxHandler(
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceSaxHandler.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/XmlSourceSaxHandler.java Tue Sep 7 19:11:17 2010
@@ -50,7 +50,7 @@ public class XmlSourceSaxHandler extends
/**
* Constructor.
- *
+ *
* @param entityReferences the known entity references, not null.
*/
public XmlSourceSaxHandler(EntityReferences entityReferences)
@@ -166,7 +166,7 @@ public class XmlSourceSaxHandler extends
}
return true;
}
-
+
@Override
public void error(SAXParseException exception)
throws SAXParseException
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java?rev=993487&r1=993486&r2=993487&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java Tue Sep 7 19:11:17 2010
@@ -50,7 +50,7 @@ public class TorqueGenVelocity
* A counter which can be used in velocity templates.
*/
private static int counter = 1;
-
+
/**
* Constructs a generator interface within the given controllerState.
*
@@ -230,7 +230,7 @@ public class TorqueGenVelocity
{
return 0;
}
-
+
return Integer.parseInt(optionString);
}
@@ -255,7 +255,7 @@ public class TorqueGenVelocity
/**
* Sets a variable. The key can be given with or without namespace;
* in the latter case, the variable is set in the namespace of the
- * currently active outlet.
+ * currently active outlet.
* The Scope of the variable is this outlet and its children.
*
* @param key the name of the variable, not null
@@ -289,14 +289,14 @@ public class TorqueGenVelocity
/**
* Returns the currently processed source file.
- *
+ *
* @return the source file which is currently processed.
*/
public File getSourceFile()
{
return controllerState.getSourceFile();
}
-
+
/**
* Returns the current date.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org