diff options
Diffstat (limited to 'libjava/classpath/javax/management')
22 files changed, 145 insertions, 145 deletions
diff --git a/libjava/classpath/javax/management/DefaultLoaderRepository.java b/libjava/classpath/javax/management/DefaultLoaderRepository.java index b905af22ff2..38f7d020652 100644 --- a/libjava/classpath/javax/management/DefaultLoaderRepository.java +++ b/libjava/classpath/javax/management/DefaultLoaderRepository.java @@ -77,6 +77,8 @@ import java.util.List; * @throws ClassNotFoundException if all the class loaders fail * to load the class. */ + // API issue with lack of <?> on Class + @SuppressWarnings("unchecked") public static Class loadClass(String name) throws ClassNotFoundException { @@ -124,6 +126,8 @@ import java.util.List; * @throws ClassNotFoundException if all the class loaders fail * to load the class. */ + // API issue with lack of <?> on Class + @SuppressWarnings("unchecked") public static Class loadClassWithout(ClassLoader exclude, String name) throws ClassNotFoundException { diff --git a/libjava/classpath/javax/management/JMX.java b/libjava/classpath/javax/management/JMX.java index a435d3e6b77..e5fb2586fc3 100644 --- a/libjava/classpath/javax/management/JMX.java +++ b/libjava/classpath/javax/management/JMX.java @@ -324,6 +324,8 @@ public class JMX * server using the given name. * @see #newMXBeanProxy(MBeanServerConnection, ObjectName, Class) */ + // Suppress warnings as we know an instance of T will be returned. + @SuppressWarnings("unchecked") public static <T> T newMXBeanProxy(MBeanServerConnection conn, ObjectName name, Class<T> iface, boolean bcast) diff --git a/libjava/classpath/javax/management/MBeanAttributeInfo.java b/libjava/classpath/javax/management/MBeanAttributeInfo.java index 2e8475ea0eb..85e4e453b0d 100644 --- a/libjava/classpath/javax/management/MBeanAttributeInfo.java +++ b/libjava/classpath/javax/management/MBeanAttributeInfo.java @@ -117,7 +117,7 @@ public class MBeanAttributeInfo { Type t = setter.getGenericParameterTypes()[0]; if (t instanceof Class) - attributeType = ((Class) t).getName(); + attributeType = ((Class<?>) t).getName(); else attributeType = t.toString(); isRead = false; @@ -127,7 +127,7 @@ public class MBeanAttributeInfo { Type t = getter.getGenericReturnType(); if (t instanceof Class) - attributeType = ((Class) t).getName(); + attributeType = ((Class<?>) t).getName(); else attributeType = t.toString(); isRead = true; diff --git a/libjava/classpath/javax/management/MBeanConstructorInfo.java b/libjava/classpath/javax/management/MBeanConstructorInfo.java index 15c8227c246..041f3e904b6 100644 --- a/libjava/classpath/javax/management/MBeanConstructorInfo.java +++ b/libjava/classpath/javax/management/MBeanConstructorInfo.java @@ -75,6 +75,8 @@ public class MBeanConstructorInfo * @param desc a description of the attribute. * @param cons the constructor. */ + // API issue with lack of <?> on Constructor + @SuppressWarnings("unchecked") public MBeanConstructorInfo(String desc, Constructor cons) { super(cons.getName(), desc); @@ -85,7 +87,7 @@ public class MBeanConstructorInfo Type t = paramTypes[a]; if (t instanceof Class) signature[a] = new MBeanParameterInfo(null, - ((Class) t).getName(), + ((Class<?>) t).getName(), null); else signature[a] = new MBeanParameterInfo(null, t.toString(), null); diff --git a/libjava/classpath/javax/management/MBeanOperationInfo.java b/libjava/classpath/javax/management/MBeanOperationInfo.java index 6495072e627..03220c15e10 100644 --- a/libjava/classpath/javax/management/MBeanOperationInfo.java +++ b/libjava/classpath/javax/management/MBeanOperationInfo.java @@ -121,14 +121,14 @@ public class MBeanOperationInfo Type t = paramTypes[a]; if (t instanceof Class) signature[a] = new MBeanParameterInfo(null, - ((Class) t).getName(), + ((Class<?>) t).getName(), null); else signature[a] = new MBeanParameterInfo(null, t.toString(), null); } Type retType = method.getGenericReturnType(); if (retType instanceof Class) - type = ((Class) retType).getName(); + type = ((Class<?>) retType).getName(); else type = retType.toString(); if (method.getReturnType() == Void.TYPE) diff --git a/libjava/classpath/javax/management/MBeanPermission.java b/libjava/classpath/javax/management/MBeanPermission.java index 1ee0e710433..076ac86f1af 100644 --- a/libjava/classpath/javax/management/MBeanPermission.java +++ b/libjava/classpath/javax/management/MBeanPermission.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.management; +import gnu.java.lang.CPStringBuilder; + import java.security.Permission; import java.io.IOException; @@ -154,19 +156,19 @@ public class MBeanPermission /** * The list of actions as an ordered set. */ - private transient Set actionSet; + private transient Set<String> actionSet; /** * The set of valid actions. */ - private static final Set validSet; + private static final Set<String> validSet; /** * Initialise the set of valid actions. */ static { - validSet = new HashSet(); + validSet = new HashSet<String>(); validSet.add("addNotificationListener"); validSet.add("getAttribute"); validSet.add("getClassLoader"); @@ -263,8 +265,8 @@ public class MBeanPermission */ public String getActions() { - Iterator it = actionSet.iterator(); - StringBuilder builder = new StringBuilder(); + Iterator<String> it = actionSet.iterator(); + CPStringBuilder builder = new CPStringBuilder(); while (it.hasNext()) { builder.append(it.next()); @@ -323,10 +325,8 @@ public class MBeanPermission NameHolder name = new NameHolder(getName()); if (!(name.equals(pName))) return false; - Iterator i = mp.getActionSet().iterator(); - while (i.hasNext()) + for (String nextAction : mp.actionSet) { - String nextAction = (String) i.next(); boolean found = actions.contains(nextAction); if (!found) if (nextAction.equals("queryNames")) @@ -502,23 +502,13 @@ public class MBeanPermission } /** - * Returns the set of actions. - * - * @return the actions as an ordered set. - */ - Set getActionSet() - { - return actionSet; - } - - /** * Updates the action set from the current value of * the actions string. */ private void updateActionSet() { String[] actionsArray = actions.split(","); - actionSet = new TreeSet(); + actionSet = new TreeSet<String>(); for (int a = 0; a < actionsArray.length; ++a) actionSet.add(actionsArray[a].trim()); } @@ -548,10 +538,8 @@ public class MBeanPermission */ private void checkActions() { - Iterator it = actionSet.iterator(); - while (it.hasNext()) + for (String action : actionSet) { - String action = (String) it.next(); if (!(validSet.contains(action))) throw new IllegalArgumentException("Invalid action " + action + " found."); diff --git a/libjava/classpath/javax/management/MBeanServerDelegate.java b/libjava/classpath/javax/management/MBeanServerDelegate.java index 9e9d19111a8..c55faa3d069 100644 --- a/libjava/classpath/javax/management/MBeanServerDelegate.java +++ b/libjava/classpath/javax/management/MBeanServerDelegate.java @@ -69,7 +69,8 @@ public class MBeanServerDelegate /** * The listeners registered with the delegate. */ - private final List listeners = new ArrayList(); + private final List<ListenerData> listeners = + new ArrayList<ListenerData>(); /** * The sequence identifier used by the delegate. @@ -234,12 +235,11 @@ public class MBeanServerDelegate public void removeNotificationListener(NotificationListener listener) throws ListenerNotFoundException { - Iterator it = listeners.iterator(); + Iterator<ListenerData> it = listeners.iterator(); boolean foundOne = false; while (it.hasNext()) { - ListenerData data = (ListenerData) it.next(); - if (data.getListener() == listener) + if (it.next().getListener() == listener) { it.remove(); foundOne = true; @@ -293,10 +293,8 @@ public class MBeanServerDelegate { if (notification.getSequenceNumber() <= 0) notification.setSequenceNumber(++seqNo); - Iterator it = listeners.iterator(); - while (it.hasNext()) + for (ListenerData ldata : listeners) { - ListenerData ldata = (ListenerData) it.next(); NotificationFilter filter = ldata.getFilter(); if (filter == null || filter.isNotificationEnabled(notification)) ldata.getListener().handleNotification(notification, ldata.getPassback()); diff --git a/libjava/classpath/javax/management/MBeanServerFactory.java b/libjava/classpath/javax/management/MBeanServerFactory.java index a8dac948984..d798b0c4517 100644 --- a/libjava/classpath/javax/management/MBeanServerFactory.java +++ b/libjava/classpath/javax/management/MBeanServerFactory.java @@ -89,7 +89,8 @@ public class MBeanServerFactory /** * The map of registered servers (identifiers to servers). */ - private static final Map<Object,MBeanServer> servers = new HashMap(); + private static final Map<Object,MBeanServer> servers = + new HashMap<Object,MBeanServer>(); /** * Private constructor to prevent instance creation. @@ -212,7 +213,7 @@ public class MBeanServerFactory if (sm != null) sm.checkPermission(new MBeanServerPermission("findMBeanServer")); if (id == null) - return new ArrayList(servers.values()); + return new ArrayList<MBeanServer>(servers.values()); ArrayList<MBeanServer> list = new ArrayList<MBeanServer>(); MBeanServer server = servers.get(id); if (server != null) @@ -342,7 +343,7 @@ public class MBeanServerFactory cl = MBeanServerFactory.class.getClassLoader(); try { - Class bClass = Class.forName(builderClass, true, cl); + Class<?> bClass = Class.forName(builderClass, true, cl); builder = (MBeanServerBuilder) bClass.newInstance(); } catch (ClassNotFoundException e) diff --git a/libjava/classpath/javax/management/MBeanServerInvocationHandler.java b/libjava/classpath/javax/management/MBeanServerInvocationHandler.java index 948996764d9..acc8543f11b 100644 --- a/libjava/classpath/javax/management/MBeanServerInvocationHandler.java +++ b/libjava/classpath/javax/management/MBeanServerInvocationHandler.java @@ -204,7 +204,7 @@ public class MBeanServerInvocationHandler throws Throwable { String mName = method.getName(); - Class proxyClass = proxy.getClass(); + Class<?> proxyClass = proxy.getClass(); if (mName.equals("toString")) { if (inInterface(mName, proxyClass)) @@ -352,6 +352,8 @@ public class MBeanServerInvocationHandler * @return a proxy for the specified bean. * @see JMX#newMBeanProxy(MBeanServerConnection,ObjectName,Class) */ + // Suppress warnings as we know an instance of T will be returned. + @SuppressWarnings("unchecked") public static <T> T newProxyInstance(MBeanServerConnection conn, ObjectName name, Class<T> iface, boolean broadcaster) diff --git a/libjava/classpath/javax/management/MBeanServerPermission.java b/libjava/classpath/javax/management/MBeanServerPermission.java index e6227814443..045573aba02 100644 --- a/libjava/classpath/javax/management/MBeanServerPermission.java +++ b/libjava/classpath/javax/management/MBeanServerPermission.java @@ -280,6 +280,7 @@ public class MBeanServerPermission * @see #isReadOnly() * @see #setReadOnly(boolean) */ + @Override public void add(Permission p) { if (isReadOnly()) @@ -305,13 +306,14 @@ public class MBeanServerPermission String cps = cp[b].trim(); if (cps.equals(nps)) found = true; - if (np.equals("newMBeanServer") + if (nps.equals("newMBeanServer") && createms != -1) found = true; - if (np.equals("createMBeanServer") + if (nps.equals("createMBeanServer") && newms != -1) - finalString.replace("newMBeanServer", - "createMBeanServer"); + finalString = + finalString.replace("newMBeanServer", + "createMBeanServer"); } if (!found) finalString += "," + nps; @@ -327,7 +329,8 @@ public class MBeanServerPermission * * @return an enumeration over the collection permission. */ - public Enumeration elements() + @Override + public Enumeration<Permission> elements() { return new MBeanServerPermissionEnumeration(collectionPermission); @@ -341,7 +344,7 @@ public class MBeanServerPermission * @since 1.5 */ private class MBeanServerPermissionEnumeration - implements Enumeration + implements Enumeration<Permission> { /** @@ -381,7 +384,7 @@ public class MBeanServerPermission * * @return the next capability. */ - public Object nextElement() + public Permission nextElement() { if (hasMoreElements()) { @@ -405,6 +408,7 @@ public class MBeanServerPermission * @param p the permission to check for implication. * @return true if this permission implies <code>p</code>. */ + @Override public boolean implies(Permission p) { return collectionPermission.implies(p); diff --git a/libjava/classpath/javax/management/ObjectName.java b/libjava/classpath/javax/management/ObjectName.java index 1fb51506f04..d3ccd201fbd 100644 --- a/libjava/classpath/javax/management/ObjectName.java +++ b/libjava/classpath/javax/management/ObjectName.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.management; +import gnu.java.lang.CPStringBuilder; + import java.io.Serializable; import java.util.Hashtable; @@ -304,17 +306,14 @@ public class ObjectName "character."); char[] keychars = new char[] { '\n', ':', ',', '*', '?', '=' }; char[] valchars = new char[] { '\n', ':', ',', '=' }; - Iterator i = properties.entrySet().iterator(); - while (i.hasNext()) + for (Map.Entry<String,String> entry : properties.entrySet()) { - Map.Entry entry = (Map.Entry) i.next(); - String key = (String) entry.getKey(); for (int a = 0; a < keychars.length; ++a) - if (key.indexOf(keychars[a]) != -1) + if (entry.getKey().indexOf(keychars[a]) != -1) throw new MalformedObjectNameException("A key contains a '" + keychars[a] + "' " + "character."); - String value = (String) entry.getValue(); + String value = entry.getValue(); int quote = value.indexOf('"'); if (quote == 0) { @@ -387,15 +386,13 @@ public class ObjectName if (isPropertyPattern()) { - Hashtable oProps = name.getKeyPropertyList(); - Iterator i = properties.entrySet().iterator(); - while (i.hasNext()) + Hashtable<String,String> oProps = name.getKeyPropertyList(); + for (Map.Entry<String,String> entry : properties.entrySet()) { - Map.Entry entry = (Map.Entry) i.next(); - String key = (String) entry.getKey(); + String key = entry.getKey(); if (!(oProps.containsKey(key))) return false; - String val = (String) entry.getValue(); + String val = entry.getValue(); if (!(val.equals(oProps.get(key)))) return false; } @@ -476,11 +473,11 @@ public class ObjectName */ public String getCanonicalKeyPropertyListString() { - StringBuilder builder = new StringBuilder(); - Iterator i = properties.entrySet().iterator(); + CPStringBuilder builder = new CPStringBuilder(); + Iterator<Map.Entry<String,String>> i = properties.entrySet().iterator(); while (i.hasNext()) { - Map.Entry entry = (Map.Entry) i.next(); + Map.Entry<String,String> entry = i.next(); builder.append(entry.getKey() + "=" + entry.getValue()); if (i.hasNext()) builder.append(","); @@ -795,7 +792,7 @@ public class ObjectName */ public static String quote(String string) { - StringBuilder builder = new StringBuilder(); + CPStringBuilder builder = new CPStringBuilder(); builder.append('"'); for (int a = 0; a < string.length(); ++a) { @@ -863,7 +860,7 @@ public class ObjectName throws IOException { out.defaultWriteObject(); - StringBuffer buffer = new StringBuffer(getDomain()); + CPStringBuilder buffer = new CPStringBuilder(getDomain()); buffer.append(':'); String properties = getKeyPropertyListString(); buffer.append(properties); @@ -924,7 +921,7 @@ public class ObjectName if (q.charAt(q.length() - 1) != '"') throw new IllegalArgumentException("The string does " + "not end with a quote."); - StringBuilder builder = new StringBuilder(); + CPStringBuilder builder = new CPStringBuilder(); for (int a = 1; a < (q.length() - 1); ++a) { char n = q.charAt(a); diff --git a/libjava/classpath/javax/management/StandardMBean.java b/libjava/classpath/javax/management/StandardMBean.java index bd59c68ae22..13e95bd396d 100644 --- a/libjava/classpath/javax/management/StandardMBean.java +++ b/libjava/classpath/javax/management/StandardMBean.java @@ -569,8 +569,8 @@ public class StandardMBean if (info != null) return info; Method[] methods = iface.getMethods(); - Map attributes = new HashMap(); - List operations = new ArrayList(); + Map<String,Method[]> attributes = new HashMap<String,Method[]>(); + List<MBeanOperationInfo> operations = new ArrayList<MBeanOperationInfo>(); for (int a = 0; a < methods.length; ++a) { String name = methods[a].getName(); @@ -614,16 +614,14 @@ public class StandardMBean operations.add(new MBeanOperationInfo(methods[a].getName(), methods[a])); } - List attribs = new ArrayList(attributes.size()); - Iterator it = attributes.entrySet().iterator(); - while (it.hasNext()) + List<MBeanAttributeInfo> attribs = new ArrayList<MBeanAttributeInfo>(attributes.size()); + for (Map.Entry<String,Method[]> entry : attributes.entrySet()) { - Map.Entry entry = (Map.Entry) it.next(); - Method[] amethods = (Method[]) entry.getValue(); + Method[] amethods = entry.getValue(); try { - attribs.add(new MBeanAttributeInfo((String) entry.getKey(), - (String) entry.getKey(), + attribs.add(new MBeanAttributeInfo(entry.getKey(), + entry.getKey(), amethods[0], amethods[1])); } catch (IntrospectionException e) @@ -646,7 +644,7 @@ public class StandardMBean oldInfo.isWritable(), oldInfo.isIs()); } - Constructor[] cons = impl.getClass().getConstructors(); + Constructor<?>[] cons = impl.getClass().getConstructors(); MBeanConstructorInfo[] cinfo = new MBeanConstructorInfo[cons.length]; for (int a = 0; a < cinfo.length; ++a) { @@ -778,10 +776,10 @@ public class StandardMBean "Invocation of an attribute " + "method is disallowed."); ClassLoader loader = getClass().getClassLoader(); - Class[] sigTypes; + Class<?>[] sigTypes; if (signature != null) { - sigTypes = new Class[signature.length]; + sigTypes = new Class<?>[signature.length]; for (int a = 0; a < signature.length; ++a) try { @@ -892,7 +890,7 @@ public class StandardMBean public AttributeList setAttributes(AttributeList attributes) { AttributeList list = new AttributeList(attributes.size()); - Iterator it = attributes.iterator(); + Iterator<Object> it = attributes.iterator(); while (it.hasNext()) { try diff --git a/libjava/classpath/javax/management/openmbean/ArrayType.java b/libjava/classpath/javax/management/openmbean/ArrayType.java index e6cf5261aaa..1a23f666f10 100644 --- a/libjava/classpath/javax/management/openmbean/ArrayType.java +++ b/libjava/classpath/javax/management/openmbean/ArrayType.java @@ -152,7 +152,7 @@ public class ArrayType<T> throw new IllegalArgumentException("Dimensions must be greater " + "than or equal to 1."); if (elementType instanceof ArrayType) - return dim + ((ArrayType) elementType).getDimension(); + return dim + ((ArrayType<?>) elementType).getDimension(); return dim; } @@ -236,7 +236,7 @@ public class ArrayType<T> private static final OpenType<?> getElementType(OpenType<?> elemType) { if (elemType instanceof ArrayType) - return ((ArrayType) elemType).getElementOpenType(); + return ((ArrayType<?>) elemType).getElementOpenType(); return elemType; } @@ -257,7 +257,7 @@ public class ArrayType<T> { OpenType<?> trueElemType = getElementType(elemType); if (elemType instanceof ArrayType && - ((ArrayType) elemType).isPrimitiveArray()) + ((ArrayType<?>) elemType).isPrimitiveArray()) return getPrimitiveTypeClass((SimpleType<?>) trueElemType).getName(); return trueElemType.getClassName(); } @@ -323,7 +323,7 @@ public class ArrayType<T> dimension = getDimensions(elementType, dim); this.elementType = getElementType(elementType); primitiveArray = (elementType instanceof ArrayType && - ((ArrayType) elementType).isPrimitiveArray()); + ((ArrayType<?>) elementType).isPrimitiveArray()); } /** @@ -408,7 +408,7 @@ public class ArrayType<T> { if (!(obj instanceof ArrayType)) return false; - ArrayType atype = (ArrayType) obj; + ArrayType<?> atype = (ArrayType<?>) obj; return (atype.getDimension() == dimension && atype.getElementOpenType().equals(elementType) && atype.isPrimitiveArray() == primitiveArray); @@ -439,13 +439,14 @@ public class ArrayType<T> * is not in {@link OpenType#ALLOWED_CLASSNAMES_LIST}. * @since 1.6 */ + @SuppressWarnings("unchecked") public static <E> ArrayType<E[]> getArrayType(OpenType<E> elementType) throws OpenDataException { ArrayType<E[]> arr = (ArrayType<E[]>) cache.get(elementType); if (arr != null) return arr; - arr = new ArrayType(1, elementType); + arr = new ArrayType<E[]>(1, elementType); cache.put(elementType, arr); return arr; } @@ -484,6 +485,7 @@ public class ArrayType<T> * array. * @since 1.6 */ + @SuppressWarnings("unchecked") public static <T> ArrayType<T> getPrimitiveArrayType(Class<T> type) { ArrayType<T> arr = (ArrayType<T>) primCache.get(type); @@ -499,10 +501,9 @@ public class ArrayType<T> throw new IllegalArgumentException("The given class is " + "not an array."); } while (comType.isArray()); - String className = type.getName(); try { - arr = new ArrayType(getPrimitiveType(comType), true); + arr = new ArrayType<T>(getPrimitiveType(comType), true); } catch (OpenDataException e) { @@ -512,7 +513,7 @@ public class ArrayType<T> while (dim > 1) try { - arr = new ArrayType(1, arr); + arr = new ArrayType<T>(1, arr); --dim; } catch (OpenDataException e) @@ -610,12 +611,12 @@ public class ArrayType<T> { if (obj == null) return false; - Class objClass = obj.getClass(); + Class<?> objClass = obj.getClass(); if (!(objClass.isArray())) return false; if (elementType instanceof SimpleType) return getClassName().equals(objClass.getName()); - Class elementClass = null; + Class<?> elementClass = null; try { elementClass = Class.forName(getClassName()); diff --git a/libjava/classpath/javax/management/openmbean/CompositeDataSupport.java b/libjava/classpath/javax/management/openmbean/CompositeDataSupport.java index d4c9d450c38..6bce2672d4f 100644 --- a/libjava/classpath/javax/management/openmbean/CompositeDataSupport.java +++ b/libjava/classpath/javax/management/openmbean/CompositeDataSupport.java @@ -154,7 +154,7 @@ public class CompositeDataSupport throw new IllegalArgumentException("The values array is null."); if (names.length != values.length) throw new IllegalArgumentException("The sizes of the arrays differ."); - Set typeKeys = type.keySet(); + Set<String> typeKeys = type.keySet(); if (typeKeys.size() != names.length) throw new OpenDataException("The number of field names does not match " + "the type description."); @@ -227,10 +227,8 @@ public class CompositeDataSupport CompositeData data = (CompositeData) obj; if (!(data.getCompositeType().equals(compositeType))) return false; - Iterator it = contents.keySet().iterator(); - while (it.hasNext()) + for (String key : contents.keySet()) { - String key = (String) it.next(); if (!(data.containsKey(key))) return false; if (!(data.get(key).equals(contents.get(key)))) @@ -308,9 +306,8 @@ public class CompositeDataSupport public int hashCode() { int code = compositeType.hashCode(); - Iterator it = values().iterator(); - while (it.hasNext()) - code += it.next().hashCode(); + for (Object o : contents.values()) + code += o.hashCode(); return code; } diff --git a/libjava/classpath/javax/management/openmbean/CompositeType.java b/libjava/classpath/javax/management/openmbean/CompositeType.java index 1a213f607c9..3244c6457c1 100644 --- a/libjava/classpath/javax/management/openmbean/CompositeType.java +++ b/libjava/classpath/javax/management/openmbean/CompositeType.java @@ -118,7 +118,7 @@ public class CompositeType || names.length != types.length) throw new IllegalArgumentException("Arrays must be non-empty " + "and of equal size."); - nameToDescription = new TreeMap(); + nameToDescription = new TreeMap<String,String>(); for (int a = 0; a < names.length; ++a) { if (names[a] == null) @@ -243,10 +243,8 @@ public class CompositeType if (hashCode == null) { int elementTotal = 0; - Iterator it = nameToType.entrySet().iterator(); - while (it.hasNext()) + for (Map.Entry<String,OpenType<?>> entry : nameToType.entrySet()) { - Map.Entry entry = (Map.Entry) it.next(); elementTotal += (entry.getKey().hashCode() + entry.getValue().hashCode()); } diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java index 22667aadf7d..6da2e95e689 100644 --- a/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java +++ b/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java @@ -77,12 +77,12 @@ public class OpenMBeanAttributeInfoSupport /** * The minimum value of the attribute (may be <code>null</code>). */ - private Comparable<Object> minValue; + private Comparable<?> minValue; /** * The maximum value of the attribute (may be <code>null</code>). */ - private Comparable<Object> maxValue; + private Comparable<?> maxValue; /** * The hash code of this instance. @@ -203,6 +203,7 @@ public class OpenMBeanAttributeInfoSupport * the empty string. * @throws OpenDataException if any condition in the list above is broken. */ + @SuppressWarnings("unchecked") public <T> OpenMBeanAttributeInfoSupport(String name, String desc, OpenType<T> type, boolean isReadable, boolean isWritable, boolean isIs, T defaultValue, @@ -224,23 +225,23 @@ public class OpenMBeanAttributeInfoSupport type instanceof TabularType)) throw new OpenDataException("Default values are not applicable for " + "array or tabular types."); - if (minValue != null && maxValue != null - && minValue.compareTo(maxValue) > 0) + if (minimumValue != null && maximumValue != null + && minimumValue.compareTo((T) maximumValue) > 0) throw new OpenDataException("The minimum value is greater than the " + "maximum."); - if (minValue != null && defaultValue != null - && minValue.compareTo(defaultValue) > 0) + if (minimumValue != null && defaultValue != null + && minimumValue.compareTo(defaultValue) > 0) throw new OpenDataException("The minimum value is greater than the " + "default."); - if (defaultValue != null && maxValue != null - && maxValue.compareTo(defaultValue) < 0) + if (defaultValue != null && maximumValue != null + && maximumValue.compareTo(defaultValue) < 0) throw new OpenDataException("The default value is greater than the " + "maximum."); openType = type; this.defaultValue = defaultValue; - minValue = (Comparable<Object>) minimumValue; - maxValue = (Comparable<Object>) maximumValue; + minValue = minimumValue; + maxValue = maximumValue; } /** @@ -300,7 +301,7 @@ public class OpenMBeanAttributeInfoSupport "array or tabular types."); if (legalValues != null && legalValues.length > 0) { - Set lv = new HashSet(legalValues.length); + Set<T> lv = new HashSet<T>(legalValues.length); for (int a = 0; a < legalValues.length; ++a) { if (legalValues[a] != null && diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanInfoSupport.java b/libjava/classpath/javax/management/openmbean/OpenMBeanInfoSupport.java index 5f8d55b8377..d67ff76a0f3 100644 --- a/libjava/classpath/javax/management/openmbean/OpenMBeanInfoSupport.java +++ b/libjava/classpath/javax/management/openmbean/OpenMBeanInfoSupport.java @@ -151,10 +151,10 @@ public class OpenMBeanInfoSupport if (hashCode == null) hashCode = Integer.valueOf(getClassName().hashCode() + - new HashSet(Arrays.asList(getAttributes())).hashCode() + - new HashSet(Arrays.asList(getConstructors())).hashCode() + - new HashSet(Arrays.asList(getNotifications())).hashCode() + - new HashSet(Arrays.asList(getOperations())).hashCode()); + new HashSet<MBeanAttributeInfo>(Arrays.asList(getAttributes())).hashCode() + + new HashSet<MBeanConstructorInfo>(Arrays.asList(getConstructors())).hashCode() + + new HashSet<MBeanNotificationInfo>(Arrays.asList(getNotifications())).hashCode() + + new HashSet<MBeanOperationInfo>(Arrays.asList(getOperations())).hashCode()); return hashCode.intValue(); } diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java b/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java index 7fad2a13161..5f86bf4af96 100644 --- a/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java +++ b/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java @@ -78,12 +78,12 @@ public class OpenMBeanParameterInfoSupport /** * The minimum value of the parameter (may be <code>null</code>). */ - private Comparable<Object> minValue; + private Comparable<?> minValue; /** * The maximum value of the parameter (may be <code>null</code>). */ - private Comparable<Object> maxValue; + private Comparable<?> maxValue; /** * The hash code of this instance. @@ -190,6 +190,7 @@ public class OpenMBeanParameterInfoSupport * the empty string. * @throws OpenDataException if any condition in the list above is broken. */ + @SuppressWarnings("unchecked") public <T> OpenMBeanParameterInfoSupport(String name, String desc, OpenType<T> type, T defaultValue, Comparable<T> minimumValue, Comparable<T> maximumValue) @@ -209,22 +210,22 @@ public class OpenMBeanParameterInfoSupport type instanceof TabularType)) throw new OpenDataException("Default values are not applicable for " + "array or tabular types."); - if (minValue != null && maxValue != null - && minValue.compareTo(maxValue) > 0) + if (minimumValue != null && maximumValue != null + && minimumValue.compareTo((T) maximumValue) > 0) throw new OpenDataException("The minimum value is greater than the " + "maximum."); - if (minValue != null && defaultValue != null - && minValue.compareTo(defaultValue) > 0) + if (minimumValue != null && defaultValue != null + && minimumValue.compareTo(defaultValue) > 0) throw new OpenDataException("The minimum value is greater than the " + "default."); - if (defaultValue != null && maxValue != null - && maxValue.compareTo(defaultValue) < 0) + if (defaultValue != null && maximumValue != null + && maximumValue.compareTo(defaultValue) < 0) throw new OpenDataException("The default value is greater than the " + "maximum."); this.defaultValue = defaultValue; - minValue = (Comparable<Object>) minimumValue; - maxValue = (Comparable<Object>) maximumValue; + minValue = minimumValue; + maxValue = maximumValue; } /** @@ -279,7 +280,7 @@ public class OpenMBeanParameterInfoSupport "array or tabular types."); if (legalValues != null && legalValues.length > 0) { - Set lv = new HashSet(legalValues.length); + Set<T> lv = new HashSet<T>(legalValues.length); for (int a = 0; a < legalValues.length; ++a) { if (legalValues[a] != null && diff --git a/libjava/classpath/javax/management/openmbean/SimpleType.java b/libjava/classpath/javax/management/openmbean/SimpleType.java index fb3b1bc28b7..ef05e9dfe4f 100644 --- a/libjava/classpath/javax/management/openmbean/SimpleType.java +++ b/libjava/classpath/javax/management/openmbean/SimpleType.java @@ -232,7 +232,7 @@ public final class SimpleType<T> { if (!(obj instanceof SimpleType)) return false; - SimpleType sType = (SimpleType) obj; + SimpleType<?> sType = (SimpleType<?>) obj; return sType.getClassName().equals(getClassName()); } diff --git a/libjava/classpath/javax/management/openmbean/TabularDataSupport.java b/libjava/classpath/javax/management/openmbean/TabularDataSupport.java index 1d340e86f59..8557f5f2464 100644 --- a/libjava/classpath/javax/management/openmbean/TabularDataSupport.java +++ b/libjava/classpath/javax/management/openmbean/TabularDataSupport.java @@ -68,7 +68,7 @@ public class TabularDataSupport * * @serial the map of rows to column values. */ - private Map<Object,Object> dataMap; + private HashMap<Object,Object> dataMap; /** * The tabular type which represents this tabular data instance. @@ -141,14 +141,10 @@ public class TabularDataSupport throw new InvalidOpenTypeException("The type of the given value " + "does not match the row type " + "of this instance."); - List indexNames = tabularType.getIndexNames(); - List matchingIndicies = new ArrayList(indexNames.size()); - Iterator it = indexNames.iterator(); - while (it.hasNext()) - { - String name = (String) it.next(); - matchingIndicies.add(val.get(name)); - } + List<String> indexNames = tabularType.getIndexNames(); + List<String> matchingIndicies = new ArrayList<String>(indexNames.size()); + for (String name : indexNames) + matchingIndicies.add(val.get(name).toString()); return matchingIndicies.toArray(); } @@ -167,13 +163,14 @@ public class TabularDataSupport * * @return a shallow clone of this {@link TabularDataSupport}. */ + @SuppressWarnings("unchecked") public Object clone() { TabularDataSupport clone = null; try { clone = (TabularDataSupport) super.clone(); - clone.setMap((HashMap) ((HashMap) dataMap).clone()); + clone.setMap((HashMap<Object,Object>) dataMap.clone()); } catch (CloneNotSupportedException e) { @@ -390,11 +387,11 @@ public class TabularDataSupport */ private boolean isKeyValid(Object[] key) { - Iterator it = tabularType.getIndexNames().iterator(); + Iterator<String> it = tabularType.getIndexNames().iterator(); CompositeType rowType = tabularType.getRowType(); for (int a = 0; it.hasNext(); ++a) { - OpenType type = rowType.getType((String) it.next()); + OpenType<?> type = rowType.getType(it.next()); if (!(type.isValue(key[a]))) return false; } @@ -496,7 +493,7 @@ public class TabularDataSupport { if (vals == null || vals.length == 0) return; - Map mapToAdd = new HashMap(vals.length); + Map<Object,Object> mapToAdd = new HashMap<Object,Object>(vals.length); for (int a = 0; a < vals.length; ++a) { Object[] key = calculateIndex(vals[a]); @@ -539,9 +536,9 @@ public class TabularDataSupport { if (m == null || m.size() == 0) return; - Collection vals = m.values(); + Collection<?> vals = m.values(); CompositeData[] data = new CompositeData[vals.size()]; - Iterator it = vals.iterator(); + Iterator<?> it = vals.iterator(); for (int a = 0; it.hasNext(); ++a) { data[a] = (CompositeData) it.next(); @@ -591,12 +588,12 @@ public class TabularDataSupport } /** - * Package-private method to set the internal {@link java.util.Map} + * Private method to set the internal {@link java.util.Map} * instance (used in cloning). * * @param map the new map used. */ - void setMap(Map map) + private void setMap(HashMap<Object,Object> map) { dataMap = map; } diff --git a/libjava/classpath/javax/management/openmbean/TabularType.java b/libjava/classpath/javax/management/openmbean/TabularType.java index 9a0881e0f92..5a861d061bd 100644 --- a/libjava/classpath/javax/management/openmbean/TabularType.java +++ b/libjava/classpath/javax/management/openmbean/TabularType.java @@ -206,9 +206,8 @@ public class TabularType if (hashCode == null) { int elementTotal = 0; - Iterator it = indexNames.iterator(); - while (it.hasNext()) - elementTotal += it.next().hashCode(); + for (String s : indexNames) + elementTotal += s.hashCode(); hashCode = Integer.valueOf(elementTotal + getTypeName().hashCode() + rowType.hashCode()); diff --git a/libjava/classpath/javax/management/remote/rmi/RMIConnection.java b/libjava/classpath/javax/management/remote/rmi/RMIConnection.java index 38fb544fe45..430f1c7dc97 100644 --- a/libjava/classpath/javax/management/remote/rmi/RMIConnection.java +++ b/libjava/classpath/javax/management/remote/rmi/RMIConnection.java @@ -152,6 +152,7 @@ public interface RMIConnection * NotificationFilter, * Object) */ + @SuppressWarnings("unchecked") void addNotificationListener(ObjectName name, ObjectName listener, MarshalledObject filter, MarshalledObject passback, Subject delegationSubject) @@ -223,6 +224,7 @@ public interface RMIConnection * NotificationFilter, * Object) */ + @SuppressWarnings("unchecked") Integer[] addNotificationListeners(ObjectName[] names, MarshalledObject[] filters, Subject[] delegationSubjects) throws InstanceNotFoundException, IOException; @@ -296,6 +298,7 @@ public interface RMIConnection * @throws IOException if an I/O error occurred in communicating with * the bean server. */ + @SuppressWarnings("unchecked") ObjectInstance createMBean(String className, ObjectName name, MarshalledObject params, String[] sig, Subject delegationSubject) @@ -364,6 +367,7 @@ public interface RMIConnection * @throws IOException if an I/O error occurred in communicating with * the bean server. */ + @SuppressWarnings("unchecked") ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, MarshalledObject params, String[] sig, Subject delegationSubject) @@ -763,6 +767,7 @@ public interface RMIConnection * the bean server. * @see DynamicMBean#invoke(String, Object[], String[]) */ + @SuppressWarnings("unchecked") Object invoke(ObjectName bean, String name, MarshalledObject params, String[] sig, Subject delegationSubject) throws InstanceNotFoundException, MBeanException, @@ -866,6 +871,7 @@ public interface RMIConnection * @throws SecurityException if the client or delegated subject (if any) does * not have permission to invoke this operation. */ + @SuppressWarnings("unchecked") Set<ObjectInstance> queryMBeans(ObjectName name, MarshalledObject query, Subject delegationSubject) throws IOException; @@ -908,6 +914,7 @@ public interface RMIConnection * @throws IOException if an I/O error occurred in communicating with * the bean server. */ + @SuppressWarnings("unchecked") Set<ObjectName> queryNames(ObjectName name, MarshalledObject query, Subject delegationSubject) throws IOException; @@ -953,6 +960,7 @@ public interface RMIConnection * NotificationFilter, * Object) */ + @SuppressWarnings("unchecked") void removeNotificationListener(ObjectName name, ObjectName listener, MarshalledObject filter, @@ -1072,6 +1080,7 @@ public interface RMIConnection * @see #getAttribute(ObjectName, String, Subject) * @see javax.management.DynamicMBean#setAttribute(Attribute) */ + @SuppressWarnings("unchecked") void setAttribute(ObjectName name, MarshalledObject attribute, Subject delegationSubject) throws InstanceNotFoundException, AttributeNotFoundException, @@ -1112,6 +1121,7 @@ public interface RMIConnection * @see #getAttributes(ObjectName, String[]) * @see DynamicMBean#setAttributes(AttributeList) */ + @SuppressWarnings("unchecked") AttributeList setAttributes(ObjectName name, MarshalledObject attributes, Subject delegationSubject) throws InstanceNotFoundException, ReflectionException, |
