svn commit: r608461 - in /ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget: html/HtmlMenuRenderer.java menu/ModelMenuItem.java

Author: jleroux
Date: Thu Jan  3 04:08:41 2008
New Revision: 608461

URL: http://svn.apache.org/viewvc?rev=608461&view=rev
Log:
Reverted on Scott's advice

Modified:
    ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
    ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java

Modified: ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=608461&r1=608460&r2=608461&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java (original)
+++ ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java Thu Jan  3 04:08:41 2008
@@ -156,7 +156,7 @@
 
         String style = null;
         
-        if (menuItem.isSelected()) {
+        if (menuItem.isSelected(context)) {
             style = menuItem.getSelectedStyle();
             if (UtilValidate.isEmpty(style)) {
                 style = "selected";

Modified: ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=608461&r1=608460&r2=608461&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original)
+++ ofbiz/branches/release4.0/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Thu Jan  3 04:08:41 2008
@@ -569,14 +569,9 @@
        return this.link;
     }
     
-    /** @deprecated use isSelected() */
     public boolean isSelected(Map context) {
         String currentMenuItemName = modelMenu.getSelectedMenuItemContextFieldName(context);
         return currentMenuItemName != null && currentMenuItemName.equals(this.name);
-    }
-
-    public boolean isSelected() {
-        return modelMenu.getCurrentMenuItemName() != null && modelMenu.getCurrentMenuItemName().equals(this.name);
     }
 
     public static class Link {