[Columba-svn] SF.net SVN: columba:[429] columba/trunk/calendar/src/main/java/org/columba/ calendar/store/LocalCalendarStore.java

[<es...@us...>]

Revision: 429
          http://columba.svn.sourceforge.net/columba/?rev=429&view=rev
Author:   eschman
Date:     2009-11-13 17:34:45 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
[bug] fix deleting activities again

Modified Paths:
--------------
    columba/trunk/calendar/src/main/java/org/columba/calendar/store/LocalCalendarStore.java

Modified: columba/trunk/calendar/src/main/java/org/columba/calendar/store/LocalCalendarStore.java
===================================================================
--- columba/trunk/calendar/src/main/java/org/columba/calendar/store/LocalCalendarStore.java	2009-11-13 16:43:16 UTC (rev 428)
+++ columba/trunk/calendar/src/main/java/org/columba/calendar/store/LocalCalendarStore.java	2009-11-13 17:34:45 UTC (rev 429)
@@ -32,9 +32,12 @@
 import org.columba.calendar.parser.VCalendarModelFactory;
 import org.columba.calendar.store.api.ICalendarStore;
 import org.columba.calendar.store.api.StoreException;
+import org.columba.calendar.ui.base.CalendarHelper;
 import org.columba.core.io.DiskIO;
 import org.jdom.Document;
 
+import com.miginfocom.calendar.activity.Activity;
+
 public class LocalCalendarStore extends AbstractCalendarStore implements
 		ICalendarStore {
 
@@ -164,9 +167,14 @@
 		if (id == null)
 			throw new IllegalArgumentException("id == null");
 
+		IComponentInfo info = get(id);
+		Activity activity = null;
+		if (info instanceof IEventInfo) {
+			activity = CalendarHelper.createActivity((IEventInfo)info, this);
+		}
 		dataStorage.remove(id);
 
-		super.remove(id);
+		super.remove(activity == null ? id : activity.getID());
 	}
 
 	public boolean isReadOnly(String uid) throws StoreException {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.