--- old/src/share/classes/javax/swing/text/NumberFormatter.java 2014-06-10 11:51:33.000000000 -0700
+++ new/src/share/classes/javax/swing/text/NumberFormatter.java 2014-06-10 11:51:33.000000000 -0700
@@ -173,7 +173,8 @@
* Byte
or Short
and value
* is an instanceof Number
.
*/
- private Object convertValueToValueClass(Object value, Class valueClass) {
+ private Object convertValueToValueClass(Object value,
+ Class> valueClass) {
if (valueClass != null && (value instanceof Number)) {
Number numberValue = (Number)value;
if (valueClass == Integer.class) {
@@ -266,7 +267,7 @@
* Subclassed to treat the decimal separator, grouping separator,
* exponent symbol, percent, permille, currency and sign as literals.
*/
- boolean isLiteral(Map attrs) {
+ boolean isLiteral(Map, ?> attrs) {
if (!super.isLiteral(attrs)) {
if (attrs == null) {
return false;
@@ -327,7 +328,7 @@
while (index >= 0 && index < max) {
iterator.setIndex(index);
- Map attrs = iterator.getAttributes();
+ Map,?> attrs = iterator.getAttributes();
if (attrs != null && attrs.size() > 0) {
for (Object key : attrs.keySet()) {
@@ -432,8 +433,8 @@
try {
ReflectUtil.checkPackageAccess(valueClass);
SwingUtilities2.checkAccess(valueClass.getModifiers());
- Constructor cons = valueClass.getConstructor(
- new Class[] { String.class });
+ Constructor> cons = valueClass.getConstructor(
+ new Class>[] { String.class });
if (cons != null) {
SwingUtilities2.checkAccess(cons.getModifiers());
return cons.newInstance(new Object[]{string});