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

equal deleted inserted replaced

-:1c076468bf7d
+:eca249f3c768
 /*
-* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
 */
 /*
 * 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.
 Constants.JAXP_PROPERTY_PREFIX + Constants.SCHEMA_SOURCE;
 /** Property identifier: entity resolver. */
 public static final String ENTITY_RESOLVER =
 Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_RESOLVER_PROPERTY;
 /** Property identifier: entity manager. */
 protected static final String ENTITY_MANAGER =
 Constants.XERCES_PROPERTY_PREFIX + Constants.ENTITY_MANAGER_PROPERTY;
 /** Property identifier: error reporter. */
 /** Property identifier: security manager. */
 protected static final String SECURITY_MANAGER =
 Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
-private static final String SECURE_PROCESSING =
-Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
 /** Property identifier: locale. */
 protected static final String LOCALE =
 Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
 /** Property identifier: Security property manager. */
 private static final String XML_SECURITY_PROPERTY_MANAGER =
 Constants.XML_SECURITY_PROPERTY_MANAGER;
 protected static final boolean DEBUG_NODE_POOL = false;
 // Data
 // this string gets appended to redefined names; it's purpose is to be
 // as unlikely as possible to cause collisions.
 public final static String REDEF_IDENTIFIER = "_fn3dktizrknc9pi";
-//
+//protected data that can be accessible by any traverser
-//protected data that can be accessable by any traverser
 protected XSDeclarationPool fDeclPool = null;
-/**
+// the Security manager in effect.
-* <p>Security manager in effect.</p>
+protected XMLSecurityManager fSecurityManager = null;
-*
-* <p>Protected to allow access by any traverser.</p>
-*/
-protected XMLSecurityManager fSecureProcessing = null;
 private String fAccessExternalSchema;
 private String fAccessExternalDTD;
 // These tables correspond to the symbol spaces defined in the
 // their values are nodes corresponding to the given name's decl.
 // By asking the node for its ownerDocument and looking in
 // XSDocumentInfoRegistry we can easily get the corresponding
 // XSDocumentInfo object.
 private boolean registryEmpty = true;
-private Map<String, Element> fUnparsedAttributeRegistry = new HashMap();
+private Map<String, Element> fUnparsedAttributeRegistry = new HashMap<>();
-private Map<String, Element> fUnparsedAttributeGroupRegistry =  new HashMap();
+private Map<String, Element> fUnparsedAttributeGroupRegistry =  new HashMap<>();
-private Map<String, Element> fUnparsedElementRegistry =  new HashMap();
+private Map<String, Element> fUnparsedElementRegistry =  new HashMap<>();
-private Map<String, Element> fUnparsedGroupRegistry =  new HashMap();
+private Map<String, Element> fUnparsedGroupRegistry =  new HashMap<>();
-private Map<String, Element> fUnparsedIdentityConstraintRegistry =  new HashMap();
+private Map<String, Element> fUnparsedIdentityConstraintRegistry =  new HashMap<>();
-private Map<String, Element> fUnparsedNotationRegistry =  new HashMap();
+private Map<String, Element> fUnparsedNotationRegistry =  new HashMap<>();
-private Map<String, Element> fUnparsedTypeRegistry =  new HashMap();
+private Map<String, Element> fUnparsedTypeRegistry =  new HashMap<>();
 // Compensation for the above maps to locate XSDocumentInfo,
 // Since we may take Schema Element directly, so can not get the
 // corresponding XSDocumentInfo object just using above maps.
-private Map<String, XSDocumentInfo> fUnparsedAttributeRegistrySub =  new HashMap();
+private Map<String, XSDocumentInfo> fUnparsedAttributeRegistrySub =  new HashMap<>();
-private Map<String, XSDocumentInfo> fUnparsedAttributeGroupRegistrySub =  new HashMap();
+private Map<String, XSDocumentInfo> fUnparsedAttributeGroupRegistrySub =  new HashMap<>();
-private Map<String, XSDocumentInfo> fUnparsedElementRegistrySub =  new HashMap();
+private Map<String, XSDocumentInfo> fUnparsedElementRegistrySub =  new HashMap<>();
-private Map<String, XSDocumentInfo> fUnparsedGroupRegistrySub =  new HashMap();
+private Map<String, XSDocumentInfo> fUnparsedGroupRegistrySub =  new HashMap<>();
-private Map<String, XSDocumentInfo> fUnparsedIdentityConstraintRegistrySub =  new HashMap();
+private Map<String, XSDocumentInfo> fUnparsedIdentityConstraintRegistrySub =  new HashMap<>();
-private Map<String, XSDocumentInfo> fUnparsedNotationRegistrySub =  new HashMap();
+private Map<String, XSDocumentInfo> fUnparsedNotationRegistrySub =  new HashMap<>();
-private Map<String, XSDocumentInfo> fUnparsedTypeRegistrySub =  new HashMap();
+private Map<String, XSDocumentInfo> fUnparsedTypeRegistrySub =  new HashMap<>();
 // Stores XSDocumentInfo (keyed by component name), to check for duplicate
 // components declared within the same xsd document
