JBoss Tools SVN: r12539 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE and 6 other directories.
8:46 a.m.
Author: mareshkau
Date: 2008-12-10 09:46:27 -0500 (Wed, 10 Dec 2008)
New Revision: 12539
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3376Test.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandLinkTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java
Log:
JBIDE-3376
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandLinkTemplate.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandLinkTemplate.java 2008-12-10
14:36:05 UTC (rev 12538)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandLinkTemplate.java 2008-12-10
14:46:27 UTC (rev 12539)
@@ -14,6 +14,7 @@
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -41,7 +42,7 @@
boolean disabled = ComponentUtil.string2boolean(ComponentUtil
.getAttribute(element, HTML.ATTR_DISABLED));
String value = ComponentUtil.getAttribute(element, HTML.ATTR_VALUE);
- boolean hasParentForm = hasParentForm(element);
+ boolean hasParentForm = hasParentForm(pageContext, element);
if (!hasParentForm) {
parentElement = visualDocument.createElement(HTML.TAG_SPAN);
@@ -79,11 +80,12 @@
}
- private boolean hasParentForm(Element sourceElement) {
+ private boolean hasParentForm(VpePageContext pageContext, Element sourceElement) {
Node parent = sourceElement.getParentNode();
while (parent != null && parent instanceof Element &&
parent.getNodeName() != null) {
- if (parent.getNodeName().indexOf(H_FORM) >= 0
- || parent.getNodeName().indexOf(A4J_FORM) >= 0) {
+ String parentTemplateName =
VpeTemplateManager.getInstance().getTemplateName(pageContext, parent);
+ if (H_FORM.equals(parentTemplateName)
+ || A4J_FORM.equals(parentTemplateName)) {
return true;
}
parent = parent.getParentNode();
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp 2008-12-10
14:46:27 UTC (rev 12539)
@@ -0,0 +1,30 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+<html>
+<head></head>
+<body id="jbide3376">
+<f:view >
+ <j:form>
+ <j:dataTable value="#{bookList.bookList}" var="book">
+ <f:facet name="header">
+ <j:outputText value="Header" />
+ </f:facet>
+ <f:facet name="footer">
+ <j:outputText value="Header" />
+ </f:facet>
+ <j:column>
+ <j:outputText value="#{book.name}" />
+ </j:column>
+ <j:column>
+ <j:outputText value="#{book.name}" />
+ </j:column>
+ </j:dataTable>
+ <j:commandLink action="none" value="Go next page:" />
+ <br></br>
+ <j:outputText value="Begin" />
+ </j:form>
+</f:view>
+</body>
+</html>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3376/jbide3376.jsp.xml 2008-12-10
14:46:27 UTC (rev 12539)
@@ -0,0 +1,82 @@
+<tests>
+ <test id="jbide3376">
+ <DIV ID="jbide3376">
+<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width:
100%;">
+<TR>
+<TD>
+<DIV>
+<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
+<TABLE STYLE="-moz-user-modify: read-only;">
+<TR>
+<TD>
+<DIV>
+<TABLE>
+<CAPTION>
+</CAPTION>
+<THEAD>
+<TR>
+<TH>
+<DIV>
+<SPAN>
+Header
+</SPAN>
+</DIV>
+</TH>
+</TR>
+</THEAD>
+<TFOOT>
+<TR>
+<TD>
+<DIV>
+<SPAN>
+Header
+</SPAN>
+</DIV>
+</TD>
+</TR>
+</TFOOT>
+<TBODY>
+<TR>
+<TD STYLE="border: 0px hidden ; padding: 0px;">
+<TABLE WIDTH="100%" BORDER="0">
+<TBODY>
+<TR>
+<TD>
+<SPAN>
+#{book.name}
+</SPAN>
+</TD>
+<TD>
+<SPAN>
+#{book.name}
+</SPAN>
+</TD>
+</TR>
+</TBODY>
+<COLGROUP>
+<COL STYLE="-moz-user-modify: read-write;"/>
+
+<COL STYLE="-moz-user-modify: read-write;"/>
+
+</COLGROUP>
+</TABLE>
+</TD>
+</TR>
+</TBODY>
+</TABLE>
+</DIV>
+</TD>
+</TR>
+</TABLE><A>Go next page:</A><BR STYLE="-moz-user-modify:
read-write;"/>
+
+<SPAN>
+Begin
+</SPAN>
+</FORM>
+</DIV>
+</TD>
+</TR>
+</TABLE>
+</DIV>
+</test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-12-10
14:36:05 UTC (rev 12538)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-12-10
14:46:27 UTC (rev 12539)
@@ -44,6 +44,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3127Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3144Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3163Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3376Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
@@ -113,6 +114,7 @@
suite.addTestSuite(JBIDE3144Test.class);
suite.addTestSuite(JBIDE2354Test.class);
suite.addTestSuite(JBIDE3163Test.class);
+ suite.addTestSuite(JBIDE3376Test.class);
// $JUnit-END$
// added by Max Areshkau
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3376Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3376Test.java
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3376Test.java 2008-12-10
14:46:27 UTC (rev 12539)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.ui.test.ComponentContentTest;
+
+/**
+ * @author mareshkau
+ *
+ */
+public class JBIDE3376Test extends ComponentContentTest{
+
+ public JBIDE3376Test(String name) {
+ super(name);
+ }
+
+ @Override
+ protected String getTestProjectName() {
+ return JsfAllTests.IMPORT_PROJECT_NAME;
+ }
+
+ public void testJBIDE3144Test2() throws Throwable {
+ performContentTest("JBIDE/3376/jbide3376.jsp"); //$NON-NLS-1$
+ }
+
+}
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-12-10
14:36:05 UTC (rev 12538)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-12-10
14:46:27 UTC (rev 12539)
@@ -23,8 +23,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import org.apache.commons.httpclient.methods.GetMethod;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Path;
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-12-10
14:36:05 UTC (rev 12538)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-12-10
14:46:27 UTC (rev 12539)
@@ -332,7 +332,7 @@
* @param sourceNode
* @return name of template
*/
- private String getTemplateName(VpePageContext pageContext, Node sourceNode) {
+ public String getTemplateName(VpePageContext pageContext, Node sourceNode) {
if(sourceNode==null) {
return null;
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java 2008-12-10
14:36:05 UTC (rev 12538)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java 2008-12-10
14:46:27 UTC (rev 12539)
@@ -13,6 +13,7 @@
import org.w3c.dom.Node;
import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
/**
*
* @author mareshkau
@@ -25,6 +26,8 @@
public VpeValue exec(VpePageContext pageContext, Node sourceNode) {
Node parentNode = sourceNode.getParentNode();
- return new VpeValue(parentNode != null ? parentNode.getNodeName() : "");
+ String parentTemplateName =
VpeTemplateManager.getInstance().getTemplateName(pageContext, parentNode);
+
+ return new VpeValue(parentTemplateName != null ? parentTemplateName : "");
}
}
6339
days inactive
6339
days old
jbosstools-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbosstools-commits＠lists.jboss.org