svn commit: r1764261 - in /ofbiz/trunk: applications/securityext/config/ applications/securityext/widget/ framework/minilang/config/ framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/ framework/webapp/src/main/java/org/apache/of...

Author: jleroux
Date: Tue Oct 11 14:56:49 2016
New Revision: 1764261

URL: http://svn.apache.org/viewvc?rev=1764261&view=rev
Log:
No functional change, renames files:
conditional.xml to conditionalLabels.xml
DefaultMessages.xml to DefaultMessagesLabels.xml
EmailPassword.xml to EmailPasswordLabels.xml
Found while working on OFBIZ-8321

Added:
    ofbiz/trunk/applications/securityext/config/EmailPasswordUiLabels.xml
      - copied unchanged from r1764215, ofbiz/trunk/applications/securityext/config/EmailPassword.xml
    ofbiz/trunk/framework/minilang/config/DefaultMessagesUiLabels
      - copied unchanged from r1764215, ofbiz/trunk/framework/minilang/config/DefaultMessages.xml
    ofbiz/trunk/framework/widget/config/conditionalUiLabels.xml
      - copied unchanged from r1764215, ofbiz/trunk/framework/widget/config/conditional.xml
Removed:
    ofbiz/trunk/applications/securityext/config/EmailPassword.xml
    ofbiz/trunk/framework/minilang/config/DefaultMessages.xml
    ofbiz/trunk/framework/widget/config/conditional.xml
Modified:
    ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml
    ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java
    ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
    ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java

Modified: ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml?rev=1764261&r1=1764260&r2=1764261&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml (original)
+++ ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml Tue Oct 11 14:56:49 2016
@@ -24,7 +24,7 @@ under the License.
     <screen name="PasswordEmail">
         <section>
             <actions>
-                <property-map resource="EmailPassword" map-name="uiLabelMap" global="true"/>
+                <property-map resource="EmailPasswordUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}"/>
             </actions>

Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java?rev=1764261&r1=1764260&r2=1764261&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java (original)
+++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java Tue Oct 11 14:56:49 2016
@@ -47,12 +47,12 @@ public final class FlexibleMessage imple
             } else {
                 messageFse = null;
                 propertykey = MiniLangValidate.checkAttribute(element.getAttribute("property"), defaultProperty);
-                propertyResource = MiniLangValidate.checkAttribute(element.getAttribute("resource"), "DefaultMessages");
+                propertyResource = MiniLangValidate.checkAttribute(element.getAttribute("resource"), "DefaultMessagesUiLabels");
             }
         } else {
             messageFse = null;
             propertykey = defaultProperty;
-            propertyResource = "DefaultMessages";
+            propertyResource = "DefaultMessagesUiLabels";
         }
     }
 

Modified: ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java?rev=1764261&r1=1764260&r2=1764261&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java Tue Oct 11 14:56:49 2016
@@ -148,10 +148,10 @@ public class ServiceMultiEventHandler im
         }
 
         // some default message settings
