[Bedework-commit] webapps r1157 - in trunk/webcommon/src/org/bedework/webcommon: event misc schedule

[svnadmin at bedework.org]

Author: douglm
Date: 2010-03-31 15:01:23 -0400 (Wed, 31 Mar 2010)
New Revision: 1157

Modified:
   trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
   trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java
   trunk/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java
Log:
Fix a bug in which deleted overrides were not removed as updateEvent (and it's called methods) did not remove them from the db.

Involved moving the UpdateResult class into EventInfo and going through the list of overrides to see if any had changed, also checking to see if any had been added or deleted.  

Most of the changes here are trivial, involving the removal of a null parameter. The bulk is in Events and CoreEvents.

Modified: trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2010-03-05 19:50:41 UTC (rev 1156)
+++ trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2010-03-31 19:01:23 UTC (rev 1157)
@@ -40,11 +40,11 @@
 import org.bedework.calfacade.exc.CalFacadeException;
 import org.bedework.calfacade.exc.ValidationError;
 import org.bedework.calfacade.svc.EventInfo;
+import org.bedework.calfacade.svc.EventInfo.UpdateResult;
 import org.bedework.calfacade.util.CalFacadeUtil;
 import org.bedework.calfacade.util.ChangeTable;
 import org.bedework.calfacade.util.ChangeTableEntry;
 import org.bedework.calsvci.CalSvcI;
-import org.bedework.calsvci.EventsI.UpdateResult;
 import org.bedework.icalendar.IcalTranslator;
 import org.bedework.icalendar.Icalendar;
 import org.bedework.webcommon.Attendees;
@@ -527,8 +527,7 @@
                                          true);
       } else {
         ur = svci.getEventsHandler().update(ei,
-                                            !sendInvitations,
-                                            changes);
+                                            !sendInvitations);
       }
 
       if ((ur != null) && (ur.schedulingResult != null)) {

Modified: trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java	2010-03-05 19:50:41 UTC (rev 1156)
+++ trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java	2010-03-31 19:01:23 UTC (rev 1157)
@@ -36,8 +36,8 @@
 import org.bedework.calfacade.exc.CalFacadeException;
 import org.bedework.calfacade.exc.ValidationError;
 import org.bedework.calfacade.svc.EventInfo;
+import org.bedework.calfacade.svc.EventInfo.UpdateResult;
 import org.bedework.calsvci.CalSvcI;
-import org.bedework.calsvci.EventsI.UpdateResult;
 import org.bedework.icalendar.IcalTranslator;
 import org.bedework.icalendar.Icalendar;
 import org.bedework.webcommon.AddEventResult;
@@ -204,8 +204,7 @@
             form.getErr().emit(cfe.getMessage(), cfe.getExtra());
           }
         } else {
-          svci.getEventsHandler().update(ei, false,
-                                         ei.getChangeset());
+          svci.getEventsHandler().update(ei, false);
           numEventsUpdated++;
         }
       }

Modified: trunk/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java	2010-03-05 19:50:41 UTC (rev 1156)
+++ trunk/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java	2010-03-31 19:01:23 UTC (rev 1157)
@@ -29,9 +29,9 @@
 import org.bedework.calfacade.ScheduleResult;
 import org.bedework.calfacade.exc.ValidationError;
 import org.bedework.calfacade.svc.EventInfo;
+import org.bedework.calfacade.svc.EventInfo.UpdateResult;
 import org.bedework.calsvci.CalSvcI;
 import org.bedework.calsvci.SchedulingI;
-import org.bedework.calsvci.EventsI.UpdateResult;
 import org.bedework.icalendar.Icalendar;
 import org.bedework.webcommon.BwActionFormBase;
 import org.bedework.webcommon.BwRequest;
@@ -90,8 +90,9 @@
   /* (non-Javadoc)
    * @see org.bedework.webcommon.BwAbstractAction#doAction(org.bedework.webcommon.BwRequest, org.bedework.webcommon.BwActionFormBase)
    */
-  public int doAction(BwRequest request,
-                      BwActionFormBase form) throws Throwable {
+  @Override
+  public int doAction(final BwRequest request,
+                      final BwActionFormBase form) throws Throwable {
     if (form.getGuest()) {
       return forwardNoAccess; // First line of defence
     }