cvs commit: jahia/core/src/java/org/jahia/taglibs/html/actions ActionMenuTag.java

[Xavier Lawrence]

xlawrence    2005/08/05 15:49:52 CEST

  Modified files:
    core/src/java/org/jahia/taglibs/html/actions 
                                                 ActionMenuTag.java 
  Log:
  Updated the tag to support the new ContentBean API
  
  Revision  Changes    Path
  1.5       +3 -13     
jahia/core/src/java/org/jahia/taglibs/html/actions/ActionMenuTag.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/taglibs/html/actions/ActionMenuTag.java.diff?r1=1.4&r2=1.5&f=h
  
  
  
  Index: ActionMenuTag.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/taglibs/html/actions/ActionMenuTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ActionMenuTag.java        5 Jul 2005 15:46:37 -0000       1.4
  +++ ActionMenuTag.java        5 Aug 2005 13:49:52 -0000       1.5
  @@ -1,24 +1,14 @@
   package org.jahia.taglibs.html.actions;
   
   import java.io.IOException;
  -import java.util.Iterator;
  -import java.util.Locale;
   import java.util.Map;
  -import java.util.MissingResourceException;
  -import java.util.ResourceBundle;
   import javax.servlet.ServletRequest;
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.JspWriter;
   import javax.servlet.jsp.tagext.BodyTagSupport;
  -
  -import org.jahia.data.beans.ActionURIBean;
  -import org.jahia.data.beans.ContainerBean;
  -import org.jahia.data.beans.ContainerListBean;
  -import org.jahia.data.beans.FieldBean;
  -import org.jahia.data.beans.PageBean;
  +import org.jahia.data.beans.ContentBean;
   import org.jahia.data.beans.RequestBean;
   import org.jahia.params.ProcessingContext;
  -import org.jahia.resourcebundle.JahiaResourceBundle;
   import org.jahia.gui.GuiBean;
   import org.jahia.gui.HTMLToolBox;
   
  @@ -92,7 +82,7 @@
   
   public class ActionMenuTag extends BodyTagSupport {
   
  -    private static org.apache.log4j.Logger logger =
  +    private static final org.apache.log4j.Logger logger =
           org.apache.log4j.Logger.getLogger(ActionMenuTag.class);
   
       private boolean useFieldSet = true;
  @@ -241,7 +231,7 @@
           processingContext = requestBean.getParamBean();
           guiBean = new GuiBean(processingContext);
           htmlToolBox = new HTMLToolBox(guiBean, processingContext);
  -        Object contentObject = pageContext.findAttribute(name);
  +        ContentBean contentObject = 
(ContentBean)pageContext.findAttribute(name);
           if (contentObject == null) {
               logger.error("Couldn't find any object with name " + name);
               return EVAL_BODY_BUFFERED;