jdk-sandbox: comparison jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java

equal deleted inserted replaced

-:230d872f56ea
+:db51759e3695
 /*
-* reserved comment block
+* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
-* DO NOT REMOVE OR ALTER!
 */
 /*
-* Copyright 2001-2004 The Apache Software Foundation.
+* Licensed to the Apache Software Foundation (ASF) under one or more
-*
+* contributor license agreements.  See the NOTICE file distributed with
-* Licensed under the Apache License, Version 2.0 (the "License");
+* this work for additional information regarding copyright ownership.
-* you may not use this file except in compliance with the License.
+* The ASF licenses this file to You under the Apache License, Version 2.0
-* You may obtain a copy of the License at
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-/*
-* $Id: TemplatesHandlerImpl.java,v 1.2.4.1 2005/09/06 12:09:03 pvedula Exp $
-*/
 package com.sun.org.apache.xalan.internal.xsltc.trax;
-import javax.xml.XMLConstants;
-import javax.xml.transform.Source;
-import javax.xml.transform.Templates;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.URIResolver;
-import javax.xml.transform.sax.TemplatesHandler;
 import com.sun.org.apache.xalan.internal.XalanConstants;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.CompilerException;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.Parser;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.SourceLoader;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.Stylesheet;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.SyntaxTreeNode;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
+import java.util.ArrayList;
+import javax.xml.XMLConstants;
+import javax.xml.catalog.CatalogFeatures;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.sax.TemplatesHandler;
+import jdk.xml.internal.JdkXmlFeatures;
+import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
-import org.xml.sax.Attributes;
-import java.util.Vector;
 /**
 * Implementation of a JAXP1.1 TemplatesHandler
 * @author Morten Jorgensen
 * @author Santiago Pericas-Geertsen
 /**
 * The created Templates object.
 */
 private TemplatesImpl _templates = null;
+// Catalog features
+CatalogFeatures _catalogFeatures;
+// Catalog is enabled by default
+boolean _useCatalog = true;
 /**
 * Default constructor
 */
 protected TemplatesHandlerImpl(int indentNumber,
 TransformerFactoryImpl tfactory)
 {
 _indentNumber = indentNumber;
 _tfactory = tfactory;
 // Instantiate XSLTC and get reference to parser object
-XSLTC xsltc = new XSLTC(tfactory.useServicesMechnism(), tfactory.getFeatureManager());
+XSLTC xsltc = new XSLTC(tfactory.useServicesMechnism(), tfactory.getJdkXmlFeatures());
 if (tfactory.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING))
 xsltc.setSecureProcessing(true);
 xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET,
 (String)tfactory.getAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET));
 if ("true".equals(tfactory.getAttribute(TransformerFactoryImpl.ENABLE_INLINING)))
 xsltc.setTemplateInlining(true);
 else
 xsltc.setTemplateInlining(false);
+_useCatalog = tfactory.getFeature(XMLConstants.USE_CATALOG);
+_catalogFeatures = (CatalogFeatures)tfactory.getAttribute(JdkXmlFeatures.CATALOG_FEATURES);
+xsltc.setProperty(JdkXmlFeatures.CATALOG_FEATURES, _catalogFeatures);
 _parser = xsltc.getParser();
 }
 /**
 stylesheet.setTemplateInlining(true);
 else
 stylesheet.setTemplateInlining(false);
 // Set a document loader (for xsl:include/import) if defined
-if (_uriResolver != null) {
+if (_uriResolver != null || (_useCatalog &&
+_catalogFeatures.get(CatalogFeatures.Feature.FILES) != null)) {
 stylesheet.setSourceLoader(this);
 }
 _parser.setCurrentStylesheet(stylesheet);
 _templates.setURIResolver(_uriResolver);
 }
 }
 }
 else {
-StringBuffer errorMessage = new StringBuffer();
+StringBuilder errorMessage = new StringBuilder();
-Vector errors = _parser.getErrors();
+ArrayList<ErrorMsg> errors = _parser.getErrors();
 final int count = errors.size();
 for (int i = 0; i < count; i++) {
 if (errorMessage.length() > 0)
 errorMessage.append('\n');
-errorMessage.append(errors.elementAt(i).toString());
+errorMessage.append(errors.get(i).toString());
 }
 throw new SAXException(ErrorMsg.JAXP_COMPILE_ERR, new TransformerException(errorMessage.toString()));
 }
 }
 catch (CompilerException e) {

changeset 39907	db51759e3695
parent 25868	686eef1e7a79