Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the problem reported by Thomas Fahrmeyer <thomas.fahrmeyer@einsurance.de> 

where ExtendedProperties would re-process data when making a subset.  Hope no one
was depending on that :)

Also adjusted the testcase to test this.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130474 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Geir Magnusson Jr 2001-05-10 00:40:09 +00:00
parent a971c4055c
commit 1688a5a244
2 changed files with 59 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/java/org/apache/commons/collections/ExtendedProperties.java
View File

@ -168,7 +168,7 @@ import java.util.Vector;
* @author <a href="mailto:kjohnson@transparent.com>Kent Johnson</a>
* @author <a href="mailto:dlr@finemaltcoding.com>Daniel Rall</a>
* @author <a href="mailto:ipriha@surfeu.fi>Ilkka Priha</a>
* @version $Id: ExtendedProperties.java,v 1.2 2001/05/04 02:22:48 geirm Exp $
* @version $Id: ExtendedProperties.java,v 1.3 2001/05/10 00:40:08 geirm Exp $
*/
public class ExtendedProperties extends Hashtable
{
@ -519,7 +519,6 @@ public class ExtendedProperties extends Hashtable
else
{
addProperty(key,value);
//setProperty(key,value);
}
}
}
@ -581,7 +580,6 @@ public class ExtendedProperties extends Hashtable
* @param String key
* @param String value
*/
//public void setProperty(String key, Object token)
public void addProperty(String key, Object token)
{
Object o = this.get(key);
@ -635,7 +633,7 @@ public class ExtendedProperties extends Hashtable
while (tokenizer.hasMoreTokens())
{
String value = tokenizer.nextToken();
/*
* we know this is a string, so make sure it
* just goes in rather than risking vectorization
@ -656,23 +654,34 @@ public class ExtendedProperties extends Hashtable
* in a definite order it will be possible.
*/
/*
* safety check
*/
if( !containsKey( key ) )
{
keysAsListed.add(key);
}
/*
* and the value
*/
put(key, token);
addPropertyDirect( key, token );
}
}
}
/**
* Adds a key/value pair to the map. This routine does
* no magic morphing. It ensures the keylist is maintained
*
* @param key key to use for mapping
* @param obj object to store
*/
private void addPropertyDirect( String key, Object obj )
{
/*
* safety check
*/
if( !containsKey( key ) )
{
keysAsListed.add(key);
}
/*
* and the value
*/
put(key, obj);
}
/**
* Sets a string property w/o checking for commas - used
@ -719,12 +728,7 @@ public class ExtendedProperties extends Hashtable
}
else
{
if( !containsKey( key ) )
{
keysAsListed.add(key);
}
put( key, token);
addPropertyDirect( key, token );
}
}
@ -809,7 +813,6 @@ public class ExtendedProperties extends Hashtable
for (Iterator i = c.getKeys() ; i.hasNext() ;)
{
String key = (String) i.next();
//clearProperty(key);
setProperty( key, c.get(key) );
}
}
@ -918,14 +921,12 @@ public class ExtendedProperties extends Hashtable
}
/*
* Make sure to use the setProperty() method and not
* just put(). setProperty() takes care of catching
* all the keys in the order they appear in a
* properties files or the order they are set
* dynamically.
* use addPropertyDirect() - this will plug the data as
* is into the Map, but will also do the right thing
* re key accounting
*/
c.setProperty(newKey, get(key));
c.addPropertyDirect( newKey, get(key) );
}
}

32
src/test/org/apache/commons/collections/TestExtendedProperties.java
View File

@ -1,7 +1,7 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestExtendedProperties.java,v 1.1 2001/05/04 02:23:44 geirm Exp $
* $Revision: 1.1 $
* $Date: 2001/05/04 02:23:44 $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestExtendedProperties.java,v 1.2 2001/05/10 00:40:09 geirm Exp $
* $Revision: 1.2 $
* $Date: 2001/05/10 00:40:09 $
*
* ====================================================================
*
@ -70,7 +70,7 @@ import junit.framework.TestSuite;
* class
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @version $Id: TestExtendedProperties.java,v 1.1 2001/05/04 02:23:44 geirm Exp $
* @version $Id: TestExtendedProperties.java,v 1.2 2001/05/10 00:40:09 geirm Exp $
*/
public class TestExtendedProperties extends TestCase
{
@ -119,5 +119,29 @@ public class TestExtendedProperties extends TestCase
* property
*/
assert("This returns scalar", ( eprop.getString("number") instanceof String ) );
/*
* test comma separated string properties
*/
String prop = "hey, that's a test";
eprop.setProperty("prop.string", prop);
assert("This returns vector", ( eprop.getVector("prop.string") instanceof java.util.Vector ) );
String prop2 = "hey\\, that's a test";
eprop.remove("prop.string");
eprop.setProperty("prop.string", prop2);
assert("This returns array", ( eprop.getString("prop.string") instanceof java.lang.String) );
/*
* test subset : we want to make sure that the EP doesn't reprocess the data
* elements when generating the subset
*/
ExtendedProperties subEprop = eprop.subset("prop");
assert("Returns the full string", subEprop.getString("string").equals( prop ) );
assert("This returns string for subset", ( subEprop.getString("string") instanceof java.lang.String) );
assert("This returns array for subset", ( subEprop.getVector("string") instanceof java.util.Vector) );
}
}