[Rails-commits] rails/common

[Erik V. <ev...@us...>]

 rails/common/parser/Tag.java |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 91ed37d10a7c65408b8a23007a0601e6491bb51d
Author: Erik Vos <eri...@xs...>
Date:   Fri Jul 22 20:34:29 2011 +0200

    Reverted Tag change, added some comments

diff --git a/rails/common/parser/Tag.java b/rails/common/parser/Tag.java
index a1aa913..ed1c334 100644
--- a/rails/common/parser/Tag.java
+++ b/rails/common/parser/Tag.java
@@ -318,6 +318,7 @@ public class Tag {
                     String optionValue = gameOptions.get(name);
 
                 	// For backwards compatibility: search for an extended name
+                    // TODO OBSOLETE??
                     if (optionValue == null) {
                     	for (String optName : gameOptions.keySet()) {
                     		if (optName != null && optName.startsWith(name)) {
@@ -326,7 +327,10 @@ public class Tag {
                     			break;
                     		}
                     	}
-                        // Take the default value
+                    }
+                    
+                    // If not assigned in the previous step, take the default value
+                    if (optionValue == null) {
                         GameOption go = GameOption.getByName(name);
                         optionValue = go != null ? go.getDefaultValue() : "";
                         log.warn("GameOption " + name + "=" + value