balld 01/06/11 21:14:26
Modified: src/org/apache/cocoon/sitemap AbstractSitemap.java
Log:
removed restriction that Maps in the listOfMaps must have String values. Now
the values are cast as Objects and toString() is invoked on them. Or should
that be String.valueOf()?
Revision Changes Path
1.6 +4 -4
xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractSitemap.java 2001/06/08 20:28:23 1.5
+++ AbstractSitemap.java 2001/06/12 04:14:24 1.6
@@ -43,7 +43,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/06/08 20:28:23 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/06/12 04:14:24 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap, Disposable, ThreadSafe {
private Context context;
@@ -281,12 +281,12 @@
}
m = s.lastIndexOf('/');
if (m == -1) {
- result.append((String)((Map)list.get(k)).get(s));
+
result.append(((Object)((Map)list.get(k)).get(s)).toString());
} else {
-
result.append((String)((Map)list.get(k)).get(s.substring(m + 1)));
+
result.append(((Object)((Map)list.get(k)).get(s.substring(m + 1))).toString());
}
getLogger().debug("substitute evaluated value for " + ((m ==
-1) ? s : s.substring(m + 1)) + " as " +
- (String)((Map)list.get(k)).get((m == -1) ? s :
s.substring(m + 1)));
+ ((Object)((Map)list.get(k)).get((m == -1) ? s :
s.substring(m + 1))).toString());
}
if (ii < expr.length()) {
result.append(expr.substring(ii));
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
