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 04:24:04 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1855] basic
code clean-up
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 1400f1c [OPENMEETINGS-1855] basic code clean-up
1400f1c is described below
commit 1400f1c3f205f6b20998433c7779b687bc1d1eef
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Mar 22 11:23:53 2018 +0700
[OPENMEETINGS-1855] basic code clean-up
---
.../apache/openmeetings/web/pages/HashPage.java | 19 +++++++-----
.../openmeetings/web/pages/auth/SignInDialog.java | 6 ++--
.../web/room/{SwfPanel.html => NetTestPanel.html} | 0
.../web/room/{SwfPanel.java => NetTestPanel.java} | 35 ++++++----------------
.../web/user/dashboard/WelcomeWidgetView.java | 6 ++--
5 files changed, 26 insertions(+), 40 deletions(-)
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 4ff7ca9..532fc9d 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
@@ -20,9 +20,6 @@ package org.apache.openmeetings.web.pages;
import static org.apache.openmeetings.core.remote.KurentoHandler.KURENTO_TYPE;
import static org.apache.openmeetings.web.app.WebSession.getRecordingId;
-import static org.apache.openmeetings.web.room.SwfPanel.SWF;
-import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
-import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_SETTINGS;
import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
import org.apache.commons.lang3.time.FastDateFormat;
@@ -39,8 +36,8 @@ import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.IUpdatable;
import org.apache.openmeetings.web.common.MainPanel;
import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior;
+import org.apache.openmeetings.web.room.NetTestPanel;
import org.apache.openmeetings.web.room.RoomPanel;
-import org.apache.openmeetings.web.room.SwfPanel;
import org.apache.openmeetings.web.room.VideoSettings;
import org.apache.openmeetings.web.user.record.VideoInfo;
import org.apache.openmeetings.web.user.record.VideoPlayer;
@@ -76,6 +73,10 @@ 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";
+ public static final String SWF = "swf";
public static final String PANEL_MAIN = "panel-main";
public static final String INVITATION_HASH = "invitation";
private static final String HASH = "secure";
@@ -169,13 +170,15 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
createRoom(roomId);
}
}
+
StringValue swf = p.get(SWF);
- if (!swf.isEmpty()) {
- if (SWF_TYPE_NETWORK.equals(swf.toString())) {
- replace(new SwfPanel(PANEL_MAIN, p));
+ StringValue app = swf.isEmpty() ? p.get(APP) : swf;
+ if (!app.isEmpty()) {
+ if (APP_TYPE_NETWORK.equals(app.toString())) {
+ replace(new NetTestPanel(PANEL_MAIN, p));
error = false;
}
- if (SWF_TYPE_SETTINGS.equals(swf.toString())) {
+ if (APP_TYPE_SETTINGS.equals(app.toString())) {
replace(new VideoSettings(PANEL_MAIN)
.add(new OmAjaxClientInfoBehavior() {
private static final long serialVersionUID = 1L;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 9b0e267..b9b2be8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -21,11 +21,11 @@ package org.apache.openmeetings.web.pages.auth;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LDAP_ID;
import static org.apache.openmeetings.web.app.Application.getAuthenticationStrategy;
import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.pages.HashPage.APP;
+import static org.apache.openmeetings.web.pages.HashPage.APP_TYPE_NETWORK;
import static org.apache.openmeetings.web.pages.auth.SignInPage.allowOAuthLogin;
import static org.apache.openmeetings.web.pages.auth.SignInPage.allowRegister;
import static org.apache.openmeetings.web.pages.auth.SignInPage.showAuth;
-import static org.apache.openmeetings.web.room.SwfPanel.SWF;
-import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
import java.util.ArrayList;
import java.util.List;
@@ -272,7 +272,7 @@ public class SignInDialog extends NonClosableDialog<String> {
@Override
public void onClick() {
- setResponsePage(HashPage.class, new PageParameters().add(SWF, SWF_TYPE_NETWORK));
+ setResponsePage(HashPage.class, new PageParameters().add(APP, APP_TYPE_NETWORK));
}
});
add(new WebMarkupContainer("oauthContainer").add(
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.java
similarity index 79%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.java
index 8aa9893..61c4c05 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.java
@@ -22,6 +22,8 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_NATIVE_SS
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_PORT;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_SECURE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_SSL_PORT;
+import static org.apache.openmeetings.web.pages.HashPage.APP;
+import static org.apache.openmeetings.web.pages.HashPage.APP_TYPE_NETWORK;
import java.net.URL;
@@ -30,13 +32,8 @@ import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior;
import org.apache.openmeetings.web.util.ExtendedClientProperties;
import org.apache.wicket.ajax.AjaxRequestTarget;
-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.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
@@ -45,20 +42,16 @@ import org.slf4j.LoggerFactory;
import com.github.openjson.JSONArray;
import com.github.openjson.JSONObject;
-public class SwfPanel extends BasePanel {
+public class NetTestPanel extends BasePanel {
private static final long serialVersionUID = 1L;
- private static final Logger log = LoggerFactory.getLogger(SwfPanel.class);
- public static final ResourceReference FLASH_JS_REFERENCE = new JavaScriptResourceReference(SwfPanel.class, "swf-functions.js");
- public static final String SWF = "swf";
- public static final String SWF_TYPE_NETWORK = "network";
- public static final String SWF_TYPE_SETTINGS = "settings";
+ private static final Logger log = LoggerFactory.getLogger(NetTestPanel.class);
private final PageParameters pp;
- public SwfPanel(String id) {
+ public NetTestPanel(String id) {
this(id, new PageParameters());
}
- public SwfPanel(String id, PageParameters pp) {
+ public NetTestPanel(String id, PageParameters pp) {
super(id);
this.pp = pp;
}
@@ -79,23 +72,13 @@ public class SwfPanel extends BasePanel {
});
}
- private static ResourceReference newResourceReference() {
- return new JavaScriptResourceReference(SwfPanel.class, "swf-functions.js");
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(newResourceReference())));
- }
-
public String getInitFunction(PageParameters pp, ExtendedClientProperties cp) {
String initStr = null;
- StringValue type = pp.get(SWF);
+ StringValue type = pp.get(APP);
String swf = getFlashFile(type);
if (!Strings.isEmpty(swf)) {
String lbls = null;
- if (SWF_TYPE_NETWORK.equals(type.toString())) {
+ if (APP_TYPE_NETWORK.equals(type.toString())) {
lbls = getStringLabels(
"network.test.ms", "network.test.mb", "network.test.sec"
, "network.test.click.play", "network.test.copy.log"
@@ -138,7 +121,7 @@ public class SwfPanel extends BasePanel {
}
private static String getFlashFile(StringValue type) {
- return SWF_TYPE_NETWORK.equals(type.toString()) ? "networktest.swf" : "";
+ return APP_TYPE_NETWORK.equals(type.toString()) ? "networktest.swf" : "";
}
public String getStringLabels(String... ids) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
index 80ba6c7..d1cb17c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
@@ -21,8 +21,8 @@ package org.apache.openmeetings.web.user.dashboard;
import static org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.apache.openmeetings.web.room.SwfPanel.SWF;
-import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
+import static org.apache.openmeetings.web.pages.HashPage.APP;
+import static org.apache.openmeetings.web.pages.HashPage.APP_TYPE_NETWORK;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_EDIT;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
@@ -73,7 +73,7 @@ public class WelcomeWidgetView extends WidgetView {
@Override
public void onClick() {
- setResponsePage(HashPage.class, new PageParameters().add(SWF, SWF_TYPE_NETWORK));
+ setResponsePage(HashPage.class, new PageParameters().add(APP, APP_TYPE_NETWORK));
}
});
}
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.