Menu
▾
▴
[Webical-commits] SF.net SVN: webical: [651] trunk/webical-core/src/main/java/org/webical
|
From: <mat...@us...> - 2008-01-11 13:47:15
|
Revision: 651
http://webical.svn.sourceforge.net/webical/?rev=651&view=rev
Author: mattijshoitink
Date: 2008-01-11 05:47:07 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
- Made Recurrence serializable
- Organised imports
- Removed as many other warnings as I could
Modified Paths:
--------------
trunk/webical-core/src/main/java/org/webical/ical/Recurrence.java
trunk/webical-core/src/main/java/org/webical/web/component/HeaderPanel.java
trunk/webical-core/src/main/java/org/webical/web/component/calendar/CalendarPanel.java
trunk/webical-core/src/main/java/org/webical/web/component/calendar/DatePickerRowRepeater.java
trunk/webical-core/src/main/java/org/webical/web/component/calendar/DateSwitcherPanel.java
trunk/webical-core/src/main/java/org/webical/web/component/calendar/MonthViewPanel.java
trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekColumnRepeater.java
trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekViewPanel.java
trunk/webical-core/src/main/java/org/webical/web/component/calendar/model/DatePickerModel.java
trunk/webical-core/src/main/java/org/webical/web/component/event/EventDetailsPanel.java
trunk/webical-core/src/main/java/org/webical/web/component/event/EventForm.java
trunk/webical-core/src/main/java/org/webical/web/component/event/UpdateAndDeleteExceptionPanel.java
Modified: trunk/webical-core/src/main/java/org/webical/ical/Recurrence.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/ical/Recurrence.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/ical/Recurrence.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -20,6 +20,7 @@
package org.webical.ical;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -27,7 +28,9 @@
* @author ivo
*
*/
-public class Recurrence {
+public class Recurrence implements Serializable {
+ private static final long serialVersionUID = 7486441319376790428L;
+
public static final int DAILY = 1;
public static final int WEEKLY = 2;
public static final int MONTHLY = 3;
Modified: trunk/webical-core/src/main/java/org/webical/web/component/HeaderPanel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/HeaderPanel.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/HeaderPanel.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -24,7 +24,6 @@
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.StringResourceModel;
import org.webical.web.action.IAction;
Modified: trunk/webical-core/src/main/java/org/webical/web/component/calendar/CalendarPanel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/calendar/CalendarPanel.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/calendar/CalendarPanel.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -31,7 +31,6 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.CompoundPropertyModel;
@@ -71,6 +70,7 @@
public abstract class CalendarPanel extends AbstractBasePanel {
private static final long serialVersionUID = 1L;
+ @SuppressWarnings("unused")
private static Log log = LogFactory.getLog(CalendarPanel.class);
// Markup ID's
@@ -118,7 +118,6 @@
// Panel components
private Link addEventLink;
- private Label addEventLabel;
private DatePickerPanel datePicker;
private CompoundPropertyModel datePickerModel;
private DateSwitcherPanel dateSwitcher;
@@ -422,7 +421,7 @@
this.currentViewPanel = currentViewPanel;
}
- private boolean isAction(Class comparisonClass, IAction action) {
+ private boolean isAction(Class<?> comparisonClass, IAction action) {
return action.getClass().equals(comparisonClass);
}
@@ -590,6 +589,7 @@
* @param calendar The calendar to show
* @param target The Ajax Target of the panel
*/
+ @SuppressWarnings("unused")
private void enableOnlyThisCalendar(org.webical.Calendar calendar, AjaxRequestTarget target) {
try {
calendar.setVisible(true);
@@ -616,6 +616,7 @@
* Enable all calendars in the view for the current user
* @param target The Ajax Target of the panel
*/
+ @SuppressWarnings("unused")
private void enableAllCalendars(AjaxRequestTarget target) {
try {
List<org.webical.Calendar> calendars = calendarManager.getCalendars(WebicalSession.getWebicalSession().getUser());
Modified: trunk/webical-core/src/main/java/org/webical/web/component/calendar/DatePickerRowRepeater.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/calendar/DatePickerRowRepeater.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/calendar/DatePickerRowRepeater.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -20,12 +20,10 @@
package org.webical.web.component.calendar;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.webical.util.CalendarUtils;
import org.webical.web.action.IAction;
@@ -45,7 +43,6 @@
protected static Class[] PANELACTIONS = new Class[] { };
private DatePickerModel datePickerModel;
- private GregorianCalendar currentDate;
// The date range
private Date startDate;
Modified: trunk/webical-core/src/main/java/org/webical/web/component/calendar/DateSwitcherPanel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/calendar/DateSwitcherPanel.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/calendar/DateSwitcherPanel.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -71,7 +71,6 @@
* @see org.webical.web.component.IAccessibilitySwitchingComponent#setupAccessibleComponents()
*/
public void setupAccessibleComponents() {
- final CalendarViewPanel cvp = ((DateSwitcherModel)getModel()).getCurrentViewPanel();
todayLink = new Link(TODAY_LINK_MARKUP_ID) {
private static final long serialVersionUID = 1L;
Modified: trunk/webical-core/src/main/java/org/webical/web/component/calendar/MonthViewPanel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/calendar/MonthViewPanel.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/calendar/MonthViewPanel.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -27,7 +27,6 @@
import java.util.GregorianCalendar;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.Model;
Modified: trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekColumnRepeater.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekColumnRepeater.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekColumnRepeater.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -61,12 +61,10 @@
int numberOfDays = CalendarUtils.getDifferenceInDays(eventsModel.getStartDate(), eventsModel.getEndDate());
Date startDate = eventsModel.getStartDate();
- Date endDate = eventsModel.getEndDate();
GregorianCalendar todayCal = new GregorianCalendar();
Date todayStartDate = CalendarUtils.getStartOfDay(todayCal.getTime());
GregorianCalendar startCal = new GregorianCalendar();
- GregorianCalendar endCal = new GregorianCalendar();
startCal.setTime(startDate);
for(int i = 0; i <= numberOfDays; i++) {
Modified: trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekViewPanel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekViewPanel.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/calendar/WeekViewPanel.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -32,7 +32,6 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.Model;
-import org.apache.wicket.model.ResourceModel;
import org.webical.util.CalendarUtils;
import org.webical.web.action.IAction;
import org.webical.web.app.WebicalSession;
Modified: trunk/webical-core/src/main/java/org/webical/web/component/calendar/model/DatePickerModel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/calendar/model/DatePickerModel.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/calendar/model/DatePickerModel.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -21,7 +21,6 @@
package org.webical.web.component.calendar.model;
import java.io.Serializable;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -44,6 +43,7 @@
*/
private GregorianCalendar currentDate;
+ @SuppressWarnings("unused")
private GregorianCalendar currentMonth;
private Date rangeStartDate, rangeEndDate;
Modified: trunk/webical-core/src/main/java/org/webical/web/component/event/EventDetailsPanel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/event/EventDetailsPanel.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/event/EventDetailsPanel.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -212,6 +212,7 @@
/**
* Shows confirmation screen for removing recurring events
*/
+ @SuppressWarnings("unused")
private void showRecurringConfirmation() {
EventDetailsPanel.this.replaceWith(new ConfirmRecurringActionPanel(EventDetailsPanel.this.getId(), "Which instance(s) of " + event.getSummary() + " do you want to delete?") {
private static final long serialVersionUID = 1L;
Modified: trunk/webical-core/src/main/java/org/webical/web/component/event/EventForm.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/event/EventForm.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/event/EventForm.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -26,8 +26,6 @@
import java.util.GregorianCalendar;
import java.util.List;
-import net.fortuna.ical4j.util.Calendars;
-
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -484,6 +482,7 @@
/**
* Show confirmation panel when editing a recurring event
*/
+ @SuppressWarnings("unused")
private void showConfirmation() {
final EventFormPanel parent = (EventFormPanel) EventForm.this.getParent();
parent.replaceWith(new ConfirmRecurringActionPanel(parent.getId(), "Which instances of " + formEvent.getSummary() + " do you want to alter?") {
Modified: trunk/webical-core/src/main/java/org/webical/web/component/event/UpdateAndDeleteExceptionPanel.java
===================================================================
--- trunk/webical-core/src/main/java/org/webical/web/component/event/UpdateAndDeleteExceptionPanel.java 2008-01-11 13:36:41 UTC (rev 650)
+++ trunk/webical-core/src/main/java/org/webical/web/component/event/UpdateAndDeleteExceptionPanel.java 2008-01-11 13:47:07 UTC (rev 651)
@@ -45,8 +45,6 @@
private static final String CANCEL_CHANGES_LINK_MARKUP_ID = "overwritecancelchanges";
private Event event;
- // TODO mattijs: check what this variable is used for
- private Calendar calendar;
private boolean isUpdateException;
@SpringBean(name="eventManager")
@@ -62,7 +60,6 @@
public UpdateAndDeleteExceptionPanel(String markupId ,Event event, Calendar calendar, boolean isUpdateException) {
super(markupId, UpdateAndDeleteExceptionPanel.class);
this.event = event;
- this.calendar = calendar;
this.isUpdateException = isUpdateException;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
