rails-commits

[Rails-commits] Branch 'rails1.7.x' - rails/common

[Stefan F. <ste...@us...>]

 rails/common/ConfigProfile.java |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit bf4edec12c22ba77b954fc4cdfb6912557ccd79a
Author: Stefan Frey <ste...@we...>
Date:   Tue Apr 3 16:34:47 2012 +0200

    fixed wrong logic in setProperty of configProfile

diff --git a/rails/common/ConfigProfile.java b/rails/common/ConfigProfile.java
index 1057a72..1ee6876 100644
--- a/rails/common/ConfigProfile.java
+++ b/rails/common/ConfigProfile.java
@@ -188,10 +188,10 @@ public final class ConfigProfile implements Comparable<ConfigProfile> {
     
     void setProperty(String key, String value) {
         ensureLoad();
-        if (!parent.getProperty(key).equals(value)) {
-            properties.setProperty(key, value);
-        } else {
+        if (parent.getProperty(key) != null && parent.getProperty(key).equals(value)) {
             properties.remove(key);
+        } else {
+            properties.setProperty(key, value);
         }
     }
     
@@ -219,7 +219,8 @@ public final class ConfigProfile implements Comparable<ConfigProfile> {
         newProfile.setParent(reference);
 
         // copy properties
-        for (String key:properties.stringPropertyNames()){
+        for (Object k:properties.keySet()){
+            String key = (String)k;
             if (!key.equals(PARENT_KEY) && !key.equals(FINAL_KEY)) {
                 newProfile.setProperty(key, properties.getProperty(key));
             }
@@ -350,6 +351,7 @@ public final class ConfigProfile implements Comparable<ConfigProfile> {
             result = false;
         }
         
+        
         if (result) {
             // and reassign and save children
             for (ConfigProfile child:getChildren()) {
@@ -382,3 +384,4 @@ public final class ConfigProfile implements Comparable<ConfigProfile> {
 }
 
 
+

[Rails-commits] Branch 'rails1.7.x' - rails/common

[Stefan F. <ste...@us...>]

 rails/common/ConfigProfile.java |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 8f3d0f38fae254c55c74930be3e4142b012af685
Author: Stefan Frey <ste...@we...>
Date:   Wed Apr 4 16:05:42 2012 +0200

    made selection of start profile and parent profile more robust

diff --git a/rails/common/ConfigProfile.java b/rails/common/ConfigProfile.java
index 3b9d101..2fb7762 100644
--- a/rails/common/ConfigProfile.java
+++ b/rails/common/ConfigProfile.java
@@ -111,20 +111,27 @@ public final class ConfigProfile implements Comparable<ConfigProfile> {
     
     static ConfigProfile getStartProfile() {
         // first checks cli
-        String profile = System.getProperty(CLI_AND_RECENT_OPTION);
-        if (Util.hasValue(profile) && profiles.containsKey(profile)) {
-            return profiles.get(profile);
+        ConfigProfile profile = getProfile(System.getProperty(CLI_AND_RECENT_OPTION));
+        if (profile != null) {
+            return profile;
         } 
         // second check recent
-        profile = Config.getRecent(CLI_AND_RECENT_OPTION);
-        if (Util.hasValue(profile) && profiles.containsKey(profile)) {
-            return profiles.get(profile);
+        profile = getProfile(Config.getRecent(CLI_AND_RECENT_OPTION));
+        if (profile != null) {
+            return profile;
         } 
         // third return standard profile
-        return profiles.get(STANDARD_PROFILE);
+        profile = getProfile(STANDARD_PROFILE);
+        if (profile != null) {
+            return profile;
+        }
+        // last return root
+        return root;
     }
     
     static ConfigProfile getProfile(String name) {
+        if (name == null) return null;
+        if (name.equals(ROOT_PROFILE)) return root;
         return profiles.get(name);
     }
     
@@ -169,7 +176,7 @@ public final class ConfigProfile implements Comparable<ConfigProfile> {
     }
     
     private ConfigProfile setParent(String name) {
-        return setParent(profiles.get(name));
+        return setParent(getProfile(name));
     }
 
     ConfigProfile getParent() {