svn commit: r1507596 - /ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java

Author: jleroux
Date: Sat Jul 27 08:15:23 2013
New Revision: 1507596

URL: http://svn.apache.org/r1507596
Log:
No functional change, temporary weird compile error workaround

There is an issue with commit r1507200. It does not compile.
I wonder though why Buildbot did not detect it and also why my IDE (Eclipse) does not detect it and also why this fails, because the same scheme is successfully used elsewhere.

The demo compilers (1.6.26, mine is 1.6.22, ) say:

classes:
  [javac16] Compiling 11 source files to /home/ofbiz/trunk/applications/party/build/classes
  [javac16] /home/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java:2097: incompatible types
  [javac16] found   : java.util.Map<java.lang.String,org.ofbiz.entity.GenericValue>
  [javac16] required: java.util.Map<java.lang.String,java.lang.Object>
  [javac16]                     Map<String, Object> postalAddress = UtilMisc.toMap("userLogin", userLogin);
  [javac16]                                                                       ^
  [javac16] /home/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java:2117: incompatible types
  [javac16] found   : java.util.Map<java.lang.String,org.ofbiz.entity.GenericValue>
  [javac16] required: java.util.Map<java.lang.String,java.lang.Object>
  [javac16]                     Map<String, Object> telecomNumber = UtilMisc.toMap("userLogin", userLogin);
  [javac16]                                                                       ^
  [javac16] 2 errors


Of course replacing by
    java.util.Map<java.lang.String,java.lang.Object> postalAddress = UtilMisc.toMap("userLogin", userLogin);
as the compilers suggest does not help. I temporarily replaced by

Map<String, Object> postalAddress = new HashMap<String, Object>();
postalAddress.put("userLogin", userLogin);

Unrelated: I set my IDE to automatically clean imports...

Modified:
    ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java

Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=1507596&r1=1507595&r2=1507596&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java Sat Jul 27 08:15:23 2013
@@ -19,23 +19,24 @@
 
 package org.ofbiz.party.party;
 
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 import javolution.util.FastList;
 import javolution.util.FastMap;
 
 import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVRecord;
 import org.apache.commons.csv.CSVFormat.CSVFormatBuilder;
+import org.apache.commons.csv.CSVRecord;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilGenerics;
@@ -2094,7 +2095,9 @@ public class PartyServices {
                         lastEmailAddress = rec.get("emailAddress");
                     }
                     
-                    Map<String, Object> postalAddress = UtilMisc.toMap("userLogin", userLogin);
+                    //Map<String, Object> postalAddress = UtilMisc.toMap("userLogin", userLogin);
+                    Map<String, Object> postalAddress = new HashMap<String, Object>();
+                    postalAddress.put("userLogin", userLogin);
                     Boolean postalAddressChanged = false;
                     if ("POSTAL_ADDRESS".equals(currentContactMechTypeId)) {
                         postalAddress.put("address1", rec.get("address1"));
@@ -2114,7 +2117,9 @@ public class PartyServices {
                         lastCountryGeoId = (String) postalAddress.get("countryGeoId");
                     }                            
                             
-                    Map<String, Object> telecomNumber = UtilMisc.toMap("userLogin", userLogin);
+                    //Map<String, Object> telecomNumber = UtilMisc.toMap("userLogin", userLogin);
+                    Map<String, Object> telecomNumber = new HashMap<String, Object>();
+                    postalAddress.put("userLogin", userLogin);                    
                     Boolean telecomNumberChanged = false;
                     if ("TELECOM_NUMBER".equals(currentContactMechTypeId)) {
                         telecomNumber.put("countryCode", rec.get("telCountryCode"));