[cvs] expresso commit by lhamel: fix bug that resets preferences when

[JCorporate Ltd]

Log Message:
-----------
fix bug that resets preferences when DBCreate is run: populate system events for full notification (both successful and unsuccessful events) if there are no records already set (otherwise, leave those settings alone)

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
        EventMail.java

Revision Data
-------------
Index: EventMail.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java -u -r1.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java
@@ -78,7 +78,7 @@
  * EventMail objects tell who is to be notified when an event is triggered
  *
  * @author Michael Nash
- * @version $Revision$  $Date$
+ * @author Larry Hamel
  */
 public class EventMail
         extends SecuredDBObject {
@@ -87,8 +87,7 @@
      */
     public EventMail()
             throws DBException {
-        super();
-    } /* EventMail() */
+    }
 
 
     /**
@@ -208,6 +207,8 @@
     }
 
     /**
+     * populate system events for full notification (both successful and unsuccessful events)
+     *  if there are no records already set (otherwise, leave those settings alone)
      * @throws DBException
      */
     public synchronized void populateDefaultValues()
@@ -219,18 +220,11 @@
         oneMail.setDataContext(getDataContext());
         oneMail.setField("Event", "SYSERROR");
         oneMail.setField("ExpUid", adminId);
-        oneMail.setField("Success", "Y");
 
         if (!oneMail.find()) {
+            oneMail.setField("Success", "Y");
             oneMail.add();
-        }
-
-        oneMail.clear();
-        oneMail.setField("Event", "SYSERROR");
-        oneMail.setField("ExpUid", adminId);
-        oneMail.setField("Success", "N");
-
-        if (!oneMail.find()) {
+            oneMail.setField("Success", "N");
             oneMail.add();
         }
 
@@ -238,18 +232,11 @@
         oneMail.clear();
         oneMail.setField("Event", "HEALTH");
         oneMail.setField("ExpUid", adminId);
-        oneMail.setField("Success", "Y");
 
         if (!oneMail.find()) {
+            oneMail.setField("Success", "Y");
             oneMail.add();
-        }
-
-        oneMail.clear();
-        oneMail.setField("Event", "HEALTH");
-        oneMail.setField("ExpUid", adminId);
-        oneMail.setField("Success", "N");
-
-        if (!oneMail.find()) {
+            oneMail.setField("Success", "N");
             oneMail.add();
         }
 
@@ -258,19 +245,11 @@
         oneMail.setDataContext(getDataContext());
         oneMail.setField("Event", "DOWNLOAD");
         oneMail.setField("ExpUid", adminId);
-        oneMail.setField("Success", "Y");
 
         if (!oneMail.find()) {
+            oneMail.setField("Success", "Y");
             oneMail.add();
-        }
-
-        oneMail.clear();
-        oneMail.setDataContext(getDataContext());
-        oneMail.setField("Event", "DOWNLOAD");
-        oneMail.setField("ExpUid", adminId);
-        oneMail.setField("Success", "N");
-
-        if (!oneMail.find()) {
+            oneMail.setField("Success", "N");
             oneMail.add();
         }
 
@@ -279,24 +258,15 @@
         oneMail.setDataContext(getDataContext());
         oneMail.setField("Event", "REGISTER");
         oneMail.setField("ExpUid", adminId);
-        oneMail.setField("Success", "Y");
 
         if (!oneMail.find()) {
+            oneMail.setField("Success", "Y");
             oneMail.add();
-        }
-
-        oneMail.clear();
-        oneMail.setDataContext(getDataContext());
-        oneMail.setField("Event", "REGISTER");
-        oneMail.setField("ExpUid", adminId);
-        oneMail.setField("Success", "N");
-
-        if (!oneMail.find()) {
+            oneMail.setField("Success", "N");
             oneMail.add();
         }
+
     } /* populateDefaultValues() */
 
 
 } /* EventMail */
-
-/* EventMail */