jdk-sandbox: comparison src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java

equal deleted inserted replaced

-:d07d5f7cab35
+:e1a6c0168741
 /*
 * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+* @LastModified: Oct 2017
+* @modifiedBy: Oracle Inc.
+* @modifiedOn: Nov 2015, Sept 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.
 * limitations under the License.
 */
 package com.sun.org.apache.xerces.internal.xinclude;
-import java.io.CharConversionException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Stack;
-import java.util.StringTokenizer;
-import javax.xml.XMLConstants;
 import com.sun.org.apache.xerces.internal.impl.Constants;
 import com.sun.org.apache.xerces.internal.impl.XMLEntityManager;
 import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
 import com.sun.org.apache.xerces.internal.impl.io.MalformedByteSequenceException;
 import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
 import com.sun.org.apache.xerces.internal.util.AugmentationsImpl;
 import com.sun.org.apache.xerces.internal.util.HTTPInputSource;
 import com.sun.org.apache.xerces.internal.util.IntStack;
 import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings;
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.util.URI.MalformedURIException;
 import com.sun.org.apache.xerces.internal.util.URI;
 import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl;
+import com.sun.org.apache.xerces.internal.util.XMLChar;
 import com.sun.org.apache.xerces.internal.util.XMLResourceIdentifierImpl;
-import com.sun.org.apache.xerces.internal.util.XMLChar;
 import com.sun.org.apache.xerces.internal.util.XMLSymbols;
-import com.sun.org.apache.xerces.internal.util.URI.MalformedURIException;
+import com.sun.org.apache.xerces.internal.utils.ObjectFactory;
 import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
 import com.sun.org.apache.xerces.internal.xni.Augmentations;
 import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
 import com.sun.org.apache.xerces.internal.xni.QName;
 import com.sun.org.apache.xerces.internal.xni.XMLAttributes;
 import com.sun.org.apache.xerces.internal.xni.XMLDTDHandler;
 import com.sun.org.apache.xerces.internal.xni.parser.XMLEntityResolver;
 import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
 import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
 import com.sun.org.apache.xerces.internal.xpointer.XPointerHandler;
 import com.sun.org.apache.xerces.internal.xpointer.XPointerProcessor;
-import com.sun.org.apache.xerces.internal.utils.ObjectFactory;
+import java.io.CharConversionException;
-import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
+import java.util.Stack;
+import java.util.StringTokenizer;
+import javax.xml.XMLConstants;
 import javax.xml.catalog.CatalogException;
 import javax.xml.catalog.CatalogFeatures;
 import javax.xml.catalog.CatalogManager;
 import javax.xml.catalog.CatalogResolver;
 import javax.xml.transform.Source;
 protected XIncludeTextReader fXInclude11TextReader;
 // these are needed for XML Base processing
 protected XMLResourceIdentifier fCurrentBaseURI;
 protected IntStack fBaseURIScope;
-protected Stack fBaseURI;
+protected Stack<String> fBaseURI;
-protected Stack fLiteralSystemID;
+protected Stack<String> fLiteralSystemID;
-protected Stack fExpandedSystemID;
+protected Stack<String> fExpandedSystemID;
 // these are needed for Language Fixup
 protected IntStack fLanguageScope;
-protected Stack fLanguageStack;
+protected Stack<String> fLanguageStack;
 protected String fCurrentLanguage;
 // used for passing features on to child XIncludeHandler objects
 protected ParserConfigurationSettings fSettings;
 // The state of the processor at each given depth.
 private int[] fState = new int[INITIAL_SIZE];
 // buffering the necessary DTD events
-private final ArrayList<Notation> fNotations;
+private final List<Notation> fNotations;
-private final ArrayList<UnparsedEntity> fUnparsedEntities;
+private final List<UnparsedEntity> fUnparsedEntities;
 // flags which control whether base URI or language fixup is performed.
 private boolean fFixupBaseURIs = true;
 private boolean fFixupLanguage = true;
 fState[fDepth] = STATE_NORMAL_PROCESSING;
 fNotations = new ArrayList<>();
 fUnparsedEntities = new ArrayList<>();
 fBaseURIScope = new IntStack();
-fBaseURI = new Stack();
+fBaseURI = new Stack<>();
-fLiteralSystemID = new Stack();
+fLiteralSystemID = new Stack<>();
-fExpandedSystemID = new Stack();
+fExpandedSystemID = new Stack<>();
 fCurrentBaseURI = new XMLResourceIdentifierImpl();
 fLanguageScope = new IntStack();
-fLanguageStack = new Stack();
+fLanguageStack = new Stack<>();
 fCurrentLanguage = null;
 }
 // XMLComponent methods
 fCurrentLanguage);
 attributes.setSpecified(index, true);
 }
 // Modify attributes of included items to do namespace-fixup. (spec 4.5.4)
