Author: bayard
Date: Tue Sep 15 05:54:56 2009
New Revision: 815043
URL: http://svn.apache.org/viewvc?rev=815043&view=rev
Log:
Merging from -r468106:814127 of collections_jdk5_branch - namely where this
code was generified; mostly in r738956.
Also see the following revisions:
------------------------------------------------------------------------
r656324 | ebourg | 2008-05-14 09:05:43 -0700 (Wed, 14 May 2008) | 1 line
Modified the javadoc in ExtendedProperties to redirect users to Commons
Configuration for advanced needs
------------------------------------------------------------------------
r468687 | scolebourne | 2006-10-28 05:53:28 -0700 (Sat, 28 Oct 2006) | 1
line
COLLECTIONS-229 - Remove deprecated classes and code
------------------------------------------------------------------------
Modified:
commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java
Modified:
commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java?rev=815043&r1=815042&r2=815043&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java
(original)
+++
commons/proper/collections/trunk/src/java/org/apache/commons/collections/ExtendedProperties.java
Tue Sep 15 05:54:56 2009
@@ -182,16 +182,7 @@
* This is the name of the property that can point to other
* properties file for including other properties files.
*/
- private String includePropertyName = null;
-
- /**
- * This is the default name of the property that can point to other
- * properties file for including other properties files.
- *
- * @deprecated Use getInclude() and setInclude() methods which operate
- * on an instance variable from v3.3. Due to be removed in v4.0.
- */
- protected static String include = "include";
+ private String includePropertyName = "include";
/**
* These are the keys in the order they listed
@@ -507,41 +498,20 @@
/**
* Gets the property value for including other properties files.
* By default it is "include".
- * <p>
- * NOTE: Prior to v3.3 this method accessed a static variable.
- * It now accesses an instance variable. For compatability, if the
- * instance variable has not been set then the previous static
- * variable is then accessed. However, the protected static variable
- * can now only be set by subclasses.
- * In v4.0, the static variable will be removed.
*
* @return the property name which includes another property
*/
public String getInclude() {
- if (includePropertyName == null) {
- return include; // backwards compatability
- }
- if ("".equals(includePropertyName)) {
- return null; // hack to allow backwards compatability
- }
return includePropertyName;
}
/**
* Sets the property value for including other properties files.
* By default it is "include".
- * <p>
- * NOTE: Prior to v3.3 this method set a static variable and affected all
- * users of the class. It now sets an instance variable.
- * An empty string is also now converted to null internally.
- * In v4.0, the static variable will be removed.
*
* @param inc the property name which includes another property, empty
converted to null
*/
public void setInclude(String inc) {
- if (inc == null) {
- inc = ""; // hack to allow backwards compatability
- }
includePropertyName = inc;
}
