Here are a few I missed, JAPI will like this... Changelog:
2007-03-06 Andrew John Hughes <[EMAIL PROTECTED]>
* gnu/java/lang/management/BeanImpl.java:
(translate(String)): Add horrible generics hacks
to make things work with the new type signatures.
* javax/management/loading/ClassLoaderRepository.java:
Added generic types.
* javax/management/openmbean/CompositeDataSupport.java:
Likewise.
* javax/management/openmbean/OpenMBeanOperationInfo.java:
Likewise.
* javax/management/openmbean/OpenMBeanParameterInfo.java:
Likewise.
--
Andrew :-)
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: gnu/java/lang/management/BeanImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/lang/management/BeanImpl.java,v
retrieving revision 1.13
diff -u -3 -p -u -r1.13 BeanImpl.java
--- gnu/java/lang/management/BeanImpl.java 5 Mar 2007 00:22:41 -0000 1.13
+++ gnu/java/lang/management/BeanImpl.java 6 Mar 2007 23:18:38 -0000
@@ -136,7 +136,8 @@ public class BeanImpl
lv = param.getLegalValues().toArray();
attribs[a] = new OpenMBeanAttributeInfoSupport(oldA[a].getName(),
oldA[a].getDescription(),
- param.getOpenType(),
+ ((OpenType<Object>)
+ param.getOpenType()),
oldA[a].isReadable(),
oldA[a].isWritable(),
oldA[a].isIs(),
@@ -146,13 +147,16 @@ public class BeanImpl
else
attribs[a] = new OpenMBeanAttributeInfoSupport(oldA[a].getName(),
oldA[a].getDescription(),
- param.getOpenType(),
+ ((OpenType<Object>)
+ param.getOpenType()),
oldA[a].isReadable(),
oldA[a].isWritable(),
oldA[a].isIs(),
param.getDefaultValue(),
- param.getMinValue(),
- param.getMaxValue());
+ ((Comparable<Object>)
+ param.getMinValue()),
+ ((Comparable<Object>)
+ param.getMaxValue()));
}
MBeanConstructorInfo[] oldC = info.getConstructors();
OpenMBeanConstructorInfo[] cons = new OpenMBeanConstructorInfoSupport[oldC.length];
@@ -341,17 +345,21 @@ public class BeanImpl
lv = param.getLegalValues().toArray();
sig[a] = new OpenMBeanParameterInfoSupport(oldS[a].getName(),
oldS[a].getDescription(),
- param.getOpenType(),
+ ((OpenType<Object>)
+ param.getOpenType()),
param.getDefaultValue(),
lv);
}
else
sig[a] = new OpenMBeanParameterInfoSupport(oldS[a].getName(),
oldS[a].getDescription(),
- param.getOpenType(),
+ ((OpenType<Object>)
+ param.getOpenType()),
param.getDefaultValue(),
- param.getMinValue(),
- param.getMaxValue());
+ ((Comparable<Object>)
+ param.getMinValue()),
+ ((Comparable<Object>)
+ param.getMaxValue()));
}
return sig;
}
Index: javax/management/loading/ClassLoaderRepository.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/loading/ClassLoaderRepository.java,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 ClassLoaderRepository.java
--- javax/management/loading/ClassLoaderRepository.java 28 Sep 2006 20:03:32 -0000 1.2
+++ javax/management/loading/ClassLoaderRepository.java 6 Mar 2007 23:18:38 -0000
@@ -71,7 +71,7 @@ public interface ClassLoaderRepository
* @throws ClassNotFoundException if all the class loaders fail
* to load the class.
*/
- Class loadClass(String name)
+ Class<?> loadClass(String name)
throws ClassNotFoundException;
/**
@@ -102,7 +102,7 @@ public interface ClassLoaderRepository
* @throws ClassNotFoundException if all the class loaders fail
* to load the class.
*/
- Class loadClassBefore(ClassLoader stop, String name)
+ Class<?> loadClassBefore(ClassLoader stop, String name)
throws ClassNotFoundException;
/**
@@ -132,7 +132,7 @@ public interface ClassLoaderRepository
* @throws ClassNotFoundException if all the class loaders fail
* to load the class.
*/
- Class loadClassWithout(ClassLoader exclude, String name)
+ Class<?> loadClassWithout(ClassLoader exclude, String name)
throws ClassNotFoundException;
}
Index: javax/management/openmbean/CompositeDataSupport.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/openmbean/CompositeDataSupport.java,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 CompositeDataSupport.java
--- javax/management/openmbean/CompositeDataSupport.java 5 Mar 2007 23:19:44 -0000 1.2
+++ javax/management/openmbean/CompositeDataSupport.java 6 Mar 2007 23:18:38 -0000
@@ -340,7 +340,7 @@ public class CompositeDataSupport
*
* @return the values of this instance.
*/
- public Collection values()
+ public Collection<?> values()
{
return Collections.unmodifiableCollection(contents.values());
}
Index: javax/management/openmbean/OpenMBeanOperationInfo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/openmbean/OpenMBeanOperationInfo.java,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 OpenMBeanOperationInfo.java
--- javax/management/openmbean/OpenMBeanOperationInfo.java 2 Aug 2006 21:38:08 -0000 1.2
+++ javax/management/openmbean/OpenMBeanOperationInfo.java 6 Mar 2007 23:18:38 -0000
@@ -109,7 +109,7 @@ public interface OpenMBeanOperationInfo
*
* @return the open type of the return value.
*/
- OpenType getReturnOpenType();
+ OpenType<?> getReturnOpenType();
/**
* Returns the return type of the operation, as the class
Index: javax/management/openmbean/OpenMBeanParameterInfo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/openmbean/OpenMBeanParameterInfo.java,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 OpenMBeanParameterInfo.java
--- javax/management/openmbean/OpenMBeanParameterInfo.java 1 Aug 2006 19:28:26 -0000 1.2
+++ javax/management/openmbean/OpenMBeanParameterInfo.java 6 Mar 2007 23:18:38 -0000
@@ -93,7 +93,7 @@ public interface OpenMBeanParameterInfo
* @return a set of legal values, or <code>null</code> if no such
* set exists.
*/
- Set getLegalValues();
+ Set<?> getLegalValues();
/**
* Returns the maximum value of this parameter, or <code>null</code>
@@ -101,7 +101,7 @@ public interface OpenMBeanParameterInfo
*
* @return the maximum value, or <code>null</code> if none exists.
*/
- Comparable getMaxValue();
+ Comparable<?> getMaxValue();
/**
* Returns the minimum value of this parameter, or <code>null</code>
@@ -109,7 +109,7 @@ public interface OpenMBeanParameterInfo
*
* @return the minimum value, or <code>null</code> if none exists.
*/
- Comparable getMinValue();
+ Comparable<?> getMinValue();
/**
* Returns the name of this parameter.
@@ -124,7 +124,7 @@ public interface OpenMBeanParameterInfo
*
* @return the open type of this parameter.
*/
- OpenType getOpenType();
+ OpenType<?> getOpenType();
/**
* Returns true if this parameter has a default value.
signature.asc
Description: Digital signature
