svn commit: r1075534 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.java

[mrisaliti]

Author: mrisaliti
Date: Mon Feb 28 21:19:34 2011
New Revision: 1075534

URL: http://svn.apache.org/viewvc?rev=1075534&view=rev
Log:
Remove some warning in EntityField (OFBIZ-4102)

Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.java

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.java?rev=1075534&r1=1075533&r2=1075534&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.java Mon Feb 28 21:19:34 2011
@@ -122,7 +122,7 @@ public class EntityField {
                         fieldObject = defaultStr;
                         fieldObjectType = "comment"; // Default for NULL objects.
                     }
-                } else if (attrObject instanceof Map) {
+                } else if (attrObject instanceof Map<?, ?>) {
                     Map<String, ?> valueMap = UtilGenerics.cast(attrObject);
 
                     fieldObject = valueMap.get(field);
@@ -165,10 +165,9 @@ public class EntityField {
         // Get the Locale from the Request object.
         Locale userLocale = null;
 
-        if (false) {
-            // disable this until we get i18n issues addressed
-            userLocale = pageContext.getRequest().getLocale();
-        }
+        // disable this until we get i18n issues addressed
+        //userLocale = pageContext.getRequest().getLocale();
+        
         if (userLocale == null) {
             userLocale = Locale.getDefault();
         }