Author: olamy
Date: Thu Feb 7 14:14:13 2008
New Revision: 619666
URL: http://svn.apache.org/viewvc?rev=619666&view=rev
Log:
fix some checkstyle errors
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/ReflectionProperties.java
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=619666&r1=619665&r2=619666&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
Thu Feb 7 14:14:13 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.IOException;
@@ -42,10 +43,7 @@
public class DefaultMavenFileFilter
implements MavenFileFilter
{
-
- /**
- * @see
org.apache.maven.shared.filtering.MavenFileFilter#copyFile(java.io.File,
java.io.File, boolean, org.apache.maven.project.MavenProject, java.util.List)
- */
+
public void copyFile( File from, File to, boolean filtering, MavenProject
mavenProject, List filters,
boolean escapedBackslashesInFilePath, String
encoding )
throws MavenFilteringException
@@ -54,9 +52,6 @@
copyFile( from, to, filtering, filterWrappers, encoding );
}
- /**
- * @see
org.apache.maven.shared.filtering.MavenFileFilter#copyFile(java.io.File,
java.io.File, boolean, java.util.List)
- */
public void copyFile( File from, File to, boolean filtering, List
filterWrappers, String encoding )
throws MavenFilteringException
{
@@ -81,9 +76,6 @@
}
- /**
- * @see
org.apache.maven.shared.filtering.MavenFileFilter#getDefaultFilterWrappers(org.apache.maven.project.MavenProject,
java.util.List)
- */
public List getDefaultFilterWrappers( final MavenProject mavenProject,
List filters,
final boolean
escapedBackslashesInFilePath )
throws MavenFilteringException
@@ -121,9 +113,9 @@
}
List buildFilters = mavenProject.getFilters();
- if (buildFilters != null)
+ if ( buildFilters != null )
{
- for (Iterator iterator =
buildFilters.iterator();iterator.hasNext();)
+ for ( Iterator iterator = buildFilters.iterator();
iterator.hasNext(); )
{
String filterFile = (String) iterator.next();
try
@@ -137,12 +129,12 @@
throw new MavenFilteringException( "Error loading property
file '" + filterFile + "'", e );
}
}
- }
-
+ }
+
buildFilters = mavenProject.getBuild().getFilters();
- if (buildFilters != null)
+ if ( buildFilters != null )
{
- for (Iterator iterator =
buildFilters.iterator();iterator.hasNext();)
+ for ( Iterator iterator = buildFilters.iterator();
iterator.hasNext(); )
{
String filterFile = (String) iterator.next();
try
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=619666&r1=619665&r2=619666&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
Thu Feb 7 14:14:13 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.io.File;
import java.util.Arrays;
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java?rev=619666&r1=619665&r2=619666&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
Thu Feb 7 14:14:13 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.IOException;
@@ -34,7 +35,7 @@
/**
* Will copy a file with some filtering using defaultFilterWrappers
- * @see #getDefaultFilterWrappers(MavenProject, List)
+ * @see #getDefaultFilterWrappers(MavenProject, List, boolean)
*
* @param from file to copy/filter
* @param to destination file
@@ -43,7 +44,7 @@
* @param filters [EMAIL PROTECTED] List} of properties file
* @throws IOException
*/
- public void copyFile( File from, final File to, boolean filtering,
MavenProject mavenProject, List filters,
+ void copyFile( File from, final File to, boolean filtering, MavenProject
mavenProject, List filters,
boolean escapedBackslashesInFilePath, String
encoding )
throws MavenFilteringException;
@@ -54,7 +55,7 @@
* @param filterWrappers [EMAIL PROTECTED] List} of FileUtils.FilterWrapper
* @throws MavenFilteringException
*/
- public void copyFile( File from, final File to, boolean filtering, List
filterWrappers, String encoding )
+ void copyFile( File from, final File to, boolean filtering, List
filterWrappers, String encoding )
throws MavenFilteringException;
/**
@@ -62,8 +63,8 @@
* Will return the default FileUtils.FilterWrappers
*
* <ul>
- * <li>interpolation with token ${ } and values from
System.getProperties, project.getProperties, from filters and project
filters.</li>
- * <li>interpolation with token @ @ and values from
System.getProperties, project.getProperties, from filters and project
filters.</li>
+ * <li>interpolation with token ${ } and values from SystemProps,
project.properties, from filters and project filters.</li>
+ * <li>interpolation with token @ @ and values from SystemProps,
project.properties, from filters and project filters.</li>
* <li>interpolation with token ${ } and values from mavenProject
interpolation.</li>
* </ul>
*
@@ -73,6 +74,6 @@
* @return [EMAIL PROTECTED] List} of FileUtils.FilterWrapper
*
*/
- public List getDefaultFilterWrappers( MavenProject mavenProject, List
filters, boolean escapedBackslashesInFilePath )
+ List getDefaultFilterWrappers( MavenProject mavenProject, List filters,
boolean escapedBackslashesInFilePath )
throws MavenFilteringException;
}
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java?rev=619666&r1=619665&r2=619666&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
Thu Feb 7 14:14:13 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">olamy</a>
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java?rev=619666&r1=619665&r2=619666&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
Thu Feb 7 14:14:13 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,13 +18,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.io.File;
-import java.io.IOException;
import java.util.List;
-import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
/**
@@ -40,9 +39,8 @@
* @param encoding
* @param fileFilters [EMAIL PROTECTED] List} of Properties file
* @throws MavenFilteringException
- * @throws IOException
*/
- public void filterResources( List resources, File outputDirectory,
MavenProject mavenProject, String encoding,
+ void filterResources( List resources, File outputDirectory, MavenProject
mavenProject, String encoding,
List fileFilters )
throws MavenFilteringException;
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java?rev=619666&r1=619665&r2=619666&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
Thu Feb 7 14:14:13 2008
@@ -18,6 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
@@ -36,6 +37,9 @@
*/
public final class PropertyUtils
{
+ /**
+ * private empty constructor to prevent instantiation
+ */
private PropertyUtils()
{
// prevent instantiation
@@ -44,8 +48,8 @@
/**
* Reads a property file, resolving all internal variables, using the
supplied base properties.
* <p>
- * The properties are resolved iteratively, so if the value of property A
refers to property B, then after resolution
- * the value of property B will contain the value of property B.
+ * The properties are resolved iteratively, so if the value of property A
refers to property B,
+ * then after resolution the value of property B will contain the value of
property B.
* </p>
*
* @param propFile The property file to load.
@@ -109,26 +113,27 @@
final Properties baseProps = new Properties();
- if (useSystemProps)
+ if ( useSystemProps )
{
- baseProps.putAll(System.getProperties());
+ baseProps.putAll( System.getProperties() );
}
final Properties resolvedProps = new Properties();
- try
+ try
{
- resolvedProps.putAll(loadPropertyFile(propfile, baseProps));
- } catch (FileNotFoundException e)
+ resolvedProps.putAll( loadPropertyFile( propfile, baseProps ) );
+ }
+ catch ( FileNotFoundException e )
{
- if (fail)
+ if ( fail )
{
- throw new FileNotFoundException(propfile.toString());
+ throw new FileNotFoundException( propfile.toString() );
}
}
- if (useSystemProps)
+ if ( useSystemProps )
{
- resolvedProps.putAll(baseProps);
+ resolvedProps.putAll( baseProps );
}
return resolvedProps;
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/ReflectionProperties.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/ReflectionProperties.java?rev=619666&r1=619665&r2=619666&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/ReflectionProperties.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/ReflectionProperties.java
Thu Feb 7 14:14:13 2008
@@ -38,11 +38,11 @@
private MavenProject project;
- boolean escapedBackslashesInFilePath;
+ private boolean escapedBackslashesInFilePath;
public ReflectionProperties( MavenProject mavenProject )
{
- this(mavenProject, false);
+ this( mavenProject, false );
}
public ReflectionProperties( MavenProject mavenProject, boolean
escapedBackslashesInFilePath )
@@ -56,7 +56,7 @@
public Object get( Object key )
{
- if (key == null || StringUtils.isEmpty( key.toString() ))
+ if ( key == null || StringUtils.isEmpty( key.toString() ) )
{
return null;
}
