--- old/src/share/classes/javax/swing/text/AbstractDocument.java 2014-06-10 11:51:28.000000000 -0700
+++ new/src/share/classes/javax/swing/text/AbstractDocument.java 2014-06-10 11:51:28.000000000 -0700
@@ -1809,7 +1809,7 @@
if (getAttributeCount() > 0) {
out.println("");
// dump the attributes
- Enumeration names = attributes.getAttributeNames();
+ Enumeration> names = attributes.getAttributeNames();
while (names.hasMoreElements()) {
Object name = names.nextElement();
indent(out, indentAmount + 1);
@@ -2193,7 +2193,7 @@
* Enumeration
.
* @return the children of the receiver as an Enumeration
*/
- public abstract Enumeration children();
+ public abstract Enumeration> children();
// --- serialization ---------------------------------------------
@@ -2456,7 +2456,7 @@
* Enumeration
.
* @return the children of the receiver
*/
- public Enumeration children() {
+ public Enumeration children() {
if(nchildren == 0)
return null;
@@ -2610,7 +2610,7 @@
* Enumeration
.
* @return the children of the receiver
*/
- public Enumeration children() {
+ public Enumeration> children() {
return null;
}
--- old/src/share/classes/javax/swing/text/AbstractWriter.java 2014-06-10 11:51:29.000000000 -0700
+++ new/src/share/classes/javax/swing/text/AbstractWriter.java 2014-06-10 11:51:29.000000000 -0700
@@ -668,7 +668,7 @@
*/
protected void writeAttributes(AttributeSet attr) throws IOException {
- Enumeration names = attr.getAttributeNames();
+ Enumeration> names = attr.getAttributeNames();
while (names.hasMoreElements()) {
Object name = names.nextElement();
write(" " + name + "=" + attr.getAttribute(name));
--- old/src/share/classes/javax/swing/text/DateFormatter.java 2014-06-10 11:51:29.000000000 -0700
+++ new/src/share/classes/javax/swing/text/DateFormatter.java 2014-06-10 11:51:29.000000000 -0700
@@ -108,8 +108,8 @@
/**
* Returns the field that will be adjusted by adjustValue.
*/
- Object getAdjustField(int start, Map attributes) {
- Iterator attrs = attributes.keySet().iterator();
+ Object getAdjustField(int start, Map, ?> attributes) {
+ Iterator> attrs = attributes.keySet().iterator();
while (attrs.hasNext()) {
Object key = attrs.next();
@@ -127,7 +127,7 @@
* Adjusts the Date if FieldPosition identifies a known calendar
* field.
*/
- Object adjustValue(Object value, Map attributes, Object key,
+ Object adjustValue(Object value, Map, ?> attributes, Object key,
int direction) throws
BadLocationException, ParseException {
if (key != null) {
--- old/src/share/classes/javax/swing/text/DefaultFormatter.java 2014-06-10 11:51:30.000000000 -0700
+++ new/src/share/classes/javax/swing/text/DefaultFormatter.java 2014-06-10 11:51:30.000000000 -0700
@@ -246,12 +246,12 @@
}
}
if (vc != null) {
- Constructor cons;
+ Constructor> cons;
try {
ReflectUtil.checkPackageAccess(vc);
SwingUtilities2.checkAccess(vc.getModifiers());
- cons = vc.getConstructor(new Class[]{String.class});
+ cons = vc.getConstructor(new Class>[]{String.class});
} catch (NoSuchMethodException nsme) {
cons = null;
--- old/src/share/classes/javax/swing/text/DefaultStyledDocument.java 2014-06-10 11:51:30.000000000 -0700
+++ new/src/share/classes/javax/swing/text/DefaultStyledDocument.java 2014-06-10 11:51:30.000000000 -0700
@@ -1048,8 +1048,9 @@
styleChangeListener = createStyleChangeListener();
}
if (styleChangeListener != null && styles != null) {
- Enumeration styleNames = styles.getStyleNames();
- Vector v = (Vector)listeningStyles.clone();
+ Enumeration> styleNames = styles.getStyleNames();
+ @SuppressWarnings("unchecked")
+ Vector