10:56 a.m.
Author: amarkhel
Date: 2009-09-18 11:56:22 -0400 (Fri, 18 Sep 2009)
New Revision: 15625
Modified:
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuTest.java
branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java
Log:
Fix for RF-7900
Modified:
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuTest.java
===================================================================
---
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuTest.java 2009-09-18
15:52:48 UTC (rev 15624)
+++
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuTest.java 2009-09-18
15:56:22 UTC (rev 15625)
@@ -291,7 +291,7 @@
writeStatus("Expose group 2");
clickById("tablehide" + parentId + "pGroup2_selected");
- testIcon("pGroup2_selected", "Spacer");
+ testIcon("pGroup2_selected", "Grid");
testIcon("pItem2_selected", "Chevron");
}
Modified: branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml
===================================================================
---
branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml 2009-09-18
15:52:48 UTC (rev 15624)
+++
branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml 2009-09-18
15:56:22 UTC (rev 15625)
@@ -108,7 +108,7 @@
<description>Path to the icon to be displayed for the expanded Group state.
You can also use predefined icons, setting the attribute to one of these possible
values: "triangle", "triangleUp",
"triangleDown", "disc", "chevron",
"chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA["grid"]]></defaultvalue>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>iconCollapsedGroup</name>
@@ -116,7 +116,7 @@
<description>Path to the icon to be displayed for the collapsed Group state.
You can also use predefined icons, setting the attribute to one of these possible
values: "triangle", "triangleUp",
"triangleDown", "disc", "chevron",
"chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA["grid"]]></defaultvalue>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>iconDisabledGroup</name>
@@ -124,7 +124,7 @@
<description>Path to the icon to be displayed for the disabled group state.
You can also use predefined icons, setting the attribute to one of these possible
values: "triangle", "triangleUp",
"triangleDown", "disc", "chevron",
"chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA["grid"]]></defaultvalue>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>iconExpandedTopGroup</name>
@@ -132,7 +132,7 @@
<description>Path to the icon to be displayed for the expanded top group state.
You can also use predefined icons, setting the attribute to one of these possible
values: "triangle", "triangleUp",
"triangleDown", "disc", "chevron",
"chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA["grid"]]></defaultvalue>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>iconCollapsedTopGroup</name>
@@ -140,7 +140,7 @@
<description>Path to the icon to be displayed for the collapsed top group
state.\
You can also use predefined icons, setting the attribute to one of these possible
values: "triangle", "triangleUp",
"triangleDown", "disc", "chevron",
"chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA["grid"]]></defaultvalue>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>iconTopDisableGroup</name>
@@ -149,7 +149,7 @@
You can also use predefined icons, setting the attribute to one of these possible
values: "triangle", "triangleUp",
"triangleDown", "disc", "chevron",
"chevronUp", "chevronDown", "grid".
Default value is "grid".
</description>
- <defaultvalue><![CDATA["grid"]]></defaultvalue>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>iconItemPosition</name>
Modified:
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java
===================================================================
---
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2009-09-18
15:52:48 UTC (rev 15624)
+++
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2009-09-18
15:56:22 UTC (rev 15625)
@@ -57,6 +57,8 @@
public final static String PANEL_MENU_SPACER_ICON_NAME = "spacer";
+ public final static String DEFAULT_ICON = "grid";
+
public void insertSpacerImages(FacesContext context , UIComponent component) throws
IOException {
ResponseWriter writer = context.getResponseWriter();
int level = calculateLevel(component);
Modified:
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
===================================================================
---
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2009-09-18
15:52:48 UTC (rev 15624)
+++
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2009-09-18
15:56:22 UTC (rev 15625)
@@ -121,7 +121,9 @@
defaultIconNodeClosed = panelMenu.getIconCollapsedGroup();
}
}
-
+ if(defaultIconNodeClosed == null || defaultIconNodeClosed.equals("")){
+ defaultIconNodeClosed = DEFAULT_ICON;
+ }
String defaultIconNodeOpened = null;
if(isTopLevel){
@@ -132,7 +134,9 @@
} else {
defaultIconNodeOpened = panelMenu.getIconExpandedGroup();
}
-
+ if(defaultIconNodeOpened == null || defaultIconNodeOpened.equals("")){
+ defaultIconNodeOpened = DEFAULT_ICON;
+ }
String iconExpanded = "";
String iconCollapsed = "";
Modified:
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java
===================================================================
---
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2009-09-18
15:52:48 UTC (rev 15624)
+++
branches/community/3.3.X/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2009-09-18
15:56:22 UTC (rev 15625)
@@ -452,7 +452,9 @@
defaultIconNodeClosed = panelMenu.getIconCollapsedGroup();
}
}
-
+ if(defaultIconNodeClosed == null || defaultIconNodeClosed.equals("")){
+ defaultIconNodeClosed = DEFAULT_ICON;
+ }
String defaultIconNodeOpened = isTopLevel ? panelMenu.getIconExpandedTopGroup() :
panelMenu.getIconExpandedGroup();
if(isTopLevel){
@@ -463,7 +465,9 @@
} else {
defaultIconNodeOpened = panelMenu.getIconExpandedGroup();
}
-
+ if(defaultIconNodeOpened == null || defaultIconNodeOpened.equals("")){
+ defaultIconNodeOpened = DEFAULT_ICON;
+ }
String defaultIconNodeClosedSrc = getIconByType(defaultIconNodeClosed,
isTopLevel,context, component);
String defaultIconNodeOpenedSrc = getIconByType(defaultIconNodeOpened,
isTopLevel,context, component);