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

Author: mcconnell
Date: Sun Jun 20 14:02:11 2004
New Revision: 21516

Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/FilterTask.java
Log:
make symbol a little less verbose

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/FilterTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/FilterTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/FilterTask.java	Sun Jun 20 14:02:11 2004
@@ -119,7 +119,9 @@
         }
         else if( m_feature.equals( "version" ) )
         {
-            return resource.getInfo().getVersion();
+            String version = resource.getInfo().getVersion();
+            if( null == version ) return "";
+            return version;
         }
         else if( m_feature.equals( "uri" ) )
         {
@@ -190,11 +192,11 @@
     {
         if( windows )
         {
-            return "%SYSTEM_CACHE_DIRECTORY%";
+            return "%MAGIC_SCD%";
         }
         else
         {
-            return "$SYSTEM_CACHE_DIRECTORY";
+            return "$MAGIC_SCD";
         } 
     }