-private Map fUnparsedRegistriesExt[] = new HashMap[] {
+@SuppressWarnings("unchecked")
+private Map<String, XSDocumentInfo> fUnparsedRegistriesExt[] = new HashMap[] {
 null,
 null, // ATTRIBUTE_TYPE
 null, // ATTRIBUTEGROUP_TYPE
 null, // ELEMENT_TYPE
 null, // GROUP_TYPE
 };
 // this map is keyed on by XSDocumentInfo objects.  Its values
 // are Vectors containing the XSDocumentInfo objects <include>d,
 // <import>ed or <redefine>d by the key XSDocumentInfo.
-private Map<XSDocumentInfo, Vector> fDependencyMap = new HashMap();
+private Map<XSDocumentInfo, Vector<XSDocumentInfo>> fDependencyMap = new HashMap<>();
 // this map is keyed on by a target namespace.  Its values
 // are Vectors containing namespaces imported by schema documents
 // with the key target namespace.
-// if an imprted schema has absent namespace, the value "null" is stored.
+// if an imported schema has absent namespace, the value "null" is stored.
-private Map<String, Vector> fImportMap = new HashMap();
+private Map<String, Vector> fImportMap = new HashMap<> ();
 // all namespaces that imports other namespaces
 // if the importing schema has absent namespace, empty string is stored.
 // (because the key of a map can't be null.)
-private Vector fAllTNSs = new Vector();
+private Vector<String> fAllTNSs = new Vector<>();
 // stores instance document mappings between namespaces and schema hints
 private Map<String, XMLSchemaLoader.LocationArray> fLocationPairs = null;
 // Records which nodes are hidden when the input is a DOMInputSource.
 Map<Node, String> fHiddenNodes = null;
 * REVISIT: Casting until DOM Level 3 interfaces are available. -- mrglavas
 */
 if(ele.getOwnerDocument() instanceof com.sun.org.apache.xerces.internal.impl.xs.opti.SchemaDOM){
 documentURI = ((com.sun.org.apache.xerces.internal.impl.xs.opti.SchemaDOM) ele.getOwnerDocument()).getDocumentURI();
 }
-return documentURI != null ? documentURI : (String) fDoc2SystemId.get(ele);
+return documentURI != null ? documentURI : fDoc2SystemId.get(ele);
 }
 // This vector stores strings which are combinations of the
 // publicId and systemId of the inputSource corresponding to a
 // schema document.  This combination is used so that the user's
 // EntityResolver can provide a consistent way of identifying a
 // schema document that is included in multiple other schemas.
-private Map fTraversed = new HashMap();
+private Map<XSDKey, Element> fTraversed = new HashMap<>();
 // this map contains a mapping from Schema Element to its systemId
 // this is useful to resolve a uri relative to the referring document
-private Map fDoc2SystemId = new HashMap();
+private Map<Element, String> fDoc2SystemId = new HashMap<>();
 // the primary XSDocumentInfo we were called to parse
 private XSDocumentInfo fRoot = null;
 // This map's job is to act as a link between the Schema Element and its
 // handle tolerate duplicates feature
 boolean fTolerateDuplicates = false;
 // the XMLErrorReporter
 private XMLErrorReporter fErrorReporter;
-private XMLEntityResolver fEntityResolver;
+// the XMLErrorHandler
+private XMLErrorHandler fErrorHandler;
+// the Locale
+private Locale fLocale;
+// the XMLEntityManager
+private XMLEntityResolver fEntityManager;
 // the XSAttributeChecker
 private XSAttributeChecker fAttributeChecker;
 // the symbol table
 // the Grammar description
 private XSDDescription fSchemaGrammarDescription;
 // the Grammar Pool
 private XMLGrammarPool fGrammarPool;
