Author: dmaliarevich Date: 2008-01-25 12:10:32 -0500 (Fri, 25 Jan 2008) New Revision: 5973 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarGroupTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java Log: http://jira.jboss.com/jira/browse/JBIDE-1586 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarGroupTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarGroupTemplate.java 2008-01-25 15:52:18 UTC (rev 5972) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarGroupTemplate.java 2008-01-25 17:10:32 UTC (rev 5973) @@ -141,13 +141,8 @@ if (!sourceNode.getParentNode().getNodeName().endsWith(":" + RichFacesToolBarTemplate.TAG_NAME)) { visualNode = RichFacesToolBarTemplate.createExceptionNode(visualDocument, "Parent should be toolBar"); creationData = new VpeCreationData(visualNode); - } else if (!RichFacesToolBarTemplate.isValidItemSeparatorName(itemSeparator)) { - visualNode = RichFacesToolBarTemplate.createExceptionNode(visualDocument, - "Unknown type of separator \"" + itemSeparator + "\""); - - creationData = new VpeCreationData(visualNode); - } else { - + } else { + itemSeparator = RichFacesToolBarTemplate.checkAndUpdateItemSeparatorName(itemSeparator); SourceToolBarGroupItems sourceToolBarGroupItems = new SourceToolBarGroupItems(sourceNode, ATTR_LOCATION_RIGHT_VALUE.equals(sourceElement.getAttribute(ATTR_LOCATION_NAME)), itemSeparator); 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 2008-01-25 15:52:18 UTC (rev 5972) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java 2008-01-25 17:10:32 UTC (rev 5973) @@ -58,11 +58,8 @@ Element sourceElement = (Element) sourceNode; String itemSeparator = sourceElement.getAttribute(ITEMSEPARATOR_ATTR_NAME); - if (!isValidItemSeparatorName(itemSeparator)) { - visualNode = createExceptionNode(visualDocument, - "Unknown type of separator \"" + itemSeparator + "\""); - creationData = new VpeCreationData(visualNode); - } else { + + itemSeparator = checkAndUpdateItemSeparatorName(itemSeparator); SourceToolBarItems sourceToolBarItems = new SourceToolBarItems(sourceNode, itemSeparator); String itemSeparatorImageUrl = getSeparatorImageUrlString(sourceToolBarItems.getItemSeparator()); @@ -169,7 +166,6 @@ body.appendChild(row); visualNode.appendChild(body); - } return creationData; } @@ -351,14 +347,18 @@ return separatorImageUrl; } - static boolean isValidItemSeparatorName(String itemSeparator) { - return itemSeparator == null - || (itemSeparator != null && itemSeparator.length() == 0) - || ITEM_SEPARATOR_DISC.equals(itemSeparator) - || ITEM_SEPARATOR_LINE.equals(itemSeparator) - || ITEM_SEPARATOR_GRID.equals(itemSeparator) - || ITEM_SEPARATOR_SQUARE.equals(itemSeparator) - || ITEM_SEPARATOR_NONE.equals(itemSeparator); + static String checkAndUpdateItemSeparatorName(String itemSeparator) { + if (itemSeparator == null + || (itemSeparator != null && itemSeparator.length() == 0)) { + return ITEM_SEPARATOR_NONE; + } else if (ITEM_SEPARATOR_DISC.equals(itemSeparator) + || ITEM_SEPARATOR_LINE.equals(itemSeparator) + || ITEM_SEPARATOR_GRID.equals(itemSeparator) + || ITEM_SEPARATOR_SQUARE.equals(itemSeparator) + || ITEM_SEPARATOR_NONE.equals(itemSeparator)) { + return itemSeparator; + } + return ITEM_SEPARATOR_NONE; } private class SourceToolBarItem {