svn commit: rev 22644 - avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks

[mc...@apache.org]

Author: mcconnell
Date: Tue Jul  6 15:59:39 2004
New Revision: 22644

Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
Log:
quick fix

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java	Tue Jul  6 15:59:39 2004
@@ -172,7 +172,7 @@
         final String resourcesPath = project.getProperty( XDOC_RESOURCES_KEY );
         final File resources = new File( build, resourcesPath );
 
-        log( "Year: " + getProject().getProperty( "magic.year" ) );
+        log( "Year: " + getYear() );
         log( "Theme: " + themeDir );
         
         //
@@ -279,8 +279,8 @@
         final FileFilter filter, final String extension )
         throws BuildException
     {
-        final String year = getProject().getProperty( "magic.year" );
-        final String org = getProject().getProperty( ORG_NAME_KEY );
+        final String year = getYear();
+        final String org = getOrganization();
         final String copyright =
           "Copyright " + year + ", " + org + " All rights reserved.";
 
@@ -401,5 +401,23 @@
             m = m_Excludes.matcher( fullpath );
             return ! m.matches() ;
         }
+    }
+
+    private String getYear()
+    {
+        String year = getProject().getProperty( "magic.year" );
+        if( year != null ) 
+        {
+            return year;
+        }
+        else
+        {
+            return "2004"; // 6 months to fix this
+        }
+    }
+
+    private String getOrganization()
+    {
+        getProject().getProperty( ORG_NAME_KEY );
     }
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org