You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/09/26 23:23:50 UTC
svn commit: r1176068 - in /myfaces/core/trunk/impl/src:
main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java
Author: lu4242
Date: Mon Sep 26 21:23:50 2011
New Revision: 1176068
URL: http://svn.apache.org/viewvc?rev=1176068&view=rev
Log:
MYFACES-3327 Spaces between markup and component are trimmed by facelets algorithm
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java?rev=1176068&r1=1176067&r2=1176068&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java Mon Sep 26 21:23:50 2011
@@ -387,6 +387,15 @@ final class TextUnit extends Compilation
{
i--;
}
+ if (i >= 0)
+ {
+ return s;
+ }
+ else
+ {
+ return "";
+ }
+ /*
if (i == s.length() - 1)
{
return s;
@@ -394,7 +403,7 @@ final class TextUnit extends Compilation
else
{
return s.substring(0, i + 1);
- }
+ }*/
}
public String toString()
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java?rev=1176068&r1=1176067&r2=1176068&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/tag/ui/IncludeParamTestCase.java Mon Sep 26 21:23:50 2011
@@ -129,7 +129,7 @@ public class IncludeParamTestCase extend
String result = fw.toString();
- Assert.assertTrue("Output:" + result, result.contains("<p>Component value:page test2</p>"));
+ Assert.assertTrue("Output:" + result, result.contains("<p>Component value: page test2</p>"));
Assert.assertTrue("Output:" + result,result.contains("<p>Inline EL value: page test2</p>"));
//System.out.println(fw);
@@ -154,7 +154,7 @@ public class IncludeParamTestCase extend
result = fw.toString();
- Assert.assertTrue("Output:" + result, result.contains("<p>Component value:page test3</p>"));
+ Assert.assertTrue("Output:" + result, result.contains("<p>Component value: page test3</p>"));
Assert.assertTrue("Output:" + result, result.contains("<p>Inline EL value: page test3</p>"));
}