Author: scolebourne Date: Sat Oct 28 05:53:28 2006 New Revision: 468687 URL: http://svn.apache.org/viewvc?view=rev&rev=468687 Log: COLLECTIONS-229 - Remove deprecated classes and code
Added: jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt (with props) Removed: jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.html jakarta/commons/proper/collections/branches/collections_jdk5_branch/data/test/CursorableLinkedList.emptyCollection.version1.obj jakarta/commons/proper/collections/branches/collections_jdk5_branch/data/test/CursorableLinkedList.fullCollection.version1.obj jakarta/commons/proper/collections/branches/collections_jdk5_branch/data/test/LRUMap.emptyCollection.version2.obj jakarta/commons/proper/collections/branches/collections_jdk5_branch/data/test/LRUMap.fullCollection.version2.obj jakarta/commons/proper/collections/branches/collections_jdk5_branch/data/test/MultiHashMap.emptyCollection.version2.obj jakarta/commons/proper/collections/branches/collections_jdk5_branch/data/test/MultiHashMap.fullCollection.version2.obj jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BeanMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BinaryHeap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/BoundedFifoBuffer.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/CursorableLinkedList.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/DefaultMapBag.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/DefaultMapEntry.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/DoubleOrderedMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/HashBag.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/LRUMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MultiHashMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/PriorityQueue.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ProxyMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ReferenceMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/SequencedHashMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/StaticBucketMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/TreeBag.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/iterators/ProxyIterator.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestBeanMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestBinaryHeap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCursorableLinkedList.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestHashBag.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestLRUMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestMultiHashMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestReferenceMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestSequencedHashMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestStaticBucketMap.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestTreeBag.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ExtendedProperties.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/MapPerformance.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestAll.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestExtendedProperties.java jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java Added: jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt?view=auto&rev=468687 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt (added) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt Sat Oct 28 05:53:28 2006 @@ -0,0 +1,43 @@ + + Commons Collections Generics Package + Version X.X + Release Notes + + +INTRODUCTION: + +Commons collections is a project to develop and maintain collection classes +based on and inspired by the JDK collection framework. +This version uses the generics features of JDK1.5 and is not compatible with +earlier JDK versions. + +The process of generifying an API is complex. +For commons-collections, we have chosen to break the API in various ways. +The aim behind this is to provide an API design that better suits generics. +We have also removed all deprecated classes and fixed oddities in the previous +API that we couldn't fix due to backwards compatability restrictions. + +As such, this release should not be considered to be a simple, drop-in, replacement +for commons-collections. You will probably receive compile errors, and you will +certainly have generification warnings to solve. These release notes will try +to guide you in the process of upgrading, however you should remember that this +is a new API based on the original, so some concepts have changed. + + +Changes from commons-collections +-------------------------------- +- Removed all deprecated classes and methods + + +Feedback +-------- +Open source works best when you give feedback: +http://jakarta.apache.org/commons/collections/ + +Please direct all bug reports to JIRA +http://issues.apache.org/jira/browse/COLLECTIONS + +Or subscribe to the commons-user mailing list (prefix emails by [collections]) +http://jakarta.apache.org/site/mail.html + +The Commons-Collections-Generics Team Propchange: jakarta/commons/proper/collections/branches/collections_jdk5_branch/RELEASE-NOTES.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ExtendedProperties.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ExtendedProperties.java?view=diff&rev=468687&r1=468686&r2=468687 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ExtendedProperties.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/ExtendedProperties.java Sat Oct 28 05:53:28 2006 @@ -176,16 +176,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 @@ -501,41 +492,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; } Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/MapPerformance.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/MapPerformance.java?view=diff&rev=468687&r1=468686&r2=468687 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/MapPerformance.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/MapPerformance.java Sat Oct 28 05:53:28 2006 @@ -54,7 +54,6 @@ Map unmodHashMap = Collections.unmodifiableMap(new HashMap(hashMap)); Map fastHashMap = new FastHashMap(hashMap); Map treeMap = new TreeMap(hashMap); - Map seqMap = new SequencedHashMap(hashMap); // Map linkedMap = new LinkedHashMap(hashMap); // Map syncMap = Collections.unmodifiableMap(new HashMap(hashMap)); // Map bucketMap = new StaticBucketMap(); Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestAll.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestAll.java?view=diff&rev=468687&r1=468686&r2=468687 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestAll.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestAll.java Sat Oct 28 05:53:28 2006 @@ -41,6 +41,7 @@ suite.addTest(TestBufferUtils.suite()); suite.addTest(TestEnumerationUtils.suite()); suite.addTest(TestFactoryUtils.suite()); + suite.addTest(TestIteratorUtils.suite()); suite.addTest(TestListUtils.suite()); suite.addTest(TestMapUtils.suite()); suite.addTest(TestPredicateUtils.suite()); @@ -48,12 +49,6 @@ suite.addTest(TestTransformerUtils.suite()); suite.addTest(TestArrayStack.suite()); - suite.addTest(TestBeanMap.suite()); - suite.addTest(TestBinaryHeap.suite()); - suite.addTest(TestBoundedFifoBuffer.suite()); - suite.addTest(TestBoundedFifoBuffer2.suite()); - suite.addTest(TestCursorableLinkedList.suite()); - suite.addTest(TestDoubleOrderedMap.suite()); suite.addTest(TestExtendedProperties.suite()); suite.addTest(TestFastArrayList.suite()); suite.addTest(TestFastArrayList1.suite()); @@ -61,15 +56,6 @@ suite.addTest(TestFastHashMap1.suite()); suite.addTest(TestFastTreeMap.suite()); suite.addTest(TestFastTreeMap1.suite()); - suite.addTest(TestHashBag.suite()); - suite.addTest(TestIteratorUtils.suite()); - suite.addTest(TestLRUMap.suite()); - suite.addTest(TestMultiHashMap.suite()); - suite.addTest(TestReferenceMap.suite()); - suite.addTest(TestSequencedHashMap.suite()); - suite.addTest(TestStaticBucketMap.suite()); - suite.addTest(TestTreeBag.suite()); - suite.addTest(TestUnboundedFifoBuffer.suite()); return suite; } Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestExtendedProperties.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestExtendedProperties.java?view=diff&rev=468687&r1=468686&r2=468687 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestExtendedProperties.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestExtendedProperties.java Sat Oct 28 05:53:28 2006 @@ -325,14 +325,6 @@ assertEquals("import", a.getInclude()); assertEquals("include", b.getInclude()); - a.setInclude(""); - assertEquals(null, a.getInclude()); - assertEquals("include", b.getInclude()); - - a.setInclude("hi"); - assertEquals("hi", a.getInclude()); - assertEquals("include", b.getInclude()); - a.setInclude(null); assertEquals(null, a.getInclude()); assertEquals("include", b.getInclude()); Modified: jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java?view=diff&rev=468687&r1=468686&r2=468687 ============================================================================== --- jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java (original) +++ jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java Sat Oct 28 05:53:28 2006 @@ -1473,4 +1473,15 @@ return (String[])list.toArray(new String[0]); } + public String getCompatibilityVersion() { + return "4.0"; + } + +// public void testCreate() throws Exception { +// resetEmpty(); +// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/CursorableLinkedList.emptyCollection.version4.0.obj"); +// resetFull(); +// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/CursorableLinkedList.fullCollection.version4.0.obj"); +// } + } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]