5:27 p.m.
Author: akazakov
Date: 2010-05-13 18:27:59 -0400 (Thu, 13 May 2010)
New Revision: 22072
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/inputUserName.jsp
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6284
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml 2010-05-13 21:19:38
UTC (rev 22071)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml 2010-05-13 22:27:59
UTC (rev 22072)
@@ -2,8 +2,8 @@
<!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN"
"http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd">
<tag-lib defaultPrefix="f">
- <component closeTag="true" name="facet">
- <attribute name="name">
+ <component name="facet">
+ <attribute name="name" required="true">
<proposal type="facetName"/>
</attribute>
</component>
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2010-05-13
21:19:38 UTC (rev 22071)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2010-05-13
22:27:59 UTC (rev 22072)
@@ -8,7 +8,9 @@
org.eclipse.core.resources,
org.jboss.tools.jst.web.kb,
org.junit,
- org.jboss.tools.tests
+ org.jboss.tools.tests,
+ org.jboss.tools.common.el.core,
+ org.jboss.tools.common
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Vendor.0
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/inputUserName.jsp
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/inputUserName.jsp 2010-05-13
21:19:38 UTC (rev 22071)
+++
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/inputUserName.jsp 2010-05-13
22:27:59 UTC (rev 22072)
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-
+
<f:loadBundle var="Message" basename="demo.Messages"/>
<html>
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java 2010-05-13
21:19:38 UTC (rev 22071)
+++
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java 2010-05-13
22:27:59 UTC (rev 22072)
@@ -12,7 +12,14 @@
import junit.framework.TestCase;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.jboss.tools.common.el.core.resolver.ELContext;
+import org.jboss.tools.common.text.TextProposal;
+import org.jboss.tools.jst.web.kb.KbQuery;
+import org.jboss.tools.jst.web.kb.PageContextFactory;
+import org.jboss.tools.jst.web.kb.PageProcessor;
+import org.jboss.tools.jst.web.kb.KbQuery.Type;
import org.jboss.tools.jst.web.kb.internal.taglib.CustomTagLibAttribute;
import org.jboss.tools.jst.web.kb.taglib.CustomTagLibManager;
import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibrary;
@@ -49,8 +56,32 @@
}
}
+ /**
+ * https://jira.jboss.org/jira/browse/JBIDE-6284
+ */
+ public void testFFacet() {
+ IFile file = testProject.getFile("WebContent/pages/inputUserName.jsp");
+ ELContext context = PageContextFactory.createPageContext(file);
+ KbQuery query = new KbQuery();
+ query.setMask(true);
+ query.setOffset(130);
+ query.setType(Type.TAG_NAME);
+ query.setPrefix("f");
+ query.setUri("http://java.sun.com/jsf/core");
+ query.setValue("f:facet");
+
+ TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context);
+ for (TextProposal proposal : proposals) {
+ if("<f:facet
name=\"\">".equals(proposal.getReplacementString())) {
+ return;
+ }
+ }
+ fail("Can't find <f:facet name=\"\"> proposal.");
+ }
+
public void testCustomExtensions() {
CustomTagLibAttribute[] attributes =
CustomTagLibManager.getInstance().getComponentExtensions();
assertNotNull("Can't load component extensions.", attributes);
assertFalse("Can't load component extensions.", attributes.length==0);
- }}
\ No newline at end of file
+ }
+}
\ No newline at end of file