December 2008 - jbosstools-commits

JBoss Tools SVN: r12500 - trunk/documentation/jboss-tools-docs/index/en.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-12-09 14:18:07 -0500 (Tue, 09 Dec 2008) New Revision: 12500 Modified: trunk/documentation/jboss-tools-docs/index/en/master.xml Log: Smooks, jBPM, BPMN covert documentation links included in index module Modified: trunk/documentation/jboss-tools-docs/index/en/master.xml =================================================================== --- trunk/documentation/jboss-tools-docs/index/en/master.xml 2008-12-09 19:09:15 UTC (rev 12499) +++ trunk/documentation/jboss-tools-docs/index/en/master.xml 2008-12-09 19:18:07 UTC (rev 12500) @@ -143,6 +143,33 @@ >(pdf)</ulink> </primaryie> </indexentry> + + <indexentry> + <primaryie>Smooks Reference Guide <ulink + url="en/jboss_smooks_plugin_ref_guide/html/index.html">(html)</ulink> + <ulink url="en/jboss_smooks_plugin_ref_guide/html_single/index.html">(html single)</ulink> + <ulink url="en/jboss_smooks_plugin_ref_guide/pdf/Smooks_Reference_Guide.pdf" + >(pdf)</ulink> + </primaryie> + </indexentry> + <indexentry> + <primaryie>BPMN Convert Reference Guide <ulink + url="en/jboss_bpmn_convert_ref_guide/html/index.html">(html)</ulink> + <ulink url="en/jboss_bpmn_convert_ref_guide/html_single/index.html">(html single)</ulink> + <ulink url="en/jboss_bpmn_convert_ref_guide/pdf/Converter_Reference_Guide.pdf" + >(pdf)</ulink> + </primaryie> + </indexentry> + + <indexentry> + <primaryie>jBPM Reference Guide <ulink + url="en/jboss_jbpm_ref_guide/html/index.html">(html)</ulink> + <ulink url="en/jboss_jbpm_ref_guide/html_single/index.html">(html single)</ulink> + <ulink url="en/jboss_jbpm_ref_guide/pdf/JBPM_Reference_Guide.pdf" + >(pdf)</ulink> + </primaryie> + </indexentry> + </index> </book>

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r12499 - trunk/documentation/jboss-tools-docs.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-12-09 14:09:15 -0500 (Tue, 09 Dec 2008) New Revision: 12499 Modified: trunk/documentation/jboss-tools-docs/all-guides.xml trunk/documentation/jboss-tools-docs/pom.xml Log: Smooks, jBPM, BPMN covert documentation were added to nightly build Modified: trunk/documentation/jboss-tools-docs/all-guides.xml =================================================================== --- trunk/documentation/jboss-tools-docs/all-guides.xml 2008-12-09 19:01:21 UTC (rev 12498) +++ trunk/documentation/jboss-tools-docs/all-guides.xml 2008-12-09 19:09:15 UTC (rev 12499) @@ -273,6 +273,48 @@ <fileMode>0644</fileMode> <directoryMode>0755</directoryMode> </fileSet> + + <fileSet> + <directory>../../smooks/docs/references/target/docbook/publish/en-US</directory> + <outputDirectory>/jboss_smooks_plugin_ref_guide</outputDirectory> + <filtered>false</filtered> + <lineEnding>keep</lineEnding> + <includes> + <include>**/*.*</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <useDefaultExcludes>true</useDefaultExcludes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + + <fileSet> + <directory>../../jbpm/docs/converter_ref/target/docbook/publish/en-US</directory> + <outputDirectory>/jboss_bpmn_convert_ref_guide</outputDirectory> + <filtered>false</filtered> + <lineEnding>keep</lineEnding> + <includes> + <include>**/*.*</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <useDefaultExcludes>true</useDefaultExcludes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + + <fileSet> + <directory>../../jbpm/docs/reference/target/docbook/publish/en-US</directory> + <outputDirectory>/jboss_jbpm_ref_guide</outputDirectory> + <filtered>false</filtered> + <lineEnding>keep</lineEnding> + <includes> + <include>**/*.*</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <useDefaultExcludes>true</useDefaultExcludes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> </fileSets> </assembly> \ No newline at end of file Modified: trunk/documentation/jboss-tools-docs/pom.xml =================================================================== --- trunk/documentation/jboss-tools-docs/pom.xml 2008-12-09 19:01:21 UTC (rev 12498) +++ trunk/documentation/jboss-tools-docs/pom.xml 2008-12-09 19:09:15 UTC (rev 12499) @@ -26,7 +26,9 @@ <module>../../ws/docs/reference</module> <module>../../portlet/docs/reference</module> <module>../../birt/docs</module> - + <module>../../smooks/docs/reference</module> + <module>../../jbpm/docs/converter_ref</module> + <module>../../jbpm/docs/reference</module> <module>index</module> </modules>

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r12498 - branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-12-09 14:01:21 -0500 (Tue, 09 Dec 2008) New Revision: 12498 Modified: branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java Log: JBIDE-3368 Modified: branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java =================================================================== --- branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2008-12-09 18:55:35 UTC (rev 12497) +++ branches/jbosstools-3.0.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2008-12-09 19:01:21 UTC (rev 12498) @@ -31,7 +31,10 @@ public void serverAdded(IServer server) { // create metadata area - IJBossServerConstants.PLUGIN_LOCATION.append(server.getId()).toFile().mkdirs(); + File location = IJBossServerConstants.PLUGIN_LOCATION.append(server.getId().replace(' ', '_')).toFile(); + location.mkdirs(); + new File(location, IJBossServerConstants.DEPLOY).mkdir(); + new File(location, IJBossServerConstants.TEMP_DEPLOY).mkdir(); // create temp deploy folder IRuntime rt = server.getRuntime(); @@ -46,10 +49,8 @@ public void serverRemoved(IServer server) { // delete metadata area - File f = IJBossServerConstants.PLUGIN_LOCATION.append(server.getId()).toFile(); + File f = IJBossServerConstants.PLUGIN_LOCATION.append(server.getId().replace(' ', '_')).toFile(); FileUtil.safeDelete(f); - - // delete temp folder } public void serverChanged(ServerEvent event) {

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r12497 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-12-09 13:55:35 -0500 (Tue, 09 Dec 2008) New Revision: 12497 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java Log: JBIDE-3368 - critical fail Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2008-12-09 17:47:22 UTC (rev 12496) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2008-12-09 18:55:35 UTC (rev 12497) @@ -31,7 +31,10 @@ public void serverAdded(IServer server) { // create metadata area - IJBossServerConstants.PLUGIN_LOCATION.append(server.getId()).toFile().mkdirs(); + File location = IJBossServerConstants.PLUGIN_LOCATION.append(server.getId().replace(' ', '_')).toFile(); + location.mkdirs(); + new File(location, IJBossServerConstants.DEPLOY).mkdir(); + new File(location, IJBossServerConstants.TEMP_DEPLOY).mkdir(); // create temp deploy folder IRuntime rt = server.getRuntime(); @@ -46,10 +49,8 @@ public void serverRemoved(IServer server) { // delete metadata area - File f = IJBossServerConstants.PLUGIN_LOCATION.append(server.getId()).toFile(); + File f = IJBossServerConstants.PLUGIN_LOCATION.append(server.getId().replace(' ', '_')).toFile(); FileUtil.safeDelete(f); - - // delete temp folder } public void serverChanged(ServerEvent event) {

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r12496 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-12-09 12:47:22 -0500 (Tue, 09 Dec 2008) New Revision: 12496 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3224, for these templates resizing was fixed, others worked fine without any fixing. JUnits were updated. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml 2008-12-09 17:47:17 UTC (rev 12495) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml 2008-12-09 17:47:22 UTC (rev 12496) @@ -1,66 +1,38 @@ <tests> <test id="selectManyCheckbox1"> - <TABLE> - <TR> - <TD> - <SPAN> - <INPUT TYPE="checkbox" /> - <LABEL> - <SPAN> check1</SPAN> - </LABEL> - </SPAN> - </TD> - </TR> - <TR> - <TD> - <SPAN> - <INPUT TYPE="checkbox" /> - <LABEL> - <SPAN> check2</SPAN> - </LABEL> - </SPAN> - </TD> - </TR> - <TR> - <TD> - <SPAN> - <INPUT TYPE="checkbox" /> - <LABEL> - <SPAN> check3</SPAN> - </LABEL> - </SPAN> - </TD> - </TR> - </TABLE> + <DIV> + <TABLE> + <TR> + <TD> + <SPAN STYLE="-moz-user-modify: read-write;"> + <INPUT TYPE="checkbox" /> + <LABEL> + <SPAN> check1</SPAN> + </LABEL> + </SPAN> + </TD> + </TR> + <TR> + <TD> + <SPAN STYLE="-moz-user-modify: read-write;"> + <INPUT TYPE="checkbox" /> + <LABEL> + <SPAN> check2</SPAN> + </LABEL> + </SPAN> + </TD> + </TR> + <TR> + <TD> + <SPAN STYLE="-moz-user-modify: read-write;"> + <INPUT TYPE="checkbox" /> + <LABEL> + <SPAN> check3</SPAN> + </LABEL> + </SPAN> + </TD> + </TR> + </TABLE> + </DIV> </test> - <test id="selectManyCheckbox2"> - <TABLE> - <TR> - <TD> - <SPAN> - <INPUT TYPE="checkbox" /> - <LABEL> - <SPAN> check1</SPAN> - </LABEL> - </SPAN> - </TD> - <TD> - <SPAN> - <INPUT TYPE="checkbox" /> - <LABEL> - <SPAN> check2</SPAN> - </LABEL> - </SPAN> - </TD> - <TD> - <SPAN> - <INPUT TYPE="checkbox" /> - <LABEL> - <SPAN> check3</SPAN> - </LABEL> - </SPAN> - </TD> - </TR> - </TABLE> - </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp.xml 2008-12-09 17:47:17 UTC (rev 12495) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneRadio.jsp.xml 2008-12-09 17:47:22 UTC (rev 12496) @@ -1,68 +1,40 @@ <tests> <test id="selectOneRadio1"> - <TABLE BORDER="1"> - <TR> - <TD> - <DIV> - <INPUT TYPE="radio" DIR="" SIZE="" /> - <LABEL> value1</LABEL> - </DIV> - </TD> - </TR> - <TR> - <TD> - <DIV> - <INPUT TYPE="radio" DIR="" SIZE="" /> - <LABEL> value2</LABEL> - </DIV> - </TD> - </TR> - <TR> - <TD> - <DIV> - <INPUT TYPE="radio" DIR="" SIZE="" /> - <LABEL> value3</LABEL> - </DIV> - </TD> - </TR> - <TR> - <TD> - <DIV> - <INPUT TYPE="radio" DIR="" SIZE="" /> - <LABEL> value4</LABEL> - </DIV> - </TD> - </TR> - </TABLE> + <DIV > + <TABLE BORDER="1" STYLE=""> + <TR> + <TD> + <DIV STYLE="-moz-user-modify: read-write;"> + <INPUT TYPE="radio" DIR="" SIZE="" /> + <LABEL > value1</LABEL> + </DIV> + </TD> + </TR> + <TR> + <TD> + <DIV STYLE="-moz-user-modify: read-write;"> + <INPUT TYPE="radio" DIR="" SIZE="" /> + <LABEL > value2</LABEL> + </DIV> + </TD> + </TR> + <TR> + <TD> + <DIV STYLE="-moz-user-modify: read-write;"> + <INPUT TYPE="radio" DIR="" SIZE="" /> + <LABEL > value3</LABEL> + </DIV> + </TD> + </TR> + <TR> + <TD> + <DIV STYLE="-moz-user-modify: read-write;"> + <INPUT TYPE="radio" DIR="" SIZE="" /> + <LABEL > value4</LABEL> + </DIV> + </TD> + </TR> + </TABLE> + </DIV> </test> - <test id="selectOneRadio2"> - <TABLE> - <TR> - <TD> - <DIV> - <INPUT TYPE="radio" DIR="ltr" /> - <LABEL> value1</LABEL> - </DIV> - </TD> - <TD> - <DIV> - <INPUT TYPE="radio" DIR="ltr" /> - <LABEL> value2</LABEL> - </DIV> - </TD> - <TD> - <DIV> - <INPUT TYPE="radio" DIR="ltr" /> - <LABEL> value3</LABEL> - </DIV> - </TD> - <TD> - <DIV> - <INPUT TYPE="radio" DIR="ltr" /> - <LABEL> value4</LABEL> - </DIV> - </TD> - </TR> - </TABLE> - </test> </tests> \ No newline at end of file

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r12495 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-12-09 12:47:17 -0500 (Tue, 09 Dec 2008) New Revision: 12495 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-3224, for these templates resizing was fixed, others worked fine without any fixing. JUnits were updated. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java 2008-12-09 17:47:12 UTC (rev 12494) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java 2008-12-09 17:47:17 UTC (rev 12495) @@ -72,7 +72,9 @@ readAttributes(sourceNode); Element sourceElement = (Element) sourceNode; + nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE); + div.appendChild(table); nsIDOMElement tr = null; nsIDOMElement td = null; @@ -86,7 +88,7 @@ table.setAttribute(BORDER, border); } - VpeCreationData creationData = new VpeCreationData(table); + VpeCreationData creationData = new VpeCreationData(div); NodeList children = sourceNode.getChildNodes(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java 2008-12-09 17:47:12 UTC (rev 12494) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java 2008-12-09 17:47:17 UTC (rev 12495) @@ -35,162 +35,163 @@ public class JsfSelectOneRadioTemplate extends VpeAbstractTemplate { - private static final String VAL_PAGE_DIRECTION = "pageDirection"; - private static final String ATTR_LAYOUT = "layout"; - private static final String ATTR_BORDER = "border"; - private static final String ATTR_DISABLED_CLASS = "disabledClass"; - private static final String ATTR_ENABLED_CLASS = "enabledClass"; - private static final String ATTR_STYLE_CLASS = "styleClass"; + private static final String VAL_PAGE_DIRECTION = "pageDirection"; + private static final String ATTR_LAYOUT = "layout"; + private static final String ATTR_BORDER = "border"; + private static final String ATTR_DISABLED_CLASS = "disabledClass"; + private static final String ATTR_ENABLED_CLASS = "enabledClass"; + private static final String ATTR_STYLE_CLASS = "styleClass"; - private static final String ATTR_DIR_RIGHT_TO_LEFT = "rtl"; - private static final String ATTR_DIR_LEFT_TO_RIGHT = "ltr"; - private static final String ATTR_DISABLED_VALUE = "disabled"; + private static final String ATTR_DIR_RIGHT_TO_LEFT = "rtl"; + private static final String ATTR_DIR_LEFT_TO_RIGHT = "ltr"; + private static final String ATTR_DISABLED_VALUE = "disabled"; - public JsfSelectOneRadioTemplate() { - super(); + public JsfSelectOneRadioTemplate() { + super(); - } + } - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - nsIDOMDocument visualDocument) { + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { - Element sourceElement = (Element) sourceNode; + Element sourceElement = (Element) sourceNode; - boolean layoutHorizontal = true; + boolean layoutHorizontal = true; - String layout = sourceElement.getAttribute(ATTR_LAYOUT); + String layout = sourceElement.getAttribute(ATTR_LAYOUT); - layoutHorizontal = !VAL_PAGE_DIRECTION.equalsIgnoreCase(layout); + layoutHorizontal = !VAL_PAGE_DIRECTION.equalsIgnoreCase(layout); - nsIDOMElement visualTable = visualDocument - .createElement(HTML.TAG_TABLE); - VpeCreationData creatorInfo = new VpeCreationData(visualTable); + nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement visualTable = visualDocument.createElement(HTML.TAG_TABLE); + div.appendChild(visualTable); + VpeCreationData creatorInfo = new VpeCreationData(div); - visualTable.setAttribute(HTML.ATTR_CLASS, ComponentUtil.getAttribute( - sourceElement, ATTR_STYLE_CLASS)); - visualTable.setAttribute(HTML.ATTR_STYLE, ComponentUtil.getAttribute( - sourceElement, HTML.ATTR_STYLE)); - String border = sourceElement.getAttribute(ATTR_BORDER); - if (border != null) - visualTable.setAttribute(ATTR_BORDER, border); + visualTable.setAttribute(HTML.ATTR_CLASS, ComponentUtil.getAttribute( + sourceElement, ATTR_STYLE_CLASS)); + visualTable.setAttribute(HTML.ATTR_STYLE, ComponentUtil.getAttribute( + sourceElement, HTML.ATTR_STYLE)); + String border = sourceElement.getAttribute(ATTR_BORDER); + if (border != null) + visualTable.setAttribute(ATTR_BORDER, border); - NodeList children = sourceNode.getChildNodes(); - int count = children != null ? children.getLength() : 0; - if (count > 0) { - Node[] sourceChildren = new Node[count]; - int childrenCount = 0; - for (int i = 0; i < count; i++) { - Node node = children.item(i); - int type = node.getNodeType(); - if (type == Node.ELEMENT_NODE || type == Node.TEXT_NODE - && node.getNodeValue().trim().length() > 0) { - sourceChildren[childrenCount] = node; - childrenCount++; - } + NodeList children = sourceNode.getChildNodes(); + int count = children != null ? children.getLength() : 0; + if (count > 0) { + Node[] sourceChildren = new Node[count]; + int childrenCount = 0; + for (int i = 0; i < count; i++) { + Node node = children.item(i); + int type = node.getNodeType(); + if (type == Node.ELEMENT_NODE || type == Node.TEXT_NODE + && node.getNodeValue().trim().length() > 0) { + sourceChildren[childrenCount] = node; + childrenCount++; + } + } + if (childrenCount > 0) { + int rowCount; + int rowLength; + int tableSize = childrenCount; + if (layoutHorizontal) { + rowCount = (childrenCount + tableSize - 1) / tableSize; + rowLength = tableSize; + } else { + rowCount = tableSize; + rowLength = (childrenCount + tableSize - 1) / tableSize; + } + for (int i = 0; i < rowCount; i++) { + nsIDOMElement visualRow = visualDocument + .createElement(HTML.TAG_TR); + for (int j = 0; j < rowLength; j++) { + nsIDOMElement visualCell = visualDocument + .createElement(HTML.TAG_TD); + visualRow.appendChild(visualCell); + int sourceIndex = layoutHorizontal ? rowLength * i + j + : rowCount * j + i; + if (sourceIndex < childrenCount) { + VpeChildrenInfo childrenInfo = new VpeChildrenInfo( + visualCell); + childrenInfo + .addSourceChild(sourceChildren[sourceIndex]); + creatorInfo.addChildrenInfo(childrenInfo); } - if (childrenCount > 0) { - int rowCount; - int rowLength; - int tableSize = childrenCount; - if (layoutHorizontal) { - rowCount = (childrenCount + tableSize - 1) / tableSize; - rowLength = tableSize; - } else { - rowCount = tableSize; - rowLength = (childrenCount + tableSize - 1) / tableSize; - } - for (int i = 0; i < rowCount; i++) { - nsIDOMElement visualRow = visualDocument - .createElement(HTML.TAG_TR); - for (int j = 0; j < rowLength; j++) { - nsIDOMElement visualCell = visualDocument - .createElement(HTML.TAG_TD); - visualRow.appendChild(visualCell); - int sourceIndex = layoutHorizontal ? rowLength * i + j - : rowCount * j + i; - if (sourceIndex < childrenCount) { - VpeChildrenInfo childrenInfo = new VpeChildrenInfo( - visualCell); - childrenInfo - .addSourceChild(sourceChildren[sourceIndex]); - creatorInfo.addChildrenInfo(childrenInfo); - } - } - visualTable.appendChild(visualRow); - } - } + } + visualTable.appendChild(visualRow); } - return creatorInfo; + } } + return creatorInfo; + } - @Override - public void validate(VpePageContext pageContext, Node sourceNode, - nsIDOMDocument visualDocument, VpeCreationData data) { - if (data.getNode() != null) { - applyChildAttributes((Element) sourceNode, data.getNode()); - } + @Override + public void validate(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument, VpeCreationData data) { + if (data.getNode() != null) { + applyChildAttributes((Element) sourceNode, data.getNode()); } + } - private void applyChildAttributes(Element sourceElement, nsIDOMNode node) { - boolean disabled = false; - try { - nsIDOMNodeList list = node.getChildNodes(); - nsIDOMElement element = (nsIDOMElement) node - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - disabled = ComponentUtil.string2boolean(ComponentUtil.getAttribute( - sourceElement, HTML.ATTR_DISABLED)); - if (node.getNodeName().equalsIgnoreCase(HTML.TAG_INPUT)) { - element - .setAttribute( - HTML.ATTR_DIR, - (ComponentUtil.getAttribute(sourceElement, - HTML.ATTR_DIR).trim() - .equalsIgnoreCase(ATTR_DIR_RIGHT_TO_LEFT)) ? ATTR_DIR_RIGHT_TO_LEFT - : ((ComponentUtil.getAttribute( - sourceElement, HTML.ATTR_DIR) - .trim() - .equalsIgnoreCase(ATTR_DIR_LEFT_TO_RIGHT)) ? ATTR_DIR_LEFT_TO_RIGHT - : "")); - element.setAttribute(HTML.ATTR_SIZE, ComponentUtil - .getAttribute(sourceElement, HTML.ATTR_SIZE)); - if (disabled - || ComponentUtil - .string2boolean(ComponentUtil - .getAttribute( - element, - AbstractRadioSelectItemTemplate.ITEM_DISABLED))) - element.setAttribute(HTML.ATTR_DISABLED, - ATTR_DISABLED_VALUE); + private void applyChildAttributes(Element sourceElement, nsIDOMNode node) { + boolean disabled = false; + try { + nsIDOMNodeList list = node.getChildNodes(); + nsIDOMElement element = (nsIDOMElement) node + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + disabled = ComponentUtil.string2boolean(ComponentUtil.getAttribute( + sourceElement, HTML.ATTR_DISABLED)); + if (node.getNodeName().equalsIgnoreCase(HTML.TAG_INPUT)) { + element + .setAttribute( + HTML.ATTR_DIR, + (ComponentUtil.getAttribute(sourceElement, + HTML.ATTR_DIR).trim() + .equalsIgnoreCase(ATTR_DIR_RIGHT_TO_LEFT)) ? ATTR_DIR_RIGHT_TO_LEFT + : ((ComponentUtil.getAttribute( + sourceElement, HTML.ATTR_DIR) + .trim() + .equalsIgnoreCase(ATTR_DIR_LEFT_TO_RIGHT)) ? ATTR_DIR_LEFT_TO_RIGHT + : "")); + element.setAttribute(HTML.ATTR_SIZE, ComponentUtil + .getAttribute(sourceElement, HTML.ATTR_SIZE)); + if (disabled + || ComponentUtil + .string2boolean(ComponentUtil + .getAttribute( + element, + AbstractRadioSelectItemTemplate.ITEM_DISABLED))) + element.setAttribute(HTML.ATTR_DISABLED, + ATTR_DISABLED_VALUE); - } - if (node.getNodeName().equalsIgnoreCase(HTML.TAG_LABEL)) { - element - .setAttribute( - HTML.ATTR_CLASS, - (disabled || ComponentUtil - .string2boolean(ComponentUtil - .getAttribute( - element, - AbstractRadioSelectItemTemplate.ITEM_DISABLED))) ? ComponentUtil - .getAttribute(sourceElement, - ATTR_DISABLED_CLASS) - : ComponentUtil.getAttribute( - sourceElement, - ATTR_ENABLED_CLASS)); - } + } + if (node.getNodeName().equalsIgnoreCase(HTML.TAG_LABEL)) { + element + .setAttribute( + HTML.ATTR_CLASS, + (disabled || ComponentUtil + .string2boolean(ComponentUtil + .getAttribute( + element, + AbstractRadioSelectItemTemplate.ITEM_DISABLED))) ? ComponentUtil + .getAttribute(sourceElement, + ATTR_DISABLED_CLASS) + : ComponentUtil.getAttribute( + sourceElement, + ATTR_ENABLED_CLASS)); + } - if (node.getNodeName().equalsIgnoreCase(HTML.TAG_TABLE)) { - element.setAttribute(HTML.ATTR_STYLE, ComponentUtil - .getAttribute(sourceElement, HTML.ATTR_STYLE)); - } + if (node.getNodeName().equalsIgnoreCase(HTML.TAG_TABLE)) { + element.setAttribute(HTML.ATTR_STYLE, ComponentUtil + .getAttribute(sourceElement, HTML.ATTR_STYLE)); + } - for (int i = 0; i < list.getLength(); i++) { - applyChildAttributes(sourceElement, list.item(i)); - } - } catch (XPCOMException e) { - // Ignore - return; - } + for (int i = 0; i < list.getLength(); i++) { + applyChildAttributes(sourceElement, list.item(i)); + } + } catch (XPCOMException e) { + // Ignore + return; } + } }

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r12494 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-12-09 12:47:12 -0500 (Tue, 09 Dec 2008) New Revision: 12494 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3224, for these templates resizing was fixed, others worked fine without any fixing. JUnits were updated. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml.xml 2008-12-09 17:47:05 UTC (rev 12493) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelBar.xhtml.xml 2008-12-09 17:47:12 UTC (rev 12494) @@ -1,29 +1,31 @@ <tests> <test id="panelBar"> - <TABLE CLASS="dr-pnlbar rich-panelbar dr-pnlbar-b" STYLE="padding: 0px; height: 50px; width: 500px;"> - <DIV CLASS="dr-pnlbar rich-panelbar dr-pnlbar-ext" STYLE="" - VPE-USER-TOGGLE-ID="0"> - <DIV CLASS="dr-pnlbar-h rich-panelbar-header" STYLE="" - VPE-USER-TOGGLE-ID="0"> Panel bar item 1 </DIV> - </DIV> - <TR HEIGHT="100%" WIDTH="100%"> - <TD> - <TABLE WIDTH="100%" HEIGHT="100%" CELLPADDING="0"> - <TBODY> - <TR> - <TD CLASS="dr-pnlbar-c rich-panelbar-content" STYLE=""> - <SPAN> Test panel bar item component 1 </SPAN> - </TD> - </TR> - </TBODY> - </TABLE> - </TD> - </TR> - <DIV CLASS="dr-pnlbar rich-panelbar dr-pnlbar-ext" STYLE="" - VPE-USER-TOGGLE-ID="1"> - <DIV CLASS="dr-pnlbar-h rich-panelbar-header" STYLE="" - VPE-USER-TOGGLE-ID="1"> Panel bar item 2 </DIV> - </DIV> - </TABLE> + <DIV> + <TABLE CLASS="dr-pnlbar rich-panelbar dr-pnlbar-b" STYLE="padding: 0px; height: 50px; width: 500px;"> + <DIV CLASS="dr-pnlbar rich-panelbar dr-pnlbar-ext" STYLE="" + VPE-USER-TOGGLE-ID="0"> + <DIV CLASS="dr-pnlbar-h rich-panelbar-header" STYLE="" + VPE-USER-TOGGLE-ID="0"> Panel bar item 1</DIV> + </DIV> + <TR HEIGHT="100%" WIDTH="100%"> + <TD> + <TABLE WIDTH="100%" HEIGHT="100%" CELLPADDING="0"> + <TBODY> + <TR> + <TD CLASS="dr-pnlbar-c rich-panelbar-content" STYLE=""> + <SPAN> Test panel bar item component 1</SPAN> + </TD> + </TR> + </TBODY> + </TABLE> + </TD> + </TR> + <DIV CLASS="dr-pnlbar rich-panelbar dr-pnlbar-ext" STYLE="" + VPE-USER-TOGGLE-ID="1"> + <DIV CLASS="dr-pnlbar-h rich-panelbar-header" STYLE="" + VPE-USER-TOGGLE-ID="1"> Panel bar item 2</DIV> + </DIV> + </TABLE> + </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml.xml 2008-12-09 17:47:05 UTC (rev 12493) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/recursiveTreeNodesAdaptor.xhtml.xml 2008-12-09 17:47:12 UTC (rev 12494) @@ -1,97 +1,112 @@ <tests> <test id="dir"> <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-tree-full-width"> - <TBODY> - <TR> - <TD - STYLE="/background-image: url$.*resources//tree/line.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconClosedNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> - </TD> - <TD - STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/> - </TD> - <TD CLASS="treeNodeNameStyle"> - <A>Directory: #{dir.name}</A> - </TD> - </TR> - </TBODY> - </TABLE> - <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> + <DIV> <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="dr-tree-full-width"> <TBODY> <TR> <TD STYLE="/background-image: url$.*resources//tree/line.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNotCollapsedWithAllLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconClosedNodeWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> </TD> - <TD> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconLeafWithLines.gif/" - RICHFACESTREENODEPARAM="iconLeaf"/> + <TD + STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> </TD> <TD CLASS="treeNodeNameStyle"> - <A>File: #{file.name}</A> + <SPAN> + <SPAN> Directory: #{dir.name}</SPAN> + <SPAN> : This link is disabled as it is not nested within a JSF form.</SPAN> + </SPAN> </TD> </TR> </TBODY> </TABLE> </DIV> <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-tree-full-width"> - <TBODY> - <TR> - <TD - STYLE="/background-image: url$.*resources//tree/line.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNotCollapsedWithAllLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> - </TD> - <TD> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconLeafWithLines.gif/" - RICHFACESTREENODEPARAM="iconLeaf"/> - </TD> - <TD CLASS="treeNodeNameStyle"> - <A>File1: #{file.name}</A> - </TD> - </TR> - </TBODY> - </TABLE> + <DIV> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-tree-full-width"> + <TBODY> + <TR> + <TD + STYLE="/background-image: url$.*resources//tree/line.gif$; background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" + SRC="/.*resources/tree/iconNotCollapsedWithAllLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> + </TD> + <TD> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconLeafWithLines.gif/" + RICHFACESTREENODEPARAM="iconLeaf" /> + </TD> + <TD CLASS="treeNodeNameStyle"> + <SPAN> + <SPAN> File: #{file.name}</SPAN> + <SPAN> : This link is disabled as it is not nested within a JSF form.</SPAN> + </SPAN> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> </DIV> <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-tree-full-width"> - <TBODY> - <TR> - <TD - STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNotCollapsedWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> - </TD> - <TD> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconLeafWithLines.gif/" - RICHFACESTREENODEPARAM="iconLeaf"/> - </TD> - <TD CLASS="treeNodeNameStyle"> - <A>Archive entry: #{archiveEntry.name}</A> - </TD> - </TR> - </TBODY> - </TABLE> + <DIV> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-tree-full-width"> + <TBODY> + <TR> + <TD + STYLE="/background-image: url$.*resources//tree/line.gif$; background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" + SRC="/.*resources/tree/iconNotCollapsedWithAllLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> + </TD> + <TD> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconLeafWithLines.gif/" + RICHFACESTREENODEPARAM="iconLeaf" /> + </TD> + <TD CLASS="treeNodeNameStyle"> + <SPAN> + <SPAN> File1: #{file.name}</SPAN> + <SPAN> : This link is disabled as it is not nested within a JSF form.</SPAN> + </SPAN> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> </DIV> + <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> + <DIV> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-tree-full-width"> + <TBODY> + <TR> + <TD + STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" + SRC="/.*resources/tree/iconNotCollapsedWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> + </TD> + <TD> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconLeafWithLines.gif/" + RICHFACESTREENODEPARAM="iconLeaf" /> + </TD> + <TD CLASS="treeNodeNameStyle"> + <SPAN> + <SPAN> Archive entry: #{archiveEntry.name}</SPAN> + <SPAN> : This link is disabled as it is not nested within a JSF form.</SPAN> + </SPAN> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> + </DIV> </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml 2008-12-09 17:47:05 UTC (rev 12493) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml 2008-12-09 17:47:12 UTC (rev 12494) @@ -1,167 +1,165 @@ <tests> <test id="tabPanel"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="rich-tabpanel" - STYLE="width: 100%;"> - <TBODY> - <TR> - <TD ALIGN="left" CLASS=""> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> - <TR> - <TD> - <IMG WIDTH="2" HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/"/> - </TD> - <TD> - <IMG HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - STYLE="width: 1px;"/> - </TD> - <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-active" - VPE-USER-TOGGLE-ID="0"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - STYLE="height: 100%; position: relative; z-index: 2;" - VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TR VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" - STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" - VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <IMG WIDTH="1" HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/> - </TD> - <TD VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="0" - VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TR VPE-USER-TOGGLE-ID="0" + <DIV> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="rich-tabpanel" + STYLE="width: 100%;"> + <TBODY> + <TR> + <TD ALIGN="left" CLASS=""> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> + <TR> + <TD> + <IMG WIDTH="2" HEIGHT="1" BORDER="0" + SRC="/.*resources/common/spacer.gif/" /> + </TD> + <TD> + <IMG HEIGHT="1" BORDER="0" SRC="/.*resources/common/spacer.gif/" + STYLE="width: 1px;" /> + </TD> + <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-active" + VPE-USER-TOGGLE-ID="0"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + STYLE="height: 100%; position: relative; z-index: 2;" + VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TR VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" + STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" + VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <IMG WIDTH="1" HEIGHT="1" BORDER="0" + SRC="/.*resources/common/spacer.gif/" VPE-USER-TOGGLE-ID="0" + VPE-USER-TOGGLE-LOOKUP-PARENT="true" /> + </TD> + <TD VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TD - CLASS="rich-tab-header rich-tab-label rich-tab-active rich-tabhdr-cell-active" - VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - First </TD> - </TR> - </TABLE> - </TD> - <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" - STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" - VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <IMG WIDTH="1" HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/> - </TD> - </TR> - </TABLE> - </TD> - <TD> - <IMG HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - STYLE="width: 1px;"/> - </TD> - <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-disabled rich-tab-disabled" - VPE-USER-TOGGLE-ID="1"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - STYLE="height: 100%; position: relative; z-index: 2;" - VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TR VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" - STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" - VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <IMG WIDTH="1" HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/> - </TD> - <TD VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="1" - VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TR VPE-USER-TOGGLE-ID="1" + <TR VPE-USER-TOGGLE-ID="0" + VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TD + CLASS="rich-tab-header rich-tab-label rich-tab-active rich-tabhdr-cell-active" + VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + First</TD> + </TR> + </TABLE> + </TD> + <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" + STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" + VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <IMG WIDTH="1" HEIGHT="1" BORDER="0" + SRC="/.*resources/common/spacer.gif/" VPE-USER-TOGGLE-ID="0" + VPE-USER-TOGGLE-LOOKUP-PARENT="true" /> + </TD> + </TR> + </TABLE> + </TD> + <TD> + <IMG HEIGHT="1" BORDER="0" SRC="/.*resources/common/spacer.gif/" + STYLE="width: 1px;" /> + </TD> + <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-disabled rich-tab-disabled" + VPE-USER-TOGGLE-ID="1"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + STYLE="height: 100%; position: relative; z-index: 2;" + VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TR VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" + STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" + VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <IMG WIDTH="1" HEIGHT="1" BORDER="0" + SRC="/.*resources/common/spacer.gif/" VPE-USER-TOGGLE-ID="1" + VPE-USER-TOGGLE-LOOKUP-PARENT="true" /> + </TD> + <TD VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TD - CLASS="rich-tab-header rich-tab-label rich-tab-disabled rich-tabhdr-cell-disabled" - VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - Second </TD> - </TR> - </TABLE> - </TD> - <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" - STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" - VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <IMG WIDTH="1" HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/> - </TD> - </TR> - </TABLE> - </TD> - <TD> - <IMG HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - STYLE="width: 1px;"/> - </TD> - <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-inactive" - VPE-USER-TOGGLE-ID="2"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - STYLE="height: 100%; position: relative; z-index: 2;" - VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TR VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" - STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" - VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <IMG WIDTH="1" HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/> - </TD> - <TD VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="2" - VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TR VPE-USER-TOGGLE-ID="2" + <TR VPE-USER-TOGGLE-ID="1" + VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TD + CLASS="rich-tab-header rich-tab-label rich-tab-disabled rich-tabhdr-cell-disabled" + VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + Second</TD> + </TR> + </TABLE> + </TD> + <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" + STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" + VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <IMG WIDTH="1" HEIGHT="1" BORDER="0" + SRC="/.*resources/common/spacer.gif/" VPE-USER-TOGGLE-ID="1" + VPE-USER-TOGGLE-LOOKUP-PARENT="true" /> + </TD> + </TR> + </TABLE> + </TD> + <TD> + <IMG HEIGHT="1" BORDER="0" SRC="/.*resources/common/spacer.gif/" + STYLE="width: 1px;" /> + </TD> + <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-inactive" + VPE-USER-TOGGLE-ID="2"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + STYLE="height: 100%; position: relative; z-index: 2;" + VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TR VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" + STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" + VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <IMG WIDTH="1" HEIGHT="1" BORDER="0" + SRC="/.*resources/common/spacer.gif/" VPE-USER-TOGGLE-ID="2" + VPE-USER-TOGGLE-LOOKUP-PARENT="true" /> + </TD> + <TD VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <TD - CLASS="rich-tab-header rich-tab-label rich-tab-inactive rich-tabhdr-cell-inactive" - VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - Third </TD> - </TR> - </TABLE> - </TD> - <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" - STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" - VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> - <IMG WIDTH="1" HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/> - </TD> - </TR> - </TABLE> - </TD> - <TD> - <IMG HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/" - STYLE="width: 1px;"/> - </TD> - <TD> - <IMG WIDTH="1" HEIGHT="1" BORDER="0" - SRC="/.*resources/common/spacer.gif/"/> - </TD> - </TR> - </TABLE> - </TD> - </TR> - <TR> - <TD HEIGHT="100%"> - <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="10" BORDER="0" - CLASS="rich-tabpanel-content-position" STYLE="position: relative; z-index: 1;"> - <TR> - <TD - CLASS="rich-tabpanel rich-tabpanel-content rich-tabpanel-content-position" - STYLE=""> - <SPAN> Here is tab #1 </SPAN> - </TD> - </TR> - </TABLE> - </TD> - </TR> - </TBODY> - </TABLE> + <TR VPE-USER-TOGGLE-ID="2" + VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <TD + CLASS="rich-tab-header rich-tab-label rich-tab-inactive rich-tabhdr-cell-inactive" + VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + Third</TD> + </TR> + </TABLE> + </TD> + <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border" + STYLE="/background-image: url$.*resources/tabPanel/border.gif$;/" + VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> + <IMG WIDTH="1" HEIGHT="1" BORDER="0" + SRC="/.*resources/common/spacer.gif/" VPE-USER-TOGGLE-ID="2" + VPE-USER-TOGGLE-LOOKUP-PARENT="true" /> + </TD> + </TR> + </TABLE> + </TD> + <TD> + <IMG HEIGHT="1" BORDER="0" SRC="/.*resources/common/spacer.gif/" + STYLE="width: 1px;" /> + </TD> + <TD> + <IMG WIDTH="1" HEIGHT="1" BORDER="0" + SRC="/.*resources/common/spacer.gif/" /> + </TD> + </TR> + </TABLE> + </TD> + </TR> + <TR> + <TD HEIGHT="100%"> + <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="10" + BORDER="0" CLASS="rich-tabpanel-content-position" STYLE="position: relative; z-index: 1;"> + <TR> + <TD + CLASS="rich-tabpanel rich-tabpanel-content rich-tabpanel-content-position" + STYLE=""> + <SPAN> Here is tab #1</SPAN> + </TD> + </TR> + </TABLE> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2008-12-09 17:47:05 UTC (rev 12493) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2008-12-09 17:47:12 UTC (rev 12494) @@ -1,82 +1,80 @@ <tests> <test id="toolBar"> - <TABLE WIDTH="100%" CLASS="dr-toolbar-ext rich-toolbar" - STYLE="/background-image: url$.*resources/common/background.gif$;/"> - <TBODY> - <TR VALIGN="middle"> - <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;"> - <TABLE - STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;"> - <TBODY> - <TR VALIGN="middle"> - <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <LABEL FOR="edit"> Edit </LABEL> - </TD> - </TR> - </TBODY> - </TABLE> - </TD> - <TD ALIGN="center"> - <IMG - SRC="/.*resources/toolBar/separatorLine.gif/"/> - </TD> - <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;"> - <TABLE - STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;"> - <TBODY> - <TR VALIGN="middle"> - <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <LABEL FOR="find"> Find </LABEL> - </TD> - </TR> - </TBODY> - </TABLE> - </TD> - <TD ALIGN="center"> - <IMG - SRC="/.*resources/toolBar/separatorLine.gif/"/> - </TD> - <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;"> - <TABLE - STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;"> - <TBODY> - <TR VALIGN="middle"> - <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <LABEL FOR="filter"> Filter </LABEL> - </TD> - </TR> - </TBODY> - </TABLE> - </TD> - <TD ALIGN="center"> - <IMG - SRC="/.*resources/toolBar/separatorLine.gif/"/> - </TD> - <TD WIDTH="100%"> - <BR _MOZ_DIRTY="" TYPE="_moz"/> - </TD> - <TD ALIGN="center"> - <IMG - SRC="/.*resources/toolBar/separatorLine.gif/"/> - </TD> - <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;"> - <TABLE - STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;"> - <TBODY> - <TR VALIGN="middle"> - <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <INPUT CLASS="barsearch"/> - </TD> - <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <INPUT TYPE="button" CLASS="barsearchbutton" VALUE="Search" - STYLE="-moz-user-modify: read-only;"/> - </TD> - </TR> - </TBODY> - </TABLE> - </TD> - </TR> - </TBODY> - </TABLE> + <DIV> + <TABLE WIDTH="100%" CLASS="dr-toolbar-ext rich-toolbar" + STYLE="/background-image: url$.*resources/common/background.gif$;/"> + <TBODY> + <TR VALIGN="middle"> + <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;"> + <TABLE + STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;"> + <TBODY> + <TR VALIGN="middle"> + <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> + <LABEL FOR="edit"> Edit</LABEL> + </TD> + </TR> + </TBODY> + </TABLE> + </TD> + <TD ALIGN="center"> + <IMG SRC="/.*resources/toolBar/separatorLine.gif/" /> + </TD> + <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;"> + <TABLE + STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;"> + <TBODY> + <TR VALIGN="middle"> + <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> + <LABEL FOR="find"> Find</LABEL> + </TD> + </TR> + </TBODY> + </TABLE> + </TD> + <TD ALIGN="center"> + <IMG SRC="/.*resources/toolBar/separatorLine.gif/" /> + </TD> + <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;"> + <TABLE + STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;"> + <TBODY> + <TR VALIGN="middle"> + <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> + <LABEL FOR="filter"> Filter</LABEL> + </TD> + </TR> + </TBODY> + </TABLE> + </TD> + <TD ALIGN="center"> + <IMG SRC="/.*resources/toolBar/separatorLine.gif/" /> + </TD> + <TD WIDTH="100%"> + <BR _MOZ_DIRTY="" TYPE="_moz" /> + </TD> + <TD ALIGN="center"> + <IMG SRC="/.*resources/toolBar/separatorLine.gif/" /> + </TD> + <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;"> + <TABLE + STYLE="border: 0px none ; margin: 0px; padding: 0px; width: 100%; height: 100%;"> + <TBODY> + <TR VALIGN="middle"> + <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> + <INPUT CLASS="barsearch" /> + </TD> + <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> + <INPUT TYPE="button" CLASS="barsearchbutton" VALUE="Search" + STYLE="-moz-user-modify: read-only;" /> + </TD> + </TR> + </TBODY> + </TABLE> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml 2008-12-09 17:47:05 UTC (rev 12493) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tree.xhtml.xml 2008-12-09 17:47:12 UTC (rev 12494) @@ -1,66 +1,43 @@ <tests> <test id="tree"> <DIV STYLE="width: 300px;"> - <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" - CLASS="dr-tree-full-width"> - <TBODY> - <TR> - <TD - STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconCollapsedWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> - </TD> - <TD - STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/> - </TD> - <TD CLASS="treeNodeNameStyle"> - <SPAN> #{item.name}</SPAN> - </TD> - </TR> - </TBODY> - </TABLE> - <DIV CLASS="dr-tree-h-ic-div"> + <DIV> <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="dr-tree-full-width"> <TBODY> <TR> <TD STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconCollapsedWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconCollapsedWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> </TD> <TD STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> </TD> <TD CLASS="treeNodeNameStyle"> - <SPAN> #{item.title}</SPAN> + <SPAN> #{item.name}</SPAN> </TD> </TR> </TBODY> </TABLE> - <DIV CLASS="dr-tree-h-ic-div"> + </DIV> + <DIV CLASS="dr-tree-h-ic-div"> + <DIV> <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="dr-tree-full-width"> <TBODY> <TR> <TD STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconNotCollapsedWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconCollapsedWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> </TD> - <TD> - <IMG CLASS="treePictureStyle" - SRC="/.*resources/tree/iconLeafWithLines.gif/" - RICHFACESTREENODEPARAM="iconLeaf"/> + <TD + STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> </TD> <TD CLASS="treeNodeNameStyle"> <SPAN> #{item.title}</SPAN> @@ -69,6 +46,30 @@ </TBODY> </TABLE> </DIV> + <DIV CLASS="dr-tree-h-ic-div"> + <DIV> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" + CLASS="dr-tree-full-width"> + <TBODY> + <TR> + <TD + STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> + <IMG CLASS="treePictureStyle" + SRC="/.*resources/tree/iconNotCollapsedWithLines.gif/" + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> + </TD> + <TD> + <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconLeafWithLines.gif/" + RICHFACESTREENODEPARAM="iconLeaf" /> + </TD> + <TD CLASS="treeNodeNameStyle"> + <SPAN> #{item.title}</SPAN> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> + </DIV> </DIV> </DIV> </test> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml 2008-12-09 17:47:05 UTC (rev 12493) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNode.xhtml.xml 2008-12-09 17:47:12 UTC (rev 12494) @@ -1,5 +1,6 @@ <tests> <test id="treeNode"> + <DIV> <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="dr-tree-full-width"> <TBODY> @@ -22,5 +23,6 @@ </TR> </TBODY> </TABLE> + </DIV> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml.xml 2008-12-09 17:47:05 UTC (rev 12493) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/treeNodesAdaptor.xhtml.xml 2008-12-09 17:47:12 UTC (rev 12494) @@ -1,7 +1,7 @@ <tests> <test id="project"> - - <DIV ID="treeNodesAdaptor"> + <DIV ID="treeNodesAdaptor" > + <DIV> <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="dr-tree-full-width"> <TBODY> @@ -10,21 +10,26 @@ STYLE="/background-image: url$.*resources//tree/line.gif$; background-position: center; background-repeat: repeat-y;/"> <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconClosedNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> </TD> <TD STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/> + RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> </TD> <TD CLASS="treeNodeNameStyle"> - <A>Project: #{project.name}</A> + <SPAN> + <SPAN> Project: #{project.name} </SPAN> + <SPAN> : This link is disabled as it is not nested within a JSF form. </SPAN> + </SPAN> </TD> </TR> </TBODY> </TABLE> - <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> + </DIV> + <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> + <DIV> <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="dr-tree-full-width"> <TBODY> @@ -33,21 +38,26 @@ STYLE="/background-image: url$.*resources//tree/line.gif$; background-position: center; background-repeat: repeat-y;/"> <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconClosedNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> </TD> <TD STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/> + RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> </TD> <TD CLASS="treeNodeNameStyle"> - <A>Source directory: #{srcDir.name}</A> + <SPAN> + <SPAN> Source directory: #{srcDir.name} </SPAN> + <SPAN> : This link is disabled as it is not nested within a JSF form. </SPAN> + </SPAN> </TD> </TR> </TBODY> </TABLE> - <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> + </DIV> + <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> + <DIV> <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="dr-tree-full-width"> <TBODY> @@ -56,21 +66,26 @@ STYLE="/background-image: url$.*resources//tree/line.gif$; background-position: center; background-repeat: repeat-y;/"> <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconClosedNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> </TD> <TD STYLE="/background-image: url$.*resources//tree/leftLine.gif$; background-position: center; background-repeat: repeat-y;/"> <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNodeWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM"/> + RICHFACESTREENODEPARAM="DEFAULT_ICON_PARAM" /> </TD> <TD CLASS="treeNodeNameStyle"> - <A>Package: #{pkg.name}</A> + <SPAN> + <SPAN> Package: #{pkg.name} </SPAN> + <SPAN> : This link is disabled as it is not nested within a JSF form. </SPAN> + </SPAN> </TD> </TR> </TBODY> </TABLE> - <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> + </DIV> + <DIV ID="treeNodesAdaptor" CLASS="dr-tree-h-ic-div"> + <DIV> <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="dr-tree-full-width"> <TBODY> @@ -79,15 +94,18 @@ STYLE="/background-image: url$.*resources//tree/rightLine.gif$; background-position: center; background-repeat: repeat-y;/"> <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconNotCollapsedWithLines.gif/" - RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM"/> + RICHFACESTREENODEPARAM="DEFAULT_ICON_EXPANDED_PARAM" /> </TD> <TD> <IMG CLASS="treePictureStyle" SRC="/.*resources/tree/iconLeafWithLines.gif/" - RICHFACESTREENODEPARAM="iconLeaf"/> + RICHFACESTREENODEPARAM="iconLeaf" /> </TD> <TD CLASS="treeNodeNameStyle"> - <A>Class: #{class.name}</A> + <SPAN> + <SPAN> Class: #{class.name} </SPAN> + <SPAN> : This link is disabled as it is not nested within a JSF form. </SPAN> + </SPAN> </TD> </TR> </TBODY> @@ -96,6 +114,6 @@ </DIV> </DIV> </DIV> - + </DIV> </test> </tests> \ No newline at end of file

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r12493 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-12-09 12:47:05 -0500 (Tue, 09 Dec 2008) New Revision: 12493 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesRecursiveTreeNodesAdaptorTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 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/RichFacesTreeNodeTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-3224, for these templates resizing was fixed, others worked fine without any fixing. JUnits were updated. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java 2008-12-09 17:21:36 UTC (rev 12492) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelBarTemplate.java 2008-12-09 17:47:05 UTC (rev 12493) @@ -11,7 +11,7 @@ package org.jboss.tools.jsf.vpe.richfaces.template; import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; -import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; @@ -19,6 +19,7 @@ import org.jboss.tools.vpe.editor.template.VpeTemplate; import org.jboss.tools.vpe.editor.template.VpeToggableTemplate; 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; @@ -42,28 +43,29 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { Element sourceElement = (Element) sourceNode; - nsIDOMElement table = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE); + nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE); + div.appendChild(table); + VpeCreationData creationData = new VpeCreationData(div); - VpeCreationData creationData = new VpeCreationData(table); - ComponentUtil.setCSSLink(pageContext, PANEL_BAR_PANEL_BAR_CSS, "richFacesPanelBar"); //$NON-NLS-1$ - String styleClass = sourceElement.getAttribute(HtmlComponentUtil.HTML_STYLECLASS_ATTR); - table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, + String styleClass = sourceElement.getAttribute(RichFaces.ATTR_STYLE_CLASS); + table.setAttribute(HTML.ATTR_CLASS, DR_PNLBAR_RICH_PANELBAR_DR_PNLBAR_B + ((styleClass == null) ? Constants.EMPTY : styleClass)); // Set style attribute StringBuffer styleValue = new StringBuffer("padding: 0px; "); //$NON-NLS-1$ styleValue.append(height(sourceElement)).append(Constants.WHITE_SPACE) .append(width(sourceElement)).append(Constants.WHITE_SPACE) - .append(ComponentUtil.getAttribute(sourceElement, HtmlComponentUtil.HTML_STYLE_ATTR)); + .append(ComponentUtil.getAttribute(sourceElement, HTML.ATTR_STYLE)); // Encode Body List<Node> children = ComponentUtil.getChildren(sourceElement); int activeId = getActiveId(sourceElement, children); int i = 0; - String style = ComponentUtil.getAttribute(sourceElement, HtmlComponentUtil.HTML_STYLE_ATTR); + String style = ComponentUtil.getAttribute(sourceElement, HTML.ATTR_STYLE); String contentClass = ComponentUtil.getAttribute(sourceElement, RichFacesPanelItemTemplate.CONTENT_CLASS); @@ -84,7 +86,7 @@ if (child.getNodeName().endsWith(PANEL_BAR_ITEM)) { RichFacesPanelItemTemplate.encode(creationData, pageContext, (Element) child, visualDocument, table, active, - ComponentUtil.getAttribute(sourceElement, HtmlComponentUtil.HTML_STYLECLASS_ATTR), + ComponentUtil.getAttribute(sourceElement, RichFaces.ATTR_STYLE_CLASS), style, headerClass, headerStyle, headerActiveClass, headerActiveStyle, contentClass, contentStyle, String.valueOf(i)); @@ -92,8 +94,7 @@ } } - table.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, styleValue.toString()); - + table.setAttribute(HTML.ATTR_STYLE, styleValue.toString()); return creationData; } @@ -103,7 +104,7 @@ * @return */ private String height(Element sourceElement) { - String height = sourceElement.getAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR); + String height = sourceElement.getAttribute(HTML.ATTR_HEIGHT); if ((height == null) || (height.length() == 0)) { height = PERCENT_100; @@ -129,7 +130,7 @@ * @return */ public String width(Element sourceElement) { - String width = sourceElement.getAttribute(HtmlComponentUtil.HTML_ATR_WIDTH); + String width = sourceElement.getAttribute(HTML.ATTR_WIDTH); if ((width == null) || (width.length() == 0)) { width = PERCENT_100; @@ -222,12 +223,13 @@ @Override public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement visualNode, Object data, String name, String value) { - if (name.equalsIgnoreCase(HtmlComponentUtil.HTML_WIDTH_ATTR) || - name.equalsIgnoreCase(HtmlComponentUtil.HTML_HEIGHT_ATTR) || - name.equalsIgnoreCase(HtmlComponentUtil.HTML_STYLE_ATTR)) { - return true; - } - - return false; +// if (name.equalsIgnoreCase(HTML.WIDTH_ATTR) || +// name.equalsIgnoreCase(HTML.ATTR_HEIGHT) || +// name.equalsIgnoreCase(HTML.ATTR_STYLE)) { +// return true; +// } +// +// return false; + return true; } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesRecursiveTreeNodesAdaptorTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesRecursiveTreeNodesAdaptorTemplate.java 2008-12-09 17:21:36 UTC (rev 12492) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesRecursiveTreeNodesAdaptorTemplate.java 2008-12-09 17:47:05 UTC (rev 12493) @@ -11,11 +11,11 @@ package org.jboss.tools.jsf.vpe.richfaces.template; import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; -import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil; import org.jboss.tools.jsf.vpe.richfaces.RichFacesTemplatesActivator; 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.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -32,23 +32,23 @@ public class RichFacesRecursiveTreeNodesAdaptorTemplate extends RichFacesTreeNodeTemplate { - private static final String TREE_NAME = "tree"; + private static final String TREE_NAME = "tree"; //$NON-NLS-1$ - private final static String TREE_NODE_NAME = "treeNode"; + private final static String TREE_NODE_NAME = "treeNode"; //$NON-NLS-1$ - public final static String TREE_NODES_ADAPTOR_NAME = "treeNodesAdaptor"; + public final static String TREE_NODES_ADAPTOR_NAME = "treeNodesAdaptor"; //$NON-NLS-1$ - public final static String RECURSIVE_TREE_NODES_ADAPTOR_NAME = "recursiveTreeNodesAdaptor"; + public final static String RECURSIVE_TREE_NODES_ADAPTOR_NAME = "recursiveTreeNodesAdaptor"; //$NON-NLS-1$ - private static final String STYLE_PATH = "/tree/tree.css"; + private static final String STYLE_PATH = "/tree/tree.css"; //$NON-NLS-1$ - public static final String ICON_DIV_LINE = "/tree/divLine.gif"; + public static final String ICON_DIV_LINE = "/tree/divLine.gif"; //$NON-NLS-1$ - private static final String ADAPTER_LINES_STYLE = "background-position: left center; background-repeat: repeat-y;"; + private static final String ADAPTER_LINES_STYLE = "background-position: left center; background-repeat: repeat-y;"; //$NON-NLS-1$ - public static final String ID_ATTR_NAME = "ID"; + public static final String ID_ATTR_NAME = "ID"; //$NON-NLS-1$ - public static final String NODES_NAME = "nodes"; + public static final String NODES_NAME = "nodes"; //$NON-NLS-1$ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { @@ -56,21 +56,21 @@ return super.create(pageContext, sourceNode, visualDocument); } else { ComponentUtil.setCSSLink(pageContext, STYLE_PATH, - "treeNodesAdaptor"); + "treeNodesAdaptor"); //$NON-NLS-1$ nsIDOMElement visualElement = visualDocument - .createElement(HtmlComponentUtil.HTML_TAG_DIV); + .createElement(HTML.TAG_DIV); visualElement.setAttribute(ID_ATTR_NAME, TREE_NODES_ADAPTOR_NAME); if (isHasParentAdapter(sourceNode)) { - visualElement.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "dr-tree-h-ic-div"); + visualElement.setAttribute(HTML.ATTR_CLASS, + "dr-tree-h-ic-div"); //$NON-NLS-1$ if (getShowLinesAttr(sourceNode) && (isAdapterBetweenNodes(sourceNode) || isHasNextParentAdaptorElement(sourceNode))) { String path = RichFacesTemplatesActivator .getPluginResourcePath() + ICON_DIV_LINE; visualElement.setAttribute( - HtmlComponentUtil.HTML_STYLE_ATTR, - "background-image: url(file://" + path + "); " + HTML.ATTR_STYLE, + "background-image: url(file://" + path + "); " //$NON-NLS-1$ //$NON-NLS-2$ + ADAPTER_LINES_STYLE); } } @@ -96,10 +96,10 @@ NodeList nodeList = sourceNode.getChildNodes(); Element element = null; int lenght = nodeList.getLength(); - String treeNodeName = sourceNode.getPrefix() + ":" + TREE_NODE_NAME; - String treeNodesAdaptorName = sourceNode.getPrefix() + ":" + String treeNodeName = sourceNode.getPrefix() + ":" + TREE_NODE_NAME; //$NON-NLS-1$ + String treeNodesAdaptorName = sourceNode.getPrefix() + ":" //$NON-NLS-1$ + TREE_NODES_ADAPTOR_NAME; - String recursiveTreeNodesAdaptorName = sourceNode.getPrefix() + ":" + String recursiveTreeNodesAdaptorName = sourceNode.getPrefix() + ":" //$NON-NLS-1$ + RECURSIVE_TREE_NODES_ADAPTOR_NAME; VpeChildrenInfo vpeChildrenInfo = null; for (int i = 0; i < lenght; i++) { @@ -127,9 +127,9 @@ * @return */ public boolean isHasParentAdapter(Node sourceNode) { - String treeNodesAdaptorName = sourceNode.getPrefix() + ":" + String treeNodesAdaptorName = sourceNode.getPrefix() + ":" //$NON-NLS-1$ + TREE_NODES_ADAPTOR_NAME; - String recursiveTreeNodesAdaptorName = sourceNode.getPrefix() + ":" + String recursiveTreeNodesAdaptorName = sourceNode.getPrefix() + ":" //$NON-NLS-1$ + RECURSIVE_TREE_NODES_ADAPTOR_NAME; Node node = sourceNode.getParentNode(); if (node.getNodeName().equals(treeNodesAdaptorName) @@ -146,7 +146,7 @@ * @return */ private boolean getShowLinesAttr(Node sourceNode) { - String treeName = sourceNode.getPrefix() + ":" + TREE_NAME; + String treeName = sourceNode.getPrefix() + ":" + TREE_NAME; //$NON-NLS-1$ do { sourceNode = sourceNode.getParentNode(); if (!(sourceNode instanceof Element)) { @@ -158,7 +158,7 @@ .getAttribute(RichFacesTreeTemplate.SHOW_LINES_ATTR_NAME); boolean showLinesValue = true; - if (showLinesParam != null && showLinesParam.equalsIgnoreCase("false")) { + if (showLinesParam != null && showLinesParam.equalsIgnoreCase("false")) { //$NON-NLS-1$ showLinesValue = false; } return showLinesValue; @@ -180,11 +180,11 @@ return true; } NodeList childs = parentTree.getChildNodes(); - String treeNodeName = parentTree.getPrefix() + ":" + String treeNodeName = parentTree.getPrefix() + ":" //$NON-NLS-1$ + RichFacesTreeTemplate.TREE_NODE_NAME; - String treeNodesAdaptorName = parentTree.getPrefix() + ":" + String treeNodesAdaptorName = parentTree.getPrefix() + ":" //$NON-NLS-1$ + RichFacesTreeTemplate.TREE_NODES_ADAPTOR; - String treeRecursiveNodesAdaptorName = parentTree.getPrefix() + ":" + String treeRecursiveNodesAdaptorName = parentTree.getPrefix() + ":" //$NON-NLS-1$ + RichFacesTreeTemplate.TREE_RECURSIVE_NODES_ADAPTOR; Node lastElement = null; Node el = null; @@ -223,7 +223,7 @@ Node beforeAdapterNode = null; Node afterAdapterNode = null; Node adapterNode = null; - String treeNodeName = sourceNode.getPrefix() + ":" + String treeNodeName = sourceNode.getPrefix() + ":" //$NON-NLS-1$ + RichFacesTreeTemplate.TREE_NODE_NAME; for (int i = 0; i < childs.getLength(); i++) { Node el = childs.item(i); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2008-12-09 17:21:36 UTC (rev 12492) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2008-12-09 17:47:05 UTC (rev 12493) @@ -16,13 +16,14 @@ import java.util.Map; import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; -import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; 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.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -79,45 +80,46 @@ Element sourceElement = (Element)sourceNode; - nsIDOMElement table = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE); - - VpeCreationData creationData = new VpeCreationData(table); + nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE); + nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); + div.appendChild(table); + VpeCreationData creationData = new VpeCreationData(div); ComponentUtil.setCSSLink(pageContext, CSS_FILE_PATH, RICH_FACES_TAB_PANEL); setDirAttr(table, sourceElement); - table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - ComponentUtil.getAttribute(sourceElement, HtmlComponentUtil.HTML_STYLECLASS_ATTR) + table.setAttribute(HTML.ATTR_CLASS, + ComponentUtil.getAttribute(sourceElement, RichFaces.ATTR_STYLE_CLASS) + SPACE + CSS_PANEL); - table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, ZERO); - table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, ZERO); - table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, ZERO); - table.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, getStyle(sourceElement)); + table.setAttribute(HTML.ATTR_BORDER, ZERO); + table.setAttribute(HTML.ATTR_CELLPADDING, ZERO); + table.setAttribute(HTML.ATTR_CELLSPACING, ZERO); + table.setAttribute(HTML.ATTR_STYLE, getStyle(sourceElement)); - nsIDOMElement tbody = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TBODY); + nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY); table.appendChild(tbody); - nsIDOMElement tr = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR); + nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR); tbody.appendChild(tr); - nsIDOMElement td = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); + nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD); tr.appendChild(td); - td.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, getHeaderAlignment(sourceElement)); - td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, ComponentUtil + td.setAttribute(HTML.ATTR_ALIGN, getHeaderAlignment(sourceElement)); + td.setAttribute(HTML.ATTR_CLASS, ComponentUtil .getAttribute(sourceElement, HEADER_CLASS)); - nsIDOMElement inerTable = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE); + nsIDOMElement inerTable = visualDocument.createElement(HTML.TAG_TABLE); td.appendChild(inerTable); - inerTable.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, ZERO); - inerTable.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, ZERO); - inerTable.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, ZERO); + inerTable.setAttribute(HTML.ATTR_BORDER, ZERO); + inerTable.setAttribute(HTML.ATTR_CELLPADDING, ZERO); + inerTable.setAttribute(HTML.ATTR_CELLSPACING, ZERO); // Encode header - nsIDOMElement inerTr = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR); + nsIDOMElement inerTr = visualDocument.createElement(HTML.TAG_TR); inerTable.appendChild(inerTr); - nsIDOMElement inerTd = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); + nsIDOMElement inerTd = visualDocument.createElement(HTML.TAG_TD); inerTr.appendChild(inerTd); - nsIDOMElement img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG); + nsIDOMElement img = visualDocument.createElement(HTML.TAG_IMG); inerTd.appendChild(img); ComponentUtil.setImg(img, SPACER_FILE_PATH); - img.setAttribute(HtmlComponentUtil.HTML_WIDTH_ATTR, TWO); - img.setAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR, ONE); - img.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, ZERO); + img.setAttribute(HTML.ATTR_WIDTH, TWO); + img.setAttribute(HTML.ATTR_HEIGHT, ONE); + img.setAttribute(HTML.ATTR_BORDER, ZERO); String headerSpacing = sourceElement.getAttribute(HEADER_SPACING); List<Node> children = ComponentUtil.getChildren(sourceElement); @@ -163,17 +165,17 @@ } } - inerTd = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); + inerTd = visualDocument.createElement(HTML.TAG_TD); inerTr.appendChild(inerTd); - img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG); + img = visualDocument.createElement(HTML.TAG_IMG); inerTd.appendChild(img); ComponentUtil.setImg(img, SPACER_FILE_PATH); - img.setAttribute(HtmlComponentUtil.HTML_WIDTH_ATTR, ONE); - img.setAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR, ONE); - img.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, ZERO); + img.setAttribute(HTML.ATTR_WIDTH, ONE); + img.setAttribute(HTML.ATTR_HEIGHT, ONE); + img.setAttribute(HTML.ATTR_BORDER, ZERO); // Encode first child tab - inerTr = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR); + inerTr = visualDocument.createElement(HTML.TAG_TR); tbody.appendChild(inerTr); children = ComponentUtil.getChildren(sourceElement); i = 0; @@ -208,17 +210,17 @@ * @param headerSpacing the header spacing */ private void addSpacer(nsIDOMDocument visualDocument, nsIDOMElement parentTr, String headerSpacing) { - nsIDOMElement spaceTd = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); + nsIDOMElement spaceTd = visualDocument.createElement(HTML.TAG_TD); parentTr.appendChild(spaceTd); - nsIDOMElement spaceImg = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG); + nsIDOMElement spaceImg = visualDocument.createElement(HTML.TAG_IMG); spaceTd.appendChild(spaceImg); ComponentUtil.setImg(spaceImg, SPACER_FILE_PATH); - spaceImg.setAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR, ONE); - spaceImg.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, ZERO); + spaceImg.setAttribute(HTML.ATTR_HEIGHT, ONE); + spaceImg.setAttribute(HTML.ATTR_BORDER, ZERO); if(headerSpacing==null) { headerSpacing = ONE; } - spaceImg.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: " + headerSpacing + "px"); //$NON-NLS-1$ //$NON-NLS-2$ + spaceImg.setAttribute(HTML.ATTR_STYLE, "width: " + headerSpacing + "px"); //$NON-NLS-1$ //$NON-NLS-2$ } private int getActiveId(Element sourceElement, List<Node> children) { @@ -274,17 +276,17 @@ private String getStyle(Element sourceElement) { - String widthAttrValue = sourceElement.getAttribute(HtmlComponentUtil.HTML_WIDTH_ATTR); - String heightAttrValue = sourceElement.getAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR); - String styleAttrValue = sourceElement.getAttribute(HtmlComponentUtil.HTML_STYLE_ATTR); + String widthAttrValue = sourceElement.getAttribute(HTML.ATTR_WIDTH); + String heightAttrValue = sourceElement.getAttribute(HTML.ATTR_HEIGHT); + String styleAttrValue = sourceElement.getAttribute(HTML.ATTR_STYLE); String style = styleAttrValue != null ? styleAttrValue : EMPTY; - if (!ComponentUtil.parameterPresent(styleAttrValue, HtmlComponentUtil.HTML_WIDTH_ATTR)) { + if (!ComponentUtil.parameterPresent(styleAttrValue, HTML.ATTR_WIDTH)) { String width = (widthAttrValue != null && widthAttrValue.length() > 0) ? widthAttrValue : "100%"; //$NON-NLS-1$ style = ComponentUtil.addParameter(style, "width:" + width); //$NON-NLS-1$ } - if (!ComponentUtil.parameterPresent(styleAttrValue, HtmlComponentUtil.HTML_HEIGHT_ATTR)) { + if (!ComponentUtil.parameterPresent(styleAttrValue, HTML.ATTR_HEIGHT)) { String height = (heightAttrValue != null && heightAttrValue.length() > 0) ? heightAttrValue : EMPTY; if (height.length() > 0) { style =ComponentUtil.addParameter(style, "height:" + height); //$NON-NLS-1$ @@ -313,7 +315,7 @@ private String getHeaderAlignment(Element sourceElement) { String headerAlignment = sourceElement.getAttribute(HEADER_ALINGMENT); if(headerAlignment==null) { - headerAlignment = HtmlComponentUtil.HTML_ALIGN_LEFT_VALUE; + headerAlignment = HTML.VALUE_ALIGN_LEFT; } return headerAlignment; } @@ -346,15 +348,15 @@ public void validate(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData data) { List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); - ComponentUtil.findAllElementsByName(data.getNode(), elements, HtmlComponentUtil.HTML_TAG_TABLE); + ComponentUtil.findAllElementsByName(data.getNode(), elements, HTML.TAG_TABLE); for (nsIDOMNode node : elements) { try { nsIDOMElement element = (nsIDOMElement) node.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); if (ComponentUtil.getAttribute(element, RichFacesTabTemplate.TAB_HEADER_ATTR).equalsIgnoreCase(YES)) { - element.removeAttribute(HtmlComponentUtil.HTML_STYLE_ATTR); + element.removeAttribute(HTML.ATTR_STYLE); } if (ComponentUtil.getAttribute(element, RichFacesTabTemplate.TAB_BODY_ATTR).equalsIgnoreCase(YES)) { - element.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, HtmlComponentUtil.CSS_DISPLAY+" : "+RichFacesTabTemplate.DISABLED_ELEMENT_STYLE+";"); //$NON-NLS-1$//$NON-NLS-2$ + element.setAttribute(HTML.ATTR_STYLE, HTML.ATTR_DISPLAY+" : "+RichFacesTabTemplate.DISABLED_ELEMENT_STYLE+";"); //$NON-NLS-1$//$NON-NLS-2$ } } catch (XPCOMException exeption) { // Ignore 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-12-09 17:21:36 UTC (rev 12492) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java 2008-12-09 17:47:05 UTC (rev 12493) @@ -15,11 +15,11 @@ import java.util.List; import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; -import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; 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.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMText; @@ -45,8 +45,8 @@ static final String CONTENTCLASS_ATTR_NAME = "contentClass"; //$NON-NLS-1$ static final String CONTENTSTYLE_ATTR_NAME = "contentStyle"; //$NON-NLS-1$ - static final String STYLECLASS_ATTR_NAME = "styleClass"; //$NON-NLS-1$ - static final String STYLE_ATTR_NAME = "style"; //$NON-NLS-1$ + static final String STYLEATTR_CLASS_NAME = "styleClass"; //$NON-NLS-1$ + static final String ATTR_STYLE_NAME = "style"; //$NON-NLS-1$ static final String ITEMSEPARATOR_ATTR_NAME = "itemSeparator"; //$NON-NLS-1$ static final String SEPARATORCLASS_ATTR_NAME = "separatorClass"; //$NON-NLS-1$ static final String WIDTH_ATTR_NAME = "width"; //$NON-NLS-1$ @@ -60,9 +60,10 @@ private static final String SPACE = " "; //$NON-NLS-1$ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - VpeCreationData creationData = null; - nsIDOMElement visualNode = null; - + nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement visualNode = visualDocument.createElement(HTML.TAG_TABLE); + div.appendChild(visualNode); + VpeCreationData creationData = new VpeCreationData(div); Element sourceElement = (Element) sourceNode; String itemSeparator = sourceElement.getAttribute(ITEMSEPARATOR_ATTR_NAME); @@ -71,49 +72,45 @@ String itemSeparatorImageUrl = getSeparatorImageUrlString(sourceToolBarItems.getItemSeparator()); ComponentUtil.setCSSLink(pageContext, "toolBar/toolBar.css", "richFacesToolBar"); //$NON-NLS-1$ //$NON-NLS-2$ - - visualNode = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE); ComponentUtil.correctAttribute(sourceElement, visualNode, WIDTH_ATTR_NAME, - HtmlComponentUtil.HTML_WIDTH_ATTR, null, "100%"); //$NON-NLS-1$ + HTML.ATTR_WIDTH, null, "100%"); //$NON-NLS-1$ ComponentUtil.correctAttribute(sourceElement, visualNode, HEIGHT_ATTR_NAME, - HtmlComponentUtil.HTML_HEIGHT_ATTR, null, null); + HTML.ATTR_HEIGHT, null, null); ComponentUtil.correctAttribute(sourceElement, visualNode, - STYLECLASS_ATTR_NAME, HtmlComponentUtil.HTML_CLASS_ATTR, + STYLEATTR_CLASS_NAME, HTML.ATTR_CLASS, CSS_DR_TOOLBAR_EXT + SPACE + CSS_RICH_TOOLBAR, CSS_DR_TOOLBAR_EXT + SPACE + CSS_RICH_TOOLBAR); String style = ComponentUtil.getHeaderBackgoundImgStyle() + ";"; //$NON-NLS-1$ ComponentUtil.correctAttribute(sourceElement, visualNode, - STYLE_ATTR_NAME, - HtmlComponentUtil.HTML_STYLE_ATTR, style, style); + ATTR_STYLE_NAME, + HTML.ATTR_STYLE, style, style); - creationData = new VpeCreationData(visualNode); - nsIDOMElement body = null; nsIDOMElement row = null; nsIDOMElement cell = null; - body = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TBODY); - row = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR); - row.setAttribute(HtmlComponentUtil.HTML_ATTR_VALIGN, HtmlComponentUtil.HTML_ATTR_VALIGN_MIDDLE_VALUE); + body = visualDocument.createElement(HTML.TAG_TBODY); + row = visualDocument.createElement(HTML.TAG_TR); + row.setAttribute(HTML.ATTR_VALIGN, HTML.VALUE_ALIGN_MIDDLE); SourceToolBarItem toolBarItem; Iterator<SourceToolBarItem> iterator = sourceToolBarItems.getLeftItemsIterator(); while (iterator.hasNext()) { toolBarItem = iterator.next(); - cell = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); + cell = visualDocument.createElement(HTML.TAG_TD); if (toolBarItem.isItem()) { ComponentUtil.correctAttribute(sourceElement, cell, CONTENTCLASS_ATTR_NAME, - HtmlComponentUtil.HTML_CLASS_ATTR, + HTML.ATTR_CLASS, CSS_DR_TOOLBAR_INT + SPACE + CSS_RICH_TOOLBAR_ITEM, CSS_DR_TOOLBAR_INT + SPACE + CSS_RICH_TOOLBAR_ITEM); ComponentUtil.correctAttribute(sourceElement, cell, CONTENTSTYLE_ATTR_NAME, - HtmlComponentUtil.HTML_STYLE_ATTR, + HTML.ATTR_STYLE, toolBarItem.isToolBarGroupItem() ? "padding: 0px 0px 0px 0px;" : null, //$NON-NLS-1$ toolBarItem.isToolBarGroupItem() ? "padding: 0px 0px 0px 0px;" : null); //$NON-NLS-1$ @@ -122,14 +119,14 @@ childrenInfo.addSourceChild(toolBarItem.getToolBarItem()); } else { if (itemSeparatorImageUrl != null) { - cell = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); - cell.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, - HtmlComponentUtil.HTML_ALIGN_CENTER_VALUE); + cell = visualDocument.createElement(HTML.TAG_TD); + cell.setAttribute(HTML.ATTR_ALIGN, + HTML.VALUE_ALIGN_CENTER); ComponentUtil.correctAttribute(sourceElement, cell, SEPARATORCLASS_ATTR_NAME, - HtmlComponentUtil.HTML_CLASS_ATTR, null, null); + HTML.ATTR_CLASS, null, null); nsIDOMElement separatorImage = visualDocument - .createElement(HtmlComponentUtil.HTML_TAG_IMG); + .createElement(HTML.TAG_IMG); ComponentUtil.setImg(separatorImage, itemSeparatorImageUrl); cell.appendChild(separatorImage); } @@ -139,21 +136,21 @@ } // Empty column - cell = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); - cell.setAttribute(HtmlComponentUtil.HTML_WIDTH_ATTR, "100%"); //$NON-NLS-1$ + cell = visualDocument.createElement(HTML.TAG_TD); + cell.setAttribute(HTML.ATTR_WIDTH, "100%"); //$NON-NLS-1$ row.appendChild(cell); iterator = sourceToolBarItems.getRightItemsIterator(); while (iterator.hasNext()) { toolBarItem = iterator.next(); - cell = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); + cell = visualDocument.createElement(HTML.TAG_TD); if (toolBarItem.isItem()) { ComponentUtil.correctAttribute(sourceElement, cell, CONTENTCLASS_ATTR_NAME, - HtmlComponentUtil.HTML_CLASS_ATTR, CSS_DR_TOOLBAR_INT + SPACE + CSS_RICH_TOOLBAR_ITEM, CSS_DR_TOOLBAR_INT + SPACE + CSS_RICH_TOOLBAR_ITEM); + HTML.ATTR_CLASS, CSS_DR_TOOLBAR_INT + SPACE + CSS_RICH_TOOLBAR_ITEM, CSS_DR_TOOLBAR_INT + SPACE + CSS_RICH_TOOLBAR_ITEM); ComponentUtil.correctAttribute(sourceElement, cell, CONTENTSTYLE_ATTR_NAME, - HtmlComponentUtil.HTML_STYLE_ATTR, + HTML.ATTR_STYLE, toolBarItem.isToolBarGroupItem() ? "padding: 0px;" : null, //$NON-NLS-1$ toolBarItem.isToolBarGroupItem() ? "padding: 0px;" : null); //$NON-NLS-1$ @@ -162,12 +159,12 @@ childrenInfo.addSourceChild(toolBarItem.getToolBarItem()); } else { if (itemSeparatorImageUrl != null) { - cell = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD); - cell.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, HtmlComponentUtil.HTML_ALIGN_CENTER_VALUE); + cell = visualDocument.createElement(HTML.TAG_TD); + cell.setAttribute(HTML.ATTR_ALIGN, HTML.VALUE_ALIGN_CENTER); ComponentUtil.correctAttribute(sourceElement, cell, SEPARATORCLASS_ATTR_NAME, - HtmlComponentUtil.HTML_CLASS_ATTR, null, null); - nsIDOMElement separatorImage = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG); + HTML.ATTR_CLASS, null, null); + nsIDOMElement separatorImage = visualDocument.createElement(HTML.TAG_IMG); ComponentUtil.setImg(separatorImage, itemSeparatorImageUrl); cell.appendChild(separatorImage); } @@ -191,8 +188,8 @@ static nsIDOMElement createExceptionNode(nsIDOMDocument visualDocument, String message) { nsIDOMElement visualNode; - visualNode = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_SPAN); - visualNode.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, EXCEPTION_ATTR_STYLE_VALUE); + visualNode = visualDocument.createElement(HTML.TAG_SPAN); + visualNode.setAttribute(HTML.ATTR_STYLE, EXCEPTION_ATTR_STYLE_VALUE); nsIDOMText text = visualDocument.createTextNode(message); visualNode.appendChild(text); @@ -212,19 +209,19 @@ // Element visualTable = visualDocument.createElement("table"); // // ComponentUtil.correctAttribute(sourceElement, visualTable, -// WIDTH_ATTR_NAME, -// HtmlComponentUtil.HTML_WIDTH_ATTR, null, "100%"); +// ATTR_WIDTH_NAME, +// HTML.ATTR_WIDTH, null, "100%"); // ComponentUtil.correctAttribute(sourceElement, visualTable, -// HEIGHT_ATTR_NAME, -// HtmlComponentUtil.HTML_HEIGHT_ATTR, null, null); +// ATTR_HEIGHT_NAME, +// HTML.ATTR_HEIGHT, null, null); // ComponentUtil.correctAttribute(sourceElement, visualTable, -// STYLECLASS_ATTR_NAME, -// HtmlComponentUtil.HTML_CLASS_ATTR, "dr-toolbar-ext rich-toolbar", "dr-toolbar-ext rich-toolbar"); +// STYLEATTR_CLASS_NAME, +// HTML.ATTR_CLASS, "dr-toolbar-ext rich-toolbar", "dr-toolbar-ext rich-toolbar"); // // String style = ComponentUtil.getHeaderBackgoundImgStyle() + ";"; // ComponentUtil.correctAttribute(sourceElement, visualTable, -// STYLE_ATTR_NAME, -// HtmlComponentUtil.HTML_STYLE_ATTR, style, style); +// ATTR_STYLE_NAME, +// HTML.ATTR_STYLE, style, style); // // // VpeCreationData creatorInfo = new VpeCreationData(visualTable); @@ -246,11 +243,11 @@ // Node columnBody = column.getColumn(); // cell = visualDocument.createElement("td"); // ComponentUtil.correctAttribute(sourceElement, cell, -// CONTENTCLASS_ATTR_NAME, -// HtmlComponentUtil.HTML_CLASS_ATTR, "dr-toolbar-int rich-toolbar-item", "dr-toolbar-int rich-toolbar-item"); +// CONTENTATTR_CLASS_NAME, +// HTML.ATTR_CLASS, "dr-toolbar-int rich-toolbar-item", "dr-toolbar-int rich-toolbar-item"); // ComponentUtil.correctAttribute(sourceElement, cell, -// CONTENTSTYLE_ATTR_NAME, -// HtmlComponentUtil.HTML_STYLE_ATTR, null, null); +// CONTENTATTR_STYLE_NAME, +// HTML.ATTR_STYLE, null, null); // // row.appendChild(cell); // @@ -268,8 +265,8 @@ // cell = visualDocument.createElement("td"); // cell.setAttribute("align", "center"); // ComponentUtil.correctAttribute(sourceElement, cell, -// SEPARATORCLASS_ATTR_NAME, -// HtmlComponentUtil.HTML_CLASS_ATTR, null, null); +// SEPARATORATTR_CLASS_NAME, +// HTML.ATTR_CLASS, null, null); // Element separatorImage = visualDocument.createElement("img"); // ComponentUtil.setImg(separatorImage, separatorImageUrl); // cell.appendChild(separatorImage); @@ -293,11 +290,11 @@ // Node columnBody = column.getColumn(); // cell = visualDocument.createElement("td"); // ComponentUtil.correctAttribute(sourceElement, cell, -// CONTENTCLASS_ATTR_NAME, -// HtmlComponentUtil.HTML_CLASS_ATTR, "dr-toolbar-int rich-toolbar-item", "dr-toolbar-int rich-toolbar-item"); +// CONTENTATTR_CLASS_NAME, +// HTML.ATTR_CLASS, "dr-toolbar-int rich-toolbar-item", "dr-toolbar-int rich-toolbar-item"); // ComponentUtil.correctAttribute(sourceElement, cell, -// CONTENTSTYLE_ATTR_NAME, -// HtmlComponentUtil.HTML_STYLE_ATTR, null, null); +// CONTENTATTR_STYLE_NAME, +// HTML.ATTR_STYLE, null, null); // row.appendChild(cell); // // VpeChildrenInfo info = new VpeChildrenInfo(cell); @@ -314,8 +311,8 @@ // cell = visualDocument.createElement("td"); // cell.setAttribute("align", "center"); // ComponentUtil.correctAttribute(sourceElement, cell, -// SEPARATORCLASS_ATTR_NAME, -// HtmlComponentUtil.HTML_CLASS_ATTR, null, null); +// SEPARATORATTR_CLASS_NAME, +// HTML.ATTR_CLASS, null, null); // Element separatorImage = visualDocument.createElement("img"); // ComponentUtil.setImg(separatorImage, separatorImageUrl); // cell.appendChild(separatorImage); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeNodeTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeNodeTemplate.java 2008-12-09 17:21:36 UTC (rev 12492) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeNodeTemplate.java 2008-12-09 17:47:05 UTC (rev 12493) @@ -112,10 +112,12 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { + nsIDOMElement div = visualDocument + .createElement(HtmlComponentUtil.HTML_TAG_DIV); nsIDOMElement visualElement = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TABLE); addBasicTreeNodeAttributes(visualElement); - + div.appendChild(visualElement); nsIDOMElement tbody = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TBODY); @@ -125,7 +127,7 @@ visualElement.appendChild(tbody); tbody.appendChild(tableRow); - VpeCreationData vpeCreationData = new VpeCreationData(visualElement); + VpeCreationData vpeCreationData = new VpeCreationData(div); createBasicTree(pageContext, visualDocument, tableRow, sourceNode, vpeCreationData); return vpeCreationData;

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r12492 - trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-12-09 12:21:36 -0500 (Tue, 09 Dec 2008) New Revision: 12492 Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/ActionProvider.java Log: JBIDE-3375 Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/ActionProvider.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/ActionProvider.java 2008-12-09 16:25:15 UTC (rev 12491) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/ActionProvider.java 2008-12-09 17:21:36 UTC (rev 12492) @@ -66,7 +66,8 @@ // Finish up int size = getSelectionSize(); - if( size == 0 || (size == 1 && getWrappersFromSelection().length == 1)) { + Object input = getActionSite().getStructuredViewer().getInput(); + if( input instanceof JMXNavigator && (size == 0 || (size == 1 && getWrappersFromSelection().length == 1))) { menu.add(new Separator()); menu.add(newConnectionAction); }

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r12491 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-12-09 11:25:15 -0500 (Tue, 09 Dec 2008) New Revision: 12491 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AddNatureActionDelegate.java Log: JBIDE-2691 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AddNatureActionDelegate.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AddNatureActionDelegate.java 2008-12-09 16:04:22 UTC (rev 12490) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/AddNatureActionDelegate.java 2008-12-09 16:25:15 UTC (rev 12491) @@ -11,6 +11,8 @@ package org.jboss.tools.common.model.ui.action; import java.io.File; +import java.util.ArrayList; +import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -88,18 +90,31 @@ protected String findWebXML(String root) { if(root == null) return ""; - String s = root + "/WEB-INF/web.xml"; - if(new File(s).isFile()) return s; File rf = new File(root); - File[] fs = rf.listFiles(); - if(fs == null) return ""; - for (int i = 0; i < fs.length; i++) { - s = fs[i].getAbsolutePath().replace('\\', '/') + "/WEB-INF/web.xml"; + if(!rf.isDirectory()) return ""; + List<File> folders = new ArrayList<File>(); + folders.add(rf); + return findWebXML(folders); + } + + protected String findWebXML(List<File> folders) { + if(folders == null || folders.size() == 0) return ""; + for (File f: folders) { + if(!f.isDirectory()) continue; + String s = f.getAbsolutePath().replace('\\', '/') + "/WEB-INF/web.xml"; if(new File(s).isFile()) return s; - } - return ""; + } + List<File> nextLevelFolders = new ArrayList<File>(); + for (File f: folders) { + File[] fs = f.listFiles(); + if(fs == null) continue; + for (int i = 0; i < fs.length; i++) { + if(fs[i].isDirectory()) nextLevelFolders.add(fs[i]); + } + } + return findWebXML(nextLevelFolders); } - + public void dispose() {} protected boolean isWindowAction;

17 years, 4 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits December 2008