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

equal deleted inserted replaced

-:d07d5f7cab35
+:e1a6c0168741
 /*
-* reserved comment block
+* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
-* DO NOT REMOVE OR ALTER!
+* @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 com.sun.org.apache.xerces.internal.xs.XSSimpleTypeDefinition;
 import com.sun.org.apache.xerces.internal.xs.XSTypeDefinition;
 import com.sun.org.apache.xerces.internal.xs.datatypes.ObjectList;
 import java.math.BigInteger;
 import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.StringTokenizer;
-import java.util.Vector;
 import org.w3c.dom.TypeInfo;
 /**
 * @xerces.internal
 *
 private int fLength = -1;
 private int fMinLength = -1;
 private int fMaxLength = -1;
 private int fTotalDigits = -1;
 private int fFractionDigits = -1;
-private Vector fPattern;
+private List<RegularExpression> fPattern;
-private Vector fPatternStr;
+private List<String> fPatternStr;
 private ValidatedInfo[] fEnumeration;
 private int fEnumerationSize;
 private ShortList fEnumerationTypeList;
 private ObjectList fEnumerationItemTypeList;
 private StringList fLexicalPattern;
 regex = new RegularExpression(facets.pattern, "X", context.getLocale());
 } catch (Exception e) {
 reportError("InvalidRegex", new Object[]{facets.pattern, e.getLocalizedMessage()});
 }
 if (regex != null) {
-fPattern = new Vector();
+fPattern = new ArrayList<>();
-fPattern.addElement(regex);
+fPattern.add(regex);
-fPatternStr = new Vector();
+fPatternStr = new ArrayList<>();
-fPatternStr.addElement(facets.pattern);
+fPatternStr.add(facets.pattern);
 fFacetsDefined |= FACET_PATTERN;
 if ((fixedFacet & FACET_PATTERN) != 0)
 fFixedFacet |= FACET_PATTERN;
 }
 }
 // enumeration
 if ((presentFacet & FACET_ENUMERATION) != 0) {
 if ((allowedFacet & FACET_ENUMERATION) == 0) {
 reportError("cos-applicable-facets", new Object[]{"enumeration", fTypeName});
 } else {
-Vector enumVals = facets.enumeration;
+List<String> enumVals = facets.enumeration;
 int size = enumVals.size();
 fEnumeration = new ValidatedInfo[size];
-Vector enumNSDecls = facets.enumNSDecls;
+List<NamespaceContext> enumNSDecls = facets.enumNSDecls;
 ValidationContextImpl ctx = new ValidationContextImpl(context);
 enumerationAnnotations = facets.enumAnnotations;
 fEnumerationSize = 0;
 for (int i = 0; i < size; i++) {
 if (enumNSDecls != null)
-ctx.setNSContext((NamespaceContext)enumNSDecls.elementAt(i));
+ctx.setNSContext((NamespaceContext)enumNSDecls.get(i));
 try {
-ValidatedInfo info = getActualEnumValue((String)enumVals.elementAt(i), ctx, null);
+ValidatedInfo info = getActualEnumValue((String)enumVals.get(i), ctx, null);
 // check 4.3.5.c0 must: enumeration values from the value space of base
 fEnumeration[fEnumerationSize++] = info;
 } catch (InvalidDatatypeValueException ide) {
-reportError("enumeration-valid-restriction", new Object[]{enumVals.elementAt(i), this.getBaseType().getName()});
+reportError("enumeration-valid-restriction", new Object[]{enumVals.get(i), this.getBaseType().getName()});
 }
 }
 fFacetsDefined |= FACET_ENUMERATION;
 if ((fixedFacet & FACET_ENUMERATION) != 0)
 fFixedFacet |= FACET_ENUMERATION;
 fPatternStr = fBase.fPatternStr;
 patternAnnotations = fBase.patternAnnotations;
 }
 else {
 for (int i = fBase.fPattern.size()-1; i >= 0; --i) {
-fPattern.addElement(fBase.fPattern.elementAt(i));
+fPattern.add(fBase.fPattern.get(i));
-fPatternStr.addElement(fBase.fPatternStr.elementAt(i));
+fPatternStr.add(fBase.fPatternStr.get(i));
 }
 if (fBase.patternAnnotations != null) {
 if (patternAnnotations != null) {
 for (int i = fBase.patternAnnotations.getLength()-1; i >= 0; --i) {
 patternAnnotations.addXSObject(fBase.patternAnnotations.item(i));
 nvalue = content.toString();
 }
 if ( (fFacetsDefined & FACET_PATTERN ) != 0 ) {
 RegularExpression regex;
 for (int idx = fPattern.size()-1; idx >= 0; idx--) {
-regex = (RegularExpression)fPattern.elementAt(idx);
+regex = fPattern.get(idx);
 if (!regex.matches(nvalue)){
 throw new InvalidDatatypeValueException("cvc-pattern-valid",
 new Object[]{content,
-fPatternStr.elementAt(idx),
+fPatternStr.get(idx),
 fTypeName});
 }
 }
 }
 }
 else {
 strs = new String[size];
 }
 for (int i = 0; i < size; i++)
-strs[i] = (String)fPatternStr.elementAt(i);
+strs[i] = fPatternStr.get(i);
 fLexicalPattern = new StringListImpl(strs, strs.length);
 }
 return fLexicalPattern;
 }
 public short getType() {
 return XSConstants.MULTIVALUE_FACET;
 }
 }
-private static abstract class AbstractObjectList extends AbstractList implements ObjectList {
+private static abstract class AbstractObjectList extends AbstractList<Object> implements ObjectList {
 public Object get(int index) {
 if (index >= 0 && index < getLength()) {
 return item(index);
 }
 throw new IndexOutOfBoundsException("Index: " + index);

changeset 47359	e1a6c0168741
parent 47216	71c04702a3d5
child 47712	bde0215f1f70