You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/10/24 10:47:33 UTC
cvs commit: cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl SourceDescriptorManager.java
cziegeler 2003/10/24 01:47:33
Modified: src/blocks/repository/java/org/apache/cocoon/generation
XPathTraversableGenerator.java
src/blocks/repository/java/org/apache/cocoon/components/source/impl
SourceDescriptorManager.java
Log:
Fixing iteration bug
Revision Changes Path
1.2 +11 -7 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java
Index: XPathTraversableGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathTraversableGenerator.java 23 Oct 2003 07:55:49 -0000 1.1
+++ XPathTraversableGenerator.java 24 Oct 2003 08:47:33 -0000 1.2
@@ -54,6 +54,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
@@ -198,7 +199,7 @@
}
String[] params = par.getNames();
- this.prefixResolver = new XPathPrefixResolver();
+ this.prefixResolver = new XPathPrefixResolver(this.getLogger());
for (int i = 0; i < params.length; i++) {
if (params[i].startsWith("xmlns:")) {
String paramValue = par.getParameter(params[i], "");
@@ -304,8 +305,11 @@
private Map params;
- public XPathPrefixResolver() {
+ private Logger logger;
+
+ public XPathPrefixResolver(Logger logger) {
this.params = new HashMap();
+ this.logger = logger;
}
/**
@@ -314,12 +318,12 @@
* @see org.apache.excalibur.xml.xpath.PrefixResolver#prefixToNamespace(java.lang.String)
*/
public String prefixToNamespace(String prefix) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("prefix: " + prefix);
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("prefix: " + prefix);
}
if (this.params.containsKey(prefix)) {
- if(getLogger().isDebugEnabled()) {
- getLogger().debug("prefix; " + prefix + " - namespace: " + this.params.get(prefix));
+ if(this.logger.isDebugEnabled()) {
+ this.logger.debug("prefix; " + prefix + " - namespace: " + this.params.get(prefix));
}
return (String) this.params.get(prefix);
}
1.2 +4 -5 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/SourceDescriptorManager.java
Index: SourceDescriptorManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/SourceDescriptorManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceDescriptorManager.java 23 Oct 2003 17:17:13 -0000 1.1
+++ SourceDescriptorManager.java 24 Oct 2003 08:47:33 -0000 1.2
@@ -153,12 +153,12 @@
ContainerUtil.initialize(inspector);
String[] types = inspector.getExposedSourcePropertyTypes();
- for (int j = 0; i < types.length; i++) {
+ for (int j = 0; j < types.length; j++) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("Registering " + inspector
- + " to handle property " + types[i]);
+ + " to handle property " + types[j]);
}
- m_inspectors.put(types[i],inspector);
+ m_inspectors.put(types[j],inspector);
}
}
// done with these
@@ -168,7 +168,6 @@
}
public void dispose() {
- SourceInspector inspector;
Iterator iter = m_inspectors.values().iterator();
while(iter.hasNext()) {
ContainerUtil.dispose(iter.next());