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 2014/06/23 10:47:11 UTC
svn commit: r1604715 [6/7] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/
openmeetings-core/src/main/java/org/ap...
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Mon Jun 23 08:47:06 2014
@@ -18,13 +18,13 @@
*/
package org.apache.openmeetings.web.room;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.addUserToRoom;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getRoomUsers;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
import java.util.ArrayList;
import java.util.List;
@@ -54,6 +54,7 @@ import org.apache.wicket.markup.head.IHe
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.protocol.ws.IWebSocketSettings;
import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
import org.apache.wicket.protocol.ws.api.registry.PageIdKey;
@@ -63,6 +64,7 @@ import org.apache.wicket.request.resourc
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.wicketstuff.whiteboard.WhiteboardBehavior;
@AuthorizeInstantiation("Room")
public class RoomPanel extends BasePanel {
@@ -80,7 +82,7 @@ public class RoomPanel extends BasePanel
//TODO SID etc
Room r = getBean(RoomDao.class).get(roomId);
target.appendJavaScript(String.format("initVideo('%s', %s, %s, %s, %s);", "sid"
- , r.getRooms_id()
+ , r.getId()
, r.getIsAudioOnly()
, 4L == r.getRoomtype().getRoomtypes_id()
, getStringLabels(448, 449, 450, 451, 758, 447, 52, 53, 1429, 1430, 775, 452, 767, 764, 765, 918, 54, 761, 762).toString()
@@ -94,6 +96,9 @@ public class RoomPanel extends BasePanel
this.roomId = _roomId;
Room r = getBean(RoomDao.class).get(roomId);
add(new MenuPanel("roomMenu", getMenu()).setVisible(!r.getHideTopBar()));
+ WebMarkupContainer wb = new WebMarkupContainer("whiteboard");
+ add(wb.setOutputMarkupId(true));
+ add(new WhiteboardBehavior("1", wb.getMarkupId(), null, null, null));
add(aab, AttributeAppender.append("style", "height: 100%;"));
}
@@ -120,7 +125,7 @@ public class RoomPanel extends BasePanel
User u = getBean(UserDao.class).get(c.getUserId());
return new JSONObject()
.put("uid", c.getUid())
- .put("id", u.getUser_id())
+ .put("id", u.getId())
.put("firstname", u.getFirstname())
.put("lastname", u.getLastname())
.put("email", u.getAdresses() == null ? null : u.getAdresses().getEmail())
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js Mon Jun 23 08:47:06 2014
@@ -117,9 +117,10 @@ function initVideo(sid, roomid, audioOnl
}
function setHeight() {
- var h = $(document).height() - $('#roomMenu').height();
+ var h = $(window).height() - $('#roomMenu').height();
$(".room.sidebar.left").height(h);
$(".room.wb.area").height(h);
+ $(".room.wb.area .wb").height(h);
}
$(document).ready(function() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java Mon Jun 23 08:47:06 2014
@@ -35,7 +35,7 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class AboutDialog extends AbstractDialog<String> {
- private static final long serialVersionUID = 1400355222295594321L;
+ private static final long serialVersionUID = 1L;
public AboutDialog(String id) {
super(id, WebSession.getString(1549));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Mon Jun 23 08:47:06 2014
@@ -58,7 +58,7 @@ import com.googlecode.wicket.jquery.ui.p
@AuthorizeInstantiation({"Dashboard", "Room"})
public class ChatPanel extends BasePanel {
private static final Logger log = Red5LoggerFactory.getLogger(ChatPanel.class, webAppRootKey);
- private static final long serialVersionUID = -9144707674886211557L;
+ private static final long serialVersionUID = 1L;
private static final String MESSAGE_AREA_ID = "messageArea";
private JSONObject getMessage(ChatMessage m) throws JSONException {
@@ -80,7 +80,7 @@ public class ChatPanel extends BasePanel
setMarkupId(id);
add(new Behavior() {
- private static final long serialVersionUID = -2205036360048419129L;
+ private static final long serialVersionUID = 1L;
@Override
public void renderHead(Component component, IHeaderResponse response) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Mon Jun 23 08:47:06 2014
@@ -101,7 +101,7 @@ public class AppointmentDialog extends A
//@Override
public void setModelObjectWithAjaxTarget(Appointment object, AjaxRequestTarget target) {
form.setModelObject(object);
- form.setEnabled(object.getOwner() == null || getUserId() == object.getOwner().getUser_id());
+ form.setEnabled(object.getOwner() == null || getUserId() == object.getOwner().getId());
log.debug(" -- setModelObjectWithAjaxTarget -- Current model " + object);
if (object.getId() != null) {
delete.setVisible(isOwner(object), target);
@@ -164,7 +164,7 @@ public class AppointmentDialog extends A
if (delete.equals(button)) {
confirmDelete.open(target);
} else if (enterRoom.equals(button)) {
- RoomEnterBehavior.roomEnter((MainPage)getPage(), target, getModelObject().getRoom().getRooms_id());
+ RoomEnterBehavior.roomEnter((MainPage)getPage(), target, getModelObject().getRoom().getId());
}
}
@@ -179,25 +179,25 @@ public class AppointmentDialog extends A
final List<MeetingMember> attendees = a.getMeetingMembers() == null ? new ArrayList<MeetingMember>() : a.getMeetingMembers();
Set<Long> currentIds = new HashSet<Long>();
for (User u : attendeesModel.getObject()) {
- if (u.getUser_id() != null) {
- currentIds.add(u.getUser_id());
+ if (u.getId() != null) {
+ currentIds.add(u.getId());
}
}
//remove users
for (Iterator<MeetingMember> i = attendees.iterator(); i.hasNext();) {
MeetingMember m = i.next();
- if (!currentIds.contains(m.getUser().getUser_id())) {
+ if (!currentIds.contains(m.getUser().getId())) {
i.remove();
}
}
Set<Long> originalIds = new HashSet<Long>();
for (MeetingMember m : attendees) {
- originalIds.add(m.getUser().getUser_id());
+ originalIds.add(m.getUser().getId());
}
//add users
for (User u : attendeesModel.getObject()) {
- if (u.getUser_id() == null || !originalIds.contains(u.getUser_id())) {
+ if (u.getId() == null || !originalIds.contains(u.getId())) {
MeetingMember mm = new MeetingMember();
mm.setUser(u);
mm.setDeleted(false);
@@ -214,7 +214,7 @@ public class AppointmentDialog extends A
}
private boolean isOwner(Appointment object) {
- return object.getOwner() != null && getUserId() == object.getOwner().getUser_id();
+ return object.getOwner() != null && getUserId() == object.getOwner().getId();
}
private class AppointmentForm extends Form<Appointment> {
@@ -303,7 +303,7 @@ public class AppointmentDialog extends A
room.setOutputMarkupId(true);
add(room);
add(new AjaxCheckBox("createRoom", new PropertyModel<Boolean>(this, "createRoom")) {
- private static final long serialVersionUID = -3743113990890386035L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -312,7 +312,7 @@ public class AppointmentDialog extends A
}
});
add(new AjaxCheckBox("passwordProtected") {
- private static final long serialVersionUID = 6041200584296439976L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -337,7 +337,7 @@ public class AppointmentDialog extends A
RoomDao dao = getBean(RoomDao.class);
result.addAll(dao.getPublicRooms());
for (Organisation_Users ou : getBean(UserDao.class).get(getUserId()).getOrganisation_users()) {
- result.addAll(dao.getOrganisationRooms(ou.getOrganisation().getOrganisation_id()));
+ result.addAll(dao.getOrganisationRooms(ou.getOrganisation().getId()));
}
if (getModelObject().getRoom() != null && getModelObject().getRoom().getAppointment()) { //FIXME review
result.add(getModelObject().getRoom());
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java Mon Jun 23 08:47:06 2014
@@ -31,7 +31,7 @@ import com.googlecode.wicket.jquery.ui.c
import com.googlecode.wicket.jquery.ui.calendar.ICalendarVisitor;
public class AppointmentModel extends CalendarModel implements ICalendarVisitor {
- private static final long serialVersionUID = -8707880381422490413L;
+ private static final long serialVersionUID = 1L;
public void visit(CalendarEvent event) {
//every event can be customized
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Mon Jun 23 08:47:06 2014
@@ -147,7 +147,7 @@ public class CalendarPanel extends UserP
options.set("dayNamesShort", shortDays.toString());
calendar = new Calendar("calendar", new AppointmentModel(), options) {
- private static final long serialVersionUID = 8442068089963449950L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onInitialize() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java Mon Jun 23 08:47:06 2014
@@ -26,7 +26,7 @@ import ro.fortsoft.wicket.dashboard.Dash
import ro.fortsoft.wicket.dashboard.web.DashboardPanel;
public class OmDashboardPanel extends UserPanel {
- private static final long serialVersionUID = 7815949875883825949L;
+ private static final long serialVersionUID = 1L;
public OmDashboardPanel(String id) {
super(id);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidget.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidget.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidget.java Mon Jun 23 08:47:06 2014
@@ -27,7 +27,7 @@ import ro.fortsoft.wicket.dashboard.Widg
import ro.fortsoft.wicket.dashboard.web.WidgetView;
public class PrivateRoomsWidget extends AbstractWidget {
- private static final long serialVersionUID = 1769428980617610979L;
+ private static final long serialVersionUID = 1L;
public PrivateRoomsWidget() {
super();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetDescriptor.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetDescriptor.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetDescriptor.java Mon Jun 23 08:47:06 2014
@@ -23,7 +23,7 @@ import org.apache.openmeetings.web.app.W
import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
public class PrivateRoomsWidgetDescriptor implements WidgetDescriptor {
- private static final long serialVersionUID = 389662353299319574L;
+ private static final long serialVersionUID = 1L;
public String getName() {
return WebSession.getString(781L);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetView.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetView.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetView.java Mon Jun 23 08:47:06 2014
@@ -27,7 +27,7 @@ import ro.fortsoft.wicket.dashboard.Widg
import ro.fortsoft.wicket.dashboard.web.WidgetView;
public class PrivateRoomsWidgetView extends WidgetView {
- private static final long serialVersionUID = 6950427893821991173L;
+ private static final long serialVersionUID = 1L;
public PrivateRoomsWidgetView(String id, Model<Widget> model) {
super(id, model);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java Mon Jun 23 08:47:06 2014
@@ -27,7 +27,7 @@ import ro.fortsoft.wicket.dashboard.Widg
import ro.fortsoft.wicket.dashboard.web.WidgetView;
public class RssWidget extends AbstractWidget {
- private static final long serialVersionUID = 8866852061674736808L;
+ private static final long serialVersionUID = 1L;
public RssWidget() {
super();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java Mon Jun 23 08:47:06 2014
@@ -23,7 +23,7 @@ import org.apache.openmeetings.web.app.W
import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
public class RssWidgetDescriptor implements WidgetDescriptor {
- private static final long serialVersionUID = -9113376703084624276L;
+ private static final long serialVersionUID = 1L;
public String getName() {
return WebSession.getString(277L);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java Mon Jun 23 08:47:06 2014
@@ -41,7 +41,7 @@ import ro.fortsoft.wicket.dashboard.Widg
import ro.fortsoft.wicket.dashboard.web.WidgetView;
public class RssWidgetView extends WidgetView {
- private static final long serialVersionUID = -6257866996099503210L;
+ private static final long serialVersionUID = 1L;
private RSSFeedBehavior feed1;
private RSSFeedBehavior feed2;
@@ -60,7 +60,7 @@ public class RssWidgetView extends Widge
}
class RSSFeedBehavior extends AbstractAjaxBehavior {
- private static final long serialVersionUID = 721009368063152450L;
+ private static final long serialVersionUID = 1L;
private String url;
RSSFeedBehavior(String url) {
@@ -69,7 +69,7 @@ public class RssWidgetView extends Widge
public void onRequest() {
ResourceStreamRequestHandler handler = new ResourceStreamRequestHandler(new AbstractResourceStream() {
- private static final long serialVersionUID = -322593118428697261L;
+ private static final long serialVersionUID = 1L;
HttpURLConnection con;
public InputStream getInputStream() throws ResourceStreamNotFoundException {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java Mon Jun 23 08:47:06 2014
@@ -27,7 +27,7 @@ import ro.fortsoft.wicket.dashboard.Widg
import ro.fortsoft.wicket.dashboard.web.WidgetView;
public class StartWidget extends AbstractWidget {
- private static final long serialVersionUID = 9060237325733825899L;
+ private static final long serialVersionUID = 1L;
public StartWidget() {
super();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java Mon Jun 23 08:47:06 2014
@@ -23,7 +23,7 @@ import org.apache.openmeetings.web.app.W
import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
public class StartWidgetDescriptor implements WidgetDescriptor {
- private static final long serialVersionUID = 2533010836978961930L;
+ private static final long serialVersionUID = 1L;
public String getName() {
return WebSession.getString(774L);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java Mon Jun 23 08:47:06 2014
@@ -33,7 +33,7 @@ import ro.fortsoft.wicket.dashboard.web.
import com.googlecode.wicket.jquery.ui.form.button.Button;
public class StartWidgetView extends WidgetView {
- private static final long serialVersionUID = -3886388347737468022L;
+ private static final long serialVersionUID = 1L;
public StartWidgetView(String id, Model<Widget> model) {
super(id, model);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java Mon Jun 23 08:47:06 2014
@@ -27,7 +27,7 @@ import ro.fortsoft.wicket.dashboard.Widg
import ro.fortsoft.wicket.dashboard.web.WidgetView;
public class WelcomeWidget extends AbstractWidget {
- private static final long serialVersionUID = 8866852061674736808L;
+ private static final long serialVersionUID = 1L;
public WelcomeWidget() {
super();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java Mon Jun 23 08:47:06 2014
@@ -23,7 +23,7 @@ import org.apache.openmeetings.web.app.W
import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
public class WelcomeWidgetDescriptor implements WidgetDescriptor {
- private static final long serialVersionUID = 7835392425157215242L;
+ private static final long serialVersionUID = 1L;
public String getName() {
return WebSession.getString(1546L);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java Mon Jun 23 08:47:06 2014
@@ -41,7 +41,7 @@ import ro.fortsoft.wicket.dashboard.Widg
import ro.fortsoft.wicket.dashboard.web.WidgetView;
public class WelcomeWidgetView extends WidgetView {
- private static final long serialVersionUID = -6257866996099503210L;
+ private static final long serialVersionUID = 1L;
public WelcomeWidgetView(String id, Model<Widget> model) {
super(id, model);
@@ -53,7 +53,7 @@ public class WelcomeWidgetView extends W
add(new Label("lastname", Model.of(u.getLastname())));
add(new Label("tz", Model.of(u.getTimeZoneId())));
add(new AjaxLink<Void>("openUnread") {
- private static final long serialVersionUID = -1847619557485964386L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
@@ -61,7 +61,7 @@ public class WelcomeWidgetView extends W
}
}.add(new Label("unread", Model.of("" + getBean(PrivateMessagesDao.class).count(getUserId(), INBOX_FOLDER_ID, null)))));
add(new AjaxLink<Void>("editProfile") {
- private static final long serialVersionUID = -1847619557485964386L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
@@ -69,7 +69,7 @@ public class WelcomeWidgetView extends W
}
});
add(new Link<Void>("netTest") {
- private static final long serialVersionUID = -9055312659797800331L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java Mon Jun 23 08:47:06 2014
@@ -188,7 +188,7 @@ public class MessageDialog extends Abstr
PrivateMessagesDao msgDao = getBean(PrivateMessagesDao.class);
for (User to : modelTo.getObject()) {
UserDao userDao = getBean(UserDao.class);
- if (to.getUser_id() == null) {
+ if (to.getId() == null) {
userDao.update(to, getUserId());
}
//to send
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Mon Jun 23 08:47:06 2014
@@ -80,7 +80,7 @@ import com.googlecode.wicket.jquery.ui.p
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class MessagesContactsPanel extends UserPanel {
- private static final long serialVersionUID = 8098087441571734957L;
+ private static final long serialVersionUID = 1L;
private final static long MOVE_CHOOSE = -1;
private final static int SELECT_CHOOSE = 1252;
private final static int SELECT_ALL = 1239;
@@ -127,7 +127,7 @@ public class MessagesContactsPanel exten
});
private static PrivateMessageFolder NOT_MOVE_FOLDER = new PrivateMessageFolder();
static {
- NOT_MOVE_FOLDER.setPrivateMessageFolderId(MOVE_CHOOSE);
+ NOT_MOVE_FOLDER.setId(MOVE_CHOOSE);
NOT_MOVE_FOLDER.setFolderName(WebSession.getString(1243));
}
private final DropDownChoice<PrivateMessageFolder> moveDropDown = new DropDownChoice<PrivateMessageFolder>("msgMove", Model.of(NOT_MOVE_FOLDER)
@@ -140,7 +140,7 @@ public class MessagesContactsPanel exten
}
public String getIdValue(PrivateMessageFolder object, int index) {
- return "" + object.getPrivateMessageFolderId();
+ return "" + object.getId();
}
});
private WebMarkupContainer selectedFolder;
@@ -157,7 +157,7 @@ public class MessagesContactsPanel exten
private void setFolderClass(ListItem<PrivateMessageFolder> folder) {
folder.add(AttributeAppender.replace("class", "email folder clickable"));
- if (folder.getModelObject().getPrivateMessageFolderId() == selectedFolderModel.getObject()) {
+ if (folder.getModelObject().getId() == selectedFolderModel.getObject()) {
selectFolder(folder);
}
}
@@ -208,7 +208,7 @@ public class MessagesContactsPanel exten
updateTable(target);
target.add(folders, unread, selectDropDown, moveDropDown);
target.add(dataContainer.container, dataContainer.navigator);
- target.add(dataContainer.orderLinks);
+ target.add(dataContainer.getLinks());
}
}
@@ -240,7 +240,6 @@ public class MessagesContactsPanel exten
}
}
- @SuppressWarnings("unchecked")
public MessagesContactsPanel(String id) {
super(id);
foldersModel = Model.ofList(getBean(PrivateMessageFolderDao.class).get(0, Integer.MAX_VALUE));
@@ -338,7 +337,7 @@ public class MessagesContactsPanel exten
@Override
protected void onEvent(AjaxRequestTarget target) {
- selectFolder(item, item.getModelObject().getPrivateMessageFolderId(), target);
+ selectFolder(item, item.getModelObject().getId(), target);
}
});
setFolderClass(item);
@@ -412,7 +411,7 @@ public class MessagesContactsPanel exten
}
};
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dv) {
- private static final long serialVersionUID = 5097048616003411362L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
@@ -421,11 +420,11 @@ public class MessagesContactsPanel exten
}
};
dataContainer = new DataViewContainer<PrivateMessage>(container, dv, navigator);
- dataContainer.setLinks(new OmOrderByBorder<PrivateMessage>("orderById", "id", dataContainer)
- , new OmOrderByBorder<PrivateMessage>("orderByFrom", "from.lastname", dataContainer)
- , new OmOrderByBorder<PrivateMessage>("orderBySubject", "subject", dataContainer)
- , new OmOrderByBorder<PrivateMessage>("orderBySend", "inserted", dataContainer));
- add(dataContainer.orderLinks);
+ dataContainer.addLink(new OmOrderByBorder<PrivateMessage>("orderById", "id", dataContainer))
+ .addLink(new OmOrderByBorder<PrivateMessage>("orderByFrom", "from.lastname", dataContainer))
+ .addLink(new OmOrderByBorder<PrivateMessage>("orderBySubject", "subject", dataContainer))
+ .addLink(new OmOrderByBorder<PrivateMessage>("orderBySend", "inserted", dataContainer));
+ add(dataContainer.getLinks());
add(navigator);
add(unread.setOutputMarkupId(true));
@@ -506,7 +505,7 @@ public class MessagesContactsPanel exten
@Override
protected void onUpdate(AjaxRequestTarget target) {
- long folderId = moveDropDown.getModelObject().getPrivateMessageFolderId();
+ long folderId = moveDropDown.getModelObject().getId();
if (folderId != MOVE_CHOOSE) {
getBean(PrivateMessagesDao.class).moveMailsToFolder(selectedMessages, folderId);
}
@@ -549,13 +548,13 @@ public class MessagesContactsPanel exten
protected void populateItem(Item<UserContact> item) {
UserContact uc = item.getModelObject();
final long contactId = uc.getUserContactId();
- final long userId = uc.getOwner().getUser_id();
+ final long userId = uc.getOwner().getId();
if (uc.getPending()) {
item.add(AttributeModifier.append("class", "unread"));
}
item.add(new Label("name", getName(uc)));
item.add(new WebMarkupContainer("accept").add(new AjaxEventBehavior("onclick") {
- private static final long serialVersionUID = 7223188816617664993L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java Mon Jun 23 08:47:06 2014
@@ -42,7 +42,7 @@ public class ProfileForm extends Form<Us
super(id, new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId())));
add(new FormSaveRefreshPanel<User>("buttons", this) {
- private static final long serialVersionUID = 6578425915881674309L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
@@ -64,8 +64,8 @@ public class ProfileForm extends Form<Us
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
User user = getModelObject();
- if (user.getUser_id() != null) {
- user = getBean(UserDao.class).get(user.getUser_id());
+ if (user.getId() != null) {
+ user = getBean(UserDao.class).get(user.getId());
} else {
user = new User();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java Mon Jun 23 08:47:06 2014
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.user
import org.apache.openmeetings.web.common.UserPanel;
public class ProfilePanel extends UserPanel {
- private static final long serialVersionUID = -5837090230776586182L;
+ private static final long serialVersionUID = 1L;
public ProfilePanel(String id) {
super(id);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java Mon Jun 23 08:47:06 2014
@@ -36,7 +36,7 @@ import com.googlecode.wicket.jquery.core
import com.googlecode.wicket.jquery.core.Options;
public class SettingsPanel extends UserPanel {
- private static final long serialVersionUID = -830146821166434373L;
+ private static final long serialVersionUID = 1L;
public static final int PROFILE_TAB_ID = 0;
public static final int MESSAGES_TAB_ID = 1;
public static final int EDIT_PROFILE_TAB_ID = 2;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java Mon Jun 23 08:47:06 2014
@@ -26,7 +26,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
public class UserForm extends GeneralUserForm {
- private static final long serialVersionUID = 1305752513494262480L;
+ private static final long serialVersionUID = 1L;
private final PasswordTextField confirmPassword;
public UserForm(String id, IModel<User> model) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java Mon Jun 23 08:47:06 2014
@@ -34,7 +34,7 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class UserInfoDialog extends AbstractDialog<String> {
- private static final long serialVersionUID = 6393565468567393270L;
+ private static final long serialVersionUID = 1L;
private WebMarkupContainer container = new WebMarkupContainer("container");
private DialogButton cancel = new DialogButton(WebSession.getString(61));
private String messageLbl = WebSession.getString(1253);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Mon Jun 23 08:47:06 2014
@@ -31,11 +31,11 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.Model;
public class UserProfilePanel extends UserPanel {
- private static final long serialVersionUID = 137157820964246251L;
+ private static final long serialVersionUID = 1L;
private String getAddress(User u) {
String result = "";
- if (getUserId() == u.getUser_id() || Boolean.TRUE.equals(u.getShowContactData())) {
+ if (getUserId() == u.getId() || Boolean.TRUE.equals(u.getShowContactData())) {
//FIXME, more details should be added
if (u.getAdresses() != null) {
result = u.getAdresses().getStreet();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java Mon Jun 23 08:47:06 2014
@@ -55,7 +55,7 @@ import com.googlecode.wicket.jquery.ui.p
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class UserSearchPanel extends UserPanel {
- private static final long serialVersionUID = -3604291982438458598L;
+ private static final long serialVersionUID = 1L;
private final static List<Integer> itemsPerPage = Arrays.asList(10, 25, 50, 75, 100, 200, 500, 1000, 2500, 5000);
private String text;
private String search;
@@ -75,13 +75,13 @@ public class UserSearchPanel extends Use
super(id);
add(new Form<Void>("form") {
- private static final long serialVersionUID = 3171252669473438834L;
+ private static final long serialVersionUID = 1L;
{
add(new TextField<String>("text", new PropertyModel<String>(UserSearchPanel.this, "text")));
add(new TextField<String>("offer", new PropertyModel<String>(UserSearchPanel.this, "offer")));
add(new TextField<String>("search", new PropertyModel<String>(UserSearchPanel.this, "search")));
add(new AjaxFormSubmitBehavior(this, "onsubmit") {
- private static final long serialVersionUID = -5767210068168188960L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
@@ -102,7 +102,7 @@ public class UserSearchPanel extends Use
}
});
IDataProvider<User> dp = new IDataProvider<User>() {
- private static final long serialVersionUID = -1757645522251197822L;
+ private static final long serialVersionUID = 1L;
public void detach() {
}
@@ -123,20 +123,20 @@ public class UserSearchPanel extends Use
};
final UserInfoDialog d = new UserInfoDialog("infoDialog", newMessage);
final DataView<User> dv = new DataView<User>("users", dp) {
- private static final long serialVersionUID = -3314136686941736574L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(Item<User> item) {
final UserContactsDao contactsDao = getBean(UserContactsDao.class);
User u = item.getModelObject();
- final long userId = u.getUser_id();
+ final long userId = u.getId();
item.add(new WebMarkupContainer("status").add(AttributeModifier.append("class", isUserOnline(userId) ? "online" : "offline")));
item.add(new Label("name", getName(u)));
item.add(new Label("tz", getBean(TimezoneUtil.class).getTimeZone(u).getID()));
item.add(new Label("offer", u.getUserOffers()));
item.add(new Label("search", u.getUserSearchs()));
item.add(new WebMarkupContainer("view").add(new AjaxEventBehavior("onclick") {
- private static final long serialVersionUID = 7223188816617664993L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java Mon Jun 23 08:47:06 2014
@@ -35,7 +35,7 @@ import ro.fortsoft.wicket.dashboard.Widg
import ro.fortsoft.wicket.dashboard.web.DashboardContext;
public class WidgetsPanel extends Panel {
- private static final long serialVersionUID = -3959536582694664524L;
+ private static final long serialVersionUID = 1L;
private Widget isDisplayed(WidgetDescriptor wd) {
//FIXME the only way to compare is By TITLE
@@ -59,7 +59,7 @@ public class WidgetsPanel extends Panel
item.add(new Label("name", wd.getName()));
item.add(new Label("description", wd.getDescription()));
item.add(new AjaxCheckBox("display", Model.of(isDisplayed(wd) != null)) {
- private static final long serialVersionUID = -7079665921153653164L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onUpdate(AjaxRequestTarget target) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.java Mon Jun 23 08:47:06 2014
@@ -82,7 +82,7 @@ public class RecordingErrorsDialog exten
@Override
protected void onOpen(AjaxRequestTarget target) {
FlvRecording f = getModelObject();
- List<FlvRecordingLog> logs = getBean(FlvRecordingLogDao.class).getByRecordingId(f.getFlvRecordingId());
+ List<FlvRecordingLog> logs = getBean(FlvRecordingLogDao.class).getByRecordingId(f.getId());
if (f.getFileHash() == null) {
message.setVisible(true);
message.setDefaultModelObject(WebSession.getString(888));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java Mon Jun 23 08:47:06 2014
@@ -36,7 +36,7 @@ public class RecordingItemPanel extends
public RecordingItemPanel(String id, final IModel<FlvRecording> model, final RecordingErrorsDialog errorsDialog) {
super(id, model);
FlvRecording r = model.getObject();
- long errorCount = getBean(FlvRecordingLogDao.class).countErrors(r.getFlvRecordingId());
+ long errorCount = getBean(FlvRecordingLogDao.class).countErrors(r.getId());
boolean visible = errorCount != 0 || (Status.PROCESSING != r.getStatus() && !isRecordingExists(r.getFileHash() + MP4_EXTENSION));
item.add(new WebMarkupContainer("errors").add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Mon Jun 23 08:47:06 2014
@@ -63,7 +63,7 @@ import wicketdnd.Reject;
import wicketdnd.Transfer;
public class RecordingsPanel extends UserPanel {
- private static final long serialVersionUID = 1321258690447136958L;
+ private static final long serialVersionUID = 1L;
private final WebMarkupContainer trees = new WebMarkupContainer("tree-container");
private final WebMarkupContainer sizes = new WebMarkupContainer("sizes");
private final VideoPlayer video = new VideoPlayer("video");
@@ -76,7 +76,7 @@ public class RecordingsPanel extends Use
public RecordingsPanel(String id) {
super(id);
- rm.getObject().setFlvRecordingId(Long.MIN_VALUE);
+ rm.getObject().setId(Long.MIN_VALUE);
final AddFolderDialog addFolder = new AddFolderDialog("addFolder", WebSession.getString(712)) {
private static final long serialVersionUID = 1L;
@@ -91,7 +91,7 @@ public class RecordingsPanel extends Use
f.setIsPresentation(false);
f.setIsRecording(true);
FlvRecording p = rm.getObject();
- long parentId = p.getFlvRecordingId();
+ long parentId = p.getId();
if (p.isFolder()) {
f.setParentFileExplorerItemId(parentId);
}
@@ -123,7 +123,7 @@ public class RecordingsPanel extends Use
@Override
public void onClick(AjaxRequestTarget target) {
- long id = rm.getObject().getFlvRecordingId();
+ long id = rm.getObject().getId();
if (id > 0) {
getBean(FlvRecordingDao.class).delete(rm.getObject());
}
@@ -146,7 +146,7 @@ public class RecordingsPanel extends Use
treesView.add(new RecordingTree(treesView.newChildId(), new PublicRecordingTreeProvider(null, null)));
for (Organisation_Users ou : getBean(UserDao.class).get(getUserId()).getOrganisation_users()) {
Organisation o = ou.getOrganisation();
- treesView.add(new RecordingTree(treesView.newChildId(), new PublicRecordingTreeProvider(o.getOrganisation_id(), o.getName())));
+ treesView.add(new RecordingTree(treesView.newChildId(), new PublicRecordingTreeProvider(o.getId(), o.getName())));
}
add(trees.add(treesView).setOutputMarkupId(true));
updateSizes();
@@ -171,7 +171,7 @@ public class RecordingsPanel extends Use
//FIXME need to be generalized to use as Room files explorer
class RecordingTree extends DefaultNestedTree<FlvRecording> {
- private static final long serialVersionUID = 2527395034256868022L;
+ private static final long serialVersionUID = 1L;
public RecordingTree(String id, ITreeProvider<FlvRecording> tp) {
super(id, tp);
@@ -181,13 +181,13 @@ public class RecordingsPanel extends Use
@Override
protected Component newContentComponent(String id, IModel<FlvRecording> node) {
return new Folder<FlvRecording>(id, this, node) {
- private static final long serialVersionUID = 1020976220467419084L;
+ private static final long serialVersionUID = 1L;
@Override
protected Component newLabelComponent(String id, final IModel<FlvRecording> lm) {
FlvRecording r = lm.getObject();
- Component result = r.isFolder() || r.getFlvRecordingId() < 1 ? new RecordingPanel(id, lm) : new RecordingItemPanel(id, lm, errorsDialog);
- if (r.getFlvRecordingId() > 0) {
+ Component result = r.isFolder() || r.getId() < 1 ? new RecordingPanel(id, lm) : new RecordingItemPanel(id, lm, errorsDialog);
+ if (r.getId() > 0) {
result.add(new DragSource(Operation.MOVE) {
private static final long serialVersionUID = 1L;
@@ -202,14 +202,14 @@ public class RecordingsPanel extends Use
}
}.drag("div"));
}
- if (r.getFlvRecordingId() < 0 || r.isFolder()) {
+ if (r.getId() < 0 || r.isFolder()) {
result.add(new DropTarget(Operation.MOVE) {
private static final long serialVersionUID = 1L;
@Override
public void onDrop(AjaxRequestTarget target, Transfer transfer, Location location) throws Reject {
FlvRecording p = lm.getObject();
- long pid = p.getFlvRecordingId();
+ long pid = p.getId();
FlvRecording r = transfer.getData();
r.setParentFileExplorerItemId(pid > 0 ? pid : null);
r.setOrganization_id(p.getOrganization_id());
@@ -224,7 +224,7 @@ public class RecordingsPanel extends Use
@Override
protected boolean isSelected() {
- return getModelObject().getFlvRecordingId() == rm.getObject().getFlvRecordingId();
+ return getModelObject().getId() == rm.getObject().getId();
}
@Override
@@ -259,9 +259,9 @@ public class RecordingsPanel extends Use
private String getRecordingStyle(FlvRecording r, String def) {
String style;
- if (r.getFlvRecordingId() == 0) {
+ if (r.getId() == 0) {
style = "my-recordings om-icon";
- } else if (r.getFlvRecordingId() < 0) {
+ } else if (r.getId() < 0) {
style = "public-recordings om-icon";
} else if (r.isFolder()) {
style = def;
@@ -307,14 +307,14 @@ public class RecordingsPanel extends Use
public Iterator<? extends FlvRecording> getRoots() {
FlvRecording r = new FlvRecording();
- r.setFlvRecordingId(0);
+ r.setId(0L);
r.setFileName(WebSession.getString(860));
r.setOwnerId(getUserId());
return Arrays.asList(r).iterator();
}
public Iterator<? extends FlvRecording> getChildren(FlvRecording node) {
- if (node.getFlvRecordingId() == 0) {
+ if (node.getId() == 0) {
return getBean(FlvRecordingDao.class).getFlvRecordingRootByOwner(getUserId()).iterator();
} else {
return super.getChildren(node);
@@ -323,7 +323,7 @@ public class RecordingsPanel extends Use
}
class PublicRecordingTreeProvider extends RecordingTreeProvider {
- private static final long serialVersionUID = 5502610991599632079L;
+ private static final long serialVersionUID = 1L;
private final Long orgId;
private final String name;
@@ -334,7 +334,7 @@ public class RecordingsPanel extends Use
public Iterator<? extends FlvRecording> getRoots() {
FlvRecording r = new FlvRecording();
- r.setFlvRecordingId(orgId == null ? -1 : -orgId);
+ r.setId(orgId == null ? -1 : -orgId);
r.setOrganization_id(orgId);
r.setOwnerId(null);
String pub = WebSession.getString(861);
@@ -343,7 +343,7 @@ public class RecordingsPanel extends Use
}
public Iterator<? extends FlvRecording> getChildren(FlvRecording node) {
- if (node.getFlvRecordingId() < 0) {
+ if (node.getId() < 0) {
return getBean(FlvRecordingDao.class).getFlvRecordingRootByPublic(orgId).iterator();
} else {
return super.getChildren(node);
@@ -359,11 +359,11 @@ public class RecordingsPanel extends Use
}
public boolean hasChildren(FlvRecording node) {
- return node.getFlvRecordingId() <= 0 || node.isFolder();
+ return node.getId() <= 0 || node.isFolder();
}
public Iterator<? extends FlvRecording> getChildren(FlvRecording node) {
- return getBean(FlvRecordingDao.class).getFlvRecordingByParent(node.getFlvRecordingId()).iterator();
+ return getBean(FlvRecordingDao.class).getFlvRecordingByParent(node.getId()).iterator();
}
public IModel<FlvRecording> model(FlvRecording object) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java Mon Jun 23 08:47:06 2014
@@ -59,11 +59,11 @@ public class VideoPlayer extends Panel {
public VideoPlayer update(AjaxRequestTarget target, FlvRecording r) {
boolean videoExists = r != null && getMp4Recording(r.getFileHash()).exists();
if (videoExists) {
- PageParameters pp = new PageParameters().add("id", r.getFlvRecordingId());
+ PageParameters pp = new PageParameters().add("id", r.getId());
playerModel.setObject(Arrays.asList(
new MediaSource("" + getRequestCycle().urlFor(mp4res, pp), "video/mp4")
, new MediaSource("" + getRequestCycle().urlFor(oggres, pp), "video/ogg")));
- player.recId = r.getFlvRecordingId();
+ player.recId = r.getId();
}
container.setVisible(videoExists);
if (target != null) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java Mon Jun 23 08:47:06 2014
@@ -25,7 +25,7 @@ import org.apache.wicket.ajax.AjaxEventB
import org.apache.wicket.ajax.AjaxRequestTarget;
public class RoomEnterBehavior extends AjaxEventBehavior {
- private static final long serialVersionUID = -5195740583653865055L;
+ private static final long serialVersionUID = 1L;
private final long roomid;
public RoomEnterBehavior(long roomid) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java Mon Jun 23 08:47:06 2014
@@ -46,7 +46,7 @@ import org.apache.wicket.util.io.IOUtils
import com.googlecode.wicket.jquery.ui.form.button.Button;
public class RoomsPanel extends UserPanel {
- private static final long serialVersionUID = -892281210307880052L;
+ private static final long serialVersionUID = 1L;
private final WebMarkupContainer clientsContainer = new WebMarkupContainer("clientsContainer");
private final WebMarkupContainer details = new WebMarkupContainer("details");
private final ListView<Client> clients;
@@ -59,7 +59,7 @@ public class RoomsPanel extends UserPane
public RoomsPanel(String id, List<Room> rooms) {
super(id);
add(new ListView<Room>("list", rooms) {
- private static final long serialVersionUID = 9189085478336224890L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(ListItem<Room> item) {
@@ -70,23 +70,23 @@ public class RoomsPanel extends UserPane
@Override
protected void onEvent(AjaxRequestTarget target) {
- roomId = r.getRooms_id();
+ roomId = r.getId();
updateRoomDetails(target);
}
}));
roomContainer.add(new Label("roomName", r.getName()));
- final IModel<Integer> curUsersModel = new Model<Integer>(Application.getBean(ISessionManager.class).getClientListByRoom(r.getRooms_id()).size());
+ final IModel<Integer> curUsersModel = new Model<Integer>(Application.getBean(ISessionManager.class).getClientListByRoom(r.getId()).size());
final Label curUsers = new Label("curUsers", curUsersModel);
roomContainer.add(curUsers.setOutputMarkupId(true));
roomContainer.add(new Label("totalUsers", r.getNumberOfPartizipants()));
- item.add(new Button("enter").add(new RoomEnterBehavior(r.getRooms_id())));
+ item.add(new Button("enter").add(new RoomEnterBehavior(r.getId())));
roomContainer.add(new AjaxLink<Void>("refresh") {
- private static final long serialVersionUID = -3426813755917489787L;
+ private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
- roomId = r.getRooms_id();
- curUsersModel.setObject(Application.getBean(ISessionManager.class).getClientListByRoom(r.getRooms_id()).size());
+ roomId = r.getId();
+ curUsersModel.setObject(Application.getBean(ISessionManager.class).getClientListByRoom(r.getId()).size());
target.add(curUsers);
updateRoomDetails(target);
}
@@ -100,14 +100,14 @@ public class RoomsPanel extends UserPane
details.add(new Label("roomName", roomName));
details.add(new Label("roomComment", roomComment));
clients = new ListView<Client>("clients", clientsInRoom){
- private static final long serialVersionUID = 8542589945574690054L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(final ListItem<Client> item) {
Client client = item.getModelObject();
final Long userId = client.getUser_id();
item.add(new Image("clientImage", new ByteArrayResource("image/jpeg") {
- private static final long serialVersionUID = 6039580072791941591L;
+ private static final long serialVersionUID = 1L;
@Override
protected ResourceResponse newResourceResponse(Attributes attributes) {
@@ -141,7 +141,7 @@ public class RoomsPanel extends UserPane
final List<Client> clientsInRoom = Application.getBean(ISessionManager.class).getClientListByRoom(roomId);
clients.setDefaultModelObject(clientsInRoom);
Room room = Application.getBean(RoomDao.class).get(roomId);
- roomID.setObject(room.getRooms_id());
+ roomID.setObject(room.getId());
roomName.setObject(room.getName());
roomComment.setObject(room.getComment());
target.add(clientsContainer, details);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java Mon Jun 23 08:47:06 2014
@@ -26,7 +26,7 @@ import org.apache.openmeetings.web.util.
import org.apache.wicket.markup.html.basic.Label;
public class RoomsSelectorPanel extends UserPanel {
- private static final long serialVersionUID = -3246259803623925341L;
+ private static final long serialVersionUID = 1L;
public RoomsSelectorPanel(String id, MenuParams param) {
super(id);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java Mon Jun 23 08:47:06 2014
@@ -44,25 +44,25 @@ public class RoomsTabbedPanel extends Us
User u = getBean(UserDao.class).get(getUserId());
add(new ListView<Organisation_Users>("orgTabs", u.getOrganisation_users()) {
- private static final long serialVersionUID = -145637079945252731L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(ListItem<Organisation_Users> item) {
Organisation org = item.getModelObject().getOrganisation();
item.add(new WebMarkupContainer("link")
.add(new Label("name", Model.of(org.getName())))
- .add(new AttributeModifier("href", "#org" + org.getOrganisation_id())));
+ .add(new AttributeModifier("href", "#org" + org.getId())));
}
});
add(new ListView<Organisation_Users>("orgRooms", u.getOrganisation_users()) {
- private static final long serialVersionUID = 9039932126334250798L;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(ListItem<Organisation_Users> item) {
Organisation org = item.getModelObject().getOrganisation();
item.add(new RoomsPanel("rooms"
- , getBean(RoomDao.class).getOrganisationRooms(org.getOrganisation_id()))
- .setMarkupId("org" + org.getOrganisation_id())).setRenderBodyOnly(true);
+ , getBean(RoomDao.class).getOrganisationRooms(org.getId()))
+ .setMarkupId("org" + org.getId())).setRenderBodyOnly(true);
}
});
add(new JQueryBehavior("#orgTabs", "tabs"));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java Mon Jun 23 08:47:06 2014
@@ -25,7 +25,7 @@ import java.io.File;
import org.apache.openmeetings.db.entity.record.FlvRecording;
public class AviRecordingResourceReference extends RecordingResourceReference {
- private static final long serialVersionUID = 6181482949621024822L;
+ private static final long serialVersionUID = 1L;
public AviRecordingResourceReference() {
super(AviRecordingResourceReference.class);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java Mon Jun 23 08:47:06 2014
@@ -79,7 +79,7 @@ public class ContactsHelper {
contact = dao.get(userContactId);
- dao.addUserContact(contact.getOwner().getUser_id(), getUserId(), false, "");
+ dao.addUserContact(contact.getOwner().getId(), getUserId(), false, "");
User user = contact.getOwner();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java Mon Jun 23 08:47:06 2014
@@ -25,7 +25,7 @@ import java.io.File;
import org.apache.openmeetings.db.entity.record.FlvRecording;
public class FlvRecordingResourceReference extends RecordingResourceReference {
- private static final long serialVersionUID = 6181482949621024822L;
+ private static final long serialVersionUID = 1L;
public FlvRecordingResourceReference() {
super(FlvRecordingResourceReference.class);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java Mon Jun 23 08:47:06 2014
@@ -25,7 +25,7 @@ import java.io.File;
import org.apache.openmeetings.db.entity.record.FlvRecording;
public class JpgRecordingResourceReference extends RecordingResourceReference {
- private static final long serialVersionUID = 6181482949621024822L;
+ private static final long serialVersionUID = 1L;
public JpgRecordingResourceReference() {
super(JpgRecordingResourceReference.class);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java Mon Jun 23 08:47:06 2014
@@ -26,7 +26,7 @@ import java.io.File;
import org.apache.openmeetings.db.entity.record.FlvRecording;
public class Mp4RecordingResourceReference extends RecordingResourceReference {
- private static final long serialVersionUID = 6181482949621024822L;
+ private static final long serialVersionUID = 1L;
public Mp4RecordingResourceReference() {
super(Mp4RecordingResourceReference.class);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java Mon Jun 23 08:47:06 2014
@@ -26,7 +26,7 @@ import java.io.File;
import org.apache.openmeetings.db.entity.record.FlvRecording;
public class OggRecordingResourceReference extends RecordingResourceReference {
- private static final long serialVersionUID = 6181482949621024822L;
+ private static final long serialVersionUID = 1L;
public OggRecordingResourceReference() {
super(OggRecordingResourceReference.class);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java Mon Jun 23 08:47:06 2014
@@ -48,7 +48,7 @@ import org.apache.openmeetings.web.user.
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class OmUrlFragment implements Serializable {
- private static final long serialVersionUID = 7382435810352033914L;
+ private static final long serialVersionUID = 1L;
private AreaKeys area = AreaKeys.user;
private String type = "";
public static final String CHILD_ID = "child";
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java Mon Jun 23 08:47:06 2014
@@ -81,7 +81,7 @@ public abstract class RecordingResourceR
private IResourceStream getResourceStream() {
return file == null ? null : new FileResourceStream(file) {
- private static final long serialVersionUID = 2546785247219805747L;
+ private static final long serialVersionUID = 1L;
private transient BoundedInputStream bi;
@Override
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java Mon Jun 23 08:47:06 2014
@@ -77,8 +77,8 @@ public class UserChoiceProvider extends
}
protected Object getId(User u) {
- String id = "" + u.getUser_id();
- if (u.getUser_id() == null) {
+ String id = "" + u.getId();
+ if (u.getId() == null) {
newContacts.put(u.getLogin(), u);
id = u.getLogin();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Mon Jun 23 08:47:06 2014
@@ -81,14 +81,12 @@
<!-- Start of Services -->
<bean id="xmlcrm.service" class="org.apache.openmeetings.core.remote.MainService" />
<bean id="printservice.service" class="org.apache.openmeetings.core.remote.PrintService" />
- <bean id="languageservice.service" class="org.apache.openmeetings.core.remote.LanguageService" />
<bean id="invitationservice.service" class="org.apache.openmeetings.core.remote.InvitationService" />
<bean id="whiteboardservice.service" class="org.apache.openmeetings.core.remote.WhiteBoardService" />
<bean id="userservice.service" class="org.apache.openmeetings.core.remote.UserService" />
<bean id="fileservice.service" class="org.apache.openmeetings.core.remote.ConferenceLibrary" />
<bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.core.data.file.FileProcessor" />
<bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.core.converter.FlvExplorerConverter" />
- <bean id="errorservice.service" class="org.apache.openmeetings.core.remote.ErrorService" />
<bean id="conferenceservice.service" class="org.apache.openmeetings.core.remote.ConferenceService" />
<bean id="chatservice.service" class="org.apache.openmeetings.core.remote.ChatService" />
<bean id="flvrecorderservice.service" class="org.apache.openmeetings.core.remote.FLVRecorderService" />
@@ -250,7 +248,6 @@
<bean id="fieldLanguageDaoImpl" class="org.apache.openmeetings.db.dao.label.FieldLanguageDao" />
<bean id="fieldValueDaoImpl" class="org.apache.openmeetings.db.dao.label.FieldValueDao" />
<bean id="fieldLanguagesValuesDAO" class="org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao" />
- <bean id="fieldmanagment" class="org.apache.openmeetings.core.data.basic.FieldManager" />
<bean id="configurationDaoImpl" class="org.apache.openmeetings.db.dao.basic.ConfigurationDao" />
<bean id="appointmentDao" class="org.apache.openmeetings.db.dao.calendar.AppointmentDao" />
<bean id="appointmentLogic" class="org.apache.openmeetings.core.data.calendar.management.AppointmentLogic" />
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Mon Jun 23 08:47:06 2014
@@ -46,8 +46,8 @@ import org.springframework.beans.factory
public abstract class AbstractJUnitDefaults extends AbstractSpringTest {
private static final Logger log = Red5LoggerFactory.getLogger(AbstractJUnitDefaults.class);
- protected static final String username = "swagner";
- protected static final String userpass = "qweqwe";
+ protected static final String username = "admin";
+ protected static final String userpass = "12345";
private static final String orgname = "smoketest";
private static final String timeZone = "Europe/Berlin";
private static final String useremail = "junit@openmeetings.apache.org";
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureCategory.java Mon Jun 23 08:47:06 2014
@@ -51,7 +51,7 @@ public class TestDatabaseStructureCatego
log.debug("Anzahl: " + appointmentCategory.size());
for (int x = 0; x < appointmentCategory.size(); x++) {
- log.debug("id: " + appointmentCategory.get(x).getCategoryId());
+ log.debug("id: " + appointmentCategory.get(x).getId());
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java Mon Jun 23 08:47:06 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.test.calendar;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -62,7 +64,6 @@ import net.fortuna.ical4j.util.UidGenera
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.mail.ByteArrayDataSource;
import org.apache.openmeetings.util.mail.IcalHandler;
import org.apache.openmeetings.util.mail.SmtpAuthenticator;
@@ -72,10 +73,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestSendIcalMessage extends AbstractJUnitDefaults {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- TestAppointmentSchedulerTask.class,
- OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestSendIcalMessage.class, webAppRootKey);
@Autowired
private ConfigurationDao configurationDao;
@@ -132,7 +130,7 @@ public class TestSendIcalMessage extends
meeting.getProperties().add(uid);
} catch (SocketException e) {
// TODO Auto-generated catch block
- e.printStackTrace();
+ log.error("Error", e);
}
// add attendees..
@@ -175,18 +173,12 @@ public class TestSendIcalMessage extends
sendIcalMessage();
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error("Error", e);
} catch (ValidationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error("Error", e);
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error("Error", e);
}
-
-
-
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java Mon Jun 23 08:47:06 2014
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.test.config;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -27,12 +28,12 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
public class TestConfig extends AbstractJUnitDefaults {
- private static final Logger log = LoggerFactory.getLogger(TestConfig.class);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestConfig.class, webAppRootKey);
@Autowired
private ConfigurationDao configurationDao;
@@ -55,10 +56,10 @@ public class TestConfig extends Abstract
List<Configuration> list = configurationDao.get(4, 6);
for (Configuration conf : list) {
- System.err.println("conf.getConf_key() " + conf.getConf_key());
- System.err.println("conf.getUser() " + conf.getUser());
+ log.error("conf.getConf_key() " + conf.getConf_key());
+ log.error("conf.getUser() " + conf.getUser());
if (conf.getUser() != null) {
- System.err.println("conf.getUsers() " + conf.getUser().getLogin());
+ log.error("conf.getUsers() " + conf.getUser().getLogin());
}
}