Author: yradtsevich Date: 2008-12-08 10:11:42 -0500 (Mon, 08 Dec 2008) New Revision: 12468 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java Log: - each constant of HtmlComponentUtil has been commented and (if it did not exist before) moved to HTML and RichFaces classes - some methods of ComponentUtil have been fixed and commented - fixed an issue with dataOrderedList: attribute 'rows' did not work Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-08 12:46:37 UTC (rev 12467) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-08 15:11:42 UTC (rev 12468) @@ -526,27 +526,33 @@ } /** - * Move attributes from sourceNode to html. - * - * @param visualNode the visual node - * @param sourceNode the source node - * @param htmlAttrName the html attr name - * @param defValue the def value - * @param prefValue the pref value - * @param attrName the attr name + * Move attributes from sourceNode to targetNode. + * + * @param sourceNode source node to copy the attribute from + * @param targetNode target visual node + * @param sourceAttrName source attribute name to copy the attribute value from + * @param targetAttrName target attribute name + * @param prefValue the value that will be concatenated with source attribute and set to + * target attribute if the source attribute exists + * @param defValue the value that will be set to target attribute is the source node + * does not have specified attribute */ - public static void correctAttribute(Element sourceNode, nsIDOMElement visualNode, String attrName, String htmlAttrName, + public static void correctAttribute(Element sourceNode, nsIDOMElement targetNode, + String sourceAttrName, String targetAttrName, String prefValue, String defValue) { - String attrValue = ((Element) sourceNode).getAttribute(attrName); + String attrValue = ((Element) sourceNode).getAttribute(sourceAttrName); if (prefValue != null && prefValue.trim().length() > 0 && attrValue != null) { attrValue = prefValue.trim() + Constants.WHITE_SPACE + attrValue; } if (attrValue != null) { - visualNode.setAttribute(htmlAttrName, attrValue); + targetNode.setAttribute(targetAttrName, attrValue); } else if (defValue != null) { - visualNode.setAttribute(htmlAttrName, defValue); - } else - visualNode.removeAttribute(attrName); + targetNode.setAttribute(targetAttrName, defValue); + } else { + // FIXME: probably a bugged line - + // removing source attribute from target node [commented by yradtsevich] + targetNode.removeAttribute(sourceAttrName); + } } /** @@ -561,13 +567,11 @@ * @return boolean value from string */ public static boolean string2boolean(String str) { - if ((str == null) || (Constants.EMPTY.equals(str))) { - return true; - } else if ((Constants.TRUE.equalsIgnoreCase(str)) - || (Constants.FALSE.equalsIgnoreCase(str))) { - return new Boolean(str).booleanValue(); - } - return true; + if (Constants.FALSE.equals(str)) { + return false; + } else { + return true; + } } /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-12-08 12:46:37 UTC (rev 12467) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-12-08 15:11:42 UTC (rev 12468) @@ -10,171 +10,278 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.richfaces; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; +import org.jboss.tools.vpe.editor.util.HTML; + /** * Util class which contains basic html tags. * * @deprecated use org.jboss.tools.vpe.editor.util.HTML and * org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces * @author Max Areshkau - * + * @author yradtsevich */ public class HtmlComponentUtil { - /** HTML TAG DL */ + /** + * @deprecated use {@link HTML#TAG_DL} instead + */ public static final String HTML_TAG_DL = "dl"; //$NON-NLS-1$ - /** HTML TAG BR */ + /** + * @deprecated use {@link HTML#TAG_BR} instead + */ public static final String HTML_TAG_BR = "br"; //$NON-NLS-1$ - /** HTML TAG COLGROUP */ + /** + * @deprecated use {@link HTML#TAG_COLGROUP} instead + */ public static final String HTML_TAG_COLGROUP = "colgroup"; //$NON-NLS-1$ - /** HTML TAG THEAD */ + /** + * @deprecated use {@link HTML#TAG_THEAD} instead + */ public static final String HTML_TAG_THEAD = "thead"; //$NON-NLS-1$ - /** HTML TAG TFOOT */ + /** + * @deprecated use {@link HTML#TAG_TFOOT} instead + */ public static final String HTML_TAG_TFOOT = "tfoot"; //$NON-NLS-1$ - /** HTML TAG CAPTION */ + /** + * @deprecated use {@link HTML#TAG_CAPTION} instead + */ public static final String HTML_TAG_CAPTION = "caption"; //$NON-NLS-1$ - /** HTML TAG DT */ + /** + * @deprecated use {@link HTML#TAG_DT} instead + */ public static final String HTML_TAG_DT = "dt"; //$NON-NLS-1$ - /** HTML TAG DD */ + /** + * @deprecated use {@link HTML#TAG_DD} instead + */ public static final String HTML_TAG_DD = "dd"; //$NON-NLS-1$ - /** HTML_TAG_TABLE * */ + /** + * @deprecated use {@link HTML#TAG_TABLE} instead + */ public static final String HTML_TAG_TABLE = "TABLE"; //$NON-NLS-1$ - /** HTML_TAG_TBODY * */ + /** + * @deprecated use {@link HTML#TAG_TBODY} instead + */ public static final String HTML_TAG_TBODY = "TBODY"; //$NON-NLS-1$ - /** HTML_TAG_TR * */ + /** + * @deprecated use {@link HTML#TAG_TR} instead + */ public static final String HTML_TAG_TR = "TR"; //$NON-NLS-1$ - /** HTML_TAG_TD * */ + /** + * @deprecated use {@link HTML#TAG_TD} instead + */ public static final String HTML_TAG_TD = "TD"; //$NON-NLS-1$ - /** HTML_TAG_TH * */ + /** + * @deprecated use {@link HTML#TAG_TH} instead + */ public static final String HTML_TAG_TH = "TH"; //$NON-NLS-1$ - /** HTML_TAG_INPUT * */ + /** + * @deprecated use {@link HTML#TAG_INPUT} instead + */ public static final String HTML_TAG_INPUT = "INPUT"; //$NON-NLS-1$ - /** HTML_TAG_IMG * */ + /** + * @deprecated use {@link HTML#TAG_IMG} instead + */ public static final String HTML_TAG_IMG = "IMG"; //$NON-NLS-1$ - /** HTML_TAG_DIV */ + /** + * @deprecated use {@link HTML#TAG_DIV} instead + */ public static final String HTML_TAG_DIV = "DIV"; //$NON-NLS-1$ - /** HTML_TAG_SPAN */ + /** + * @deprecated use {@link HTML#TAG_SPAN} instead + */ public static final String HTML_TAG_SPAN = "SPAN"; //$NON-NLS-1$ - /** HTML_TAG_A */ + /** + * @deprecated use {@link HTML#TAG_A} instead + */ public static final String HTML_TAG_A = "A"; //$NON-NLS-1$ - /** HTML_TAG_B */ + /** + * @deprecated use {@link HTML#TAG_B} instead + */ public static final String HTML_TAG_B = "B"; //$NON-NLS-1$ - /** HTML_TAG_LI */ + /** + * @deprecated use {@link HTML#TAG_LI} instead + */ public static final String HTML_TAG_LI = "LI"; //$NON-NLS-1$ - /** HTML_TABLE_COLSPAN * */ + /** + * @deprecated use {@link HTML#ATTR_COLSPAN} instead + */ public static final String HTML_TABLE_COLSPAN = "colspan"; //$NON-NLS-1$ - /** HTML_HEIGHT_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_HEIGHT} instead + */ public static final String HTML_HEIGHT_ATTR = "height"; //$NON-NLS-1$ - /** HTML_CLASS_ATTR * */ + /** + * @deprecated use {@link RichFaces#ATTR_STYLE_CLASS} instead + */ public static final String HTML_STYLECLASS_ATTR = "styleClass"; //$NON-NLS-1$ - /** HTML_CLASS_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_CLASS} instead + */ public static final String HTML_CLASS_ATTR = "class"; //$NON-NLS-1$ - /** HTML_CELLSPACING_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_CELLSPACING} instead + */ public static final String HTML_CELLSPACING_ATTR = "cellspacing"; //$NON-NLS-1$ - /** HTML_CELLPADDING_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_CELLPADDING} instead + */ public static final String HTML_CELLPADDING_ATTR = "cellpadding"; //$NON-NLS-1$ - /** HTML_ALIGN_LEFT_VALUE * */ + /** + * @deprecated use {@link HTML#VALUE_ALIGN_LEFT} instead + */ public static final String HTML_ALIGN_LEFT_VALUE = "left"; //$NON-NLS-1$ - /** HTML_ALIGN_RIGHT_VALUE * */ + /** + * @deprecated use {@link HTML#VALUE_ALIGN_RIGHT} instead + */ public static final String HTML_ALIGN_RIGHT_VALUE = "right"; //$NON-NLS-1$ - /** HTML_ALIGN_CENTER_VALUE * */ + /** + * @deprecated use {@link HTML#VALUE_ALIGN_CENTER} instead + */ public static final String HTML_ALIGN_CENTER_VALUE = "center"; //$NON-NLS-1$ - /** HTML_ATR_WIDTH */ + /** + * @deprecated use {@link HTML#ATTR_WIDTH} instead + */ public static final String HTML_ATR_WIDTH = "width"; //$NON-NLS-1$ - /** HTML_ATR_WIDTH */ + /** + * @deprecated use {@link HTML#ATTR_HEIGHT} instead + */ public static final String HTML_ATR_HEIGHT = "height"; //$NON-NLS-1$ - /** HTML_ATR_src */ + /** + * @deprecated use {@link HTML#ATTR_SRC} instead + */ public static final String HTML_ATR_SRC = "src"; //$NON-NLS-1$ - /** style */ + /** + * @deprecated use {@link HTML#ATTR_STYLE} instead + */ public static final String HTML_STYLE_ATTR = "style"; //$NON-NLS-1$ - /** scope */ + /** + * @deprecated use {@link HTML#ATTR_SCOPE} instead + */ public static final String HTML_SCOPE_ATTR = "scope"; //$NON-NLS-1$ - /** HTML_TABLE_ATR_ */ + /** + * @deprecated use {@link HTML#ATTR_BORDER} instead + */ public static final String HTML_BORDER_ATTR = "border"; //$NON-NLS-1$ - /** HTML_ALIGN_ATR */ + /** + * @deprecated use {@link HTML#ATTR_ALIGN} instead + */ public static final String HTML_ALIGN_ATTR = "align"; //$NON-NLS-1$ - /** HTML_TABLE_ATR_ */ + // TODO: move the constant from this class to somewhere public static final String FILE_PROTOCOL = "file://"; //$NON-NLS-1$ - /** HTML_COLSPAN_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_COLSPAN} instead + */ public static final String HTML_COLSPAN_ATTR = "colspan"; //$NON-NLS-1$ - /** HTML_ROWSPAN_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_ROWSPAN} instead + */ public static final String HTML_ROWSPAN_ATTR = "rowspan"; //$NON-NLS-1$ - /** HTML_ROW_ATTR * */ + /** @deprecated there is no tag with row attribute */ + // TODO: remove the attribute from the code public static final String HTML_ROW_ATTR = "row"; //$NON-NLS-1$ - /** HTML_SIZE_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_SIZE} instead + */ public static final String HTML_SIZE_ATTR = "size"; //$NON-NLS-1$ - /** HTML_TYPE_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_TYPE} instead + */ public static final String HTML_TYPE_ATTR = "type"; //$NON-NLS-1$ - /** HTML_READONLY_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_READONLY} instead + */ public static final String HTML_READONLY_ATTR = "readonly"; //$NON-NLS-1$ - /** HTML_TAG_BUTTON * */ + /** + * @deprecated use {@link HTML#TAG_BUTTON} instead + */ public static final String HTML_TAG_BUTTON = "button"; //$NON-NLS-1$ - /** HTML_VALUE_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_VALUE} instead + */ public static final String HTML_VALUE_ATTR = "value"; //$NON-NLS-1$ - /** CSS_BORDER_WIDTH */ + /** + * @deprecated use {@link HTML#STYLE_PARAMETER_BORDER_WIDTH} instead + */ public static final String CSS_BORDER_WIDTH = "border-width"; //$NON-NLS-1$ - /** CSS_BORDER_STYLE */ + /** + * @deprecated use {@link HTML#STYLE_PARAMETER_BORDER_STYLE} instead + */ public static final String CSS_BORDER_STYLE = "border-style"; //$NON-NLS-1$ + /** + * @deprecated use {@link HTML#STYLE_PARAMETER_DISPLAY} instead + */ public static final String CSS_DISPLAY = "display"; //$NON-NLS-1$ - /** HTML_WIDTH_ATTR * */ + /** + * @deprecated use {@link HTML#ATTR_WIDTH} instead + */ public static final String HTML_WIDTH_ATTR = "width"; //$NON-NLS-1$ - /** HTML_ATTR_VALIGN */ + /** + * @deprecated use {@link HTML#ATTR_VALIGN} instead + */ public static final String HTML_ATTR_VALIGN = "valign"; //$NON-NLS-1$ - /** HTML_ATTR_VALIGN_MIDDLE_VALUE */ + /** + * @deprecated use {@link HTML#STYLE_VALUE_MIDDLE} instead + */ public static final String HTML_ATTR_VALIGN_MIDDLE_VALUE = "middle"; //$NON-NLS-1$ - /** HTML_ATTR_BACKGROUND */ + /** + * @deprecated use {@link HTML#ATTR_BACKGROUND} instead + */ public static final String HTML_ATTR_BACKGROUND = "background"; //$NON-NLS-1$ - /** HTML_ATTR_BACKGROUND */ + /** + * @deprecated use {@link HTML#ATTR_DISABLED} instead + */ public static final String HTML_ATTR_DISABLED = "disabled"; //$NON-NLS-1$ } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java 2008-12-08 12:46:37 UTC (rev 12467) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java 2008-12-08 15:11:42 UTC (rev 12468) @@ -22,39 +22,43 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; +import org.jboss.tools.vpe.editor.util.HTML; public class RichFacesDataOrderedListTemplate extends VpeAbstractTemplate { - /** CSS_FILE_NAME */ - final static private String CSS_FILE_NAME = "dataOrderedList/dataOrderedList.css"; + private static final String ORDERED_LIST_CLASSES = "dr-list rich-orderedlist"; //$NON-NLS-1$ + private static final String LIST_ITEM_CLASSES = "dr-list-item rich-list-item"; //$NON-NLS-1$ + private static final String CSS_FILE_NAME = "dataOrderedList/dataOrderedList.css"; //$NON-NLS-1$ + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { Element sourceElement = (Element)sourceNode; - nsIDOMElement orderedList = visualDocument.createElement("ol"); + nsIDOMElement orderedList = visualDocument.createElement(HTML.TAG_OL); ComponentUtil.setCSSLink(pageContext, CSS_FILE_NAME, "richFacesDataOrderList"); VisualDomUtil.copyAttributes(sourceNode, orderedList); ComponentUtil.correctAttribute(sourceElement, orderedList, - HtmlComponentUtil.HTML_STYLECLASS_ATTR, - HtmlComponentUtil.HTML_CLASS_ATTR, - "dr-list rich-orderedlist", - "dr-list rich-orderedlist"); + RichFaces.ATTR_STYLE_CLASS, + HTML.ATTR_CLASS, + ORDERED_LIST_CLASSES, + ORDERED_LIST_CLASSES); ComponentUtil.correctAttribute(sourceElement, orderedList, - HtmlComponentUtil.HTML_STYLE_ATTR, - HtmlComponentUtil.HTML_STYLE_ATTR, null, null); + RichFaces.ATTR_STYLE, + HTML.ATTR_STYLE , null, null); VpeCreationData creatorInfo = new VpeCreationData(orderedList); - int rows = 3; + int rows = 1; try { - rows = Integer.parseInt(sourceElement.getAttribute(HtmlComponentUtil.HTML_ROW_ATTR)); + rows = Integer.parseInt(sourceElement.getAttribute(RichFaces.ATTR_ROWS)); } catch (NumberFormatException x) { - rows = 3; + // this is OK, rows still equals 1 } for (int i = 0; i < rows; i++) { - nsIDOMElement listItem = visualDocument.createElement("li"); - listItem.setAttribute("class", "dr-list-item rich-list-item"); + nsIDOMElement listItem = visualDocument.createElement(HTML.TAG_LI); + listItem.setAttribute(HTML.ATTR_CLASS, LIST_ITEM_CLASSES); orderedList.appendChild(listItem); VpeChildrenInfo info = new VpeChildrenInfo(listItem); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2008-12-08 12:46:37 UTC (rev 12467) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2008-12-08 15:11:42 UTC (rev 12468) @@ -66,7 +66,7 @@ /** The Constant ATTR_NAME. */ public static final String ATTR_NAME = "name"; //$NON-NLS-1$ public static final String ATTR_POPUP = "popup";//$NON-NLS-1$ - /** The Constant ATTR_ROW_CLASSES. */ + public static final String ATTR_ROWS = "rows"; //$NON-NLS-1$ public static final String ATTR_ROW_CLASSES = "rowClasses"; //$NON-NLS-1$ public static final String ATTR_SELECT_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$ public static final String ATTR_SELECT_ITEM_VALUE = "itemValue"; //$NON-NLS-1$ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-12-08 12:46:37 UTC (rev 12467) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-12-08 15:11:42 UTC (rev 12468) @@ -38,6 +38,7 @@ public static final String TAG_TD = "TD"; //$NON-NLS-1$ public static final String TAG_DL = "DL"; //$NON-NLS-1$ public static final String TAG_DT = "DT"; //$NON-NLS-1$ + public static final String TAG_DD = "DD"; //$NON-NLS-1$ public static final String TAG_COL = "COL"; //$NON-NLS-1$ public static final String TAG_COLS = "COLS"; //$NON-NLS-1$ public static final String TAG_COLGROUP = "COLGROUP"; //$NON-NLS-1$ @@ -93,6 +94,7 @@ public static final String ATTR_READONLY = "readonly"; //$NON-NLS-1$ public static final String ATTR_SCOPE = "scope"; //$NON-NLS-1$ public static final String ATTR_SPAN = "span"; //$NON-NLS-1$ + public static final String ATTR_BACKGROUND = "background"; //$NON-NLS-1$ /**Use this constant if you have to span a column to entire row.*/ /* While in HTML 4.01 standard "colspan='0'" should be used for this purpose, @@ -102,6 +104,7 @@ public static final String VALUE_ALIGN_TOP = "top"; //$NON-NLS-1$ public static final String VALUE_ALIGN_RIGHT = "right"; //$NON-NLS-1$ + public static final String VALUE_ALIGN_LEFT = "left"; //$NON-NLS-1$ public static final String VALUE_ALIGN_MIDDLE = "middle"; //$NON-NLS-1$ public static final String VALUE_CLASS_DELIMITER = " "; //$NON-NLS-1$ public static final String VALUE_TYPE_TEXT = "text"; //$NON-NLS-1$ @@ -121,9 +124,12 @@ public static final String STYLE_PARAMETER_LEFT = "left"; //$NON-NLS-1$ public static final String STYLE_PARAMETER_HEIGHT = "height"; //$NON-NLS-1$ public static final String STYLE_PARAMETER_BACKGROUND_IMAGE = "background-image"; //$NON-NLS-1$ + public static final String STYLE_PARAMETER_BORDER_WIDTH = "border-width"; //$NON-NLS-1$ + public static final String STYLE_PARAMETER_BORDER_STYLE = "border-style"; //$NON-NLS-1$ public static final String STYLE_PARAMETER_MAX_HEIGHT = "max-height"; //$NON-NLS-1$ public static final String STYLE_PARAMETER_ZINDEX = "z-index"; //$NON-NLS-1$ public static final String STYLE_PARAMETER_CLEAR = "clear"; //$NON-NLS-1$ public static final String STYLE_PARAMETER_TABLE_LAYOUT = "table-layout"; //$NON-NLS-1$ public static final String STYLE_VALUE_FIXED = "fixed"; //$NON-NLS-1$ + public static final String STYLE_VALUE_MIDDLE = "middle"; //$NON-NLS-1$ }