From jbosstools-commits at lists.jboss.org Fri Oct 28 13:05:26 2011
Content-Type: multipart/mixed; boundary="===============1795166316467667063=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r36074 - in trunk:
jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930
and 3 other directories.
Date: Fri, 28 Oct 2011 13:05:25 -0400
Message-ID: <201110281705.p9SH5PWr006939@svn01.web.mwc.hst.phx2.redhat.com>
--===============1795166316467667063==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: vrubezhny
Date: 2011-10-28 13:05:25 -0400 (Fri, 28 Oct 2011)
New Revision: 36074
Added:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkT=
ests/JavaSource/resources.properties
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkT=
ests/WebContent/JBIDE-9930/anotherELInTagBody.jsp
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkT=
ests/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/js=
f/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web=
/kb/PageContextFactory.java
Log:
JBIDE-9930 OpenOns for ELs don't work in text nodes of JSP
Issue with EL detection in TEXT Regions is fixed. JUnit test is created.
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperl=
inkTests/JavaSource/resources.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlink=
Tests/JavaSource/resources.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlink=
Tests/JavaSource/resources.properties 2011-10-28 17:05:25 UTC (rev 36074)
@@ -0,0 +1,2 @@
+prompt=3DYour Name\:
+greeting=3DHello Hello1 Hello2 Hello3 Hello4 Hello5 Hello6 Hello7 Hello8 H=
ello9 Hello10 Hello11 Hello12 Hello13 Hello14 Hello15 Hello16 Hello17 Hello=
18 Hello19 Hello20 Hello21 Hello22 Hello23 Hello24 Hello25 Hello26 Hello27 =
Hello28 Hello29 Hello30 Hello31 Hello32 Hello33 Hello34 Hello35 Hello36 Hel=
lo37 Hello38 Hello39 =
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/proj=
ects/jsfHyperlinkTests/JavaSource/resources.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperl=
inkTests/WebContent/JBIDE-9930/anotherELInTagBody.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlink=
Tests/WebContent/JBIDE-9930/anotherELInTagBody.jsp =
(rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlink=
Tests/WebContent/JBIDE-9930/anotherELInTagBody.jsp 2011-10-28 17:05:25 UTC =
(rev 36074)
@@ -0,0 +1,12 @@
+<%@ page language=3D"java" contentType=3D"text/html; charset=3DUTF-8"
+ pageEncoding=3D"UTF-8"%>
+
+
+
+
+Insert title here
+
+
+#{msgs.greeting}
+
+
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/proj=
ects/jsfHyperlinkTests/WebContent/JBIDE-9930/anotherELInTagBody.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyp=
erlinkTests/WebContent/WEB-INF/faces-config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlink=
Tests/WebContent/WEB-INF/faces-config.xml 2011-10-28 16:44:25 UTC (rev 3607=
3)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlink=
Tests/WebContent/WEB-INF/faces-config.xml 2011-10-28 17:05:25 UTC (rev 3607=
4)
@@ -122,4 +122,10 @@
/page3.jsp
+
+
+ resources
+ msgs
+
+
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/t=
ools/jsf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/j=
sf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java 2011-10-28 16:44=
:25 UTC (rev 36073)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/j=
sf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java 2011-10-28 17:05=
:25 UTC (rev 36074)
@@ -29,15 +29,24 @@
import org.jboss.tools.test.util.WorkbenchUtils;
=
/**
- * The JUnit test cases for JBIDE-5385 issue =
+ * The JUnit test cases for JBIDE-5385, JBIDE-9930 issues =
* =
* @author Victor Rubezhny
*/
public class JSPELHyperlinkTestForELInTagBodyTest extends TestCase {
private static final String PROJECT_NAME =3D "jsfHyperlinkTests";
- private static final String PAGE_NAME =3D PROJECT_NAME+"/WebContent/JBID=
E-9930/elInTagBody.jsp";
- private static final String[] TEXT_TO_FIND =3D new String [] {"bean1", "b=
ean1.property1"};
- private static final String[] RESULT_EDITORS =3D new String [] {"Bean1.ja=
va", "Bean1.java"};
+ private static final String[] PAGE_NAMES =3D new String[] {
+ PROJECT_NAME+"/WebContent/JBIDE-9930/elInTagBody.jsp", =
+ PROJECT_NAME+"/WebContent/JBIDE-9930/anotherELInTagBody.jsp", =
+ };
+ private static final String[][] TEXT_TO_FIND =3D new String [][] {
+ {"bean1", "bean1.property1"},
+ {"msgs", "msgs.greeting"}
+ };
+ private static final String[][] RESULT_EDITORS =3D new String [][] {
+ {"Bean1.java", "Bean1.java"},
+ {"resources.properties", "resources.properties"}
+ };
=
public IProject project =3D null;
public String naturesCheckProperty;
@@ -64,20 +73,22 @@
=
public void testJSPELHyperlinkTestForELInTagBody() throws PartInitExcepti=
on, BadLocationException {
try {
- for (int i =3D 0; i < TEXT_TO_FIND.length; i++) {
- doJSPELHyperlinkTestForELInTagBodyTest(TEXT_TO_FIND[i], RESULT_EDITORS=
[i]);
+ for (int i =3D 0; i < PAGE_NAMES.length; i++) {
+ for (int j =3D 0; j < TEXT_TO_FIND.length; j++) {
+ doJSPELHyperlinkTestForELInTagBodyTest(PAGE_NAMES[i], TEXT_TO_FIND[i]=
[j], RESULT_EDITORS[i][j]);
+ }
}
} finally {
WorkbenchUtils.closeAllEditors();
}
}
=
- private void doJSPELHyperlinkTestForELInTagBodyTest(String template, Stri=
ng editorName) throws BadLocationException {
- IEditorPart editor =3D WorkbenchUtils.openEditor(PAGE_NAME);
+ private void doJSPELHyperlinkTestForELInTagBodyTest(String pageName, Stri=
ng template, String editorName) throws BadLocationException {
+ IEditorPart editor =3D WorkbenchUtils.openEditor(pageName);
assertTrue(editor instanceof JSPMultiPageEditor);
JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor;
ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie=
wer(); =
- assertNotNull("Viewer couldn't be found for " + PAGE_NAME, viewer);
+ assertNotNull("Viewer couldn't be found for " + pageName, viewer);
IDocument document =3D viewer.getDocument();
IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0,
template, true, true, false, false);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/=
jst/web/kb/PageContextFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we=
b/kb/PageContextFactory.java 2011-10-28 16:44:25 UTC (rev 36073)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we=
b/kb/PageContextFactory.java 2011-10-28 17:05:25 UTC (rev 36074)
@@ -480,10 +480,10 @@
}
=
private static void fillElReferencesForNode(IDocument document, IDOMNode =
node, XmlContextImpl context) {
- if(Node.ELEMENT_NODE =3D=3D node.getNodeType() || Node.TEXT_NODE =3D=3D =
node.getNodeType()) {
- IStructuredDocumentRegion regionNode =3D node.getFirstStructuredDocumen=
tRegion(); =
- if (regionNode =3D=3D null) return;
- =
+ IStructuredDocumentRegion regionNode =3D node.getFirstStructuredDocument=
Region(); =
+ if (regionNode =3D=3D null) return;
+ =
+ if(Node.ELEMENT_NODE =3D=3D node.getNodeType()) {
ITextRegionList regions =3D regionNode.getRegions();
if (regions =3D=3D null) return;
=
@@ -492,6 +492,20 @@
fillElReferencesForRegionNode(document, node, regionNode, region, con=
text);
}
}
+ } else if (Node.TEXT_NODE =3D=3D node.getNodeType()) {
+ IStructuredDocumentRegion lastRegionNode =3D node.getLastStructuredDocu=
mentRegion();
+ while (regionNode !=3D null) {
+ ITextRegionList regions =3D regionNode.getRegions();
+ if (regions =3D=3D null) return;
+ =
+ for (ITextRegion region : regions.toArray()) {
+ if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE =3D=3D region.getType()=
|| DOMRegionContext.XML_CONTENT =3D=3D region.getType()) {
+ fillElReferencesForRegionNode(document, node, regionNode, region, co=
ntext);
+ }
+ }
+ if (regionNode =3D=3D lastRegionNode) break;
+ regionNode =3D regionNode.getNext();
+ }
}
}
=
--===============1795166316467667063==--