jdk-sandbox: comparison src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java

equal deleted inserted replaced

-:d07d5f7cab35
+:e1a6c0168741
 /*
 * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
-* @LastModified: Sep 2017
+* @LastModified: Oct 2017
 */
 /*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 import java.util.Vector;
 import javax.xml.XMLConstants;
 import jdk.xml.internal.JdkXmlUtils;
 // the error reporter property
 XMLErrorReporter fErrorReporter;
 // store error codes; starting position of the errors for each element;
 // number of element (depth); and whether to record error
-Vector fErrors = new Vector();
+Vector<String> fErrors = new Vector<>();
 int[] fContext = new int[INITIAL_STACK_SIZE];
 int fContextCount;
 // set the external error reporter, clear errors
 public void reset(XMLErrorReporter errorReporter) {
 if (size == 0)
 return null;
 // copy errors from the list to an string array
 String[] errors = new String[size];
 for (int i = 0; i < size; i++) {
-errors[i] = (String) fErrors.elementAt(contextPos + i);
+errors[i] = fErrors.get(contextPos + i);
 }
 // remove errors of the current element
 fErrors.setSize(contextPos);
 return errors;
 }
 if (size == 0)
 return null;
 // copy errors from the list to an string array
 String[] errors = new String[size];
 for (int i = 0; i < size; i++) {
-errors[i] = (String) fErrors.elementAt(contextPos + i);
+errors[i] = fErrors.get(contextPos + i);
 }
 // don't resize the vector: leave the errors for this attribute
 // to the containing element
 return errors;
 }
 public void reportError(String domain, String key, Object[] arguments, short severity)
 throws XNIException {
 String message = fErrorReporter.reportError(domain, key, arguments, severity);
 if (fAugPSVI) {
-fErrors.addElement(key);
+fErrors.add(key);
-fErrors.addElement(message);
+fErrors.add(message);
 }
 } // reportError(String,String,Object[],short)
 public void reportError(
 XMLLocator location,
 Object[] arguments,
 short severity)
 throws XNIException {
 String message = fErrorReporter.reportError(location, domain, key, arguments, severity);
 if (fAugPSVI) {
-fErrors.addElement(key);
+fErrors.add(key);
-fErrors.addElement(message);
+fErrors.add(message);
 }
 } // reportError(XMLLocator,String,String,Object[],short)
 }
 /** Error reporter. */
 decl = fCurrentCM.oneTransition(element, fCurrCMState, fSubGroupHandler);
 // it could be an element decl or a wildcard decl
 if (fCurrCMState[0] == XSCMValidator.FIRST_ERROR) {
 XSComplexTypeDecl ctype = (XSComplexTypeDecl) fCurrentType;
 //REVISIT: is it the only case we will have particle = null?
-ArrayList next;
+List<Object> next;
 if (ctype.fParticle != null
 && (next = fCurrentCM.whatCanGoHere(fCurrCMState)).size() > 0) {
 String expected = expectedStr(next);
 final int[] occurenceInfo = fCurrentCM.occurenceInfo(fCurrCMState);
 String elemExpandedQname = (element.uri != null) ? "{"+'"'+element.uri+'"'+":"+element.localpart+"}" : element.localpart;
 SchemaGrammar[] grammars = null;
 // have we reached the end tag of the validation root?
 if (fElementDepth == 0) {
 // 7 If the element information item is the validation root, it must be valid per Validation Root Valid (ID/IDREF) (3.3.4).
-Iterator invIdRefs = fValidationState.checkIDRefID();
+Iterator<String> invIdRefs = fValidationState.checkIDRefID();
 fValidationState.resetIDTables();
 if (invIdRefs != null) {
 while (invIdRefs.hasNext()) {
 reportSchemaError("cvc-id.1", new Object[] { invIdRefs.next() });
 }
 } else {
 // Constant space algorithm for a{n,m} for n > 1 and m <= unbounded
 // After the DFA has completed, check minOccurs and maxOccurs
 // for all elements and wildcards in this content model where
 // a{n,m} is subsumed to a* or a+
-ArrayList errors = fCurrentCM.checkMinMaxBounds();
+List<String> errors = fCurrentCM.checkMinMaxBounds();
 if (errors != null) {
 for (int i = 0; i < errors.size(); i += 2) {
-reportSchemaError(
+reportSchemaError(errors.get(i),
-(String) errors.get(i),
 new Object[] { element.rawname, errors.get(i + 1) });
 }
 }
 }
 }
 key,
 arguments,
 XMLErrorReporter.SEVERITY_ERROR);
 }
-private String expectedStr(ArrayList expected) {
+private String expectedStr(List<Object> expected) {
 StringBuilder ret = new StringBuilder("{");
 int size = expected.size();
 for (int i = 0; i < size; i++) {
 if (i > 0)
 ret.append(", ");
 /** Current data value count. */
 protected int fValuesCount;
 /** global data */
-public final Vector fValues = new Vector();
+public final Vector<Object> fValues = new Vector<>();
 public ShortVector fValueTypes = null;
-public Vector fItemValueTypes = null;
+public Vector<ShortList> fItemValueTypes = null;
 private boolean fUseValueTypeVector = false;
 private int fValueTypesLength = 0;
 private short fValueType = 0;
 } // end clear():void
 // appends the contents of one ValueStore to those of us.
 public void append(ValueStoreBase newVal) {
 for (int i = 0; i < newVal.fValues.size(); i++) {
-fValues.addElement(newVal.fValues.elementAt(i));
+fValues.add(newVal.fValues.get(i));
 }
 } // append(ValueStoreBase)
 /** Start scope for value store. */
 public void startValueScope() {
 fLocalItemValueTypes[i] = itemValueType;
 if (fValuesCount == fFieldCount) {
 checkDuplicateValues();
 // store values
 for (i = 0; i < fFieldCount; i++) {
-fValues.addElement(fLocalValues[i]);
+fValues.add(fLocalValues[i]);
 addValueType(fLocalValueTypes[i]);
 addItemValueType(fLocalItemValueTypes[i]);
 }
 }
 } // addValue(String,Field)
 final int size = fValues.size();
 LOOP : for (int i = 0; i < size; i = next) {
 next = i + fFieldCount;
 for (int j = 0; j < fFieldCount; j++) {
 Object value1 = fLocalValues[j];
-Object value2 = fValues.elementAt(i);
+Object value2 = fValues.get(i);
 short valueType1 = fLocalValueTypes[j];
 short valueType2 = getValueTypeAt(i);
 if (value1 == null || value2 == null || valueType1 != valueType2 || !(value1.equals(value2))) {
 continue LOOP;
 }
 * values, otherwise the index of the first field in the
 * key sequence.
 */
 public int contains(ValueStoreBase vsb) {
-final Vector values = vsb.fValues;
+final Vector<Object> values = vsb.fValues;
 final int size1 = values.size();
 if (fFieldCount <= 1) {
 for (int i = 0; i < size1; ++i) {
 short val = vsb.getValueTypeAt(i);
-if (!valueTypeContains(val) || !fValues.contains(values.elementAt(i))) {
+if (!valueTypeContains(val) || !fValues.contains(values.get(i))) {
 return i;
 }
 else if(val == XSConstants.LIST_DT || val == XSConstants.LISTOFUNION_DT) {
 ShortList list1 = vsb.getItemValueTypeAt(i);
 if (!itemValueTypeContains(list1)) {
 /** Iterate over each set of fields. **/
 OUTER: for (int i = 0; i < size1; i += fFieldCount) {
 /** Check whether this set is contained in the value store. **/
 INNER: for (int j = 0; j < size2; j += fFieldCount) {
 for (int k = 0; k < fFieldCount; ++k) {
-final Object value1 = values.elementAt(i+k);
+final Object value1 = values.get(i+k);
-final Object value2 = fValues.elementAt(j+k);
+final Object value2 = fValues.get(j+k);
 final short valueType1 = vsb.getValueTypeAt(i+k);
 final short valueType2 = getValueTypeAt(j+k);
 if (value1 != value2 && (valueType1 != valueType2 || value1 == null || !value1.equals(value2))) {
 continue INNER;
 }
 return fTempBuffer.toString();
 } // toString(Object[]):String
 /** Returns a string of the specified values. */
-protected String toString(Vector values, int start, int length) {
+protected String toString(Vector<Object> values, int start, int length) {
 // no values
 if (length == 0) {
 return "";
 }
 // one value
 if (length == 1) {
-return String.valueOf(values.elementAt(start));
+return String.valueOf(values.get(start));
 }
 // construct value string
 StringBuilder str = new StringBuilder();
 for (int i = 0; i < length; i++) {
 if (i > 0) {
 str.append(',');
 }
-str.append(values.elementAt(start + i));
+str.append(values.get(start + i));
 }
 return str.toString();
 } // toString(Vector,int,int):String
 }
 else if (!(fItemValueType == itemValueType ||
 (fItemValueType != null && fItemValueType.equals(itemValueType)))) {
 fUseItemValueTypeVector = true;
 if (fItemValueTypes == null) {
-fItemValueTypes = new Vector(fItemValueTypesLength * 2);
+fItemValueTypes = new Vector<>(fItemValueTypesLength * 2);
 }
 for (int i = 1; i < fItemValueTypesLength; ++i) {
 fItemValueTypes.add(fItemValueType);
 }
 fItemValueTypes.add(itemValueType);
 }
 }
 private ShortList getItemValueTypeAt(int index) {
 if (fUseItemValueTypeVector) {
-return (ShortList) fItemValueTypes.elementAt(index);
+return (ShortList) fItemValueTypes.get(index);
 }
 return fItemValueType;
 }
 private boolean itemValueTypeContains(ShortList value) {
 //
 final LocalIDKey fLocalId = new LocalIDKey();
 // values stores
 /** stores all global Values stores. */
-protected final ArrayList fValueStores = new ArrayList();
+protected final List<ValueStoreBase> fValueStores = new ArrayList<>();
 /**
 * Values stores associated to specific identity constraints.
 * This map maps IdentityConstraints and
 * the 0-based element on which their selectors first matched to
 fGlobalMapStack.removeAllElements();
 } // startDocument()
 // startElement:  pushes the current fGlobalIDConstraintMap
 // onto fGlobalMapStack and clears fGlobalIDConstraint map.
+@SuppressWarnings("unchecked")
 public void startElement() {
 // only clone the map when there are elements
 if (fGlobalIDConstraintMap.size() > 0)
 fGlobalMapStack.push((Map<IdentityConstraint, ValueStoreBase>)
-((HashMap)fGlobalIDConstraintMap).clone());
+((HashMap<IdentityConstraint, ValueStoreBase>)fGlobalIDConstraintMap).clone());
 else
 fGlobalMapStack.push(null);
 fGlobalIDConstraintMap.clear();
 } // startElement(void)
 } // transplant(id)
 /** Check identity constraints. */
 public void endDocument() {
-int count = fValueStores.size();
+for (ValueStoreBase valueStore : fValueStores) {
-for (int i = 0; i < count; i++) {
-ValueStoreBase valueStore = (ValueStoreBase) fValueStores.get(i);
 valueStore.endDocument();
 }
 } // endDocument()

changeset 47359	e1a6c0168741
parent 47312	d4f959806fe9
child 47712	bde0215f1f70