From jbosstools-commits at lists.jboss.org Tue Sep 29 06:56:43 2009
Content-Type: multipart/mixed; boundary="===============7223842456242591307=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r17787 - in trunk:
jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4954
and 2 other directories.
Date: Tue, 29 Sep 2009 06:56:43 -0400
Message-ID: <200909291056.n8TAuhgI016051@svn01.web.mwc.hst.phx2.redhat.com>
--===============7223842456242591307==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: mareshkau
Date: 2009-09-29 06:56:42 -0400 (Tue, 29 Sep 2009)
New Revision: 17787
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebC=
ontent/pages/JBIDE/4954/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebC=
ontent/pages/JBIDE/4954/inputUserName.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebC=
ontent/pages/JBIDE/4954/inputUserName.jsp.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf=
/vpe/jsf/test/jbide/JBIDE2550Test.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/tem=
plate/expression/VpeFunctionSrc.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4954
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/=
WebContent/pages/JBIDE/4954/inputUserName.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.vpe.jsf.test/resources/jsf2test/Web=
Content/pages/JBIDE/4954/inputUserName.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/Web=
Content/pages/JBIDE/4954/inputUserName.jsp 2009-09-29 10:56:42 UTC (rev 177=
87)
@@ -0,0 +1,14 @@
+<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %>
+<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %>
+
+
+
+
+
+
+ Test for JBIDE-4954
+
+
+
+
+
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/=
WebContent/pages/JBIDE/4954/inputUserName.jsp.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.vpe.jsf.test/resources/jsf2test/Web=
Content/pages/JBIDE/4954/inputUserName.jsp.xml (rev=
0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/Web=
Content/pages/JBIDE/4954/inputUserName.jsp.xml 2009-09-29 10:56:42 UTC (rev=
17787)
@@ -0,0 +1,13 @@
+
+
+
+
+
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to=
ols/jsf/vpe/jsf/test/jbide/JBIDE2550Test.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.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JBIDE2550Test.java 2009-09-29 10:24:21 UTC (rev 17786)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js=
f/vpe/jsf/test/jbide/JBIDE2550Test.java 2009-09-29 10:56:42 UTC (rev 17787)
@@ -27,6 +27,10 @@
performContentTest("JBIDE/2550/jbide2550.xhtml"); //$NON-NLS-1$
}
=
+ public void testOfJSF2ResourceForEmptyString() throws Throwable{
+ performContentTest("JBIDE/4954/inputUserName.jsp"); //$NON-NLS-1$
+ }
+ =
@Override
protected String getTestProjectName() {
return JsfAllTests.IMPORT_JSF_20_PROJECT_NAME;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi=
tor/template/expression/VpeFunctionSrc.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/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/expression/VpeFunctionSrc.java 2009-09-29 10:24:21 UTC (rev 17786)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/te=
mplate/expression/VpeFunctionSrc.java 2009-09-29 10:56:42 UTC (rev 17787)
@@ -326,8 +326,13 @@
if(zipEntry!=3Dnull){
InputStream inputStream =3D jarPackageFragmentRoot.getJar().getInput=
Stream(zipEntry);
IPath stateLocation =3D VpePlugin.getDefault().getStateLocation();
- String fileName =3D classPathResource.substring(classPathResource.la=
stIndexOf("/")+1,classPathResource.lastIndexOf(".")); //$NON-NLS-1$ //$NON-=
NLS-2$
- String fileExtension =3D classPathResource.substring(classPathResour=
ce.lastIndexOf("."),classPathResource.length()); //$NON-NLS-1$
+ =
+ String fileName =3D null;
+ String fileExtension =3D null;
+ if(classPathResource.lastIndexOf(".")!=3D-1) { //$NON-NLS-1$ //added=
by mareshkau, fix for JBIDE-4954
+ fileName =3D classPathResource.substring(classPathResource.lastInde=
xOf("/")+1,classPathResource.lastIndexOf(".")); //$NON-NLS-1$ //$NON-NLS-2$
+ fileExtension =3D classPathResource.substring(classPathResource.las=
tIndexOf("."),classPathResource.length()); //$NON-NLS-1$
+ }
if(fileName!=3Dnull && fileName.length()>0
&& fileExtension!=3Dnull && fileExtension.length()>0) {
File temporaryFile =3DFile.createTempFile(
--===============7223842456242591307==--