Author: solomax
Date: Sat Sep 13 11:09:43 2014
New Revision: 1624722
URL: http://svn.apache.org/r1624722
Log:
[OPENMEETINGS-1081] polls are created as expected
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/CreatePollDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1624722&r1=1624721&r2=1624722&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
Sat Sep 13 11:09:43 2014
@@ -148,7 +148,7 @@ public class MainPage extends BaseInited
long roomId = Application.getRoom(_c);
if (roomId > 0) {
Application.removeUserFromRoom(roomId,
_c);
- RoomPanel.broadcast(roomId, new
RoomMessage(roomId, _c.getUserId(), RoomMessage.Type.roomExit));
+ RoomPanel.broadcast(new
RoomMessage(roomId, _c.getUserId(), RoomMessage.Type.roomExit));
}
}
});
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/CreatePollDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/CreatePollDialog.java?rev=1624722&r1=1624721&r2=1624722&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/CreatePollDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/CreatePollDialog.java
Sat Sep 13 11:09:43 2014
@@ -42,8 +42,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.ws.WebSocketSettings;
-import org.apache.wicket.protocol.ws.api.WebSocketPushBroadcaster;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
@@ -97,9 +95,7 @@ public class CreatePollDialog extends Ab
@Override
protected void onSubmit(AjaxRequestTarget target) {
getBean(PollDao.class).update(form.getModelObject());
- WebSocketSettings webSocketSettings =
WebSocketSettings.Holder.get(getApplication());
- WebSocketPushBroadcaster broadcaster = new
WebSocketPushBroadcaster(webSocketSettings.getConnectionRegistry());
- broadcaster.broadcastAll(getApplication(), new
RoomMessage(roomId, getUserId(), RoomMessage.Type.pollCreated));
+ RoomPanel.broadcast(new RoomMessage(roomId, getUserId(),
RoomMessage.Type.pollCreated));
}
private class PollForm extends Form<RoomPoll> {
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=1624722&r1=1624721&r2=1624722&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
Sat Sep 13 11:09:43 2014
@@ -123,7 +123,7 @@ public class RoomPanel extends BasePanel
, 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()
));
- broadcast(roomId, new RoomMessage(roomId,
c.getUserId(), RoomMessage.Type.roomEnter));
+ broadcast(new RoomMessage(roomId, c.getUserId(),
RoomMessage.Type.roomEnter));
}
};
private final InvitationDialog invite;
@@ -172,6 +172,7 @@ public class RoomPanel extends BasePanel
@Override
public void onClick(MainPage page, AjaxRequestTarget target) {
+ createPoll.updateModel(target);
createPoll.open(target);
}
};
@@ -304,7 +305,6 @@ public class RoomPanel extends BasePanel
default:
break;
}
- //TODO check this menuPanel.modelChanged();
}
}
super.onEvent(event);
@@ -346,11 +346,11 @@ public class RoomPanel extends BasePanel
}
}
- public static void broadcast(long roomId, final RoomMessage m) {
+ public static void broadcast(final RoomMessage m) {
WebSocketSettings settings =
WebSocketSettings.Holder.get(Application.get());
IWebSocketConnectionRegistry reg =
settings.getConnectionRegistry();
Executor executor = settings.getWebSocketPushMessageExecutor();
- for (Client c : getRoomUsers(roomId)) {
+ for (Client c : getRoomUsers(m.getRoomId())) {
try {
final IWebSocketConnection wsConnection =
reg.getConnection(Application.get(), c.getSessionId(), new
PageIdKey(c.getPageId()));
executor.run(new Runnable()
