You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/02/17 22:43:21 UTC
svn commit: r628553 - in /maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering: DefaultMavenResourcesFiltering.java MavenResourcesFiltering.java

Author: olamy
Date: Sun Feb 17 13:43:20 2008
New Revision: 628553

URL: http://svn.apache.org/viewvc?rev=628553&view=rev
Log:
move a method from private to public

Modified:
    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/MavenResourcesFiltering.java

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=628553&r1=628552&r2=628553&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 Sun Feb 17 13:43:20 2008
@@ -158,7 +158,7 @@
                 {
                     destinationFile.getParentFile().mkdirs();
                 }
-                boolean filteredExt = filteredFileExtension( source, nonFilteredFileExtensions );
+                boolean filteredExt = filteredFileExtension( source.getName(), nonFilteredFileExtensions );
                 mavenFileFilter.copyFile( source, destinationFile, resource.isFiltering() && filteredExt,
                                           filterWrappers, encoding );
             }
@@ -167,14 +167,14 @@
     }
 
     
-    private boolean filteredFileExtension( File file, List userNonFilteredFileExtensions )
+    public boolean filteredFileExtension( String fileName, List userNonFilteredFileExtensions )
     {
         List nonFilteredFileExtensions = new ArrayList( getDefaultNonFilteredFileExtensions() );
         if ( userNonFilteredFileExtensions != null )
         {
             nonFilteredFileExtensions.addAll( userNonFilteredFileExtensions );
         }
-        return !nonFilteredFileExtensions.contains( StringUtils.lowerCase( FileUtils.extension( file.getName() ) ) );
+        return !nonFilteredFileExtensions.contains( StringUtils.lowerCase( FileUtils.extension( fileName ) ) );
     }
 
     public List getDefaultNonFilteredFileExtensions()

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=628553&r1=628552&r2=628553&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 Sun Feb 17 13:43:20 2008
@@ -63,4 +63,6 @@
      * @return {@link List} of {@link String}
      */
     public List getDefaultNonFilteredFileExtensions();
+    
+    boolean filteredFileExtension( String fileName, List userNonFilteredFileExtensions );
 }