Mercurial > hg > openjdk > jdk9 > jaxp
changeset 1009:8bc07d268a55
Merge
author | lana |
---|---|
date | Thu, 06 Oct 2016 23:12:05 +0000 |
parents | fd47b31f4cca (current diff) dbdf839b7925 (diff) |
children | d87925045dbd |
files | |
diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java Thu Oct 06 20:56:11 2016 +0000 +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java Thu Oct 06 23:12:05 2016 +0000 @@ -52,7 +52,7 @@ private SymbolTable fSymbolTable = null; private Locale fLocale = null; - private ArrayList<String> fIdList; + private HashSet<String> fIds; private ArrayList<String> fIdRefList; // @@ -97,7 +97,7 @@ String key; for (int i = 0; i < fIdRefList.size(); i++) { key = fIdRefList.get(i); - if (fIdList == null || !fIdList.contains(key)) { + if (fIds == null || !fIds.contains(key)) { if (missingIDs == null) { missingIDs = new HashSet(); } @@ -112,7 +112,7 @@ fExtraChecking = true; fFacetChecking = true; fNamespaces = true; - fIdList = null; + fIds = null; fIdRefList = null; fEntityState = null; fNamespaceContext = null; @@ -126,7 +126,7 @@ * the two tables. */ public void resetIDTables() { - fIdList = null; + fIds = null; fIdRefList = null; } @@ -168,12 +168,11 @@ // id public boolean isIdDeclared(String name) { - if (fIdList == null) return false; - return fIdList.contains(name); + return fIds != null && fIds.contains(name); } public void addId(String name) { - if (fIdList == null) fIdList = new ArrayList(); - fIdList.add(name); + if (fIds == null) fIds = new HashSet<>(); + fIds.add(name); } // idref