removed encoding from the reader filter constructor (added new, deprecated old). Parameter was unused
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1635275 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java b/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
index b904033..923cf37 100644
--- a/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
@@ -39,8 +39,6 @@
private boolean escapeWindowsPaths = true;
- private String encoding;
-
private MavenSession mavenSession;
/**
@@ -98,19 +96,13 @@
* 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 @@
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
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
index 09fc578..3415d6c 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
@@ -40,6 +40,8 @@
private boolean filtering;
+ private String encoding;
+
/**
* The constructor.
*/
@@ -70,7 +72,8 @@
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 @@
}
/**
+ * 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()
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java b/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
index 7feeec4..6210fab 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
@@ -56,6 +56,7 @@
* @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 @@
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 @@
}
/**
+ * @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()
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
index ccc7c89..73bd9b7 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
@@ -57,6 +57,9 @@
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 @@
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 @@
}
/**
+ * 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()
