[Aplaws-commit] r187 - in ccm-core/trunk/src/com/arsdigita: kernel ui/admin

[<mb...@re...>]

Author: mbooth
Date: 2005-01-27 16:16:27 +0100 (Thu, 27 Jan 2005)
New Revision: 187

Modified:
   ccm-core/trunk/src/com/arsdigita/kernel/Party.java
   ccm-core/trunk/src/com/arsdigita/ui/admin/UserEditForm.java
Log:
Improved logging when deleting a user.


Modified: ccm-core/trunk/src/com/arsdigita/kernel/Party.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/Party.java	2005-01-27 09:55:40 UTC (rev 186)
+++ ccm-core/trunk/src/com/arsdigita/kernel/Party.java	2005-01-27 15:16:27 UTC (rev 187)
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Iterator;
 
+import org.apache.log4j.Logger;
 
 /**
  * Represents a party, which can either be a group or a
@@ -44,6 +45,8 @@
 
     public static final String versionId = "$Id: //core-platform/dev/src/com/arsdigita/kernel/Party.java#14 $ by $Author: dennis $, $DateTime: 2004/08/16 18:10:38 $";
 
+    private static final Logger s_log = Logger.getLogger( Party.class );
+
     /**
      * A list of EmailAddress objects associated with this party.
      **/
@@ -262,7 +265,7 @@
     private DataAssociation getEmailAssociation() {
         // FIXME: is there a hidden meaning to retrieving the association twice?
         // -- 2002-11-26
-        DataAssociation assoc = (DataAssociation) get("emailAddresses");
+        //DataAssociation assoc = (DataAssociation) get("emailAddresses");
         return (DataAssociation) get("emailAddresses");
     }
 

Modified: ccm-core/trunk/src/com/arsdigita/ui/admin/UserEditForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/ui/admin/UserEditForm.java	2005-01-27 09:55:40 UTC (rev 186)
+++ ccm-core/trunk/src/com/arsdigita/ui/admin/UserEditForm.java	2005-01-27 15:16:27 UTC (rev 187)
@@ -42,8 +42,7 @@
 {
     // Logging
 
-    private static final Logger s_log =
-        Logger.getLogger(UserEditForm.class.getName());
+    private static final Logger s_log = Logger.getLogger(UserEditForm.class);
 
     private UserBrowsePane m_browsePane;
 
@@ -128,8 +127,13 @@
         EmailAddress naddr = new EmailAddress(m_primaryEmail.getValue(state).toString());
 
         if (!oaddr.equals(naddr)) {
+            if( s_log.isDebugEnabled() ) {
+                s_log.debug( "Changing primary email " + oaddr + " to " +
+                             naddr );
+            }
+
             user.setPrimaryEmail(naddr);
-            user.save();
+            //user.save();
             user.removeEmailAddress(oaddr);
         }