return map of wrong appointments at addAppointment

according to the task it should return all nonPrivate appointments when a conflict happened

project/src/bean/Appointment.java

@@ -34,7 +34,7 @@ public Boolean conflictsWith(Appointment a)
     {
         assert(a != null);
         // free is a special type and returns always true
-        if (a.type == AppointmentType.FREE || isPrivate)
+        if (a.type == AppointmentType.FREE)
             return true;
         return overlapsInTime(a);
     }

project/src/bean/CalendarMgt.java

@@ -12,7 +12,9 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.GregorianCalendar;
 
 import bean.IUserMgt;
@@ -26,8 +28,11 @@ public class CalendarMgt implements ICalendarMgt
     @PersistenceContext
     private EntityManager manager;
 
-    public Boolean addAppointment(GregorianCalendar start, GregorianCalendar end, String title, String notes, Boolean isPrivate, AppointmentType type, Collection<String> userEmails)
+    // returns a list of appointments which are in conflict or null
+    // throws exception if something strange happened (couldn't find UserMgt/remote)
+    public Map<String, Appointment> addAppointment(GregorianCalendar start, GregorianCalendar end, String title, String notes, Boolean isPrivate, AppointmentType type, Collection<String> userEmails) throws Exception
     {
+        Map<String, Appointment> errorAppointments = new HashMap<String, Appointment>();
         Appointment app = new Appointment();
         app.start = start;
         app.end = end;
@@ -37,20 +42,24 @@ public Boolean addAppointment(GregorianCalendar start, GregorianCalendar end, St
         app.type = type;
 
         IUserMgt uMgt = null;
-        try {
-            InitialContext ctx = new InitialContext();
-            uMgt = (IUserMgt) ctx.lookup("UserMgt/remote");
-        } catch (Exception e)
-        {
-            return false;
-        }
+        InitialContext ctx = new InitialContext();
+        uMgt = (IUserMgt) ctx.lookup("UserMgt/remote");
 
         for (String email: userEmails)
         {
             Calendar cal = uMgt.getUserCalendar(email);
             if (cal == null || cal.hasConflict(app))
-                return false;
+            {
+                if (app.isPrivate)
+                {
+                    // cause we shouldn't send the user full information about a private appointment
+                    app = new Appointment();
+                }
+                errorAppointments.put(email, app);
+            }
         }
+        if (!errorAppointments.isEmpty())
+            return errorAppointments;
         for (String email: userEmails)
         {
             Calendar cal = uMgt.getUserCalendar(email);
@@ -63,7 +72,7 @@ public Boolean addAppointment(GregorianCalendar start, GregorianCalendar end, St
              */
             manager.merge(cal);
         }
-        return true;
+        return null;
     }
 
     public List<Appointment> viewAppointments(String email)
@@ -81,7 +90,7 @@ public List<Appointment> viewAppointments(String email)
         if (cal == null)
             return null;
         Collection<Appointment> appointments = cal.viewAppointments();
-        List sortedAppointments = new ArrayList(appointments);
+        List sortedAppointments = new LinkedList(appointments);
         Collections.sort(sortedAppointments);
         return sortedAppointments;
     }

project/src/bean/IAddAppointment.java

@@ -1,8 +1,9 @@
 package bean;
 
 import java.util.Collection;
+import java.util.Map;
 import java.util.GregorianCalendar;
 
 public interface IAddAppointment {
-    public Boolean addAppointment(GregorianCalendar start, GregorianCalendar end, String title, String notes, Boolean isPrivate, AppointmentType type, Collection<String> userEmails);
+    public Map<String, Appointment> addAppointment(GregorianCalendar start, GregorianCalendar end, String title, String notes, Boolean isPrivate, AppointmentType type, Collection<String> userEmails) throws Exception;
 }

project/src/bean/ICalendarMgt.java

@@ -6,11 +6,13 @@
 import bean.AppointmentType;
 import java.util.GregorianCalendar;
 import java.util.Collection;
+import java.util.Map;
+import java.util.List;
 
 // our interfaces, which are visible for the client getting extended here - nevertheless redefine those methods here too cause they
 // can also be used at other servercomponents
 public interface ICalendarMgt extends IAddAppointment, IViewAppointment
 {
-    public Boolean addAppointment(GregorianCalendar start, GregorianCalendar end, String title, String notes, Boolean isPrivate, AppointmentType type, Collection<String> userEmails);
-    public Collection<Appointment> viewAppointments(String email);
+    public Map<String, Appointment> addAppointment(GregorianCalendar start, GregorianCalendar end, String title, String notes, Boolean isPrivate, AppointmentType type, Collection<String> userEmails) throws Exception;
+    public List<Appointment> viewAppointments(String email);
 }

project/src/client/Client.java

@@ -10,6 +10,7 @@
 import javax.naming.InitialContext;
 import java.util.HashSet;
 import java.util.Collection;
+import java.util.Map;
 import java.util.GregorianCalendar;
 
 public class Client
@@ -26,18 +27,17 @@ public static void main(String[] args) throws Exception
         System.out.println("starting addAppointment");
         HashSet <String> userEmails = new HashSet <String>();
         userEmails.add("alice@a.com");
-        Boolean success = addApp.addAppointment(
+        Map<String, Appointment> errorAppointments = addApp.addAppointment(
             new GregorianCalendar(2011, 6, 19, 12, 30),
             new GregorianCalendar(2011, 6, 19, 13, 30),
             "title",
             "notes",
             false, // isPrivate
             AppointmentType.FREE,
             userEmails);
-        if (!success)
+        if (errorAppointments != null)
             System.out.println("Couldn't add appointment");
 
-
         System.out.println("starting viewAppointments:");
         viewAppointments(viewApp.viewAppointments("alice@a.com"));
     }