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

[mperham]

Author: mperham
Date: Tue Jan 10 12:29:07 2006
New Revision: 367779

URL: http://svn.apache.org/viewcvs?rev=367779&view=rev
Log:
PR: MJAVADOC-38
Fix year display where inception == current

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

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=367779&r1=367778&r2=367779&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 Tue Jan 10 12:29:07 2006
@@ -593,24 +593,7 @@
             return;
         }
 
-        int actualYear = Calendar.getInstance().get( Calendar.YEAR );
-        String year = String.valueOf( actualYear );
-
         Model model = getProject().getModel();
-        if ( model.getInceptionYear() != null )
-        {
-            if ( StringUtils.isNumeric( model.getInceptionYear() ) )
-            {
-                if ( Integer.valueOf( model.getInceptionYear() ).intValue() != 
actualYear )
-                {
-                    year = model.getInceptionYear() + "-" + String.valueOf( 
actualYear );
-                }
-            }
-            else
-            {
-                getLog().warn( "The inception year is not a valid year." );
-            }
-        }
 
         StringBuffer options = new StringBuffer();
         StringBuffer classpath = new StringBuffer();
@@ -829,14 +812,17 @@
         // javadoc arguments for default doclet
         if ( StringUtils.isEmpty( doclet ) )
         {
+            int actualYear = Calendar.getInstance().get( Calendar.YEAR );
+            String year = String.valueOf( actualYear );
+
             bottom = StringUtils.replace( bottom, "{currentYear}", year );
-            if ( project.getInceptionYear() != null && year.indexOf('-') == -1 
)
+            if ( model.getInceptionYear().equals( year ) )
             {
-                bottom = StringUtils.replace( bottom, "{inceptionYear}", 
project.getInceptionYear() );
+                bottom = StringUtils.replace( bottom, "{inceptionYear}-", "" 
);                
             }
             else
             {
-                bottom = StringUtils.replace( bottom, "{inceptionYear}-", "" );
+                bottom = StringUtils.replace( bottom, "{inceptionYear}", 
model.getInceptionYear() );                
             }
 
             if ( StringUtils.isEmpty( stylesheetfile ) )