[MMBASE SCM] r35723 - mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib

[michiel]

Author: michiel
Date: 2009-06-04 14:37:32 +0200 (Thu, 04 Jun 2009)
New Revision: 35723

Modified:
   
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/ContentTag.java
Log:
generics

Modified: 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/ContentTag.java
===================================================================
--- 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/ContentTag.java
 2009-06-04 12:13:28 UTC (rev 35722)
+++ 
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/ContentTag.java
 2009-06-04 12:37:32 UTC (rev 35723)
@@ -113,7 +113,7 @@
         }
     }
 
-    private static ParameterizedTransformerFactory 
readTransformerFactory(final DocumentReader reader, final Element 
parentElement, final String id) {
+    private static ParameterizedTransformerFactory<CharTransformer> 
readTransformerFactory(final DocumentReader reader, final Element 
parentElement, final String id) {
         final String claz = 
reader.getElementValue(reader.getChildElements(parentElement, "class").get(0));
         final Map configuredParams = new HashMap();
         for (Element param: reader.getChildElements(parentElement, "param")) {
@@ -152,13 +152,13 @@
             InputSource escapersSource = new InputSource(stream);
             readXML(escapersSource);
         }
-        List resources = taglibLoader.getResourceList(resource);
+        List<URL> resources = taglibLoader.getResourceList(resource);
         log.service("Using " + resources);
-        ListIterator i = resources.listIterator();
+        ListIterator<URL> i = resources.listIterator();
         while (i.hasNext()) i.next();
         while (i.hasPrevious()) {
             try {
-                URL u = (URL) i.previous();
+                URL u = i.previous();
                 log.debug("Reading " + u);
                 URLConnection con = u.openConnection();
                 if (con.getDoInput()) {
@@ -203,8 +203,8 @@
         log.debug("Reading content tag parameterizedescaperss");
         for (Element element: reader.getChildElements(root, 
"parameterizedescaper")) {
             String id   = element.getAttribute("id");
-            ParameterizedTransformerFactory fact = 
readTransformerFactory(reader, element, id);
-            ParameterizedTransformerFactory prev = 
parameterizedCharTransformerFactories.put(id, fact);
+            ParameterizedTransformerFactory<CharTransformer> fact = 
readTransformerFactory(reader, element, id);
+            ParameterizedTransformerFactory<CharTransformer> prev = 
parameterizedCharTransformerFactories.put(id, fact);
             if (prev != null) {
                 log.warn("Replaced an parameterized escaper '" + id + "' : " + 
fact + " (was " + prev + ")");
             } else {

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs