[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib ContextReferrerTag.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv12825

Modified Files:
        ContextReferrerTag.java 
Log Message:
  MMB-1668


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1668


Index: ContextReferrerTag.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContextReferrerTag.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- ContextReferrerTag.java     26 Jun 2008 10:19:38 -0000      1.106
+++ ContextReferrerTag.java     27 Jun 2008 09:07:10 -0000      1.107
@@ -17,6 +17,7 @@
 import java.io.*;
 
 import org.mmbase.bridge.NodeList;
+import org.mmbase.bridge.Query;
 import org.mmbase.bridge.jsp.taglib.edit.FormTag;
 import org.mmbase.bridge.jsp.taglib.util.Attribute;
 import org.mmbase.bridge.jsp.taglib.containers.QueryContainer;
@@ -34,7 +35,7 @@
  *
  *
  * @author Michiel Meeuwissen
- * @version $Id: ContextReferrerTag.java,v 1.106 2008/06/26 10:19:38 michiel 
Exp $
+ * @version $Id: ContextReferrerTag.java,v 1.107 2008/06/27 09:07:10 michiel 
Exp $
  * @see ContextTag
  */
 
@@ -64,7 +65,7 @@
             ClassLoader cl = ContextReferrerTag.class.getClassLoader();
             InputStream is = 
cl.getResourceAsStream("org/mmbase/taglib/version");
             if (is == null) {
-                return "1.1";
+                return "2.0";
             }
             BufferedReader r = new BufferedReader(new InputStreamReader(is));
             return r.readLine();
@@ -789,4 +790,21 @@
         }
         return formTag;
     }
+
+    /**
+     * Implements a getQuery for QueryContainerReferrers
+     * @since MMBase-1.9.0
+     */
+    protected Query getQuery(Attribute container) throws JspTagException {
+        Query query;
+        if (container == null || container == Attribute.NULL) {
+            query = (Query) pageContext.getAttribute(QueryContainer.KEY, 
QueryContainer.SCOPE);
+            if (query == null) throw new JspTagException("No query found (" + 
QueryContainer.KEY + ")");
+        } else {
+            QueryContainer c = findParentTag(QueryContainer.class, (String) 
container.getValue(this));
+            query = c.getQuery();
+        }
+        return query;
+
+    }
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs