[jbosstools-commits] JBoss Tools SVN: r13599 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components and 1 other directories.

Author: dmaliarevich Date: 2009-02-12 10:41:01 -0500 (Thu, 12 Feb 2009) New Revision: 13599 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1605Test.java Log: https://jira.jboss.org/jira/browse/JBIDE-3740, expandSingle and disabled state icons, styles and classes were updated, toggling was updated, JUnit tests were updated. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2009-02-12 14:56:14 UTC (rev 13598) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2009-02-12 15:41:01 UTC (rev 13599) @@ -136,7 +136,7 @@ div.setAttribute(COMPONENT_ATTR_VPE_SUPPORT, NAME_COMPONENT); div.setAttribute(VpeVisualDomBuilder.VPE_USER_TOGGLE_ID, childId); - buildTable(pageContext, anySuitableParent, groupSourceElement, + buildTable(pageContext, anySuitableParent, panelMenuParent, groupSourceElement, visualDocument, div, expanded, childId, attrs); nsIDOMElement childSpan = visualDocument @@ -181,7 +181,7 @@ } private void buildTable(VpePageContext pageContext, - Element anySuitableParent, Element groupSourceElement, + Element anySuitableParent, Element panelMenuParent, Element groupSourceElement, nsIDOMDocument visualDocument, nsIDOMElement div, boolean expanded, String activeChildId, Attributes attrs) { String tableStyle = Constants.EMPTY; @@ -324,8 +324,8 @@ iconCell.appendChild(imgIcon); emptyCell.appendChild(imgSpacer); - setIcon(pageContext, anySuitableParent, groupSourceElement, - imgIcon, expanded, attrs); + setIcon(pageContext, panelMenuParent, groupSourceElement, + imgIcon, expanded, childOfPanelMenu, attrs); /* * Group Style Classes Routine @@ -478,25 +478,31 @@ return parent; } - private void setIcon(VpePageContext pageContext, Node anySuitableParent, - Element groupSourceElement, nsIDOMElement imgIcon, boolean expanded, Attributes attrs) { + private void setIcon(VpePageContext pageContext, Node panelMenuParent, + Element groupSourceElement, nsIDOMElement imgIcon, + boolean expanded, boolean childOfPanelMenu, Attributes attrs) { String pathIconExpanded = attrs.getPmg_iconExpanded(); String pathIconCollapsed = attrs.getPmg_iconCollapsed(); String pathIconDisabled = attrs.getPmg_iconDisabled(); - - if ((anySuitableParent != null) - && (anySuitableParent.getNodeName() - .endsWith(PANEL_MENU_END_TAG))) { + if (pathIconExpanded == null) { + if (childOfPanelMenu) { pathIconExpanded = attrs.getPm_iconExpandedTopGroup(); + } + pathIconExpanded = attrs.getPm_iconExpandedGroup(); } if (pathIconCollapsed == null) { + if (childOfPanelMenu) { pathIconCollapsed = attrs.getPm_iconCollapsedTopGroup(); + } + pathIconCollapsed = attrs.getPm_iconCollapsedGroup(); } if (pathIconDisabled == null) { - pathIconDisabled = attrs.getPm_iconTopDisableGroup(); + if (childOfPanelMenu) { + pathIconDisabled = attrs.getPm_iconTopDisabledGroup(); + } + pathIconDisabled = attrs.getPm_iconDisabledGroup(); } - } if (TRUE.equalsIgnoreCase(attrs.getPmg_disabled())) { if (ComponentUtil.isNotBlank(pathIconDisabled)) { @@ -560,7 +566,6 @@ String pmg_disabled = groupSourceElement.getAttribute(HTML.ATTR_DISABLED); String pm_disabled = panelMenuParent.getAttribute(HTML.ATTR_DISABLED); String pm_expandSingle = panelMenuParent.getAttribute(RichFacesPanelMenuTemplate.EXPAND_SINGLE); - /* * Do nothing when panel menu or panel group are disabled. */ @@ -636,6 +641,8 @@ } } sourceNode.setUserData(VPE_EXPANDED_TOGGLE_IDS, expandedIds, null); + panelMenuParent.setUserData(VPE_EXPANDED_TOGGLE_IDS, expandedIds, null); + builder.updateNode(panelMenuParent); } /* (non-Javadoc) @@ -677,8 +684,8 @@ private String pm_iconCollapsedTopGroup; private String pm_iconExpandedGroup; private String pm_iconExpandedTopGroup; - private String pm_iconDisableGroup; - private String pm_iconTopDisableGroup; + private String pm_iconDisabledGroup; + private String pm_iconTopDisabledGroup; private String pm_expandSingle; /* @@ -734,8 +741,8 @@ pm_iconCollapsedTopGroup = sourceParentElement.getAttribute(RichFacesPanelMenuTemplate.ICON_COLLAPSED_TOP_GROUP); pm_iconExpandedGroup = sourceParentElement.getAttribute(RichFacesPanelMenuTemplate.ICON_EXPANDED_GROUP); pm_iconExpandedTopGroup = sourceParentElement.getAttribute(RichFacesPanelMenuTemplate.ICON_EXPANDED_TOP_GROUP); - pm_iconDisableGroup = sourceParentElement.getAttribute(RichFacesPanelMenuTemplate.ICON_DISABLE_GROUP); - pm_iconTopDisableGroup = sourceParentElement.getAttribute(RichFacesPanelMenuTemplate.ICON_TOP_DISABLE_GROUP); + pm_iconDisabledGroup = sourceParentElement.getAttribute(RichFacesPanelMenuTemplate.ICON_DISABLED_GROUP); + pm_iconTopDisabledGroup = sourceParentElement.getAttribute(RichFacesPanelMenuTemplate.ICON_TOP_DISABLED_GROUP); pm_expandSingle = sourceParentElement.getAttribute(RichFacesPanelMenuTemplate.EXPAND_SINGLE); /* @@ -802,12 +809,12 @@ return pm_iconExpandedTopGroup; } - public String getPm_iconDisableGroup() { - return pm_iconDisableGroup; + public String getPm_iconDisabledGroup() { + return pm_iconDisabledGroup; } - public String getPm_iconTopDisableGroup() { - return pm_iconTopDisableGroup; + public String getPm_iconTopDisabledGroup() { + return pm_iconTopDisabledGroup; } public String getPm_expandSingle() { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java 2009-02-12 14:56:14 UTC (rev 13598) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java 2009-02-12 15:41:01 UTC (rev 13599) @@ -58,8 +58,8 @@ public static final String ICON_COLLAPSED_TOP_GROUP = "iconCollapsedTopGroup"; //$NON-NLS-1$ public static final String ICON_EXPANDED_GROUP = "iconExpandedGroup"; //$NON-NLS-1$ public static final String ICON_EXPANDED_TOP_GROUP = "iconExpandedTopGroup"; //$NON-NLS-1$ - public static final String ICON_DISABLE_GROUP = "iconDisableGroup"; //$NON-NLS-1$ - public static final String ICON_TOP_DISABLE_GROUP = "iconTopDisableGroup"; //$NON-NLS-1$ + public static final String ICON_DISABLED_GROUP = "iconDisabledGroup"; //$NON-NLS-1$ + public static final String ICON_TOP_DISABLED_GROUP = "iconTopDisabledGroup"; //$NON-NLS-1$ /* * rich:panelMenu attributes for items @@ -130,10 +130,14 @@ styleClass += Constants.WHITE_SPACE + styleClassAttr; } div.setAttribute(HTML.ATTR_CLASS, styleClass); - + List<Node> children = ComponentUtil.getChildren(sourceElement); int i = 1; - List<String> expandedIds = new ArrayList<String>(); + List<String> expandedIds = (List<String>) sourceNode + .getUserData(RichFacesPanelMenuGroupTemplate.VPE_EXPANDED_TOGGLE_IDS); + if (null == expandedIds) { + expandedIds = new ArrayList<String>(); + } for (Node child : children) { if (child.getNodeName().endsWith(PANEL_MENU_GROUP_END)) { child.setUserData(VpeVisualDomBuilder.VPE_USER_TOGGLE_ID, String.valueOf(i), null); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml.xml 2009-02-12 14:56:14 UTC (rev 13598) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu.xhtml.xml 2009-02-12 15:41:01 UTC (rev 13599) @@ -1,6 +1,6 @@ <tests> <test id="panelMenu"> - <DIV BORDER="0" STYLE="margin-top: 3px; width: 200px;"> + <DIV BORDER="0" STYLE="width: 200px;" CLASS="rich-pmenu"> <DIV CLASS="dr-pmenu-top-self-div" BORDER="0" STYLE="margin-top: 3px;" VPESUPPORT="panelMenuItem"> <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" @@ -9,80 +9,91 @@ <TD STYLE="" CLASS="dr-pmenu-nowrap"> <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" SRC="/.*resources/panelMenuItem/spacer.gif/" /> + <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" SRC="/.*resources/panelMenuItem/points.gif/" CLASS="rich-pmenu-item-icon rich-pmenu-top-item-icon" /> + </TD> - <TD STYLE="width: 100%;" CLASS="rich-pmenu-item-label rich-pmenu-top-item-label"> Item 1</TD> + <TD STYLE="width: 100%;" CLASS="rich-pmenu-item-label rich-pmenu-top-item-label"> + Item 1 +</TD> <TD STYLE="" CLASS="dr-pmenu-nowrap"> <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" SRC="/.*resources/panelMenuItem/spacer.gif/" /> + </TD> </TR> </TABLE> </DIV> - <DIV> - <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="1" - CLASS="dr-pmenu-group-div dr-pmenu-top-group-div"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE="margin-top: 3px;"> - <TR> - <TD VPE-USER-TOGGLE-ID="1" CLASS="rich-pmenu-top-group-self-icon"> - <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" - SRC="/.*resources/panelMenuGroup/spacer.gif/" /> - </TD> - <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="1" - CLASS="rich-pmenu-top-group-self-label"> Group 1</TD> - <TD VPE-USER-TOGGLE-ID="1" - CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"> - <IMG - SRC="/.*resources/panelMenuGroup/chevronDown.gif/" /> - </TD> - </TR> - </TABLE> - </DIV> + <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="1" + CLASS="dr-pmenu-top-group-div rich-pmenu-top-group-div"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE=""> + <TR> + <TD VPE-USER-TOGGLE-ID="1" CLASS="rich-pmenu-top-group-self-icon"> + <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" + SRC="/.*resources/panelMenuGroup/spacer.gif/" /> + + </TD> + <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="1" + CLASS="rich-pmenu-top-group-self-label"> + Group 1 +</TD> + <TD VPE-USER-TOGGLE-ID="1" + CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"> + <IMG + SRC="/.*resources/panelMenuGroup/disc.gif/" /> + + </TD> + </TR> + </TABLE> </DIV> - <DIV> - <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="2" - CLASS="dr-pmenu-group-div dr-pmenu-top-group-div"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE="margin-top: 3px;"> - <TR> - <TD VPE-USER-TOGGLE-ID="2" CLASS="rich-pmenu-top-group-self-icon"> - <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" - SRC="/.*resources/panelMenuGroup/spacer.gif/" /> - </TD> - <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="2" - CLASS="rich-pmenu-top-group-self-label"> Group 2</TD> - <TD VPE-USER-TOGGLE-ID="2" - CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"> - <IMG - SRC="/.*resources/panelMenuGroup/chevronDown.gif/" /> - </TD> - </TR> - </TABLE> - </DIV> + <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="2" + CLASS="dr-pmenu-top-group-div rich-pmenu-top-group-div"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE=""> + <TR> + <TD VPE-USER-TOGGLE-ID="2" CLASS="rich-pmenu-top-group-self-icon"> + <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" + SRC="/.*resources/panelMenuGroup/spacer.gif/" /> + + </TD> + <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="2" + CLASS="rich-pmenu-top-group-self-label"> + Group 2 +</TD> + <TD VPE-USER-TOGGLE-ID="2" + CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"> + <IMG + SRC="/.*resources/panelMenuGroup/disc.gif/" /> + + </TD> + </TR> + </TABLE> </DIV> - <DIV> - <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="3" - CLASS="dr-pmenu-group-div dr-pmenu-top-group-div"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE="margin-top: 3px;"> - <TR> - <TD VPE-USER-TOGGLE-ID="3" CLASS="rich-pmenu-top-group-self-icon"> - <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" - SRC="/.*resources/panelMenuGroup/spacer.gif/" /> - </TD> - <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="3" - CLASS="rich-pmenu-top-group-self-label"> Group 3</TD> - <TD VPE-USER-TOGGLE-ID="3" - CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"> - <IMG - SRC="/.*resources/panelMenuGroup/chevronDown.gif/" /> - </TD> - </TR> - </TABLE> - </DIV> + <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="3" + CLASS="dr-pmenu-top-group-div rich-pmenu-top-group-div"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE=""> + <TR> + <TD VPE-USER-TOGGLE-ID="3" CLASS="rich-pmenu-top-group-self-icon"> + <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" + SRC="/.*resources/panelMenuGroup/spacer.gif/" /> + + </TD> + <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="3" + CLASS="rich-pmenu-top-group-self-label"> + Group 3 +</TD> + <TD VPE-USER-TOGGLE-ID="3" + CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"> + <IMG + SRC="/.*resources/panelMenuGroup/disc.gif/" /> + + </TD> + </TR> + </TABLE> </DIV> </DIV> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml.xml 2009-02-12 14:56:14 UTC (rev 13598) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenuGroup.xhtml.xml 2009-02-12 15:41:01 UTC (rev 13599) @@ -1,25 +1,27 @@ <tests> <test id="panelMenuGroup"> - <DIV> - <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="1" - CLASS="dr-pmenu-group-div dr-pmenu-top-group-div"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE="margin-top: 3px;"> - <TR> - <TD VPE-USER-TOGGLE-ID="1" CLASS="rich-pmenu-top-group-self-icon"> - <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" - SRC="/.*resources/panelMenuGroup/spacer.gif/"/> - </TD> - <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="1" - CLASS="rich-pmenu-top-group-self-label"> Group 1</TD> - <TD VPE-USER-TOGGLE-ID="1" - CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"> - <IMG - SRC="/.*resources/panelMenuGroup/chevronDown.gif/"/> - </TD> - </TR> - </TABLE> - </DIV> - </DIV> + <DIV VPESUPPORT="panelMenuGroup" VPE-USER-TOGGLE-ID="1" + CLASS="dr-pmenu-top-group-div rich-pmenu-top-group-div"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-pmenu-top-group rich-pmenu-group" STYLE=""> + <TR> + <TD VPE-USER-TOGGLE-ID="1" CLASS="rich-pmenu-top-group-self-icon"> + <IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16" + SRC="/.*resources/panelMenuGroup/spacer.gif/" /> + + </TD> + <TD STYLE="width: 100%;" VPE-USER-TOGGLE-ID="1" + CLASS="rich-pmenu-top-group-self-label"> + Group 1 +</TD> + <TD VPE-USER-TOGGLE-ID="1" + CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"> + <IMG + SRC="/.*resources/panelMenuGroup/disc.gif/" /> + + </TD> + </TR> + </TABLE> + </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1605Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1605Test.java 2009-02-12 14:56:14 UTC (rev 13598) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1605Test.java 2009-02-12 15:41:01 UTC (rev 13599) @@ -38,7 +38,7 @@ private static final String PAGE = "components/panelMenuGroup/jbide1605.xhtml"; //$NON-NLS-1$ /** The Constant COUNT_OF_DIVS. */ - private static final int COUNT_OF_DIVS = 16; + private static final int COUNT_OF_DIVS = 13; /** * The Constructor.