[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/util ContextCollector.java StandaloneContextContainer.java

[Michiel Meeuwissen]

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

Modified Files:
        ContextCollector.java StandaloneContextContainer.java 
Log Message:
@Override, removed deprecated method. Fixed a bug.


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/util


Index: ContextCollector.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/util/ContextCollector.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ContextCollector.java       22 Nov 2006 14:47:38 -0000      1.20
+++ ContextCollector.java       15 Oct 2008 12:36:13 -0000      1.21
@@ -26,7 +26,7 @@
  * it's parent too, so it is 'transparent'.
  *
  * @author Michiel Meeuwissen
- * @version $Id: ContextCollector.java,v 1.20 2006/11/22 14:47:38 michiel Exp $
+ * @version $Id: ContextCollector.java,v 1.21 2008/10/15 12:36:13 michiel Exp $
  * @since MMBase-1.7
  */
 public class  ContextCollector extends StandaloneContextContainer {
@@ -41,7 +41,7 @@
         }
     }
 
-    protected BasicBacking createBacking(PageContext pc) {
+    @Override protected BasicBacking createBacking(PageContext pc) {
         return new BasicBacking(pc, parent instanceof PageContextContainer) {
                 public Object put(String key, Object value) {
                     if (log.isDebugEnabled()) {
@@ -63,12 +63,12 @@
     }
 
 
-    public void unRegister(String key) throws JspTagException {
+    @Override public void unRegister(String key) throws JspTagException {
         super.unRegister(key);
         parent.unRegister(key);
 
     }
-    protected void register(String newid, Object n, boolean check, boolean 
checkParent) throws JspTagException {
+    @Override protected void register(String newid, Object n, boolean check, 
boolean checkParent) throws JspTagException {
         if (! check) {
             parent.unRegister(newid);
         }
@@ -76,20 +76,13 @@
 
     }
 
-    /**
-     * @deprecated
-     */
-    public ContextContainer getContextContainer() {
-        return this;
-    }
-
 
 
     public void doAfterBody() throws JspTagException {
         clear();
     }
 
-    public void release(PageContext pc, ContextContainer p) {
+    @Override public void release(PageContext pc, ContextContainer p) {
         parentCheckedKeys.clear();
         super.release(pc, p);
     }


Index: StandaloneContextContainer.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/util/StandaloneContextContainer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- StandaloneContextContainer.java     13 Oct 2008 12:04:31 -0000      1.16
+++ StandaloneContextContainer.java     15 Oct 2008 12:36:13 -0000      1.17
@@ -15,7 +15,7 @@
  * This ContextContainer provides its own 'backing', it is used as 
'subcontext' in other contextes.
  *
  * @author Michiel Meeuwissen
- * @version $Id: StandaloneContextContainer.java,v 1.16 2008/10/13 12:04:31 
michiel Exp $
+ * @version $Id: StandaloneContextContainer.java,v 1.17 2008/10/15 12:36:13 
michiel Exp $
  * @since MMBase-1.8
  **/
 
@@ -42,7 +42,7 @@
         backing = new BasicBacking(values);
 
     }
-    private BasicBacking createBacking(PageContext pc) {
+    protected BasicBacking createBacking(PageContext pc) {
         return new BasicBacking(pc, false);
     }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs