Repository: openmeetings Updated Branches: refs/heads/master 93816cbe1 -> 08579c068
[OPENMEETINGS-1714] some warnings are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/08579c06 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/08579c06 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/08579c06 Branch: refs/heads/master Commit: 08579c06830d7541706fcdecff865c0790993223 Parents: 93816cb Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 00:11:28 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 00:11:28 2017 +0700 ---------------------------------------------------------------------- .../screenshare/ScreenV1Encoder.java | 2 +- .../web/common/ConfirmableAjaxBorder.java | 16 ++++++------ .../web/room/menu/RoomInvitationForm.java | 2 +- .../web/room/menu/RoomMenuPanel.java | 2 +- .../web/room/menu/StartSharingButton.java | 14 +++++------ .../org/apache/openmeetings/web/room/room.js | 20 +++++++-------- .../apache/openmeetings/web/room/settings.js | 26 ++++++++++---------- 7 files changed, 40 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08579c06/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java index 144cc85..b5500bd 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java @@ -140,7 +140,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder { prev = new Rectangle(0, Math.max(0, img.height - blockSize), blockSize, blockSize); } else { prev = new Rectangle(_prev); - if (Double.compare(prev.x + prev.width, img.getWidth()) == 0) { + if (Double.compare(0. + prev.x + prev.width, img.getWidth()) == 0) { if (prev.y == 0) return new Rectangle(); //the end of the image //next row prev.x = 0; //reset position http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08579c06/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java index 81c8468..5bc80a7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java @@ -18,9 +18,6 @@ */ package org.apache.openmeetings.web.common; -import java.io.Serializable; -import java.util.function.Consumer; - import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; @@ -28,6 +25,7 @@ import org.apache.wicket.markup.html.border.Border; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.EmptyPanel; import org.apache.wicket.model.Model; +import org.danekja.java.util.function.serializable.SerializableConsumer; import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog; import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; @@ -62,8 +60,8 @@ public abstract class ConfirmableAjaxBorder extends Border { this.dialog = dialog; form.add(new EmptyPanel(DIALOG_ID)); } - this.dialog.setSubmitHandler((Consumer<AjaxRequestTarget> & Serializable)(t)->onSubmit(t)); - this.dialog.setErrorHandler((Consumer<AjaxRequestTarget> & Serializable)(t)->onError(t)); + this.dialog.setSubmitHandler((SerializableConsumer<AjaxRequestTarget>)(t)->onSubmit(t)); + this.dialog.setErrorHandler((SerializableConsumer<AjaxRequestTarget>)(t)->onError(t)); setOutputMarkupId(true); } @@ -129,8 +127,8 @@ public abstract class ConfirmableAjaxBorder extends Border { public static class ConfirmableBorderDialog extends MessageFormDialog { private static final long serialVersionUID = 1L; private Form<?> form; - private Consumer<AjaxRequestTarget> submitHandler = null; - private Consumer<AjaxRequestTarget> errorHandler = null; + private SerializableConsumer<AjaxRequestTarget> submitHandler = null; + private SerializableConsumer<AjaxRequestTarget> errorHandler = null; public ConfirmableBorderDialog(String id, String title, String message) { this(id, title, message, null); @@ -141,11 +139,11 @@ public abstract class ConfirmableAjaxBorder extends Border { this.form = form; } - public void setSubmitHandler(Consumer<AjaxRequestTarget> submitHandler) { + public void setSubmitHandler(SerializableConsumer<AjaxRequestTarget> submitHandler) { this.submitHandler = submitHandler; } - public void setErrorHandler(Consumer<AjaxRequestTarget> errorHandler) { + public void setErrorHandler(SerializableConsumer<AjaxRequestTarget> errorHandler) { this.errorHandler = errorHandler; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08579c06/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java index 38c0ac5..df33c06 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java @@ -106,7 +106,7 @@ public class RoomInvitationForm extends InvitationForm { super.updateButtons(target); } else { Collection<Group> to = groups.getModelObject(); - dialog.send.setEnabled(to.size() > 0, target); + dialog.send.setEnabled(!to.isEmpty(), target); dialog.generate.setEnabled(false, target); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08579c06/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index 376346c..cbe44c7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -326,7 +326,7 @@ public class RoomMenuPanel extends Panel { applyAvMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.audio) || !room.getClient().hasRight(Room.Right.video)); pollCreateMenuItem.setEnabled(moder); pollVoteMenuItem.setEnabled(pollExists && notExternalUser && !pollDao.hasVoted(r.getId(), getUserId())); - pollResultMenuItem.setEnabled(pollExists || pollDao.getArchived(r.getId()).size() > 0); + pollResultMenuItem.setEnabled(pollExists || !pollDao.getArchived(r.getId()).isEmpty()); sipDialerMenuItem.setEnabled(r.isSipEnabled() && getBean(ConfigurationDao.class).isSipEnabled()); //TODO sip menus menuPanel.update(handler); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08579c06/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java index aa17904..aba5107 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java @@ -99,7 +99,7 @@ public class StartSharingButton extends OmButton { String _url = s.getString(VideoSettings.URL); Room room = getBean(RoomDao.class).get(roomId); ISessionManager sessionManager = getBean(ISessionManager.class); - app = app.replace("$native", "" + s.getBoolean(FLASH_NATIVE_SSL)) + app = app.replace("$native", String.valueOf(s.getBoolean(FLASH_NATIVE_SSL))) .replace("$codebase", WebSession.get().getExtendedProperties().getCodebase()) .replace("$applicationName", cfgDao.getAppName()) .replace("$url", _url) @@ -113,12 +113,12 @@ public class StartSharingButton extends OmButton { , "1467", "1468", "1469", "1470", "1471" , "1472", "1473", "1474", "1475", "1476" , "1477", "1589", "1598", "1078")) - .replace("$defaultQuality", "" + cfgDao.getLong(CONFIG_SCREENSHARING_QUALITY, 1L)) - .replace("$defaultFps", "" + cfgDao.getLong(CONFIG_SCREENSHARING_FPS, 10L)) - .replace("$showFps", "" + cfgDao.getBool(CONFIG_SCREENSHARING_FPS_SHOW, true)) - .replace("$allowRemote", "" + cfgDao.getBool(CONFIG_SCREENSHARING_ALLOW_REMOTE, true)) - .replace("$allowRecording", "" + (room.isAllowRecording() && (0 == sessionManager.getRecordingCount(roomId)))) - .replace("$allowPublishing", "" + (0 == sessionManager.getPublishingCount(roomId))) + .replace("$defaultQuality", String.valueOf(cfgDao.getLong(CONFIG_SCREENSHARING_QUALITY, 1L))) + .replace("$defaultFps", String.valueOf(cfgDao.getLong(CONFIG_SCREENSHARING_FPS, 10L))) + .replace("$showFps", String.valueOf(cfgDao.getBool(CONFIG_SCREENSHARING_FPS_SHOW, true))) + .replace("$allowRemote", String.valueOf(cfgDao.getBool(CONFIG_SCREENSHARING_ALLOW_REMOTE, true))) + .replace("$allowRecording", String.valueOf(room.isAllowRecording() && (0 == sessionManager.getRecordingCount(roomId)))) + .replace("$allowPublishing", String.valueOf(0 == sessionManager.getPublishingCount(roomId))) ; download.initiate(target); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08579c06/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index a505865..d24b4c7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -163,7 +163,7 @@ var Video = (function() { ico.toggleClass('ui-icon-volume-off ui-icon-volume-on'); vol.removeClass('ui-state-error'); _handleMicStatus(true); - } else if (val == 0 && ico.hasClass('ui-icon-volume-on')) { + } else if (val === 0 && ico.hasClass('ui-icon-volume-on')) { ico.toggleClass('ui-icon-volume-on ui-icon-volume-off'); vol.addClass('ui-state-error'); _handleMicStatus(false); @@ -260,7 +260,7 @@ var Video = (function() { e.stopImmediatePropagation(); return false; }); - let refresh = v.parent().find('.ui-dialog-titlebar-refresh') + v.parent().find('.ui-dialog-titlebar-refresh') .click(function(e) { e.stopImmediatePropagation(); _refresh(); @@ -330,7 +330,7 @@ var Video = (function() { vol.hide(); v.parent().find('.dropdown-menu.video.volume').hide(); } - if (opts.interview && c.pod != _c.pod) { + if (opts.interview && c.pod !== _c.pod) { c.pod = _c.pod; v.dialog('option', 'appendTo', '.pod.pod-' + c.pod); } @@ -385,11 +385,11 @@ var VideoManager = (function() { let _id = VideoUtil.getVid(cl.uid) , av = VideoUtil.hasAudio(cl) || VideoUtil.hasVideo(cl) , v = $('#' + _id); - if (av && v.length != 1 && !!cl.self) { + if (av && v.length !== 1 && !!cl.self) { Video().init(cl, VideoUtil.getPos(VideoUtil.getRects(VID_SEL), cl.width, cl.height + 25)); - } else if (av && v.length == 1) { + } else if (av && v.length === 1) { v.data().update(cl); - } else if (!av && v.length == 1) { + } else if (!av && v.length === 1) { _closeV(v); } } @@ -402,10 +402,10 @@ var VideoManager = (function() { } } - if (c.streams.length == 0) { + if (c.streams.length === 0) { // check for non inited video window let v = $('#' + VideoUtil.getVid(c.uid)); - if (v.length == 1) { + if (v.length === 1) { _closeV(v); } } @@ -427,7 +427,7 @@ var VideoManager = (function() { .show(), 10); share.tooltip().off('click').click(function() { var v = $('#' + VideoUtil.getVid(c.uid)) - if (v.length != 1) { + if (v.length !== 1) { Video().init(c, $(WBA_SEL).offset()); } else { v.dialog('open'); @@ -439,7 +439,7 @@ var VideoManager = (function() { } function _close(uid, showShareBtn) { var _id = VideoUtil.getVid(uid), v = $('#' + _id); - if (v.length == 1) { + if (v.length === 1) { _closeV(v); } if (!showShareBtn && uid === share.data('uid')) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08579c06/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js index 0dca4f3..becd612 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js @@ -1,8 +1,8 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ function initVideo(el, id, options) { - var type = 'application/x-shockwave-flash'; - var src = 'public/main.swf?cache' + new Date().getTime(); - var o = $('<object>').attr('id', id).attr('type', type).attr('data', src).attr('width', options.width).attr('height', options.height); + let type = 'application/x-shockwave-flash' + , src = 'public/main.swf?cache' + new Date().getTime() + , o = $('<object>').attr('id', id).attr('type', type).attr('data', src).attr('width', options.width).attr('height', options.height); o.append($('<param>').attr('name', 'quality').attr('value', 'best')) .append($('<param>').attr('name', 'wmode').attr('value', options.wmode)) .append($('<param>').attr('name', 'allowscriptaccess').attr('value', 'sameDomain')) @@ -12,7 +12,7 @@ function initVideo(el, id, options) { return o; } var VideoSettings = (function() { - var self = {}, vs, lm, swf, s, cam, mic, res, o + let vs, lm, swf, s, cam, mic, res, o , vidScroll, recBtn, playBtn, inited = false, recAllowed = false; function _load() { s = {}; @@ -121,11 +121,11 @@ var VideoSettings = (function() { } function _initSwf() { if (!inited) { - var obj = swf.getDevices(); + let obj = swf.getDevices(); cam.find('option[value!="-1"]').remove(); - for (var i = 0; i < obj.cams.length; ++i) { - var o = $('<option></option>').attr('value', i).text(obj.cams[i]); - if (i == s.video.cam) { + for (let i = 0; i < obj.cams.length; ++i) { + let o = $('<option></option>').attr('value', i).text(obj.cams[i]); + if (i === s.video.cam) { o.prop('selected', true); } cam.append(o); @@ -135,9 +135,9 @@ var VideoSettings = (function() { swf.camChanged(s.video.cam); }); mic.find('option[value!="-1"]').remove(); - for (var i = 0; i < obj.mics.length; ++i) { - var o = $('<option></option>').attr('value', i).text(obj.mics[i]); - if (i == s.video.mic) { + for (let i = 0; i < obj.mics.length; ++i) { + let o = $('<option></option>').attr('value', i).text(obj.mics[i]); + if (i === s.video.mic) { o.prop('selected', true); } mic.append(o); @@ -151,8 +151,8 @@ var VideoSettings = (function() { swf.resChanged(s.video.width, s.video.height); }); res.find('option').each(function(idx) { - var o = $(this).data(); - if (o.width == s.video.width && o.height == s.video.height) { + let o = $(this).data(); + if (o.width === s.video.width && o.height === s.video.height) { $(this).prop('selected', true); return false; }
