svn commit: r750112 - in /openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf: ConfigurationImpl.java Value.java

[jr...@apache.org]

Author: jrbauer
Date: Wed Mar  4 19:23:33 2009
New Revision: 750112

URL: http://svn.apache.org/viewvc?rev=750112&view=rev
Log:
OPENJPA-927 Committing code contributed by Dianne Richards

Modified:
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java

Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java?rev=750112&r1=750111&r2=750112&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java Wed Mar  4 19:23:33 2009
@@ -53,6 +53,7 @@
 import java.util.MissingResourceException;
 import java.util.Properties;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.apache.commons.lang.StringUtils;
@@ -125,6 +126,8 @@
     // cache descriptors
     private PropertyDescriptor[] _pds = null;
     private MethodDescriptor[] _mds = null;
+    
+    private boolean getVisibleOnly = false;
 
     /**
      * Default constructor. Attempts to load default properties through
@@ -589,11 +592,11 @@
         // hashcode contracts
         Map<String, String> clone;
         if (_props == null)
-            clone = new HashMap<String, String>();
+            clone = new TreeMap<String, String>();
         else if (_props instanceof Properties)
             clone = (Map) ((Properties) _props).clone();
         else
-            clone = new HashMap<String, String>(_props);
+            clone = new TreeMap<String, String>(_props);
 
         // if no existing properties or the properties should contain entries
         // with default values, add values to properties
@@ -613,13 +616,17 @@
                     setValue(clone, val, str);
             }
             if (_props == null)
-                _props = new HashMap(clone);
+                _props = new TreeMap(clone);
         }
         return clone;
     }
     
     public Map<String, String> getAllProperties() {
-        return toProperties(true, true);
+        boolean saveGetVisibleOnly = getVisibleOnly;
+        getVisibleOnly = true;
+        Map<String, String> properties = toProperties(true, true);
+        getVisibleOnly = saveGetVisibleOnly;
+        return properties;
     }
 
     public Map<String, String> toProperties(boolean storeDefaults) {
@@ -725,6 +732,9 @@
                 }
             }
         }
+        if (getVisibleOnly && !val.isVisible()) {
+            return;
+        }
         map.put(key, o);
     }
 

Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java?rev=750112&r1=750111&r2=750112&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java Wed Mar  4 19:23:33 2009
@@ -52,6 +52,7 @@
     private boolean isDynamic = false;
     private String originalValue = null;
     private Set<String> otherNames = null;
+    private boolean visible = true;
 
     /**
      * Default constructor.
@@ -550,4 +551,12 @@
             return null;
         }
     }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    public void setVisible(boolean visible) {
+        this.visible = visible;
+    }
 }