Author: sdzmitrovich Date: 2008-09-22 12:23:36 -0400 (Mon, 22 Sep 2008) New Revision: 10397 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfVerbatim.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-2797 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java 2008-09-22 14:22:21 UTC (rev 10396) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java 2008-09-22 16:23:36 UTC (rev 10397) @@ -14,6 +14,7 @@ import org.jboss.tools.vpe.editor.VpeSourceDomBuilder; import org.jboss.tools.vpe.editor.context.VpePageContext; 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; @@ -75,7 +76,7 @@ input.setAttribute(HTML.ATTR_DIR, dir); } - if (attrPresents(disabled) && "true".equalsIgnoreCase(disabled)) { //$NON-NLS-1$ + if (attrPresents(disabled) && Constants.TRUE.equalsIgnoreCase(disabled)) { label.setAttribute(HTML.ATTR_CLASS, disabledClass); } else if (attrPresents(enabledClass)) { label.setAttribute(HTML.ATTR_CLASS, enabledClass); @@ -100,7 +101,7 @@ * @return true, if successful */ private boolean attrPresents(String attr) { - return ((null != attr) && (!"".equals(attr))); //$NON-NLS-1$ + return ((null != attr) && (attr.length() != 0)); } /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java 2008-09-22 14:22:21 UTC (rev 10396) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java 2008-09-22 16:23:36 UTC (rev 10397) @@ -35,8 +35,6 @@ */ public class JsfOptionSelectItemTemplate extends AbstractOutputJsfTemplate /* VpeAbstractTemplate */{ - public static final String EMPTY_STRING = ""; //$NON-NLS-1$ - /* "escape" attribute of f:selectItem */ private String escape; @@ -101,7 +99,7 @@ // if escape then contents of value (or other attribute) is only // text if (!sourceElement.hasAttribute(JSF.ATTR_ESCAPE) - || Constants.TRUE.equalsIgnoreCase(sourceElement //$NON-NLS-1$ + || Constants.TRUE.equalsIgnoreCase(sourceElement .getAttribute(JSF.ATTR_ESCAPE))) { String value = outputAttr.getNodeValue(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java 2008-09-22 14:22:21 UTC (rev 10396) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java 2008-09-22 16:23:36 UTC (rev 10397) @@ -16,6 +16,7 @@ import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; import org.jboss.tools.vpe.editor.context.VpePageContext; 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; @@ -44,9 +45,6 @@ // style of span private static final String SPAN_STYLE_VALUE = "-moz-user-modify: read-write;"; //$NON-NLS-1$ - private static final String CONSTANT_TRUE = "true"; //$NON-NLS-1$ - private static final String CONSTANT_EMPTY = ""; //$NON-NLS-1$ - private String dir; /** @@ -77,10 +75,10 @@ table.setAttribute(HTML.ATTR_TITLE, getTitle(sourceNode)); nsIDOMElement radio = visualDocument.createElement(HTML.TAG_INPUT); if (disabledItem) - radio.setAttribute(ITEM_DISABLED, CONSTANT_TRUE); + radio.setAttribute(ITEM_DISABLED, Constants.TRUE); nsIDOMElement label = visualDocument.createElement(HTML.TAG_LABEL); if (disabledItem) - label.setAttribute(ITEM_DISABLED, CONSTANT_TRUE); + label.setAttribute(ITEM_DISABLED, Constants.TRUE); table.appendChild(radio); table.appendChild(label); @@ -169,7 +167,7 @@ * @return true, if successful */ private boolean attrPresents(String attr) { - return ((null != attr) && (!CONSTANT_EMPTY.equals(attr))); + return ((null != attr) && (attr.length()!=0)); } @Override Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java 2008-09-22 14:22:21 UTC (rev 10396) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java 2008-09-22 16:23:36 UTC (rev 10397) @@ -11,7 +11,10 @@ package org.jboss.tools.jsf.vpe.jsf.template; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Set; import org.jboss.tools.jsf.vpe.jsf.template.util.JSF; import org.jboss.tools.vpe.editor.context.VpePageContext; @@ -47,13 +50,14 @@ /** * list of copied attributes */ - private static List<String> ATTR_LIST_COPY = new ArrayList<String>(); + private static Map<String, String> ATTR_LIST_COPY = new HashMap<String, String>(); static { - ATTR_LIST_COPY.add("style"); //$NON-NLS-1$ - ATTR_LIST_COPY.add("styleClass"); //$NON-NLS-1$ + ATTR_LIST_COPY.put(JSF.ATTR_STYLE, HTML.ATTR_STYLE); + ATTR_LIST_COPY.put(JSF.ATTR_STYLE_CLASS, HTML.ATTR_CLASS); } + /** * */ @@ -79,14 +83,17 @@ Element element = (Element) sourceNode; // import attributes from source - for (String attributeName : ATTR_LIST_COPY) { + Set<String> jsfAttributes = ATTR_LIST_COPY.keySet(); + for (String attributeName : jsfAttributes) { + // get attribute String attr = element.getAttribute(attributeName); // add attribute to "select" - if (attr != null) - select.setAttribute(HTML.ATTR_STYLE, attr); + if (attr != null) { + select.setAttribute(ATTR_LIST_COPY.get(attributeName), attr); + } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfVerbatim.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfVerbatim.java 2008-09-22 14:22:21 UTC (rev 10396) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfVerbatim.java 2008-09-22 16:23:36 UTC (rev 10397) @@ -18,7 +18,7 @@ import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.editor.util.TemplateManagingUtil; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.w3c.dom.Element; @@ -34,8 +34,10 @@ /* * (non-Javadoc) * - * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, - * org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument) + * @see + * org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools + * .vpe.editor.context.VpePageContext, org.w3c.dom.Node, + * org.mozilla.interfaces.nsIDOMDocument) */ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { @@ -72,7 +74,7 @@ } else { // get text by positions and add to span - String text = TemplateManagingUtil.getSourceText(pageContext, + String text = NodesManagingUtil.getSourceText(pageContext, ((IDOMNode) child).getStartOffset(), ((IDOMNode) child) .getEndOffset() - 1); span.appendChild(visualDocument.createTextNode(text)); @@ -95,10 +97,11 @@ /* * (non-Javadoc) * - * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, - * org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, - * org.mozilla.interfaces.nsIDOMElement, java.lang.Object, - * java.lang.String, java.lang.String) + * @seeorg.jboss.tools.vpe.editor.template.VpeAbstractTemplate# + * isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, + * org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, + * org.mozilla.interfaces.nsIDOMElement, java.lang.Object, java.lang.String, + * java.lang.String) */ public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-09-22 14:22:21 UTC (rev 10396) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-09-22 16:23:36 UTC (rev 10397) @@ -103,9 +103,6 @@ <vpe:tag name="h:inputHidden" case-sensitive="yes"> <vpe:template children="no" modify="no" > - <input type="text" value="{jsfvalue(@value)}" - title="{tagstring()}" /> - <vpe:dnd> <vpe:drag start-enable="yes" /> <vpe:drop container="yes"> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2008-09-22 14:22:21 UTC (rev 10396) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2008-09-22 16:23:36 UTC (rev 10397) @@ -119,7 +119,7 @@ } public void testSelectOneRadio() throws Throwable { - assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$ + performContentTest("components/selectOneRadio.jsp"); //$NON-NLS-1$ } /* @@ -147,7 +147,7 @@ } public void testFacet() throws Throwable { - assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$ + performContentTest("components/facet.jsp"); //$NON-NLS-1$ } public void testLoadBundle() throws Throwable { @@ -163,11 +163,11 @@ } public void testSelectItem() throws Throwable { - assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$ + performContentTest("components/selectItem.jsp"); //$NON-NLS-1$ } public void testSelectItems() throws Throwable { - assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$ + performContentTest("components/selectItems.jsp"); //$NON-NLS-1$ } public void testSetPropertyActionListener() throws Throwable { @@ -175,7 +175,8 @@ } public void testSubview() throws Throwable { - assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$ + performContentTest("components/subview.jsp"); //$NON-NLS-1$ + } public void testValidateDoubleRange() throws Throwable { @@ -199,11 +200,11 @@ } public void testVerbatim() throws Throwable { - assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$ + performContentTest("components/verbatim.jsp"); //$NON-NLS-1$ } public void testView() throws Throwable { - assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$ + performContentTest("components/view.jsp"); //$NON-NLS-1$ } protected String getTestProjectName() { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2008-09-22 14:22:21 UTC (rev 10396) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2008-09-22 16:23:36 UTC (rev 10397) @@ -136,5 +136,19 @@ return locale; } + + /** + * + * @param pageContext + * @param startPosition + * @param endPosition + * @return + */ + public static String getSourceText(VpePageContext pageContext, + int startPosition, int endPosition) { + return pageContext.getSourceBuilder().getStructuredTextViewer() + .getTextWidget().getText(startPosition, endPosition); + } + }