Author: khmarbaise
Date: Thu May 5 22:24:49 2016
New Revision: 1742483
URL: http://svn.apache.org/viewvc?rev=1742483&view=rev
Log:
Code Polishing
o Prevent assignment to parameters.
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/MavenBuildTimestamp.java
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/MavenBuildTimestamp.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/MavenBuildTimestamp.java?rev=1742483&r1=1742482&r2=1742483&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/MavenBuildTimestamp.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/MavenBuildTimestamp.java
Thu May 5 22:24:49 2016
@@ -78,18 +78,29 @@ public class MavenBuildTimestamp
*/
public MavenBuildTimestamp( Date time, String timestampFormat )
{
+ SimpleDateFormat dateFormat;
+
if ( timestampFormat == null )
{
- timestampFormat = DEFAULT_BUILD_TIMESTAMP_FORMAT;
+ dateFormat = new SimpleDateFormat( DEFAULT_BUILD_TIMESTAMP_FORMAT
);
}
- if ( time == null )
+ else
{
- time = new Date();
+ dateFormat = new SimpleDateFormat( timestampFormat );
}
- SimpleDateFormat dateFormat = new SimpleDateFormat( timestampFormat );
+
dateFormat.setCalendar( new GregorianCalendar() );
dateFormat.setTimeZone( DEFAULT_BUILD_TIME_ZONE );
- formattedTimestamp = dateFormat.format( time );
+
+ if ( time == null )
+ {
+ formattedTimestamp = dateFormat.format( new Date() );
+ }
+ else
+ {
+ formattedTimestamp = dateFormat.format( time );
+ }
+
}
/**
