[Yanel-commits] rev 32980 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu

[michi at wyona.com]

Author: michi
Date: 2008-03-06 09:49:45 +0100 (Thu, 06 Mar 2008)
New Revision: 32980

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java
Log:
method getAllMenus introduced in order to better customize

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java	2008-03-06 08:35:31 UTC (rev 32979)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java	2008-03-06 08:49:45 UTC (rev 32980)
@@ -14,16 +14,28 @@
 
 import java.io.IOException;
 
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
 
 /**
  *
  */
 abstract public class Menu {
 
-    private static Category log = Category.getInstance(Menu.class);
+    private static Logger log = Logger.getLogger(Menu.class);
 
     /**
+     * Get custom menus. Implement this method in order to introduce custom menus.
+     */
+    abstract public String getMenus(Resource resource, HttpServletRequest request, Map map, String reservedPrefix) throws ServletException, IOException, Exception;
+
+    /**
+     * Aggregate all menus (used by YanelServlet). Overwrite this method if Yanel or Help menu not needed.
+     */
+    public String getAllMenus(Resource resource, HttpServletRequest request, Map map, String reservedPrefix) throws ServletException, IOException, Exception {
+        return getYanelMenu(resource, request, map, reservedPrefix) + getMenus(resource, request, map, reservedPrefix) + getHelpMenu(resource, request, map, reservedPrefix);
+    }
+
+    /**
      * Get yanel menu
      */
     public String getYanelMenu(Resource resource, HttpServletRequest request, Map map, String reservedPrefix) throws ServletException, IOException, Exception {
@@ -71,11 +83,6 @@
         sb.append("</li></ul>");
         return sb.toString();
     }
-
-    /**
-     * Get custom menus
-     */
-    abstract public String getMenus(Resource resource, HttpServletRequest request, Map map, String reservedPrefix) throws ServletException, IOException, Exception;
     
     /**
      * Gets the identity from the session associated with the given request.