You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/05/07 19:59:24 UTC
svn commit: r772729 - in /ofbiz/trunk/framework:
base/src/org/ofbiz/base/util/StringUtil.java
example/widget/example/ExampleForms.xml
Author: adrianc
Date: Thu May 7 17:59:23 2009
New Revision: 772729
URL: http://svn.apache.org/viewvc?rev=772729&view=rev
Log:
Removed apostrophe to quote substitution. It caused problems with FreeMarker macros.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java
ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java?rev=772729&r1=772728&r2=772729&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java Thu May 7 17:59:23 2009
@@ -74,7 +74,6 @@
substitutionPatternMap.put(">=", Pattern.compile("@gteq", Pattern.LITERAL));
substitutionPatternMap.put("<", Pattern.compile("@lt", Pattern.LITERAL));
substitutionPatternMap.put(">", Pattern.compile("@gt", Pattern.LITERAL));
- substitutionPatternMap.put("\"", Pattern.compile("'", Pattern.LITERAL));
}
public static final SimpleEncoder htmlEncoder = new HtmlEncoder();
@@ -493,7 +492,6 @@
* <tr><td><strong>@gteq</strong></td><td>>=</td></tr>
* <tr><td><strong>@lt</strong></td><td><</td></tr>
* <tr><td><strong>@lteq</strong></td><td><=</td></tr>
- * <tr><td><strong>'</strong></td><td>"</td></tr>
* </table></p>
* @param expression The <code>String</code> to convert
* @return The converted <code>String</code>
Modified: ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleForms.xml?rev=772729&r1=772728&r2=772729&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleForms.xml Thu May 7 17:59:23 2009
@@ -52,8 +52,8 @@
<field-map field-name="orderBy" from-field="parameters.sortField"/>
</service>
</actions>
- <alt-row-style use-when="'EXST_APPROVED'.equals(statusId)" style="Validate"/>
- <alt-row-style use-when="'EXST_CANCELLED'.equals(statusId)" style="Warn"/>
+ <alt-row-style use-when=""EXST_APPROVED".equals(statusId)" style="Validate"/>
+ <alt-row-style use-when=""EXST_CANCELLED".equals(statusId)" style="Warn"/>
<field name="exampleId" title="${uiLabelMap.ExampleExampleId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${exampleId}" target="EditExample">
<parameter param-name="exampleId"/>
@@ -139,7 +139,7 @@
</entity-options>
</drop-down>
</field>
- <field name="displayAnotherText" use-when="example!=null @and example.get('anotherText')!=null">
+ <field name="displayAnotherText" use-when="example!=null @and example.get("anotherText")!=null">
<display description="${example.anotherText}"/>
</field>
<field name="submitButton" use-when="example==null" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>