svn commit: r931067 - in /click/trunk/click/extras/src/org/apache/click/extras/control: Menu.java MenuFactory.java

[sa...@apache.org]

Author: sabob
Date: Tue Apr  6 09:59:29 2010
New Revision: 931067

URL: http://svn.apache.org/viewvc?rev=931067&view=rev
Log:
javadoc

Modified:
    click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java
    click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java

Modified: click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java?rev=931067&r1=931066&r2=931067&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java Tue Apr  6 09:59:29 2010
@@ -332,7 +332,7 @@ public class Menu extends AbstractContro
      * @param accessController the menu access controller
      *
      * @deprecated use
-     * {@link MenuFactory#createMenu(org.w3c.dom.Element, org.apache.click.extras.security.AccessController)}
+     * {@link MenuFactory#buildMenu(org.w3c.dom.Element, org.apache.click.extras.security.AccessController, java.lang.Class)}
      * instead
      */
     @Deprecated
@@ -1048,7 +1048,7 @@ public class Menu extends AbstractContro
     /**
      * Return an HTML representation of the menu.
      *
-     * @see {@link #render(org.apache.click.util.HtmlStringBuffer)}
+     * @see #render(org.apache.click.util.HtmlStringBuffer)
      *
      * @return an HTML anchor tag representation of the menu
      */

Modified: click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java?rev=931067&r1=931066&r2=931067&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java Tue Apr  6 09:59:29 2010
@@ -421,10 +421,10 @@ public class MenuFactory implements Seri
      * @param menuClass the menu class to instantiate
      * @return a copy of the application's root Menu
      */
-    protected Menu loadFromMenuXml(String rootMenuName, String fileName,
+    protected Menu loadFromMenuXml(String name, String fileName,
         AccessController accessController, Class<? extends Menu> menuClass) {
 
-        if (rootMenuName == null) {
+        if (name == null) {
             throw new IllegalArgumentException("Null name parameter");
         }
 
@@ -452,7 +452,7 @@ public class MenuFactory implements Seri
             menu = createMenu(menuClass);
         }
 
-        menu.setName(rootMenuName);
+        menu.setName(name);
         menu.setAccessController(accessController);
 
         ServletContext servletContext = context.getServletContext();