infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-13 01:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8345616: Unnecessary Hashtable usage in javax.swing.text.html.parser.Element

Browse Source 
Reviewed-by: aivanov, azvegint
This commit is contained in:
Andrey Turbanov 2024-12-11 18:22:23 +00:00
parent cce5808d7a
commit e4a34e96cd
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,9 +25,9 @@
package javax.swing.text.html.parser;
import java.util.Hashtable;
import java.io.Serializable;
import java.util.BitSet;
import java.io.*;
import java.util.Map;
import sun.awt.AppContext;
/**
@ -41,8 +41,7 @@ import sun.awt.AppContext;
* @author Arthur van Hoff
*/
@SuppressWarnings("serial") // Same-version serialization only
public final
class Element implements DTDConstants, Serializable {
public final class Element implements DTDConstants, Serializable {
/**
* The element index
@ -234,15 +233,12 @@ class Element implements DTDConstants, Serializable {
return null;
}
static Hashtable<String, Integer> contentTypes = new Hashtable<String, Integer>();
static {
contentTypes.put("CDATA", Integer.valueOf(CDATA));
contentTypes.put("RCDATA", Integer.valueOf(RCDATA));
contentTypes.put("EMPTY", Integer.valueOf(EMPTY));
contentTypes.put("ANY", Integer.valueOf(ANY));
}
private static final Map<String, Integer> contentTypes = Map.of(
"CDATA", CDATA,
"RCDATA", RCDATA,
"EMPTY", EMPTY,
"ANY", ANY
);
/**
* Converts {@code nm} to type. Returns appropriate DTDConstants
@ -253,7 +249,6 @@ class Element implements DTDConstants, Serializable {
* CDATA, RCDATA, EMPTY or ANY, 0 otherwise.
*/
public static int name2type(String nm) {
Integer val = contentTypes.get(nm);
return (val != null) ? val.intValue() : 0;
return contentTypes.getOrDefault(nm, 0);
}
}