Author: dmaliarevich Date: 2008-11-18 05:22:24 -0500 (Tue, 18 Nov 2008) New Revision: 11861 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-2938, icons paths were updated, inputWidth attribute processing was updated. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java 2008-11-18 08:03:21 UTC (rev 11860) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java 2008-11-18 10:22:24 UTC (rev 11861) @@ -28,6 +28,7 @@ import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.template.VpeToggableTemplate; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.VpeStyleUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMText; @@ -465,8 +466,7 @@ final nsIDOMElement element = visualDocument.createElement(HTML.TAG_DIV); element.setAttribute(HTML.ATTR_CLASS, getMainControlsDivCssClass()); - element.setAttribute(HTML.ATTR_STYLE, "position: absolute; "+getControlPositionsSubStyles()); //$NON-NLS-1$ - + element.setAttribute(HTML.ATTR_STYLE, "position: absolute; " + getControlPositionsSubStyles()); //$NON-NLS-1$ final nsIDOMElement divShadov = visualDocument.createElement(HTML.TAG_DIV); divShadov.setAttribute(HTML.ATTR_CLASS, "rich-inplace"+getCssStylesSuffix()+"-shadow"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -524,10 +524,16 @@ final String saveControlIconImg = buttonImages .get("saveControlIcon"); //$NON-NLS-1$ if (defaultButtonImages.containsValue(saveControlIconImg)) { + /* + * Set default icon from resources + */ ComponentUtil.setImg(applyButtonImg, saveControlIconImg); } else { - ComponentUtil.setImgFromResources(pageContext, applyButtonImg, - saveControlIconImg, ""); //$NON-NLS-1$ + /* + * Set custom user icon + */ + String imgFullPath = VpeStyleUtil.addFullPathToImgSrc(saveControlIconImg, pageContext, true); + applyButtonImg.setAttribute(HTML.ATTR_SRC, imgFullPath); } applyButtonImg.setAttribute(VPE_USER_TOGGLE_ID_ATTR, String .valueOf(0)); @@ -548,10 +554,16 @@ final String cancelControlIconImg = buttonImages .get("cancelControlIcon"); //$NON-NLS-1$ if (defaultButtonImages.containsValue(cancelControlIconImg)) { + /* + * Set default icon from resources + */ ComponentUtil.setImg(cancelButtonImg, cancelControlIconImg); } else { - ComponentUtil.setImgFromResources(pageContext, cancelButtonImg, - cancelControlIconImg, ""); //$NON-NLS-1$ + /* + * Set custom user icon + */ + String imgFullPath = VpeStyleUtil.addFullPathToImgSrc(cancelControlIconImg, pageContext, true); + cancelButtonImg.setAttribute(HTML.ATTR_SRC, imgFullPath); } cancelButtonImg.setAttribute(VPE_USER_TOGGLE_ID_ATTR, String .valueOf(0)); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java 2008-11-18 08:03:21 UTC (rev 11860) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java 2008-11-18 10:22:24 UTC (rev 11861) @@ -17,6 +17,7 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.Constants; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -176,7 +177,8 @@ */ protected void prepareData(VpePageContext pageContext,Element source) { try { - this.inputWidth = String.valueOf(ComponentUtil.parseWidthHeightValue(source.getAttribute("inputWidth"))); //$NON-NLS-1$ + this.inputWidth = String.valueOf(ComponentUtil + .parseWidthHeightValue(source.getAttribute("inputWidth"))) + Constants.PIXEL; //$NON-NLS-1$ } catch (NumberFormatException e) { this.inputWidth = DEFAULT_INPUT_WIDTH_VALUE; }