You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/02/13 22:11:27 UTC
[maven-filtering] 17/44: move a method from private to public
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-filtering-1.0-alpha-1
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit b1eca6ce084f95340f85b3bdc7c570fc4aa2794a
Author: Oliver Lamy <ol...@apache.org>
AuthorDate: Sun Feb 17 21:43:20 2008 +0000
move a method from private to public
git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk/shared/maven-filtering@628553 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/shared/filtering/DefaultMavenResourcesFiltering.java | 6 +++---
.../org/apache/maven/shared/filtering/MavenResourcesFiltering.java | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
index f9122c5..3449e2f 100755
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -158,7 +158,7 @@ public class DefaultMavenResourcesFiltering
{
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 @@ public class DefaultMavenResourcesFiltering
}
- 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()
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
index be0b638..843ed86 100755
--- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
@@ -63,4 +63,6 @@ public interface MavenResourcesFiltering
* @return {@link List} of {@link String}
*/
public List getDefaultNonFilteredFileExtensions();
+
+ boolean filteredFileExtension( String fileName, List userNonFilteredFileExtensions );
}