Author: scolebourne
Date: Sat Jun 25 09:39:34 2005
New Revision: 201765
URL: http://svn.apache.org/viewcvs?rev=201765&view=rev
Log:
Add casts to avoid some JDK1.5 compilation warnings
bug 35474, from Will Pugh
Modified:
jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html
jakarta/commons/proper/collections/trunk/project.xml
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/IteratorUtils.java
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java
jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestBeanMap.java
Modified: jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html?rev=201765&r1=201764&r2=201765&view=diff
==============================================================================
--- jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html (original)
+++ jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html Sat Jun 25
09:39:34 2005
@@ -21,6 +21,11 @@
<center><h2>RELEASE NOTES: COLLECTIONS 3.2</h2></center>
<p>
+Commons collections is a project to develop and maintain collection classes
+based on and inspired by the JDK collection framework.
+This project is JDK1.2 compatible, and does not use JDK1.5 generics.
+</p>
+<p>
This release adds various new classes and fixes a number of bugs.
All feedback should be directed to commons-user at jakarta.apache.org.
</p>
@@ -74,6 +79,7 @@
<li>BoundedFifoBuffer - Fix iterator remove bug causing ArrayIndexOutOfBounds
error [33071]</li>
<li>IteratorChain.remove() - Fix to avoid IllegalStateException when one of
the underlying iterators is a FilterIterator [34267]</li>
<li>ExtendedProperties.convertProperties() - Fix to handle default properties
maps correctly [32204]</li>
+<li>Add casts to avoid some JDK1.5 compilation warnings [35474]</li>
</ul>
<center><h3>JAVADOC</h3></center>
Modified: jakarta/commons/proper/collections/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/project.xml?rev=201765&r1=201764&r2=201765&view=diff
==============================================================================
--- jakarta/commons/proper/collections/trunk/project.xml (original)
+++ jakarta/commons/proper/collections/trunk/project.xml Sat Jun 25 09:39:34
2005
@@ -277,6 +277,9 @@
<name>Jonas Van Poucke</name>
</contributor>
<contributor>
+ <name>Will Pugh</name>
+ </contributor>
+ <contributor>
<name>Herve Quiroz</name>
</contributor>
<contributor>
Modified:
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/IteratorUtils.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/IteratorUtils.java?rev=201765&r1=201764&r2=201765&view=diff
==============================================================================
---
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/IteratorUtils.java
(original)
+++
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/IteratorUtils.java
Sat Jun 25 09:39:34 2005
@@ -895,9 +895,9 @@
} else {
try {
- Method method = obj.getClass().getMethod("iterator", null);
+ Method method = obj.getClass().getMethod("iterator", (Class[])
null);
if (Iterator.class.isAssignableFrom(method.getReturnType())) {
- Iterator it = (Iterator) method.invoke(obj, null);
+ Iterator it = (Iterator) method.invoke(obj, (Object[])
null);
if (it != null) {
return it;
}
Modified:
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PrototypeFactory.java?rev=201765&r1=201764&r2=201765&view=diff
==============================================================================
---
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
(original)
+++
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
Sat Jun 25 09:39:34 2005
@@ -59,7 +59,7 @@
return ConstantFactory.NULL_INSTANCE;
}
try {
- Method method = prototype.getClass().getMethod("clone", null);
+ Method method = prototype.getClass().getMethod("clone", (Class[])
null);
return new PrototypeCloneFactory(prototype, method);
} catch (NoSuchMethodException ex) {
@@ -116,7 +116,7 @@
*/
private void findCloneMethod() {
try {
- iCloneMethod = iPrototype.getClass().getMethod("clone", null);
+ iCloneMethod = iPrototype.getClass().getMethod("clone",
(Class[]) null);
} catch (NoSuchMethodException ex) {
throw new IllegalArgumentException("PrototypeCloneFactory: The
clone method must exist and be public ");
@@ -135,7 +135,7 @@
}
try {
- return iCloneMethod.invoke(iPrototype, null);
+ return iCloneMethod.invoke(iPrototype, (Object[])null);
} catch (IllegalAccessException ex) {
throw new FunctorException("PrototypeCloneFactory: Clone
method must be public", ex);
Modified:
jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java?rev=201765&r1=201764&r2=201765&view=diff
==============================================================================
---
jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java
(original)
+++
jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/BulkTest.java
Sat Jun 25 09:39:34 2005
@@ -354,7 +354,7 @@
BulkTest bulk2;
try {
- bulk2 = (BulkTest)m.invoke(bulk, null);
+ bulk2 = (BulkTest)m.invoke(bulk, (Object[]) null);
if (bulk2 == null) return;
} catch (InvocationTargetException ex) {
ex.getTargetException().printStackTrace();
@@ -412,7 +412,7 @@
private static BulkTest makeTestCase(Class c, Method m) {
Constructor con = getTestCaseConstructor(c);
try {
- return (BulkTest)con.newInstance(new String[] { m.getName() });
+ return (BulkTest)con.newInstance(new Object[] {m.getName()});
} catch (InvocationTargetException e) {
e.printStackTrace();
throw new RuntimeException(); // FIXME;
Modified:
jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestBeanMap.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestBeanMap.java?rev=201765&r1=201764&r2=201765&view=diff
==============================================================================
---
jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestBeanMap.java
(original)
+++
jakarta/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestBeanMap.java
Sat Jun 25 09:39:34 2005
@@ -330,7 +330,7 @@
public void testMethodAccessor() throws Exception {
BeanMap map = (BeanMap) makeFullMap();
- Method method =
BeanWithProperties.class.getDeclaredMethod("getSomeIntegerValue", null);
+ Method method =
BeanWithProperties.class.getDeclaredMethod("getSomeIntegerValue", (Class[])
null);
assertEquals(method, map.getReadMethod("someIntegerValue"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
