xlawrence 2004/12/21 10:28:00 CET
Modified files:
src/java/org/jahia/suite/calendar/syncServer
CalendarManager.java
Log:
Added ckeck to determine if the syncsource is MS-outlook related or not
Revision Changes Path
1.7 +14 -4
uwcal_JSR168/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java.diff?r1=1.6&r2=1.7&f=h
Index: CalendarManager.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CalendarManager.java 17 Dec 2004 15:47:00 -0000 1.6
+++ CalendarManager.java 21 Dec 2004 09:27:59 -0000 1.7
@@ -51,6 +51,8 @@
import org.jahia.suite.calendar.framework.model.GUID;
import org.jahia.suite.calendar.util.StateValueConverter;
+import org.jahia.suite.calendar.sync4jModule.CalendarSyncSourceOutlook;
+
import sync4j.framework.engine.source.SyncSource;
import sync4j.framework.engine.SyncItem;
@@ -324,17 +326,25 @@
*/
protected SyncItem[] calendarToSyncItems(Calendar cal) {
SyncEvent[] events = cal.getEvents();
- SyncItem[] res = new SyncItem[events.length];
+ Vector res = new Vector();
for (int i=0; i<events.length; i++) {
SyncEvent e = events[i];
- SyncItem item = new SyncItemImpl(source, e.getKey(),
+
+ // Don't send the calendar properties if the calendar source is
+ // MS-Outlook
+ if (source instanceof CalendarSyncSourceOutlook &&
+ (!new String(e.getContent()).startsWith("BEGIN"))) {
+ continue;
+ }
+
+ SyncItem item = new SyncItemImpl(source, e.getKey(),
StateValueConverter.toSync4j(e.getState()));
item.setProperty(new SyncProperty(
SyncItem.PROPERTY_BINARY_CONTENT, e.getContent())
);
- res[i] = item;
+ res.addElement(item);
}
- return res;
+ return (SyncItem[])res.toArray(new SyncItem[] {});
}
/**