+// the security property manager
+private XMLSecurityPropertyManager fSecurityPropertyMgr = null;
 //************ Traversers **********
 XSDAttributeGroupTraverser fAttributeGroupTraverser;
 XSDAttributeTraverser fAttributeTraverser;
 XSDComplexTypeTraverser fComplexTypeTraverser;
 // seventh phase:  store imported grammars
 // for all grammars with <import>s
 for (int i = fAllTNSs.size() - 1; i >= 0; i--) {
 // get its target namespace
-String tns = (String)fAllTNSs.elementAt(i);
+String tns = fAllTNSs.elementAt(i);
 // get all namespaces it imports
 Vector ins = (Vector)fImportMap.get(tns);
 // get the grammar
 SchemaGrammar sg = fGrammarBucket.getGrammar(emptyString2Null(tns));
 if (sg == null)
 fAnnotationValidator = new XML11Configuration();
 fGrammarBucketAdapter = new XSAnnotationGrammarPool();
 fAnnotationValidator.setFeature(VALIDATION, true);
 fAnnotationValidator.setFeature(XMLSCHEMA_VALIDATION, true);
 fAnnotationValidator.setProperty(XMLGRAMMAR_POOL, fGrammarBucketAdapter);
+/** set security manager and XML Security Property Manager **/
+fAnnotationValidator.setProperty(SECURITY_MANAGER, (fSecurityManager != null) ? fSecurityManager : new XMLSecurityManager(true));
+fAnnotationValidator.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
 /** Set error handler. **/
-XMLErrorHandler errorHandler = fErrorReporter.getErrorHandler();
+fAnnotationValidator.setProperty(ERROR_HANDLER, (fErrorHandler != null) ? fErrorHandler : new DefaultErrorHandler());
-fAnnotationValidator.setProperty(ERROR_HANDLER, (errorHandler != null) ? errorHandler : new DefaultErrorHandler());
 /** Set locale. **/
-Locale locale = fErrorReporter.getLocale();
+fAnnotationValidator.setProperty(LOCALE, fLocale);
-fAnnotationValidator.setProperty(LOCALE, locale);
 }
 /**
 * Pull the grammar out of the bucket simply using
 * its TNS as a key
 fGrammarBucket.putGrammar(sg);
 }
 // store the document and its location
 // REVISIT: don't expose the DOM tree
-sg.addDocument(null, (String)fDoc2SystemId.get(currSchemaInfo.fSchemaElement));
+sg.addDocument(null, fDoc2SystemId.get(currSchemaInfo.fSchemaElement));
 fDoc2XSDocumentMap.put(schemaRoot, currSchemaInfo);
-Vector dependencies = new Vector();
+Vector<XSDocumentInfo> dependencies = new Vector<>();
 Element rootNode = schemaRoot;
 Element newSchemaRoot = null;
 for (Element child = DOMUtil.getFirstChildElement(rootNode);
 child != null;
 }
 }
 } // end for
 // now we're done with this one!
 DOMUtil.setHidden(currDoc, fHiddenNodes);
 // now add the schemas this guy depends on
-Vector currSchemaDepends = (Vector)fDependencyMap.get(currSchemaDoc);
+Vector<XSDocumentInfo> currSchemaDepends = fDependencyMap.get(currSchemaDoc);
 for (int i = 0; i < currSchemaDepends.size(); i++) {
 schemasToProcess.push(currSchemaDepends.elementAt(i));
 }
 } // while
 // now we're done with this one!
 currSchemaDoc.returnSchemaAttrs();
 DOMUtil.setHidden(currDoc, fHiddenNodes);
 // now add the schemas this guy depends on
-Vector currSchemaDepends = (Vector)fDependencyMap.get(currSchemaDoc);
+Vector<XSDocumentInfo> currSchemaDepends = fDependencyMap.get(currSchemaDoc);
 for (int i = 0; i < currSchemaDepends.size(); i++) {
 schemasToProcess.push(currSchemaDepends.elementAt(i));
 }
 } // while
 } // end traverseSchemas
 return retObj;
 }
 public String schemaDocument2SystemId(XSDocumentInfo schemaDoc) {
-return (String)fDoc2SystemId.get(schemaDoc.fSchemaElement);
+return fDoc2SystemId.get(schemaDoc.fSchemaElement);
 }
 // This method determines whether there is a group
 // (attributeGroup) which the given one has redefined by
 // restriction.  If so, it returns it; else it returns null.
 private Element resolveSchema(XSDDescription desc, boolean mustResolve,
 Element referElement, boolean usePairs) {
 XMLInputSource schemaSource = null;
 try {
 Map<String, XMLSchemaLoader.LocationArray> pairs = usePairs ? fLocationPairs : Collections.emptyMap();
-schemaSource = XMLSchemaLoader.resolveDocument(desc, pairs, fEntityResolver);
+schemaSource = XMLSchemaLoader.resolveDocument(desc, pairs, fEntityManager);
 }
 catch (IOException ex) {
 if (mustResolve) {
 reportSchemaError("schema_reference.4",
 new Object[]{desc.getLocationHints()[0]},
 Element referElement, boolean usePairs) {
 XMLInputSource schemaSource = null;
 try {
 Map<String, XMLSchemaLoader.LocationArray> pairs = usePairs ? fLocationPairs : Collections.emptyMap();
-schemaSource = XMLSchemaLoader.resolveDocument(desc, pairs, fEntityResolver);
+schemaSource = XMLSchemaLoader.resolveDocument(desc, pairs, fEntityManager);
 }
 catch (IOException ex) {
 if (mustResolve) {
 reportSchemaError("schema_reference.4",
 new Object[]{desc.getLocationHints()[0]},
 XSDKey key = null;
 String schemaId = null;
 if (referType != XSDDescription.CONTEXT_PREPARSE){
 schemaId = XMLEntityManager.expandSystemId(schemaSource.getSystemId(), schemaSource.getBaseSystemId(), false);
 key = new XSDKey(schemaId, referType, schemaNamespace);
-if((schemaElement = (Element)fTraversed.get(key)) != null) {
+if((schemaElement = fTraversed.get(key)) != null) {
 fLastSchemaWasDuplicate = true;
 return schemaElement;
 }
 if (referType == XSDDescription.CONTEXT_IMPORT || referType == XSDDescription.CONTEXT_INCLUDE
 || referType == XSDDescription.CONTEXT_REDEFINE) {
 XSDKey key = null;
 String schemaId = null;
 if (referType != XSDDescription.CONTEXT_PREPARSE) {
 schemaId = XMLEntityManager.expandSystemId(inputSource.getSystemId(), schemaSource.getBaseSystemId(), false);
 key = new XSDKey(schemaId, referType, schemaNamespace);
-if ((schemaElement = (Element) fTraversed.get(key)) != null) {
+if ((schemaElement = fTraversed.get(key)) != null) {
 fLastSchemaWasDuplicate = true;
 return schemaElement;
 }
 }
 try {
 parser.setFeature(NAMESPACE_PREFIXES, true);
 namespacePrefixes = true;
 // If this is a Xerces SAX parser set the security manager if there is one
 if (parser instanceof SAXParser) {
-Object securityManager = fSchemaParser.getProperty(SECURITY_MANAGER);
+if (fSecurityManager != null) {
-if (securityManager != null) {
+parser.setProperty(SECURITY_MANAGER, fSecurityManager);
-parser.setProperty(SECURITY_MANAGER, securityManager);
 }
 }
 }
 catch (SAXException se) {}
 isDocument = (parent.getNodeType() == Node.DOCUMENT_NODE);
 }
 }
 if (isDocument) {
 key = new XSDKey(schemaId, referType, schemaNamespace);
-if ((schemaElement = (Element) fTraversed.get(key)) != null) {
+if ((schemaElement = fTraversed.get(key)) != null) {
 fLastSchemaWasDuplicate = true;
 return schemaElement;
 }
 }
 }
 isDocument = eventReader.peek().isStartDocument();
 }
 }
 if (isDocument) {
 key = new XSDKey(schemaId, referType, schemaNamespace);
-if ((schemaElement = (Element) fTraversed.get(key)) != null) {
+if ((schemaElement = fTraversed.get(key)) != null) {
 fLastSchemaWasDuplicate = true;
 return schemaElement;
 }
 }
 }
 public void reset(XMLComponentManager componentManager) {
 // set symbol table
 fSymbolTable = (SymbolTable) componentManager.getProperty(SYMBOL_TABLE);
-fSecureProcessing = null;
+// set security manager
-if( componentManager!=null ) {
+fSecurityManager = (XMLSecurityManager) componentManager.getProperty(SECURITY_MANAGER, null);
-fSecureProcessing = (XMLSecurityManager) componentManager.getProperty(SECURE_PROCESSING, null);
-}
+//set entity manager
+fEntityManager = (XMLEntityResolver) componentManager.getProperty(ENTITY_MANAGER);
 //set entity resolver
-fEntityResolver = (XMLEntityResolver) componentManager.getProperty(ENTITY_MANAGER);
 XMLEntityResolver er = (XMLEntityResolver)componentManager.getProperty(ENTITY_RESOLVER);
 if (er != null)
 fSchemaParser.setEntityResolver(er);
 // set error reporter
-fErrorReporter =
+fErrorReporter = (XMLErrorReporter) componentManager.getProperty(ERROR_REPORTER);
-(XMLErrorReporter) componentManager.getProperty(ERROR_REPORTER);
+fErrorHandler = fErrorReporter.getErrorHandler();
-try {
+fLocale = fErrorReporter.getLocale();
-XMLErrorHandler currErrorHandler = fErrorReporter.getErrorHandler();
-// Setting a parser property can be much more expensive
-// than checking its value.  Don't set the ERROR_HANDLER
-// or LOCALE properties unless they've actually changed.
-if (currErrorHandler != fSchemaParser.getProperty(ERROR_HANDLER)) {
-fSchemaParser.setProperty(ERROR_HANDLER, (currErrorHandler != null) ? currErrorHandler : new DefaultErrorHandler());
-if (fAnnotationValidator != null) {
-fAnnotationValidator.setProperty(ERROR_HANDLER, (currErrorHandler != null) ? currErrorHandler : new DefaultErrorHandler());
-}
-}
-Locale currentLocale = fErrorReporter.getLocale();
-if (currentLocale != fSchemaParser.getProperty(LOCALE)) {
-fSchemaParser.setProperty(LOCALE, currentLocale);
-if (fAnnotationValidator != null) {
-fAnnotationValidator.setProperty(LOCALE, currentLocale);
-}
-}
-}
-catch (XMLConfigurationException e) {}
 fValidateAnnotations = componentManager.getFeature(VALIDATE_ANNOTATIONS, false);
 fHonourAllSchemaLocations = componentManager.getFeature(HONOUR_ALL_SCHEMALOCATIONS, false);
 fNamespaceGrowth = componentManager.getFeature(NAMESPACE_GROWTH, false);
 fTolerateDuplicates = componentManager.getFeature(TOLERATE_DUPLICATES, false);
 try {
-fSchemaParser.setFeature(
+// Setting a parser property can be much more expensive
-CONTINUE_AFTER_FATAL_ERROR,
+// than checking its value.  Don't set the ERROR_HANDLER
-fErrorReporter.getFeature(CONTINUE_AFTER_FATAL_ERROR));
+// or LOCALE properties unless they've actually changed.
-} catch (XMLConfigurationException e) {
+if (fErrorHandler != fSchemaParser.getProperty(ERROR_HANDLER)) {
-}
+fSchemaParser.setProperty(ERROR_HANDLER, (fErrorHandler != null) ? fErrorHandler : new DefaultErrorHandler());
+if (fAnnotationValidator != null) {
+fAnnotationValidator.setProperty(ERROR_HANDLER, (fErrorHandler != null) ? fErrorHandler : new DefaultErrorHandler());
+}
+}
+if (fLocale != fSchemaParser.getProperty(LOCALE)) {
+fSchemaParser.setProperty(LOCALE, fLocale);
+if (fAnnotationValidator != null) {
+fAnnotationValidator.setProperty(LOCALE, fLocale);
+}
+}
+}
+catch (XMLConfigurationException e) {}
+try {
+fSchemaParser.setFeature(CONTINUE_AFTER_FATAL_ERROR, fErrorReporter.getFeature(CONTINUE_AFTER_FATAL_ERROR));
+} catch (XMLConfigurationException e) {}
 try {
 if (componentManager.getFeature(ALLOW_JAVA_ENCODINGS, false)) {
 fSchemaParser.setFeature(ALLOW_JAVA_ENCODINGS, true);
 }
-} catch (XMLConfigurationException e) {
+} catch (XMLConfigurationException e) {}
-}
 try {
 if (componentManager.getFeature(STANDARD_URI_CONFORMANT_FEATURE, false)) {
 fSchemaParser.setFeature(STANDARD_URI_CONFORMANT_FEATURE, true);
 }
-} catch (XMLConfigurationException e) {
+} catch (XMLConfigurationException e) {}
-}
 try {
-fGrammarPool =
+fGrammarPool = (XMLGrammarPool) componentManager.getProperty(XMLGRAMMAR_POOL);
-(XMLGrammarPool) componentManager.getProperty(XMLGRAMMAR_POOL);
 } catch (XMLConfigurationException e) {
 fGrammarPool = null;
 }
 // security features
 try {
 if (componentManager.getFeature(DISALLOW_DOCTYPE, false)) {
 fSchemaParser.setFeature(DISALLOW_DOCTYPE, true);
 }
-} catch (XMLConfigurationException e) {
+} catch (XMLConfigurationException e) {}
-}
 try {
-Object security = componentManager.getProperty(SECURITY_MANAGER, null);
+if (fSecurityManager != null) {
-if (security != null){
+fSchemaParser.setProperty(SECURITY_MANAGER, fSecurityManager);
-fSchemaParser.setProperty(SECURITY_MANAGER, security);
+}
-}
+} catch (XMLConfigurationException e) {}
-} catch (XMLConfigurationException e) {
-}
+fSecurityPropertyMgr = (XMLSecurityPropertyManager) componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
-XMLSecurityPropertyManager securityPropertyMgr = (XMLSecurityPropertyManager)
-componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
 //Passing on the setting to the parser
-fSchemaParser.setProperty(XML_SECURITY_PROPERTY_MANAGER, securityPropertyMgr);
+fSchemaParser.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
-fAccessExternalDTD = securityPropertyMgr.getValue(
+fAccessExternalDTD = fSecurityPropertyMgr.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
-XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
+fAccessExternalSchema = fSecurityPropertyMgr.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA);
-fAccessExternalSchema = securityPropertyMgr.getValue(
-XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA);
 } // reset(XMLComponentManager)
 /**
 Logic here is unnecessary after schema WG's recent decision to allow
 schema components from one document to refer to components of any other,
 so long as there's some include/import/redefine path amongst them.
 If they rver reverse this decision the code's right here though...  - neilg
 // now look in fDependencyMap to see if this is reachable
-if(((Vector)fDependencyMap.get(currSchema)).contains(declDocInfo)) {
+if((fDependencyMap.get(currSchema)).contains(declDocInfo)) {
 return declDocInfo;
 }
 // obviously the requesting doc didn't include, redefine or
 // import the one containing decl...
 return null;
 private void setSchemasVisible(XSDocumentInfo startSchema) {
 if (DOMUtil.isHidden(startSchema.fSchemaElement, fHiddenNodes)) {
 // make it visible
 DOMUtil.setVisible(startSchema.fSchemaElement, fHiddenNodes);
-Vector dependingSchemas = (Vector)fDependencyMap.get(startSchema);
+Vector<XSDocumentInfo> dependingSchemas = fDependencyMap.get(startSchema);
 for (int i = 0; i < dependingSchemas.size(); i++) {
-setSchemasVisible((XSDocumentInfo)dependingSchemas.elementAt(i));
+setSchemasVisible(dependingSchemas.elementAt(i));
 }
 }
 // if it's visible already than so must be its children
 } // setSchemasVisible(XSDocumentInfo): void
 return false;
 if (e instanceof ElementImpl) {
 ElementImpl ele = (ElementImpl)e;
 // get system id from document object
 Document doc = ele.getOwnerDocument();
-String sid = (String)fDoc2SystemId.get(DOMUtil.getRoot(doc));
+String sid = fDoc2SystemId.get(DOMUtil.getRoot(doc));
 // line/column numbers are stored in the element node
 int line = ele.getLineNumber();
 int column = ele.getColumnNumber();
 l.setValues(sid, sid, line, column, ele.getCharacterOffset());
 return true;

changeset 36146	eca249f3c768
parent 35729	49f1515c5f5c
child 39080	57563e513b11