[Bedework-commit] webapps r1282 - in trunk:
appcommon/src/org/bedework/appcommon
webcommon/src/org/bedework/webcommon
webcommon/src/org/bedework/webcommon/event
webcommon/src/org/bedework/webcommon/misc
svnadmin at bedework.org
svnadmin at bedework.org
Thu Mar 24 00:35:00 EDT 2011
Author: douglm
Date: 2011-03-24 00:34:53 -0400 (Thu, 24 Mar 2011)
New Revision: 1282
Modified:
trunk/appcommon/src/org/bedework/appcommon/DayView.java
trunk/appcommon/src/org/bedework/appcommon/MonthView.java
trunk/appcommon/src/org/bedework/appcommon/TimeView.java
trunk/appcommon/src/org/bedework/appcommon/WeekView.java
trunk/appcommon/src/org/bedework/appcommon/YearView.java
trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java
trunk/webcommon/src/org/bedework/webcommon/EventListPars.java
trunk/webcommon/src/org/bedework/webcommon/event/EventActionBase.java
trunk/webcommon/src/org/bedework/webcommon/event/EventListParsAction.java
trunk/webcommon/src/org/bedework/webcommon/misc/ExportAction.java
trunk/webcommon/src/org/bedework/webcommon/misc/WebCalendarAction.java
Log:
Rebuild caldav filtering to use classes generated by new CalDAV XML schema.
Most classes only changed because of need to rename Filter class to FilterBase to avoid conflicts.
Modified: trunk/appcommon/src/org/bedework/appcommon/DayView.java
===================================================================
--- trunk/appcommon/src/org/bedework/appcommon/DayView.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/appcommon/src/org/bedework/appcommon/DayView.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -19,7 +19,7 @@
package org.bedework.appcommon;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.calfacade.exc.CalFacadeException;
import org.bedework.calsvci.CalSvcI;
@@ -43,7 +43,7 @@
public DayView(final MessageEmit err,
final MyCalendarVO curDay,
final CalSvcI cal,
- final Filter filter,
+ final FilterBase filter,
final boolean debug) throws CalFacadeException {
super(err,
curDay.getCalendar(), "Day", cal,
Modified: trunk/appcommon/src/org/bedework/appcommon/MonthView.java
===================================================================
--- trunk/appcommon/src/org/bedework/appcommon/MonthView.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/appcommon/src/org/bedework/appcommon/MonthView.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -19,7 +19,7 @@
package org.bedework.appcommon;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.calfacade.exc.CalFacadeException;
import org.bedework.calsvci.CalSvcI;
@@ -43,7 +43,7 @@
public MonthView(final MessageEmit err,
final MyCalendarVO curDay,
final CalSvcI cal,
- final Filter filter,
+ final FilterBase filter,
final boolean debug) throws CalFacadeException {
super(err,
curDay.getCalendar(), "Month", cal,
Modified: trunk/appcommon/src/org/bedework/appcommon/TimeView.java
===================================================================
--- trunk/appcommon/src/org/bedework/appcommon/TimeView.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/appcommon/src/org/bedework/appcommon/TimeView.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -18,7 +18,7 @@
*/
package org.bedework.appcommon;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.BwDateTime;
import org.bedework.calfacade.BwEvent;
@@ -152,7 +152,7 @@
private CalFmt firstDayFmt;
private CalFmt lastDayFmt;
- private Filter filter;
+ private FilterBase filter;
//private static final TimezoneCache tzcache = new TimezoneCache(false);
@@ -183,7 +183,7 @@
final String prevDate,
final String nextDate,
final boolean showData,
- final Filter filter,
+ final FilterBase filter,
final boolean debug) throws CalFacadeException {
this.err = err;
@@ -323,7 +323,7 @@
Calendar lastP1 = (Calendar)lastDay.clone();
lastP1.add(Calendar.DATE, 1);
- Filter f = Filter.addAndChild(filter,
+ FilterBase f = FilterBase.addAndChild(filter,
cal.getClientState().getViewFilter(null));
events = cal.getEventsHandler().getEvents((BwCalendar)null, f,
Modified: trunk/appcommon/src/org/bedework/appcommon/WeekView.java
===================================================================
--- trunk/appcommon/src/org/bedework/appcommon/WeekView.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/appcommon/src/org/bedework/appcommon/WeekView.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -19,7 +19,7 @@
package org.bedework.appcommon;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.calfacade.exc.CalFacadeException;
import org.bedework.calsvci.CalSvcI;
@@ -43,7 +43,7 @@
public WeekView(final MessageEmit err,
final MyCalendarVO curDay,
final CalSvcI cal,
- final Filter filter,
+ final FilterBase filter,
final boolean debug) throws CalFacadeException {
super(err,
curDay.getCalendar(), "Week", cal,
Modified: trunk/appcommon/src/org/bedework/appcommon/YearView.java
===================================================================
--- trunk/appcommon/src/org/bedework/appcommon/YearView.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/appcommon/src/org/bedework/appcommon/YearView.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -19,7 +19,7 @@
package org.bedework.appcommon;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.calfacade.exc.CalFacadeException;
import org.bedework.calsvci.CalSvcI;
@@ -48,7 +48,7 @@
final MyCalendarVO curDay,
final CalSvcI cal,
final boolean showData,
- final Filter filter,
+ final FilterBase filter,
final boolean debug) throws CalFacadeException {
super(err,
curDay.getCalendar(), "Year", cal,
Modified: trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -32,7 +32,7 @@
import org.bedework.appcommon.TimeView;
import org.bedework.appcommon.WeekView;
import org.bedework.appcommon.YearView;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.BwCategory;
import org.bedework.calfacade.BwContact;
@@ -2077,7 +2077,7 @@
viewMcDate = new MyCalendarVO(new Date(System.currentTimeMillis()));
}
- Filter filter = getFilter(null);
+ FilterBase filter = getFilter(null);
switch (curViewPeriod) {
case BedeworkDefs.todayView:
@@ -2114,7 +2114,7 @@
* @return BwFilter or null
* @throws Throwable
*/
- private Filter getFilter(final String filterName) throws Throwable {
+ private FilterBase getFilter(final String filterName) throws Throwable {
CalSvcI svci = fetchSvci();
BwFilterDef fdef = null;
Modified: trunk/webcommon/src/org/bedework/webcommon/EventListPars.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/EventListPars.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/webcommon/src/org/bedework/webcommon/EventListPars.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -18,7 +18,7 @@
*/
package org.bedework.webcommon;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.BwDateTime;
@@ -35,7 +35,7 @@
/* null if times not limited. */
private BwDateTime toDate;
- private Filter filter;
+ private FilterBase filter;
private BwCalendar collection;
@@ -75,14 +75,14 @@
/** if null no filtering
* @param val
*/
- public void setFilter(Filter val) {
+ public void setFilter(FilterBase val) {
filter = val;
}
/** if null no filtering
* @return filter
*/
- public Filter getFilter() {
+ public FilterBase getFilter() {
return filter;
}
Modified: trunk/webcommon/src/org/bedework/webcommon/event/EventActionBase.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/EventActionBase.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/webcommon/src/org/bedework/webcommon/event/EventActionBase.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -23,7 +23,7 @@
import org.bedework.appcommon.DateTimeFormatter;
import org.bedework.appcommon.EventFormatter;
import org.bedework.appcommon.SelectId;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.calfacade.BwAttendee;
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.BwContact;
@@ -88,7 +88,7 @@
rrm = new RecurringRetrievalMode(Rmode.expanded);
}
- Filter f = Filter.addAndChild(elpars.getFilter(),
+ FilterBase f = FilterBase.addAndChild(elpars.getFilter(),
svci.getClientState().getViewFilter(elpars.getCollection()));
return svci.getEventsHandler().getEvents((BwCalendar)null,
f,
Modified: trunk/webcommon/src/org/bedework/webcommon/event/EventListParsAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/EventListParsAction.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/webcommon/src/org/bedework/webcommon/event/EventListParsAction.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -20,7 +20,7 @@
import org.bedework.appcommon.ClientError;
import org.bedework.caldav.util.filter.AndFilter;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.caldav.util.filter.ObjectFilter;
import org.bedework.caldav.util.filter.OrFilter;
import org.bedework.calfacade.BwCalendar;
@@ -219,7 +219,7 @@
elpars.setCollection(cal);
}
- Filter filter = null;
+ FilterBase filter = null;
BwFilterDef fd = request.getFilterDef(debug);
if (fd != null) {
@@ -257,7 +257,7 @@
if (filter == null) {
filter = crefilter;
} else {
- Filter andFilter = new AndFilter();
+ FilterBase andFilter = new AndFilter();
andFilter.addChild(filter);
andFilter.addChild(crefilter);
filter = andFilter;
@@ -272,7 +272,7 @@
return forwardSuccess;
}
- private Filter addor(Filter filter, final BwCategory cat) {
+ private FilterBase addor(FilterBase filter, final BwCategory cat) {
ObjectFilter f = new BwCategoryFilter(null);
f.setEntity(cat);
f.setExact(false);
@@ -282,7 +282,7 @@
}
if (!(filter instanceof OrFilter)) {
- Filter orFilter = new OrFilter();
+ FilterBase orFilter = new OrFilter();
orFilter.addChild(filter);
filter = orFilter;
}
Modified: trunk/webcommon/src/org/bedework/webcommon/misc/ExportAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/misc/ExportAction.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/webcommon/src/org/bedework/webcommon/misc/ExportAction.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -18,7 +18,7 @@
*/
package org.bedework.webcommon.misc;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.RecurringRetrievalMode;
import org.bedework.calfacade.RecurringRetrievalMode.Rmode;
@@ -122,7 +122,7 @@
}
}
- Filter f = svci.getClientState().getViewFilter(col);
+ FilterBase f = svci.getClientState().getViewFilter(col);
evs = svci.getEventsHandler().getEvents(null,
f,
Modified: trunk/webcommon/src/org/bedework/webcommon/misc/WebCalendarAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/misc/WebCalendarAction.java 2011-03-21 01:06:06 UTC (rev 1281)
+++ trunk/webcommon/src/org/bedework/webcommon/misc/WebCalendarAction.java 2011-03-24 04:34:53 UTC (rev 1282)
@@ -18,7 +18,7 @@
*/
package org.bedework.webcommon.misc;
-import org.bedework.caldav.util.filter.Filter;
+import org.bedework.caldav.util.filter.FilterBase;
import org.bedework.caldav.util.filter.ObjectFilter;
import org.bedework.calfacade.BwCalendar;
import org.bedework.calfacade.BwDateTime;
@@ -141,7 +141,7 @@
}
}
- Filter filter = null;
+ FilterBase filter = null;
String cat = request.getReqPar("cat");
if (cat != null) {
More information about the Bedework-commit
mailing list