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 2018/03/22 14:01:30 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1854]
compilation errors are fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 644f2ab [OPENMEETINGS-1854] compilation errors are fixed
644f2ab is described below
commit 644f2abc06680d3a94d9a4757829acb31abcd60e
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Mar 22 21:01:20 2018 +0700
[OPENMEETINGS-1854] compilation errors are fixed
---
.../apache/openmeetings/web/common/MainPanel.html | 1 +
.../openmeetings/web/common/OmWebSocketPanel.java | 2 +-
.../apache/openmeetings/web/pages/HashPage.java | 24 ++++++++++------------
.../openmeetings/web/room/VideoSettings.html | 1 +
.../openmeetings/web/room/VideoSettings.java | 2 ++
5 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
index d8e33da..1b12cce 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
@@ -55,5 +55,6 @@
<div wicket:id="userInfoDialog"></div>
<div wicket:id="newMessageDialog"></div>
<div wicket:id="invite-to-room"></div>
+ <div wicket:id="ws-panel" style="display: none"></div>
</wicket:panel>
</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
index 019724f..d41c652 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
@@ -56,7 +56,7 @@ public abstract class OmWebSocketPanel extends Panel {
@Override
protected void onTimer(AjaxRequestTarget target) {
log.debug("Sending WebSocket PING");
- WebSocketHelper.sendClient(getWsClient(), new byte[]{getUserId().byteValue()});
+ WebSocketHelper.sendClient(getWsClient(), new byte[]{getUserId() == null ? 0 : getUserId().byteValue()});
}
};
private final WebSocketBehavior wsBehavior = new WebSocketBehavior() {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index a7d09d0..cbeaa73 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -53,8 +53,6 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.StringValue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
@@ -64,7 +62,6 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
public class HashPage extends BaseInitedPage implements IUpdatable {
private static final long serialVersionUID = 1L;
- private static final Logger log = LoggerFactory.getLogger(HashPage.class);
public static final String APP = "app";
public static final String APP_TYPE_NETWORK = "network";
public static final String APP_TYPE_SETTINGS = "settings";
@@ -170,16 +167,7 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
}
if (APP_TYPE_SETTINGS.equals(app.toString())) {
replace(new VideoSettings(PANEL_MAIN)
- .add(new OmAjaxClientInfoBehavior() {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onClientInfo(AjaxRequestTarget target, WebClientInfo info) {
- super.onClientInfo(target, info);
- target.appendJavaScript(
- String.format("VideoSettings.init(%s);VideoSettings.open();", VideoSettings.getInitJson("noclient")));
- }
- }, new OmWebSocketBehavior("ws-panel") {
+ .replace(new OmWebSocketPanel("ws-panel") {
private static final long serialVersionUID = 1L;
private WsClient c = null;
@@ -192,6 +180,16 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
protected IWsClient getWsClient() {
return c;
}
+ })
+ .add(new OmAjaxClientInfoBehavior() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onClientInfo(AjaxRequestTarget target, WebClientInfo info) {
+ super.onClientInfo(target, info);
+ target.appendJavaScript(
+ String.format("VideoSettings.init(%s);VideoSettings.open();", VideoSettings.getInitJson("noclient")));
+ }
}));
error = false;
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index e2f1892..fc8e49e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -89,5 +89,6 @@
</div>
</div>
<span id="jsNotifications"></span>
+ <div wicket:id="ws-panel" style="display: none"></div>
</wicket:panel>
</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
index 6278e5a..fb9bcab 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
@@ -25,6 +25,7 @@ import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
@@ -39,6 +40,7 @@ public class VideoSettings extends Panel {
public VideoSettings(String id) {
super(id);
+ add(new EmptyPanel("ws-panel"));
}
@Override
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.