Author: yradtsevich Date: 2009-03-30 10:06:45 -0400 (Mon, 30 Mar 2009) New Revision: 14368 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java Log: RESOLVED - issue JBIDE-4058: Tool Bar and item separator https://jira.jboss.org/jira/browse/JBIDE-4058 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java 2009-03-30 12:55:41 UTC (rev 14367) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java 2009-03-30 14:06:45 UTC (rev 14368) @@ -456,25 +456,17 @@ } } - if (isItemSeparatorExists() && !isLeftItemsExists()) { - if (rightToolBarItems.size() > 0) + // yradtsevich: JBIDE-4058: + // There should be no trailing separator after the left toolbar group + // and no leading separator at the beginning of the right toolbar group + if (isItemSeparatorExists() && !leftToolBarItems.isEmpty()) { + leftToolBarItems.remove(leftToolBarItems.size()-1); + } + if (isItemSeparatorExists() && !rightToolBarItems.isEmpty()) { rightToolBarItems.remove(0); } - - if (isItemSeparatorExists() && !isRightItemsExists()) { - if (leftToolBarItems.size() > 0) - leftToolBarItems.remove(leftToolBarItems.size()-1); - } } - - public boolean isLeftItemsExists() { - return !leftToolBarItems.isEmpty(); - } - public boolean isRightItemsExists() { - return !rightToolBarItems.isEmpty(); - } - public Iterator<SourceToolBarItem> getLeftItemsIterator() { return leftToolBarItems.iterator(); }