DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-08-03 12:54:00 +0200 (Thu, 03 Aug 2006)
New Revision: 1707

Modified:
   
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
Log:
make sure the updated version handling for decimals is backward compatible

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java  
      2006-08-03 07:35:29 UTC (rev 1706)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java  
      2006-08-03 10:54:00 UTC (rev 1707)
@@ -68,6 +68,9 @@
  */
 public class DefaultResource extends DefaultDictionary implements Resource, 
Resolver, Comparable
 {
+    private static final String LEGACY_DECIMAL_PREFIX_KEY = 
+      "project.version-prefix.enabled";
+    
    /**
     * Timestamp.
     */
@@ -1389,8 +1392,6 @@
     // version utilities
     
//----------------------------------------------------------------------------
 
-    private static final String DECIMAL_VERSIONING_KEY = 
"project.decimal.versioning.enabled";
-
     private String getStandardVersion()
     {
         String signature = getBuildSignature();
@@ -1399,8 +1400,9 @@
             return BOOTSTRAP;
         }
         
-        boolean decimalFlag = Boolean.getBoolean( DECIMAL_VERSIONING_KEY );
-        boolean isDecimal = getBooleanProperty( DECIMAL_VERSIONING_KEY, 
decimalFlag );
+        boolean isDecimal = Boolean.getBoolean( DECIMAL_VERSIONING_KEY );
+        isDecimal = getBooleanProperty( DECIMAL_VERSIONING_KEY, isDecimal );
+        isDecimal = getBooleanProperty( LEGACY_DECIMAL_PREFIX_KEY, isDecimal 
);
         if( isDecimal )
         {
             Version decimal = getDecimalVersion();