empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1375452 - in /empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components: MenuItemTag.java MenuListTag.java
Date Tue, 21 Aug 2012 09:48:19 GMT
Author: doebele
Date: Tue Aug 21 09:48:18 2012
New Revision: 1375452

URL: http://svn.apache.org/viewvc?rev=1375452&view=rev
Log:
EMPIREDB-157 
JSF2: Optimize menu item class style rendering

Modified:
    empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
    empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java

Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java?rev=1375452&r1=1375451&r2=1375452&view=diff
==============================================================================
--- empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
(original)
+++ empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
Tue Aug 21 09:48:18 2012
@@ -235,7 +235,7 @@ public class MenuItemTag extends LinkTag
     {
         if (StringUtils.isEmpty(newClass))
             return styleClass;
-        return (styleClass==null) ? newClass : " "+newClass;
+        return (styleClass==null) ? newClass : styleClass+" "+newClass;
     }
     
 }

Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java?rev=1375452&r1=1375451&r2=1375452&view=diff
==============================================================================
--- empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java
(original)
+++ empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java
Tue Aug 21 09:48:18 2012
@@ -37,7 +37,7 @@ public class MenuListTag extends UIOutpu
     
     private String currentId = null; 
     private String currentClass = null; 
-    private String enabledClass = null; 
+    // private String enabledClass = null; 
     private String disabledClass = null; 
     private String expandedClass = null;
     private String defaultItemClass = null; // e.g. "level{}"
@@ -90,7 +90,7 @@ public class MenuListTag extends UIOutpu
     {
         currentId = StringUtils.toString(map.get("currentId"));
         currentClass = StringUtils.toString(map.get("currentClass")); 
-        enabledClass = StringUtils.toString(map.get("enabledClass")); 
+        // enabledClass = StringUtils.toString(map.get("enabledClass")); 
         disabledClass = StringUtils.toString(map.get("disabledClass")); 
         expandedClass = StringUtils.toString(map.get("expandedClass"));
         defaultItemClass = StringUtils.toString(map.get("defaultItemClass"));
@@ -103,8 +103,8 @@ public class MenuListTag extends UIOutpu
             currentId = parent.getCurrentId();  
         if (currentClass==null)
             currentClass = parent.getCurrentClass();  
-        if (enabledClass==null)
-            enabledClass = parent.getEnabledClass();
+        // if (enabledClass==null)
+        //     enabledClass = parent.getEnabledClass();
         if (disabledClass==null)
             disabledClass = parent.getDisabledClass();
         if (expandedClass==null)
@@ -141,10 +141,12 @@ public class MenuListTag extends UIOutpu
         return currentClass;
     }
 
+    /*
     public String getEnabledClass()
     {
         return enabledClass;
     }
+    */
 
     public String getDisabledClass()
     {
@@ -181,10 +183,12 @@ public class MenuListTag extends UIOutpu
         this.currentClass = currentClass;
     }
 
+    /*
     public void setEnabledClass(String enabledClass)
     {
         this.enabledClass = enabledClass;
     }
+    */
 
     public void setDisabledClass(String disabledClass)
     {



Mime
View raw message