Author: krosenvold Date: Wed Oct 29 19:38:15 2014 New Revision: 1635275 URL: http://svn.apache.org/r1635275 Log: removed encoding from the reader filter constructor (added new, deprecated old). Parameter was unused
Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java?rev=1635275&r1=1635274&r2=1635275&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java (original) +++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java Wed Oct 29 19:38:15 2014 @@ -39,8 +39,6 @@ public class AbstractMavenFilteringReque private boolean escapeWindowsPaths = true; - private String encoding; - private MavenSession mavenSession; /** @@ -98,19 +96,13 @@ public class AbstractMavenFilteringReque * Create instance with given parameters * @param mavenProject The instance of MavenProject. * @param filters The list of filters. - * @param encoding The encoding. * @param mavenSession The MavenSession. */ - protected AbstractMavenFilteringRequest( - MavenProject mavenProject, - List<String> filters, - String encoding, - MavenSession mavenSession ) + protected AbstractMavenFilteringRequest( MavenProject mavenProject, List<String> filters, MavenSession mavenSession ) { initDefaults(); this.mavenProject = mavenProject; this.filters = filters; - this.encoding = encoding; this.mavenSession = mavenSession; } @@ -212,23 +204,6 @@ public class AbstractMavenFilteringReque setEscapeWindowsPaths( escape ); } - /** - * Return the encoding. - * @return Current encoding. - */ - public String getEncoding() - { - return encoding; - } - - /** - * Set the value for encoding. - * @param encoding Give the new value for encoding. - */ - public void setEncoding( String encoding ) - { - this.encoding = encoding; - } /** * @return Current value of mavenSession Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java?rev=1635275&r1=1635274&r2=1635275&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java (original) +++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java Wed Oct 29 19:38:15 2014 @@ -40,6 +40,8 @@ public class MavenFileFilterRequest private boolean filtering; + private String encoding; + /** * The constructor. */ @@ -70,7 +72,8 @@ public class MavenFileFilterRequest MavenSession mavenSession, Properties additionalProperties ) { - super( mavenProject, filters, encoding, mavenSession ); + super( mavenProject, filters, mavenSession ); + this.encoding = encoding; this.from = from; this.to = to; this.filtering = filtering; @@ -79,6 +82,25 @@ public class MavenFileFilterRequest } /** + * Return the encoding. + * @return Current encoding. + */ + public String getEncoding() + { + return encoding; + } + + /** + * Set the value for encoding. + * @param encoding Give the new value for encoding. + */ + public void setEncoding( String encoding ) + { + this.encoding = encoding; + } + + + /** * @return to filter from. */ public File getFrom() Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java?rev=1635275&r1=1635274&r2=1635275&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java (original) +++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java Wed Oct 29 19:38:15 2014 @@ -56,6 +56,7 @@ public class MavenReaderFilterRequest * @param encoding Encoding * @param mavenSession The Maven Session. * @param additionalProperties supplemental properties. + * @deprectated use version without encoding */ public MavenReaderFilterRequest( Reader from, @@ -67,7 +68,7 @@ public class MavenReaderFilterRequest MavenSession mavenSession, Properties additionalProperties ) { - super( mavenProject, filters, encoding, mavenSession ); + super( mavenProject, filters, mavenSession ); this.from = from; this.filtering = filtering; setAdditionalProperties( additionalProperties ); @@ -75,6 +76,27 @@ public class MavenReaderFilterRequest } /** + * @param from To read from + * @param filtering filter yes/no + * @param mavenProject The Maven Project. + * @param filters The list of filters which will be used. + * @param escapedBackslashesInFilePath escape backslashes in file paths. + * @param mavenSession The Maven Session. + * @param additionalProperties supplemental properties. + */ + public MavenReaderFilterRequest( Reader from, boolean filtering, MavenProject mavenProject, List<String> filters, + boolean escapedBackslashesInFilePath, MavenSession mavenSession, + Properties additionalProperties ) + { + super( mavenProject, filters, mavenSession ); + this.from = from; + this.filtering = filtering; + setAdditionalProperties( additionalProperties ); + setEscapeWindowsPaths( escapedBackslashesInFilePath ); + } + + + /** * @return where we read from. */ public Reader getFrom() Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java?rev=1635275&r1=1635274&r2=1635275&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java (original) +++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java Wed Oct 29 19:38:15 2014 @@ -57,6 +57,9 @@ public class MavenResourcesExecution private boolean filterFilenames = false; + private String encoding; + + /** * Overwrite existing files even if the destination files are newer. <code>false</code> by default. * @@ -106,7 +109,8 @@ public class MavenResourcesExecution List<String> nonFilteredFileExtensions, MavenSession mavenSession ) { - super( mavenProject, fileFilters, encoding, mavenSession ); + super( mavenProject, fileFilters, mavenSession ); + this.encoding = encoding; this.resources = resources; this.outputDirectory = outputDirectory; this.nonFilteredFileExtensions = nonFilteredFileExtensions; @@ -141,6 +145,24 @@ public class MavenResourcesExecution } /** + * Return the encoding. + * @return Current encoding. + */ + public String getEncoding() + { + return encoding; + } + + /** + * Set the value for encoding. + * @param encoding Give the new value for encoding. + */ + public void setEncoding( String encoding ) + { + this.encoding = encoding; + } + + /** * @return List of {@link org.apache.maven.model.Resource} */ public List<Resource> getResources()