Attachment #90876 for bug #118291

Lines 424-432 public class IdentityTransformer Link Here

(-)adaptx-20041105/src/main/org/exolab/adaptx/jaxp/transform/IdentityTransformer.java (-3 / +3 lines)
424	}	424	}
425	else {	425	else {
426	_outputProperties = new Properties();	426	_outputProperties = new Properties();
427	Enumeration enum = properties.keys();	427	Enumeration enum1 = properties.keys();
428	while (enum.hasMoreElements()) {	428	while (enum1.hasMoreElements()) {
429	String name = (String)enum.nextElement();	429	String name = (String)enum1.nextElement();
430	String value = properties.getProperty(name);	430	String value = properties.getProperty(name);
431	_outputProperties.setProperty(name, value);	431	_outputProperties.setProperty(name, value);
432	}	432	}

Lines 134-139 public class TransformerFactoryImpl Link Here

(-)adaptx-20041105/src/main/org/exolab/adaptx/jaxp/transform/TransformerFactoryImpl.java (+5 lines)
134	} //-- TransformerFactoryImpl	134	} //-- TransformerFactoryImpl
135		135
136		136
		137	public void setFeature (String name, boolean value)
		138	throws TransformerConfigurationException {
		139	throw new TransformerConfigurationException ();
		140	}
		141
137		142
138	/**	143	/**
139	* Returns the associated stylesheet with the given source document.	144	* Returns the associated stylesheet with the given source document.

Lines 454-462 public class TransformerImpl Link Here

(-)adaptx-20041105/src/main/org/exolab/adaptx/jaxp/transform/TransformerImpl.java (-3 / +3 lines)
454	else {	454	else {
455	_outputProperties = new Properties();	455	_outputProperties = new Properties();
456	XSLOutput output = new XSLOutput();	456	XSLOutput output = new XSLOutput();
457	Enumeration enum = properties.keys();	457	Enumeration enum1 = properties.keys();
458	while (enum.hasMoreElements()) {	458	while (enum1.hasMoreElements()) {
459	String name = (String)enum.nextElement();	459	String name = (String)enum1.nextElement();
460	String value = properties.getProperty(name);	460	String value = properties.getProperty(name);
461	_outputProperties.setProperty(name, value);	461	_outputProperties.setProperty(name, value);
462	try {	462	try {

Lines 200-208 public class ResultHandlerAdapter2 imple Link Here

(-)adaptx-20041105/src/main/org/exolab/adaptx/xslt/handlers/ResultHandlerAdapter2.java (-3 / +3 lines)
200	_handler.endElement(uri, name, name);	200	_handler.endElement(uri, name, name);
201	}	201	}
202		202
203	Enumeration enum = _namespaces.getLocalNamespacePrefixes();	203	Enumeration enum1 = _namespaces.getLocalNamespacePrefixes();
204	while (enum.hasMoreElements()) {	204	while (enum1.hasMoreElements()) {
205	_handler.endPrefixMapping((String)enum.nextElement());	205	_handler.endPrefixMapping((String)enum1.nextElement());
206	}	206	}
207	_namespaces = _namespaces.getParent();	207	_namespaces = _namespaces.getParent();
208		208




        
        ResultFormatter rf = ps.getResultFormatter();
            
        Enumeration enum1 = null;
        //-- copy top-level declared namespaces
        /*
        Hashtable namespaces = stylesheet.getNamespaces();

        
        // Process top-level parameters
        ScopedVariableSet vars = ps.getVariables();
        enum1 = stylesheet.getParameters();
        while (enum1.hasMoreElements()) {
            Param param = (Param)enum1.nextElement();
            //-- first check passed in parameters
            String value = getParameter(param.getName());
            if (value != null) {

        }
        
        //-- Process top-level variables
        enum1 = stylesheet.getVariables();
        while (enum1.hasMoreElements()) {
            Variable variable = (Variable)enum1.nextElement();
            XPathResult value = processVariable(variable, ps);
            if (value != null) {
                vars.setVariable(variable.getName(), value);

Lines 1266-1274 public class XSLTProcessor Link Here

(-)adaptx-20041105/src/main/org/exolab/adaptx/xslt/XSLTProcessor.java (-4 / +4 lines)
1266	* @param ruleProcessor the RuleProcessor to copy parameters to	1266	* @param ruleProcessor the RuleProcessor to copy parameters to
1267	**/	1267	**/
1268	private void copyParams(RuleProcessor ruleProcessor) {	1268	private void copyParams(RuleProcessor ruleProcessor) {
1269	Enumeration enum = params.keys();	1269	Enumeration enum1 = params.keys();
1270	while (enum.hasMoreElements()) {	1270	while (enum1.hasMoreElements()) {
1271	String name = (String)enum.nextElement();	1271	String name = (String)enum1.nextElement();
1272	ruleProcessor.setParameter(name, params.getProperty(name));	1272	ruleProcessor.setParameter(name, params.getProperty(name));
1273	}	1273	}
1274	} //-- copyParams	1274	} //-- copyParams
Lines 1635-1638 public class XSLTProcessor Link Here
1635	} //-- readXSLStylesheet	1635	} //-- readXSLStylesheet
1636		1636
1637		1637
1638	} //-- XSLProcessor	1638	} //-- XSLProcessor




	    if (namespace == null) return null;
	    String qns = (String) quotedns.get(namespace);
	    if (qns != null) {
	        Enumeration enum1 = namespaces.keys();
    	    String key;
	        while (enum1.hasMoreElements()) {
	            key = (String)enum1.nextElement();
	            if (qns.equals(namespaces.get(key)))
	                return key;
	        }

        
        // combine global variables and parameters
        try {
            Enumeration enum1 = xsl.getVariables();
            while (enum1.hasMoreElements()) {
                Variable v = (Variable) enum1.nextElement();
                Variable tmp = getVariable(v.getName());
                if (tmp != null) variables.remove(tmp);
                addVariable(v, true);
            }
            enum1 = xsl.getParameters();
            while (enum1.hasMoreElements()) {
                Param p = (Param) enum1.nextElement();
                Param tmp = getParameter(p.getName());
                if (tmp != null) parameters.remove(tmp);
                addParam(p);

Return to bug 118291

Lines 262-268 public class RuleProcessor extends Error Link Here

(-)adaptx-20041105/src/main/org/exolab/adaptx/xslt/RuleProcessor.java (-7 / +7 lines)
262		262
263	ResultFormatter rf = ps.getResultFormatter();	263	ResultFormatter rf = ps.getResultFormatter();
264		264
265	Enumeration enum = null;	265	Enumeration enum1 = null;
266	//-- copy top-level declared namespaces	266	//-- copy top-level declared namespaces
267	/*	267	/*
268	Hashtable namespaces = stylesheet.getNamespaces();	268	Hashtable namespaces = stylesheet.getNamespaces();
Lines 304-312 public class RuleProcessor extends Error Link Here
304		304
305	// Process top-level parameters	305	// Process top-level parameters
306	ScopedVariableSet vars = ps.getVariables();	306	ScopedVariableSet vars = ps.getVariables();
307	enum = stylesheet.getParameters();	307	enum1 = stylesheet.getParameters();
308	while (enum.hasMoreElements()) {	308	while (enum1.hasMoreElements()) {
309	Param param = (Param)enum.nextElement();	309	Param param = (Param)enum1.nextElement();
310	//-- first check passed in parameters	310	//-- first check passed in parameters
311	String value = getParameter(param.getName());	311	String value = getParameter(param.getName());
312	if (value != null) {	312	if (value != null) {
Lines 322-330 public class RuleProcessor extends Error Link Here
322	}	322	}
323		323
324	//-- Process top-level variables	324	//-- Process top-level variables
325	enum = stylesheet.getVariables();	325	enum1 = stylesheet.getVariables();
326	while (enum.hasMoreElements()) {	326	while (enum1.hasMoreElements()) {
327	Variable variable = (Variable)enum.nextElement();	327	Variable variable = (Variable)enum1.nextElement();
328	XPathResult value = processVariable(variable, ps);	328	XPathResult value = processVariable(variable, ps);
329	if (value != null) {	329	if (value != null) {
330	vars.setVariable(variable.getName(), value);	330	vars.setVariable(variable.getName(), value);

Lines 569-578 public class XSLTStylesheet extends XSLO Link Here

(-)adaptx-20041105/src/main/org/exolab/adaptx/xslt/XSLTStylesheet.java (-9 / +9 lines)
569	if (namespace == null) return null;	569	if (namespace == null) return null;
570	String qns = (String) quotedns.get(namespace);	570	String qns = (String) quotedns.get(namespace);
571	if (qns != null) {	571	if (qns != null) {
572	Enumeration enum = namespaces.keys();	572	Enumeration enum1 = namespaces.keys();
573	String key;	573	String key;
574	while (enum.hasMoreElements()) {	574	while (enum1.hasMoreElements()) {
575	key = (String)enum.nextElement();	575	key = (String)enum1.nextElement();
576	if (qns.equals(namespaces.get(key)))	576	if (qns.equals(namespaces.get(key)))
577	return key;	577	return key;
578	}	578	}
Lines 1094-1109 public class XSLTStylesheet extends XSLO Link Here
1094		1094
1095	// combine global variables and parameters	1095	// combine global variables and parameters
1096	try {	1096	try {
1097	Enumeration enum = xsl.getVariables();	1097	Enumeration enum1 = xsl.getVariables();
1098	while (enum.hasMoreElements()) {	1098	while (enum1.hasMoreElements()) {
1099	Variable v = (Variable) enum.nextElement();	1099	Variable v = (Variable) enum1.nextElement();
1100	Variable tmp = getVariable(v.getName());	1100	Variable tmp = getVariable(v.getName());
1101	if (tmp != null) variables.remove(tmp);	1101	if (tmp != null) variables.remove(tmp);
1102	addVariable(v, true);	1102	addVariable(v, true);
1103	}	1103	}
1104	enum = xsl.getParameters();	1104	enum1 = xsl.getParameters();
1105	while (enum.hasMoreElements()) {	1105	while (enum1.hasMoreElements()) {
1106	Param p = (Param) enum.nextElement();	1106	Param p = (Param) enum1.nextElement();
1107	Param tmp = getParameter(p.getName());	1107	Param tmp = getParameter(p.getName());
1108	if (tmp != null) parameters.remove(tmp);	1108	if (tmp != null) parameters.remove(tmp);
1109	addParam(p);	1109	addParam(p);