svn commit: r1452079 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

[hb...@apache.org]

Author: hboutemy
Date: Sun Mar  3 18:08:39 2013
New Revision: 1452079

URL: http://svn.apache.org/r1452079
Log:
[MJAVADOC-361] improved linguistic style of bottom
Submitted by: Michael Osipov

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1452079&r1=1452078&r2=1452079&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sun Mar  3 18:08:39 2013
@@ -907,7 +907,7 @@ public abstract class AbstractJavadocMoj
      * <br/>
      */
     @Parameter( property = "bottom",
-                defaultValue = "Copyright &#169; {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved." )
+                defaultValue = "Copyright &#169; {inceptionYear}&#x2013;{currentYear} {organizationName}. All rights reserved." )
     private String bottom;
 
     /**
@@ -1658,7 +1658,7 @@ public abstract class AbstractJavadocMoj
      */
     @Parameter
     private List<String> sourceFileExcludes;
-    
+
     // ----------------------------------------------------------------------
     // static
     // ----------------------------------------------------------------------
@@ -2591,8 +2591,8 @@ public abstract class AbstractJavadocMoj
      */
     private String getBottomText()
     {
-        int actualYear = Calendar.getInstance().get( Calendar.YEAR );
-        String year = String.valueOf( actualYear );
+        int currentYear = Calendar.getInstance().get( Calendar.YEAR );
+        String year = String.valueOf( currentYear );
 
         String inceptionYear = project.getInceptionYear();
 
@@ -2602,7 +2602,7 @@ public abstract class AbstractJavadocMoj
         {
             if ( inceptionYear.equals( year ) )
             {
-                theBottom = StringUtils.replace( theBottom, "{inceptionYear}-", "" );
+                theBottom = StringUtils.replace( theBottom, "{inceptionYear}&#x2013;", "" );
             }
             else
             {
@@ -2611,7 +2611,7 @@ public abstract class AbstractJavadocMoj
         }
         else
         {
-            theBottom = StringUtils.replace( theBottom, "{inceptionYear}-", "" );
+            theBottom = StringUtils.replace( theBottom, "{inceptionYear}&#x2013;", "" );
         }
 
         if ( project.getOrganization() == null )
@@ -5315,7 +5315,7 @@ public abstract class AbstractJavadocMoj
                     String invokerLogContent = JavadocUtil.readFile( invokerLogFile, null /* platform encoding */ );
 
                     // TODO: Why are we only interested in cases where the JVM won't start?
-                    // [MJAVADOC-275][jdcasey] I changed the logic here to only throw an error WHEN 
+                    // [MJAVADOC-275][jdcasey] I changed the logic here to only throw an error WHEN
                     //   the JVM won't start (opposite of what it was).
                     if ( invokerLogContent != null && invokerLogContent.contains( JavadocUtil.ERROR_INIT_VM ) )
                     {