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 2016/11/22 03:22:16 UTC
svn commit: r1770792 - in /openmeetings/application:
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/
trunk/openmeetings-web/src/main/ja...
Author: solomax
Date: Tue Nov 22 03:22:16 2016
New Revision: 1770792
URL: http://svn.apache.org/viewvc?rev=1770792&view=rev
Log:
[OPENMEETINGS-1507] code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1770792&r1=1770791&r2=1770792&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java Tue Nov 22 03:22:16 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.room;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_ALLOW_REMOTE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
@@ -33,7 +34,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URI;
-import java.nio.charset.StandardCharsets;
import java.util.Properties;
import org.apache.commons.codec.binary.Hex;
@@ -78,20 +78,20 @@ public class StartSharingEventBehavior e
}
};
}
-
+
@Override
protected void onBind() {
super.onBind();
getComponent().add(download);
}
-
+
@Override
protected void respond(AjaxRequestTarget target) {
//TODO deny download in case other screen sharing is in progress
String app = "";
try (InputStream jnlp = getClass().getClassLoader().getResourceAsStream("APPLICATION.jnlp")) {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
- app = IOUtils.toString(jnlp, StandardCharsets.UTF_8);
+ app = IOUtils.toString(jnlp, UTF_8);
String baseUrl = cfgDao.getBaseUrl();
Room room = getBean(RoomDao.class).get(roomId);
String publicSid = getParam(getComponent(), PARAM_PUBLIC_SID).toString();
@@ -112,14 +112,14 @@ public class StartSharingEventBehavior e
.replace("$applicationName", cfgDao.getAppName())
.replace("$url", _url)
.replace("$publicSid", publicSid)
- .replace("$labels", CDATA_BEGIN + getLabels(730, 731, 732, 733, 734
+ .replace("$labels", getLabels(730, 731, 732, 733, 734
, 735, 737, 738, 739, 740
, 741, 742, 844, 869, 870
, 871, 872, 878, 1089, 1090
, 1091, 1092, 1093, 1465, 1466
, 1467, 1468, 1469, 1470, 1471
, 1472, 1473, 1474, 1475, 1476
- , 1477, 1589, 1598, 1078) + CDATA_END)
+ , 1477, 1589, 1598, 1078))
.replace("$defaultQuality", cfgDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, ""))
.replace("$defaultFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, ""))
.replace("$showFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS_SHOW, String.class, "true"))
@@ -131,13 +131,13 @@ public class StartSharingEventBehavior e
log.error("Unexpected error while creating jnlp file", e);
}
StringResourceStream srs = new StringResourceStream(app, "application/x-java-jnlp-file");
- srs.setCharset(StandardCharsets.UTF_8);
+ srs.setCharset(UTF_8);
download.setResourceStream(srs);
download.initiate(target);
}
private static String getLabels(int ... ids) {
- StringBuilder result = new StringBuilder();
+ StringBuilder result = new StringBuilder(CDATA_BEGIN);
boolean delim = false;
LabelDao labelDao = getBean(LabelDao.class);
for (int id : ids) {
@@ -147,9 +147,10 @@ public class StartSharingEventBehavior e
result.append(labelDao.getString(id, getLanguage()));
delim = true;
}
+ result.append(CDATA_END);
return result.toString();
}
-
+
private static String addKeystore(Client rc, String app, Protocol protocol) {
log.debug("RTMP Sharer Keystore :: start");
String keystore = "--dummy--", password = "--dummy--";
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java?rev=1770792&r1=1770791&r2=1770792&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java Tue Nov 22 03:22:16 2016
@@ -82,7 +82,7 @@ public class StartSharingButton extends
}
});
}
-
+
@Override
public void onClick(AjaxRequestTarget target) {
//TODO deny download in case other screen sharing is in progress
@@ -111,14 +111,14 @@ public class StartSharingButton extends
.replace("$applicationName", cfgDao.getAppName())
.replace("$url", _url)
.replace("$publicSid", publicSid)
- .replace("$labels", CDATA_BEGIN + getLabels(730, 731, 732, 733, 734
+ .replace("$labels", getLabels(730, 731, 732, 733, 734
, 735, 737, 738, 739, 740
, 741, 742, 844, 869, 870
, 871, 872, 878, 1089, 1090
, 1091, 1092, 1093, 1465, 1466
, 1467, 1468, 1469, 1470, 1471
, 1472, 1473, 1474, 1475, 1476
- , 1477, 1589, 1598, 1078) + CDATA_END)
+ , 1477, 1589, 1598, 1078))
.replace("$defaultQuality", cfgDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, ""))
.replace("$defaultFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, ""))
.replace("$showFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS_SHOW, String.class, "true"))
@@ -136,7 +136,7 @@ public class StartSharingButton extends
}
private static String getLabels(int ... ids) {
- StringBuilder result = new StringBuilder();
+ StringBuilder result = new StringBuilder(CDATA_BEGIN);
boolean delim = false;
LabelDao labelDao = getBean(LabelDao.class);
for (int id : ids) {
@@ -146,9 +146,10 @@ public class StartSharingButton extends
result.append(labelDao.getString(id, getLanguage()));
delim = true;
}
+ result.append(CDATA_END);
return result.toString();
}
-
+
private static String addKeystore(Client rc, String app, Protocol protocol) {
log.debug("RTMP Sharer Keystore :: start");
String keystore = "--dummy--", password = "--dummy--";
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java?rev=1770792&r1=1770791&r2=1770792&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java Tue Nov 22 03:22:16 2016
@@ -82,7 +82,7 @@ public class StartSharingButton extends
}
});
}
-
+
@Override
public void onClick(AjaxRequestTarget target) {
//TODO deny download in case other screen sharing is in progress
@@ -111,14 +111,14 @@ public class StartSharingButton extends
.replace("$applicationName", cfgDao.getAppName())
.replace("$url", _url)
.replace("$publicSid", publicSid)
- .replace("$labels", CDATA_BEGIN + getLabels(730, 731, 732, 733, 734
+ .replace("$labels", getLabels(730, 731, 732, 733, 734
, 735, 737, 738, 739, 740
, 741, 742, 844, 869, 870
, 871, 872, 878, 1089, 1090
, 1091, 1092, 1093, 1465, 1466
, 1467, 1468, 1469, 1470, 1471
, 1472, 1473, 1474, 1475, 1476
- , 1477, 1589, 1598, 1078) + CDATA_END)
+ , 1477, 1589, 1598, 1078))
.replace("$defaultQuality", cfgDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, ""))
.replace("$defaultFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, ""))
.replace("$showFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS_SHOW, String.class, "true"))
@@ -136,7 +136,7 @@ public class StartSharingButton extends
}
private static String getLabels(int ... ids) {
- StringBuilder result = new StringBuilder();
+ StringBuilder result = new StringBuilder(CDATA_BEGIN);
boolean delim = false;
LabelDao labelDao = getBean(LabelDao.class);
for (int id : ids) {
@@ -146,9 +146,10 @@ public class StartSharingButton extends
result.append(labelDao.getString(id, getLanguage()));
delim = true;
}
+ result.append(CDATA_END);
return result.toString();
}
-
+
private static String addKeystore(Client rc, String app, Protocol protocol) {
log.debug("RTMP Sharer Keystore :: start");
String keystore = "--dummy--", password = "--dummy--";