Author: ashish
Date: Sat Aug 27 12:36:52 2016
New Revision: 1758013
URL: http://svn.apache.org/viewvc?rev=1758013&view=rev
Log:
Applied patch from jira issue - OFBIZ-7855 - Clean up commented out code in
Java source for Party.
Thanks Harsh for the contribution.
Modified:
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
Modified:
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java?rev=1758013&r1=1758012&r2=1758013&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
(original)
+++
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
Sat Aug 27 12:36:52 2016
@@ -348,13 +348,6 @@ public class CommunicationEventServices
sendMailParams.put("sendTo", emailAddress);
sendMailParams.put("partyId", partyId);
- // if it is a NEWSLETTER then we do not want the outgoing
emails stored, so put a communicationEventId in the sendMail context to prevent
storeEmailAsCommunicationEvent from running
- /*
- if
("NEWSLETTER".equals(contactList.getString("contactListTypeId"))) {
- sendMailParams.put("communicationEventId",
communicationEventId);
- }
- */
-
// Retrieve a record for this contactMechId from
ContactListCommStatus
Map<String, String> contactListCommStatusRecordMap =
UtilMisc.toMap("contactListId", contactListId, "communicationEventId",
communicationEventId, "contactMechId",
lastContactListPartyACM.getString("preferredContactMechId"));
GenericValue contactListCommStatusRecord =
EntityQuery.use(delegator).from("ContactListCommStatus")
@@ -457,7 +450,6 @@ public class CommunicationEventServices
thisCommEvent.store();
}
String messageId = (String) tmpResult.get("messageId");
-
//contactListCommStatusRecord.set("communicationEventId", thisCommEventId);
contactListCommStatusRecord.set("messageId",
messageId);
}
Modified:
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java?rev=1758013&r1=1758012&r2=1758013&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java
(original)
+++
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java
Sat Aug 27 12:36:52 2016
@@ -798,7 +798,6 @@ public class ContactMechServices {
*@return Map with the result of the service, the output parameters
*/
public static Map<String, Object>
createPartyContactMechPurpose(DispatchContext ctx, Map<String, ? extends
Object> context) {
- //Debug.logInfo(new Exception(), "In createPartyContactMechPurpose
context: " + context, module);
Map<String, Object> result = new HashMap<String, Object>();
Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
@@ -860,7 +859,6 @@ public class ContactMechServices {
}
public static Map<String, Object>
deletePartyContactMechPurposeIfExists(DispatchContext ctx, Map<String, ?
extends Object> context) {
- //Debug.logInfo(new Exception(), "In createPartyContactMechPurpose
context: " + context, module);
Map<String, Object> result = new HashMap<String, Object>();
Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
Modified:
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java?rev=1758013&r1=1758012&r2=1758013&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
(original)
+++
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
Sat Aug 27 12:36:52 2016
@@ -653,7 +653,6 @@ public class PartyServices {
String noteId = (String) context.get("noteId");
String noteName = (String) context.get("noteName");
Locale locale = (Locale) context.get("locale");
- //Map noteCtx = UtilMisc.toMap("note", noteString, "userLogin",
userLogin);
//Make sure the note Id actually exists if one is passed to avoid a
foreign key error below
if (noteId != null) {
Modified:
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java?rev=1758013&r1=1758012&r2=1758013&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
(original)
+++
ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
Sat Aug 27 12:36:52 2016
@@ -361,7 +361,6 @@ public class PartyWorker {
.orderBy("-fromDate")
.filterByDate()
.queryList();
- //Debug.logInfo("Checking for matching address: " +
addrCond.toString() + "[" + addresses.size() + "]", module);
if (UtilValidate.isEmpty(addresses)) {
// No address matches, return an empty list
@@ -389,14 +388,12 @@ public class PartyWorker {
if (addr2Source.equals(addr2Target)) {
Debug.logInfo("Matching address2; adding valid
address", module);
validFound.add(address);
- //validParty.put(address.getString("partyId"),
address.getString("contactMechId"));
}
}
} else {
if (address.get("address2") == null) {
Debug.logInfo("No address2; adding valid address",
module);
validFound.add(address);
- //validParty.put(address.getString("partyId"),
address.getString("contactMechId"));
}
}
}
