Revision: 4520
Author: seba.wagner
Date: Sun Nov 6 08:56:39 2011
Log: Fix unused imports in iCal Handler
http://code.google.com/p/openmeetings/source/detail?r=4520
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java
/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestSendIcalMessage.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
Sun Nov 6 05:58:38 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
Sun Nov 6 08:56:39 2011
@@ -16,7 +16,6 @@
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
import org.openmeetings.app.data.calendar.management.AppointmentLogic;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
@@ -61,8 +60,6 @@
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
- private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
- @Autowired
private ManageCryptStyle manageCryptStyle;
@Autowired
private Roommanagement roommanagement;
@@ -708,8 +705,7 @@
// OmTimeZone omTimeZone =
// omTimeZoneDaoImpl.getOmTimeZone(jNameTimeZone);
- IcalHandler handler = new IcalHandler(omTimeZoneDaoImpl,
- IcalHandler.ICAL_METHOD_CANCEL);
+ IcalHandler handler = new
IcalHandler(IcalHandler.ICAL_METHOD_CANCEL);
// refresh appointment
point =
appointmentLogic.getAppointMentById(point.getAppointmentId());
@@ -761,8 +757,7 @@
// Defining Organizer
Users user = userManagement.getUserById(organizer_userId);
- IcalHandler handler = new IcalHandler(omTimeZoneDaoImpl,
- IcalHandler.ICAL_METHOD_REQUEST);
+ IcalHandler handler = new
IcalHandler(IcalHandler.ICAL_METHOD_REQUEST);
// refresh appointment
point =
appointmentLogic.getAppointMentById(point.getAppointmentId());
@@ -823,7 +818,7 @@
username, message, invitation_link,
language_id, starttime,
endtime);
- IcalHandler handler = new IcalHandler(omTimeZoneDaoImpl,
+ IcalHandler handler = new IcalHandler(
IcalHandler.ICAL_METHOD_REQUEST);
Appointment point = appointmentLogic
@@ -1032,25 +1027,29 @@
Calendar now = Calendar.getInstance();
- if (invitation.getValidFrom().getTime()
<= now.getTime().getTime()
- &&
invitation.getValidTo().getTime() >= now.getTime().getTime()) {
+ if (invitation.getValidFrom().getTime()
<= now.getTime()
+ .getTime()
+ &&
invitation.getValidTo().getTime() >= now
+
.getTime().getTime()) {
this.updateInvitation(invitation);
//
invitation.setInvitationpass(null);
invitation.setAllowEntry(true);
return invitation;
} else {
-
+
// Invitation is of type
*period* and is not valid
- // anymore, this is an extra
hook to display the time correctly
- // in the method where it shows that the hash code does not work
anymore
+ // anymore, this is an extra
hook to display the time
+ // correctly
+ // in the method where it shows
that the hash code does
+ // not work anymore
invitation.setAllowEntry(false);
-
+
return invitation;
}
} else {
// Invitation is not limited, neither
time nor single-usage
this.updateInvitation(invitation);
-
+
invitation.setAllowEntry(true);
// invitation.setInvitationpass(null);
return invitation;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java
Sun Nov 6 08:56:39 2011
@@ -26,18 +26,16 @@
import net.fortuna.ical4j.model.property.Version;
import net.fortuna.ical4j.util.UidGenerator;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
/**
*
- * @author o.becherer
+ * @author o.becherer, seba.wagner
*
*/
public class IcalHandler {
- private final OmTimeZoneDaoImpl omTimeZoneDaoImpl;
private static final Logger log = Red5LoggerFactory.getLogger(
MailHandler.class,
ScopeApplicationAdapter.webAppRootKey);
@@ -61,9 +59,8 @@
* (@see IcalHandler Constants)
* @throws Exception
*/
- public IcalHandler(OmTimeZoneDaoImpl omTimeZoneDaoImpl, String
methodType) {
+ public IcalHandler(String methodType) {
log.debug("Icalhandler method type : " + methodType);
- this.omTimeZoneDaoImpl = omTimeZoneDaoImpl;
icsCalendar = new net.fortuna.ical4j.model.Calendar();
=======================================
---
/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestSendIcalMessage.java
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestSendIcalMessage.java
Sun Nov 6 08:56:39 2011
@@ -44,7 +44,6 @@
import org.junit.Test;
import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.test.AbstractOpenmeetingsSpringTest;
@@ -64,9 +63,6 @@
@Autowired
private Configurationmanagement cfgManagement;
- @Autowired
- private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
-
private byte[] iCalMimeBody;
String subject = "test iCal";
@@ -185,8 +181,6 @@
String username = "shans";
boolean invitor = false;
- String jNametimeZone = "Etc/GMT+1";
-
GregorianCalendar start = new GregorianCalendar();
Calendar start1 = Calendar.getInstance();
start.setTimeInMillis(start1.getTimeInMillis() +
900000);
@@ -195,7 +189,7 @@
Calendar end1 = Calendar.getInstance();
end.setTimeInMillis(end1.getTimeInMillis() + 1800000);
- IcalHandler handler = new IcalHandler(omTimeZoneDaoImpl,
+ IcalHandler handler = new IcalHandler(
IcalHandler.ICAL_METHOD_REQUEST);
// Transforming Meeting Members
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