-Enumeration inscopeNS = fNamespaceContext.getAllPrefixes();
+Enumeration<String> inscopeNS = fNamespaceContext.getAllPrefixes();
 while (inscopeNS.hasMoreElements()) {
-String prefix = (String)inscopeNS.nextElement();
+String prefix = inscopeNS.nextElement();
 String parentURI =
 fNamespaceContext.getURIFromIncludeParent(prefix);
 String uri = fNamespaceContext.getURI(prefix);
 if (parentURI != uri && attributes != null) {
 if (prefix == XMLSymbols.EMPTY_STRING) {
 protected void checkUnparsedEntity(String entName) {
 UnparsedEntity ent = new UnparsedEntity();
 ent.name = entName;
 int index = fUnparsedEntities.indexOf(ent);
 if (index != -1) {
-ent = (UnparsedEntity)fUnparsedEntities.get(index);
+ent = fUnparsedEntities.get(index);
 // first check the notation of the unparsed entity
 checkNotation(ent.notation);
 checkAndSendUnparsedEntity(ent);
 }
 }
 protected void checkNotation(String notName) {
 Notation not = new Notation();
 not.name = notName;
 int index = fNotations.indexOf(not);
 if (index != -1) {
-not = (Notation)fNotations.get(index);
+not = fNotations.get(index);
 checkAndSendNotation(not);
 }
 }
 /**
 ent.notation,
 ent.augmentations);
 }
 }
 else {
-UnparsedEntity localEntity =
+UnparsedEntity localEntity = fUnparsedEntities.get(index);
-(UnparsedEntity)fUnparsedEntities.get(index);
 if (!ent.isDuplicate(localEntity)) {
 reportFatalError(
 "NonDuplicateUnparsedEntity",
 new Object[] { ent.name });
 }
 if (fSendUEAndNotationEvents && fDTDHandler != null) {
 fDTDHandler.notationDecl(not.name, id, not.augmentations);
 }
 }
 else {
-Notation localNotation = (Notation)fNotations.get(index);
+Notation localNotation = fNotations.get(index);
 if (!not.isDuplicate(localNotation)) {
 reportFatalError(
 "NonDuplicateNotation",
 new Object[] { not.name });
 }
 // It would be nice if we didn't have to repeat code like this, but there's no interface that has
 // setFeature() and addRecognizedFeatures() that the objects have in common.
 protected void copyFeatures(
 XMLComponentManager from,
 ParserConfigurationSettings to) {
-Enumeration features = Constants.getXercesFeatures();
+Enumeration<Object> features = Constants.getXercesFeatures();
 copyFeatures1(features, Constants.XERCES_FEATURE_PREFIX, from, to);
 features = Constants.getSAXFeatures();
 copyFeatures1(features, Constants.SAX_FEATURE_PREFIX, from, to);
 }
 protected void copyFeatures(
 XMLComponentManager from,
 XMLParserConfiguration to) {
-Enumeration features = Constants.getXercesFeatures();
+Enumeration<Object> features = Constants.getXercesFeatures();
 copyFeatures1(features, Constants.XERCES_FEATURE_PREFIX, from, to);
 features = Constants.getSAXFeatures();
 copyFeatures1(features, Constants.SAX_FEATURE_PREFIX, from, to);
 }
 private void copyFeatures1(
-Enumeration features,
+Enumeration<Object> features,
 String featurePrefix,
 XMLComponentManager from,
 ParserConfigurationSettings to) {
 while (features.hasMoreElements()) {
 String featureId = featurePrefix + (String)features.nextElement();
 }
 }
 }
 private void copyFeatures1(
-Enumeration features,
+Enumeration<Object> features,
 String featurePrefix,
 XMLComponentManager from,
 XMLParserConfiguration to) {
 while (features.hasMoreElements()) {
 String featureId = featurePrefix + (String)features.nextElement();
 * @param depth
 * @return the base URI
 */
 public String getBaseURI(int depth) {
 int scope = scopeOfBaseURI(depth);
-return (String)fExpandedSystemID.elementAt(scope);
+return fExpandedSystemID.get(scope);
 }
 /**
 * Gets the language that was in use at that depth.
 * @param depth
 * @return the language
 */
 public String getLanguage(int depth) {
 int scope = scopeOfLanguage(depth);
-return (String)fLanguageStack.elementAt(scope);
+return fLanguageStack.get(scope);
 }
 /**
 * Returns a relative URI, which when resolved against the base URI at the
 * specified depth, will create the current base URI.
 int start = scopeOfBaseURI(depth) + 1;
 if (start == fBaseURIScope.size()) {
 // If that is the last system id, then we don't need a relative URI
 return "";
 }
-URI uri = new URI("file", (String)fLiteralSystemID.elementAt(start));
+URI uri = new URI("file", fLiteralSystemID.get(start));
 for (int i = start + 1; i < fBaseURIScope.size(); i++) {
-uri = new URI(uri, (String)fLiteralSystemID.elementAt(i));
+uri = new URI(uri, fLiteralSystemID.get(i));
 }
 return uri.getPath();
 }
 // We need to find two consecutive elements in the scope stack,

changeset 47359	e1a6c0168741
parent 47216	71c04702a3d5
child 47712	bde0215f1f70