-        String errorPrefixStr = UtilProperties.getMessage("DefaultMessages", "service.error.prefix", locale);
-        String errorSuffixStr = UtilProperties.getMessage("DefaultMessages", "service.error.suffix", locale);
-        String messagePrefixStr = UtilProperties.getMessage("DefaultMessages", "service.message.prefix", locale);
-        String messageSuffixStr = UtilProperties.getMessage("DefaultMessages", "service.message.suffix", locale);
+        String errorPrefixStr = UtilProperties.getMessage("DefaultMessagesUiLabels", "service.error.prefix", locale);
+        String errorSuffixStr = UtilProperties.getMessage("DefaultMessagesUiLabels", "service.error.suffix", locale);
+        String messagePrefixStr = UtilProperties.getMessage("DefaultMessagesUiLabels", "service.message.prefix", locale);
+        String messageSuffixStr = UtilProperties.getMessage("DefaultMessagesUiLabels", "service.message.suffix", locale);
 
         // prepare the error message and success message lists
         List<Object> errorMessages = new LinkedList<Object>();

Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1764261&r1=1764260&r2=1764261&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java Tue Oct 11 14:56:49 2016
@@ -1790,11 +1790,11 @@ public final class MacroFormRenderer imp
         }
         Locale locale = (Locale) context.get("locale");
         if (!textFindField.getHideOptions()) {
-            opEquals = UtilProperties.getMessage("conditional", "equals", locale);
-            opBeginsWith = UtilProperties.getMessage("conditional", "begins_with", locale);
-            opContains = UtilProperties.getMessage("conditional", "contains", locale);
-            opIsEmpty = UtilProperties.getMessage("conditional", "is_empty", locale);
-            opNotEqual = UtilProperties.getMessage("conditional", "not_equal", locale);
+            opEquals = UtilProperties.getMessage("conditionalUiLabels", "equals", locale);
+            opBeginsWith = UtilProperties.getMessage("conditionalUiLabels", "begins_with", locale);
+            opContains = UtilProperties.getMessage("conditionalUiLabels", "contains", locale);
+            opIsEmpty = UtilProperties.getMessage("conditionalUiLabels", "is_empty", locale);
+            opNotEqual = UtilProperties.getMessage("conditionalUiLabels", "not_equal", locale);
         }
         String value = modelFormField.getEntry(context, textFindField.getDefaultValue(context));
         if (value == null) {
@@ -1810,7 +1810,7 @@ public final class MacroFormRenderer imp
         if (UtilValidate.isNotEmpty(modelFormField.getTitleStyle())) {
             titleStyle = modelFormField.getTitleStyle();
         }
-        String ignoreCase = UtilProperties.getMessage("conditional", "ignore_case", locale);
+        String ignoreCase = UtilProperties.getMessage("conditionalUiLabels", "ignore_case", locale);
         boolean ignCase = textFindField.getIgnoreCase(context);
         boolean hideIgnoreCase = textFindField.getHideIgnoreCase();
         String tabindex = modelFormField.getTabindex();
@@ -1860,12 +1860,12 @@ public final class MacroFormRenderer imp
     public void renderRangeFindField(Appendable writer, Map<String, Object> context, RangeFindField rangeFindField) throws IOException {
         ModelFormField modelFormField = rangeFindField.getModelFormField();
         Locale locale = (Locale) context.get("locale");
-        String opEquals = UtilProperties.getMessage("conditional", "equals", locale);
-        String opGreaterThan = UtilProperties.getMessage("conditional", "greater_than", locale);
-        String opGreaterThanEquals = UtilProperties.getMessage("conditional", "greater_than_equals", locale);
-        String opLessThan = UtilProperties.getMessage("conditional", "less_than", locale);
-        String opLessThanEquals = UtilProperties.getMessage("conditional", "less_than_equals", locale);
-        //String opIsEmpty = UtilProperties.getMessage("conditional", "is_empty", locale);
+        String opEquals = UtilProperties.getMessage("conditionalUiLabels", "equals", locale);
+        String opGreaterThan = UtilProperties.getMessage("conditionalUiLabels", "greater_than", locale);
+        String opGreaterThanEquals = UtilProperties.getMessage("conditionalUiLabels", "greater_than_equals", locale);
+        String opLessThan = UtilProperties.getMessage("conditionalUiLabels", "less_than", locale);
+        String opLessThanEquals = UtilProperties.getMessage("conditionalUiLabels", "less_than_equals", locale);
+        //String opIsEmpty = UtilProperties.getMessage("conditionalUiLabels", "is_empty", locale);
         String className = "";
         String alert = "false";
         if (UtilValidate.isNotEmpty(modelFormField.getWidgetStyle())) {
@@ -1944,14 +1944,14 @@ public final class MacroFormRenderer imp
     public void renderDateFindField(Appendable writer, Map<String, Object> context, DateFindField dateFindField) throws IOException {
         ModelFormField modelFormField = dateFindField.getModelFormField();
         Locale locale = (Locale) context.get("locale");
-        String opEquals = UtilProperties.getMessage("conditional", "equals", locale);
-        String opGreaterThan = UtilProperties.getMessage("conditional", "greater_than", locale);
-        String opSameDay = UtilProperties.getMessage("conditional", "same_day", locale);
-        String opGreaterThanFromDayStart = UtilProperties.getMessage("conditional", "greater_than_from_day_start", locale);
-        String opLessThan = UtilProperties.getMessage("conditional", "less_than", locale);
-        String opUpToDay = UtilProperties.getMessage("conditional", "up_to_day", locale);
-        String opUpThruDay = UtilProperties.getMessage("conditional", "up_thru_day", locale);
-        String opIsEmpty = UtilProperties.getMessage("conditional", "is_empty", locale);
+        String opEquals = UtilProperties.getMessage("conditionalUiLabels", "equals", locale);
+        String opGreaterThan = UtilProperties.getMessage("conditionalUiLabels", "greater_than", locale);
+        String opSameDay = UtilProperties.getMessage("conditionalUiLabels", "same_day", locale);
+        String opGreaterThanFromDayStart = UtilProperties.getMessage("conditionalUiLabels", "greater_than_from_day_start", locale);
+        String opLessThan = UtilProperties.getMessage("conditionalUiLabels", "less_than", locale);
+        String opUpToDay = UtilProperties.getMessage("conditionalUiLabels", "up_to_day", locale);
+        String opUpThruDay = UtilProperties.getMessage("conditionalUiLabels", "up_thru_day", locale);
+        String opIsEmpty = UtilProperties.getMessage("conditionalUiLabels", "is_empty", locale);
         Map<String, String> uiLabelMap = UtilGenerics.checkMap(context.get("uiLabelMap"));
         if (uiLabelMap == null) {
             Debug.logWarning("Could not find uiLabelMap in context", module);