jdk-sandbox: comparison jdk/src/share/classes/javax/swing/JEditorPane.java

equal deleted inserted replaced

-:e7bbe37ce03a
+:15e81207e1f2
 * @return all of the <code>HyperLinkListener</code>s added or an empty
 *         array if no listeners have been added
 * @since 1.4
 */
 public synchronized HyperlinkListener[] getHyperlinkListeners() {
-return (HyperlinkListener[])listenerList.getListeners(
+return listenerList.getListeners(javax.swing.event.HyperlinkListener.class);
-HyperlinkListener.class);
 }
 /**
 * Notifies all listeners that have registered interest for
 * notification on this event type.  This is normally called
 private Document initializeModel(EditorKit kit, URL page) {
 Document doc = kit.createDefaultDocument();
 if (pageProperties != null) {
 // transfer properties discovered in stream to the
 // document property collection.
-for (Enumeration e = pageProperties.keys(); e.hasMoreElements() ;) {
+for (Enumeration<String> e = pageProperties.keys(); e.hasMoreElements() ;) {
-Object key = e.nextElement();
+String key = e.nextElement();
 doc.putProperty(key, pageProperties.get(key));
 }
 pageProperties.clear();
 }
 if (doc.getProperty(Document.StreamDescriptionProperty) == null) {
 /**
 * Handle URL connection properties (most notably, content type).
 */
 private void handleConnectionProperties(URLConnection conn) {
 if (pageProperties == null) {
-pageProperties = new Hashtable();
+pageProperties = new Hashtable<String, Object>();
 }
 String type = conn.getContentType();
 if (type != null) {
 setContentType(type);
 pageProperties.put("content-type", type);
 /**
 * This method gets the charset information specified as part
 * of the content type in the http header information.
 */
 private void setCharsetFromContentTypeParameters(String paramlist) {
-String charset = null;
+String charset;
 try {
 // paramlist is handed to us with a leading ';', strip it.
 int semi = paramlist.indexOf(';');
 if (semi > -1 && semi < paramlist.length()-1) {
 paramlist = paramlist.substring(semi + 1);
 * @param type the non-<code>null</code> content type
 * @return the editor kit
 */
 public EditorKit getEditorKitForContentType(String type) {
 if (typeHandlers == null) {
-typeHandlers = new Hashtable(3);
+typeHandlers = new Hashtable<String, EditorKit>(3);
 }
-EditorKit k = (EditorKit) typeHandlers.get(type);
+EditorKit k = typeHandlers.get(type);
 if (k == null) {
 k = createEditorKitForContentType(type);
 if (k != null) {
 setEditorKitForContentType(type, k);
 }
 * @param type the non-<code>null</code> content type
 * @param k the editor kit to be set
 */
 public void setEditorKitForContentType(String type, EditorKit k) {
 if (typeHandlers == null) {
-typeHandlers = new Hashtable(3);
+typeHandlers = new Hashtable<String, EditorKit>(3);
 }
 typeHandlers.put(type, k);
 }
 /**
 * @param type the content type
 * @return the editor kit, or <code>null</code> if there is nothing
 *   registered for the given type
 */
 public static EditorKit createEditorKitForContentType(String type) {
-EditorKit k = null;
+Hashtable<String, EditorKit> kitRegistry = getKitRegisty();
-Hashtable kitRegistry = getKitRegisty();
+EditorKit k = kitRegistry.get(type);
-k = (EditorKit) kitRegistry.get(type);
 if (k == null) {
 // try to dynamically load the support
-String classname = (String) getKitTypeRegistry().get(type);
+String classname = getKitTypeRegistry().get(type);
-ClassLoader loader = (ClassLoader) getKitLoaderRegistry().get(type);
+ClassLoader loader = getKitLoaderRegistry().get(type);
 try {
 Class c;
 if (loader != null) {
 c = loader.loadClass(classname);
 } else {
 * @param type  the non-<code>null</code> content type
 *
 * @since 1.3
 */
 public static String getEditorKitClassNameForContentType(String type) {
-return (String)getKitTypeRegistry().get(type);
+return getKitTypeRegistry().get(type);
 }
-private static Hashtable getKitTypeRegistry() {
+private static Hashtable<String, String> getKitTypeRegistry() {
 loadDefaultKitsIfNecessary();
 return (Hashtable)SwingUtilities.appContextGet(kitTypeRegistryKey);
 }
-private static Hashtable getKitLoaderRegistry() {
+private static Hashtable<String, ClassLoader> getKitLoaderRegistry() {
 loadDefaultKitsIfNecessary();
 return (Hashtable)SwingUtilities.appContextGet(kitLoaderRegistryKey);
 }
-private static Hashtable getKitRegisty() {
+private static Hashtable<String, EditorKit> getKitRegisty() {
 Hashtable ht = (Hashtable)SwingUtilities.appContextGet(kitRegistryKey);
 if (ht == null) {
 ht = new Hashtable(3);
 SwingUtilities.appContextPut(kitRegistryKey, ht);
 }
 * Current content binding of the editor.
 */
 private EditorKit kit;
 private boolean isUserSetEditorKit;
-private Hashtable pageProperties;
+private Hashtable<String, Object> pageProperties;
 /** Should be kept in sync with javax.swing.text.html.FormView counterpart. */
 final static String PostDataProperty = "javax.swing.JEditorPane.postdata";
 /**
 * Table of registered type handlers for this editor.
 */
-private Hashtable typeHandlers;
+private Hashtable<String, EditorKit> typeHandlers;
 /*
 * Private AppContext keys for this class's static variables.
 */
 private static final Object kitRegistryKey =
 public int getEndIndex() {
 return element.getEndOffset();
 }
 }
-private class LinkVector extends Vector {
+private class LinkVector extends Vector<HTMLLink> {
 public int baseElementIndex(Element e) {
 HTMLLink l;
 for (int i = 0; i < elementCount; i++) {
-l = (HTMLLink) elementAt(i);
+l = elementAt(i);
 if (l.element == e) {
 return i;
 }
 }
 return -1;
 public AccessibleHyperlink getLink(int linkIndex) {
 if (linksValid == false) {
 buildLinkTable();
 }
 if (linkIndex >= 0 && linkIndex < hyperlinks.size()) {
-return (AccessibleHyperlink) hyperlinks.elementAt(linkIndex);
+return hyperlinks.elementAt(linkIndex);
 } else {
 return null;
 }
 }

changeset 1301	15e81207e1f2
parent 715	f16baef3a20e
child 3737	83fb4621a129