--- old/src/share/classes/javax/swing/text/html/FormView.java 2014-06-10 11:51:37.000000000 -0700
+++ new/src/share/classes/javax/swing/text/html/FormView.java 2014-06-10 11:51:37.000000000 -0700
@@ -168,8 +168,8 @@
} else if (t == HTML.Tag.SELECT) {
if (model instanceof OptionListModel) {
-
- JList list = new JList((ListModel) model);
+ @SuppressWarnings("unchecked")
+ JList> list = new JList<>((ListModel) model);
int size = HTML.getIntegerAttributeValue(attr,
HTML.Attribute.SIZE,
1);
@@ -177,7 +177,9 @@
list.setSelectionModel((ListSelectionModel)model);
c = new JScrollPane(list);
} else {
- c = new JComboBox((ComboBoxModel) model);
+ @SuppressWarnings("unchecked")
+ JComboBox> tmp = new JComboBox<>((ComboBoxModel) model);
+ c = tmp;
maxIsPreferred = 3;
}
} else if (t == HTML.Tag.TEXTAREA) {
@@ -342,7 +344,8 @@
// BasicListUI$Handler.
// For JComboBox, there are 2 stale ListDataListeners, which are
// BasicListUI$Handler and BasicComboBoxUI$Handler.
- AbstractListModel listModel = (AbstractListModel) model;
+ @SuppressWarnings("unchecked")
+ AbstractListModel> listModel = (AbstractListModel) model;
String listenerClass1 =
"javax.swing.plaf.basic.BasicListUI$Handler";
String listenerClass2 =
@@ -788,6 +791,7 @@
}
Object m = attr.getAttribute(StyleConstants.ModelAttribute);
if (m instanceof OptionListModel) {
+ @SuppressWarnings("unchecked")
OptionListModel