You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/05 20:49:59 UTC
svn commit: r1520382 [2/2] - in /openmeetings/trunk/singlewebapp:
WebContent/src/modules/conference/conference/
WebContent/src/modules/conference/flexibleConferenceRoom/
src/main/java/org/apache/openmeetings/axis/services/
src/main/java/org/apache/open...
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java Thu Sep 5 18:49:58 2013
@@ -47,13 +47,13 @@ public class MeetingMember implements Se
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@Element(data = true)
- private Long meetingMemberId;
+ private Long id;
@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "user_id", nullable = true)
@ForeignKey(enabled = true)
@Element(name = "userid", data = true, required = false)
- private User userid;
+ private User user;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "appointment_id", nullable = true)
@@ -66,10 +66,10 @@ public class MeetingMember implements Se
private String appointmentStatus; // status of the appointment denial, acceptance, wait.
@Column(name = "starttime")
- private Date starttime;
+ private Date inserted;
@Column(name = "updatetime")
- private Date updatetime;
+ private Date updated;
@Column(name = "deleted")
@Element(data = true)
@@ -88,22 +88,22 @@ public class MeetingMember implements Se
private String timeZoneId;
@Column(name = "is_connected_event")
- private boolean isConnectedEvent;
+ private boolean connectedEvent;
- public Long getMeetingMemberId() {
- return meetingMemberId;
+ public Long getId() {
+ return id;
}
- public void setMeetingMemberId(Long groupMemberId) {
- this.meetingMemberId = groupMemberId;
+ public void setId(Long id) {
+ this.id = id;
}
- public User getUserid() {
- return userid;
+ public User getUser() {
+ return user;
}
- public void setUserid(User userid) {
- this.userid = userid;
+ public void setUser(User user) {
+ this.user = user;
}
public String getAppointmentStatus() {
@@ -131,22 +131,22 @@ public class MeetingMember implements Se
}
public Date getStarttime() {
- return starttime;
+ return inserted;
}
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
+ public void setInserted(Date inserted) {
+ this.inserted = inserted;
}
- public Date getUpdatetime() {
- return updatetime;
+ public Date getUpdated() {
+ return updated;
}
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
+ public void setUpdated(Date updated) {
+ this.updated = updated;
}
- public boolean getDeleted() {
+ public boolean isDeleted() {
return deleted;
}
@@ -154,12 +154,12 @@ public class MeetingMember implements Se
this.deleted = deleted;
}
- public boolean getIsConnectedEvent() {
- return isConnectedEvent;
+ public boolean isConnectedEvent() {
+ return connectedEvent;
}
- public void setIsConnectedEvent(boolean isConnectedEvent) {
- this.isConnectedEvent = isConnectedEvent;
+ public void setConnectedEvent(boolean connectedEvent) {
+ this.connectedEvent = connectedEvent;
}
public String getTimeZoneId() {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceService.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ConferenceService.java Thu Sep 5 18:49:58 2013
@@ -315,11 +315,11 @@ public class ConferenceService {
returnMap.put(
"start",
CalendarPatterns.getDateWithTimeByMiliSeconds(
- appointment.getAppointmentStarttime(), timezone));
+ appointment.getStart(), timezone));
returnMap.put(
"end",
CalendarPatterns.getDateWithTimeByMiliSeconds(
- appointment.getAppointmentEndtime(), timezone));
+ appointment.end(), timezone));
returnMap.put("timeZone", timezone.getDisplayName());
return returnMap;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Thu Sep 5 18:49:58 2013
@@ -1533,7 +1533,7 @@ public class ScopeApplicationAdapter ext
List<MeetingMember> members = meetingMemberDao
.getMeetingMemberByAppointmentId(ment
- .getAppointmentId());
+ .getId());
Long userIdInRoomClient = currentClient.getUser_id();
@@ -1546,15 +1546,15 @@ public class ScopeApplicationAdapter ext
// only persistent users can schedule a meeting
// user-id is only set for registered users
- if (member.getUserid() != null) {
- log.debug("checking user " + member.getUserid().getFirstname()
+ if (member.getUser() != null) {
+ log.debug("checking user " + member.getUser().getFirstname()
+ " for moderator role - ID : "
- + member.getUserid().getUser_id());
+ + member.getUser().getUser_id());
- if (member.getUserid().getUser_id().equals(userIdInRoomClient)) {
+ if (member.getUser().getUser_id().equals(userIdInRoomClient)) {
found = true;
- if (ment.getUserId().getUser_id() == member.getUserid().getUser_id()) {
+ if (ment.getOwner().getUser_id() == member.getUser().getUser_id()) {
log.debug("User "
+ userIdInRoomClient
+ " is moderator due to flag in MeetingMember record");
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java Thu Sep 5 18:49:58 2013
@@ -204,7 +204,7 @@ public class BackupExport {
registry.bind(AppointmentReminderTyps.class, AppointmentReminderTypeConverter.class);
registry.bind(Room.class, RoomConverter.class);
if (list != null && list.size() > 0) {
- registry.bind(list.get(0).getAppointmentStarttime().getClass(), DateConverter.class);
+ registry.bind(list.get(0).getStart().getClass(), DateConverter.class);
}
writeList(serializer, backup_dir, "appointements.xml", "appointments", list);
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java Thu Sep 5 18:49:58 2013
@@ -393,12 +393,12 @@ public class BackupImport {
List<Appointment> list = readList(serializer, f, "appointements.xml", "appointments", Appointment.class);
for (Appointment a : list) {
- Long appId = a.getAppointmentId();
+ Long appId = a.getId();
// We need to reset this as openJPA reject to store them otherwise
- a.setAppointmentId(null);
- if (a.getUserId() != null && a.getUserId().getUser_id() == null) {
- a.setUserId(null);
+ a.setId(null);
+ if (a.getOwner() != null && a.getOwner().getUser_id() == null) {
+ a.setOwner(null);
}
Long newAppId = appointmentDao.addAppointmentObj(a);
appointmentsMap.put(appId, newAppId);
@@ -414,7 +414,7 @@ public class BackupImport {
{
List<MeetingMember> list = readMeetingMemberList(f, "meetingmembers.xml", "meetingmembers");
for (MeetingMember ma : list) {
- meetingMemberDao.addMeetingMemberByObject(ma);
+ meetingMemberDao.update(ma);
}
}
@@ -699,32 +699,32 @@ public class BackupImport {
MeetingMember mm = ser.read(MeetingMember.class, item, false);
boolean needToSkip1 = true;
- if (mm.getUserid() == null) {
- mm.setUserid(new User());
+ if (mm.getUser() == null) {
+ mm.setUser(new User());
}
- if (mm.getUserid().getUser_id() == null) {
+ if (mm.getUser().getUser_id() == null) {
//HACK to handle external attendee's firstname, lastname, email
boolean contactValid = false;
do {
if ("firstname".equals(item1.getName())) {
- mm.getUserid().setFirstname(item1.getValue());
+ mm.getUser().setFirstname(item1.getValue());
}
if ("lastname".equals(item1.getName())) {
- mm.getUserid().setLastname(item1.getValue());
+ mm.getUser().setLastname(item1.getValue());
}
if ("email".equals(item1.getName())) {
- if (mm.getUserid().getAdresses() == null) {
- mm.getUserid().setAdresses(new Address());
+ if (mm.getUser().getAdresses() == null) {
+ mm.getUser().setAdresses(new Address());
}
String email = item1.getValue();
User u = usersDao.getUserByEmail(email);
if (u != null) {
- mm.setUserid(u);
- } else if (mm.getAppointment() != null && mm.getAppointment().getUserId() != null) {
- mm.getUserid().setType(Type.contact);
- mm.getUserid().getAdresses().setEmail(email);
- mm.getUserid().setLogin(mm.getAppointment().getUserId().getUser_id() + "_" + email);
- mm.getUserid().setOwner_id(mm.getAppointment().getUserId().getUser_id());
+ mm.setUser(u);
+ } else if (mm.getAppointment() != null && mm.getAppointment().getOwner() != null) {
+ mm.getUser().setType(Type.contact);
+ mm.getUser().getAdresses().setEmail(email);
+ mm.getUser().setLogin(mm.getAppointment().getOwner().getUser_id() + "_" + email);
+ mm.getUser().setOwner_id(mm.getAppointment().getOwner().getUser_id());
}
contactValid = true;
}
@@ -741,8 +741,8 @@ public class BackupImport {
} while (item1 != null && !"meetingmember".equals(item1.getName()));
}
item = listNode.getNext();
- if (mm != null && !mm.getDeleted() && mm.getUserid() != null && mm.getAppointment() != null && mm.getAppointment().getAppointmentId() != null) {
- mm.setMeetingMemberId(null);
+ if (mm != null && !mm.isDeleted() && mm.getUser() != null && mm.getAppointment() != null && mm.getAppointment().getId() != null) {
+ mm.setId(null);
list.add(mm);
}
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Thu Sep 5 18:49:58 2013
@@ -25,15 +25,15 @@
<table>
<tr>
<td><wicket:ommessage key="572" /></td>
- <td><input type="text" wicket:id="appointmentName" /></td>
+ <td><input type="text" wicket:id="title" /></td>
</tr>
<tr>
<td><wicket:ommessage key="570" /></td>
- <td><span wicket:id="appointmentStarttime"></span></td>
+ <td><span wicket:id="start"></span></td>
</tr>
<tr>
<td><wicket:ommessage key="571" /></td>
- <td><span wicket:id="appointmentEndtime"></span></td>
+ <td><span wicket:id="end"></span></td>
</tr>
<tr>
<td><wicket:ommessage key="565" /></td>
@@ -51,7 +51,7 @@
<td><select wicket:id="room" ></select></td>
</tr>
<tr>
- <td colspan="2"><input type="checkbox" wicket:id="isPasswordProtected" /><wicket:ommessage key="524" /></td>
+ <td colspan="2"><input type="checkbox" wicket:id="passwordProtected" /><wicket:ommessage key="524" /></td>
</tr>
<tr>
<td><wicket:ommessage key="525" /></td>
@@ -67,7 +67,7 @@
<div class="attendeeContainer">
<table>
<tbody wicket:id="attendeeContainer">
- <tr wicket:id="meetingMember">
+ <tr wicket:id="meetingMembers">
<td><div><span wicket:id="attendeeName"></span></div></td>
<td><div><span wicket:id="attendeeEmail"></span></div></td>
<td><div class="formCancelButton" wicket:id="attendeeDelete" wicket:ommessage="title:814"><input/></div></td>
@@ -81,13 +81,13 @@
</tr>
<tr>
<td><wicket:ommessage key="569" /></td>
- <td><input type="text" wicket:id="appointmentLocation" /></td>
+ <td><input type="text" wicket:id="location" /></td>
</tr>
<tr>
<td><wicket:ommessage key="573" /></td>
<td>
<div wicket:id="toolbarContainer"></div>
- <div wicket:id="appointmentDescription"></div>
+ <div wicket:id="description"></div>
</td>
</tr>
</table>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Thu Sep 5 18:49:58 2013
@@ -96,9 +96,9 @@ public class AppointmentDialog extends A
//@Override
public void setModelObjectWithAjaxTarget(Appointment object, AjaxRequestTarget target) {
form.setModelObject(object);
- form.setEnabled(object.getUserId() == null || getUserId() == object.getUserId().getUser_id());
+ form.setEnabled(object.getOwner() == null || getUserId() == object.getOwner().getUser_id());
log.debug(" -- setModelObjectWithAjaxTarget -- Current model " + object);
- if (object.getAppointmentId() != null) {
+ if (object.getId() != null) {
delete.setVisible(true, target);
enterRoom.setVisible(object.getRoom() != null, target);
} else {
@@ -131,7 +131,7 @@ public class AppointmentDialog extends A
}
protected void deleteAppointment(AjaxRequestTarget target) {
- getBean(AppointmentLogic.class).deleteAppointment(getModelObject().getAppointmentId(), getUserId(), getLanguage());
+ getBean(AppointmentLogic.class).deleteAppointment(getModelObject().getId(), getUserId(), getLanguage());
calendar.refresh(target);
}
@@ -199,15 +199,15 @@ public class AppointmentDialog extends A
if (a.getRoom().getRoomtype() == null && !roomTypes.isEmpty()) {
a.getRoom().setRoomtype(roomTypes.get(0));
}
- if (a.getAppointmentId() == null) {
+ if (a.getId() == null) {
java.util.Calendar start = WebSession.getCalendar();
- start.setTime(a.getAppointmentStarttime());
+ start.setTime(a.getStart());
java.util.Calendar end = WebSession.getCalendar();
- end.setTime(a.getAppointmentEndtime());
+ end.setTime(a.end());
if (start.equals(end)) {
end.add(java.util.Calendar.HOUR_OF_DAY, 1);
- a.setAppointmentEndtime(end.getTime());
+ a.setEnd(end.getTime());
}
}
}
@@ -218,15 +218,15 @@ public class AppointmentDialog extends A
add(new AttributeAppender("class", new Model<String>("appointmentPopUp"), " "));
add(feedback.setOutputMarkupId(true));
- add(new RequiredTextField<String>("appointmentName").setLabel(Model.of(WebSession.getString(572))));
+ add(new RequiredTextField<String>("title").setLabel(Model.of(WebSession.getString(572))));
DefaultWysiwygToolbar toolbar = new DefaultWysiwygToolbar("toolbarContainer");
add(toolbar);
- add(new WysiwygEditor("appointmentDescription", toolbar));
- add(new TextField<String>("appointmentLocation"));
- add(new DateTimeField("appointmentStarttime"));
- add(new DateTimeField("appointmentEndtime"));
+ add(new WysiwygEditor("description", toolbar));
+ add(new TextField<String>("location"));
+ add(new DateTimeField("start"));
+ add(new DateTimeField("end"));
final PasswordTextField pwd = new PasswordTextField("password");
- pwd.setEnabled(isPwdProtected());
+ pwd.setEnabled(getModelObject().isPasswordProtected());
pwd.setOutputMarkupId(true);
add(pwd);
@@ -257,13 +257,13 @@ public class AppointmentDialog extends A
target.add(roomType.setEnabled(createRoom), room.setEnabled(!createRoom));
}
});
- add(new AjaxCheckBox("isPasswordProtected") {
+ add(new AjaxCheckBox("passwordProtected") {
private static final long serialVersionUID = 6041200584296439976L;
@Override
protected void onUpdate(AjaxRequestTarget target) {
- AppointmentForm.this.getModelObject().setIsPasswordProtected(getConvertedInput());
- pwd.setEnabled(isPwdProtected());
+ AppointmentForm.this.getModelObject().setPasswordProtected(getConvertedInput());
+ pwd.setEnabled(AppointmentForm.this.getModelObject().isPasswordProtected());
target.add(pwd);
}
});
@@ -279,22 +279,22 @@ public class AppointmentDialog extends A
add(addMeetingMember);
final WebMarkupContainer attendeeContainer = new WebMarkupContainer("attendeeContainer");
- attendeeContainer.add(new ListView<MeetingMember>("meetingMember"){
+ attendeeContainer.add(new ListView<MeetingMember>("meetingMembers"){
private static final long serialVersionUID = -2609044181991754097L;
@Override
protected void populateItem(final ListItem<MeetingMember> item) {
MeetingMember mm = item.getModelObject();
- item.add(new Label("attendeeName", mm.getUserid().getFirstname() + " " + mm.getUserid().getLastname()));
- item.add(new Label("attendeeEmail", mm.getUserid().getAdresses().getEmail()));
+ item.add(new Label("attendeeName", mm.getUser().getFirstname() + " " + mm.getUser().getLastname()));
+ item.add(new Label("attendeeEmail", mm.getUser().getAdresses().getEmail()));
item.add(new WebMarkupContainer("attendeeDelete").add(new AjaxEventBehavior("onclick"){
private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
MeetingMember mm = item.getModelObject();
- AppointmentForm.this.getModelObject().getMeetingMember().remove(mm);
+ AppointmentForm.this.getModelObject().getMeetingMembers().remove(mm);
target.add(attendeeContainer);
}
}));
@@ -304,10 +304,6 @@ public class AppointmentDialog extends A
}
- private boolean isPwdProtected() {
- return Boolean.TRUE.equals(getModelObject().getIsPasswordProtected());
- }
-
private List<AppointmentReminderTyps> getRemindTypes() {
return getBean(AppointmentReminderTypDao.class).getAppointmentReminderTypList(getLanguage());
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java Thu Sep 5 18:49:58 2013
@@ -41,7 +41,7 @@ public class AppointmentModel extends Ca
protected List<? extends CalendarEvent> load() {
List<CalendarEvent> list = new ArrayList<CalendarEvent>();
for (Appointment a : Application.getBean(AppointmentDao.class).getAppointmentsByRange(WebSession.getUserId(), this.getStart(), this.getEnd())) {
- CalendarEvent c = new CalendarEvent(a.getAppointmentId().intValue(), a.getAppointmentName(), a.getAppointmentStarttime(), a.getAppointmentEndtime());
+ CalendarEvent c = new CalendarEvent(a.getId().intValue(), a.getTitle(), a.getStart(), a.end());
c.setAllDay(false);
//FIXME desc c.set
list.add(c);
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Thu Sep 5 18:49:58 2013
@@ -173,11 +173,11 @@ public class CalendarPanel extends UserP
cal.set(java.util.Calendar.DATE, now.get(java.util.Calendar.DATE));
cal.set(java.util.Calendar.SECOND, 0);
cal.set(java.util.Calendar.MILLISECOND, 0);
- a.setAppointmentStarttime(cal.getTime());
- a.setAppointmentEndtime(cal.getTime());
+ a.setStart(cal.getTime());
+ a.setEnd(cal.getTime());
} else {
- a.setAppointmentStarttime(start);
- a.setAppointmentEndtime(end);
+ a.setStart(start);
+ a.setEnd(end);
}
dialog.setModelObjectWithAjaxTarget(a, target);
@@ -186,7 +186,7 @@ public class CalendarPanel extends UserP
@Override
public void onEventClick(AjaxRequestTarget target, CalendarView view, int eventId) {
- Appointment a = getDao().getAppointmentById((long)eventId);
+ Appointment a = getDao().get((long)eventId);
dialog.setModelObjectWithAjaxTarget(a, target);
dialog.open(target);
@@ -195,16 +195,16 @@ public class CalendarPanel extends UserP
@Override
public void onEventDrop(AjaxRequestTarget target, int eventId, long delta, boolean allDay) {
AppointmentDao dao = getDao();
- Appointment a = dao.getAppointmentById((long)eventId);
+ Appointment a = dao.get((long)eventId);
java.util.Calendar cal = WebSession.getCalendar();
- cal.setTime(a.getAppointmentStarttime());
+ cal.setTime(a.getStart());
cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME?
- a.setAppointmentStarttime(cal.getTime());
+ a.setStart(cal.getTime());
- cal.setTime(a.getAppointmentEndtime());
+ cal.setTime(a.end());
cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME?
- a.setAppointmentEndtime(cal.getTime());
+ a.setEnd(cal.getTime());
dao.updateAppointment(a);
//FIXME add feedback info
@@ -213,11 +213,11 @@ public class CalendarPanel extends UserP
@Override
public void onEventResize(AjaxRequestTarget target, int eventId, long delta) {
AppointmentDao dao = getDao();
- Appointment a = dao.getAppointmentById((long)eventId);
+ Appointment a = dao.get((long)eventId);
java.util.Calendar cal = WebSession.getCalendar();
- cal.setTime(a.getAppointmentEndtime());
+ cal.setTime(a.end());
cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME?
- a.setAppointmentEndtime(cal.getTime());
+ a.setEnd(cal.getTime());
dao.updateAppointment(a);
//FIXME add feedback info
@@ -239,7 +239,7 @@ public class CalendarPanel extends UserP
Appointment a = new Appointment();
a.setRemind(getAppointmentReminderTypDao()
.getAppointmentReminderTypById(3L)); //TODO: Make configurable
- a.setAppointmentName(WebSession.getString(1444));
+ a.setTitle(WebSession.getString(1444));
log.debug(" -- getDefault -- Current model " + a);
return a;
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java Thu Sep 5 18:49:58 2013
@@ -195,11 +195,11 @@ public class MeetingMemberDialog extends
@Override
protected void onSubmit(AjaxRequestTarget target) {
Appointment app = getModelObject();
- final List<MeetingMember> meetingMembers = app.getMeetingMember() == null ? new ArrayList<MeetingMember>() : app.getMeetingMember();
+ final List<MeetingMember> meetingMembers = app.getMeetingMembers() == null ? new ArrayList<MeetingMember>() : app.getMeetingMembers();
for (User u : attendeesInList) {
boolean found = false;
for (MeetingMember m : meetingMembers) {
- if (u.getAdresses().getEmail().equals(m.getUserid().getAdresses().getEmail())) {
+ if (u.getAdresses().getEmail().equals(m.getUser().getAdresses().getEmail())) {
found = true;
break;
}
@@ -210,15 +210,15 @@ public class MeetingMemberDialog extends
u.setOwner_id(getUserId());
u.setLanguage_id(getLanguage());
}
- mm.setUserid(u);
+ mm.setUser(u);
mm.setDeleted(false);
- mm.setStarttime(app.getStarttime());
- mm.setUpdatetime(app.getUpdatetime());
+ mm.setInserted(app.getInserted());
+ mm.setUpdated(app.getUpdated());
mm.setAppointment(app);
meetingMembers.add(mm);
}
}
- app.setMeetingMember(meetingMembers);
+ app.setMeetingMembers(meetingMembers);
target.add(attendeeContainer);
}
}
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java Thu Sep 5 18:49:58 2013
@@ -89,26 +89,26 @@ public abstract class AbstractOpenmeetin
// add new appointment
Appointment ap = new Appointment();
- ap.setAppointmentName("appointmentName");
- ap.setAppointmentLocation("appointmentLocation");
+ ap.setTitle("appointmentName");
+ ap.setLocation("appointmentLocation");
Date appointmentstart = new Date();
Date appointmentend = new Date();
appointmentend.setTime(appointmentstart.getTime() + 3600);
- ap.setAppointmentStarttime(appointmentstart);
- ap.setAppointmentEndtime(appointmentend);
- ap.setAppointmentDescription("appointmentDescription");
- ap.setStarttime(new Date());
+ ap.setStart(appointmentstart);
+ ap.setEnd(appointmentend);
+ ap.setDescription("appointmentDescription");
+ ap.setInserted(new Date());
ap.setDeleted(false);
ap.setIsDaily(false);
ap.setIsWeekly(false);
ap.setIsMonthly(false);
ap.setIsYearly(false);
- ap.setIsPasswordProtected(false);
+ ap.setPasswordProtected(false);
- ap.setUserId(usersDao.get(1L));
- ap.setIsConnectedEvent(false);
+ ap.setOwner(usersDao.get(1L));
+ ap.setConnectedEvent(false);
Long id = appointmentDao.addAppointmentObj(ap);
assertNotNull("Cann't add appointment", id);
return ap;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java?rev=1520382&r1=1520381&r2=1520382&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java Thu Sep 5 18:49:58 2013
@@ -66,8 +66,8 @@ public class TestDatabaseStructureAppoin
for (Appointment appoints : listAppoints) {
- log.debug("Termin: "+appoints.getAppointmentName()+" startDate: "+appoints.getAppointmentStarttime()+ " endDate: "+appoints.getAppointmentEndtime());
- log.debug("MeetingMembers: "+appoints.getMeetingMember().size());
+ log.debug("Termin: "+appoints.getTitle()+" startDate: "+appoints.getStart()+ " endDate: "+appoints.end());
+ log.debug("MeetingMembers: "+appoints.getMeetingMembers().size());
}
for (Iterator<Appointment> iter = listAppoints.iterator();iter.hasNext();) {