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 2017/03/08 14:21:53 UTC
svn commit: r1785973 [1/3] - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/
branches/3.2.x/open...
Author: solomax
Date: Wed Mar 8 14:21:52 2017
New Revision: 1785973
URL: http://svn.apache.org/viewvc?rev=1785973&view=rev
Log:
[OPENMEETINGS-1547] wait for moderator dialog is added, code clean-up
Removed:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/errorModeratorPopup.lzx
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupEntityUnit.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupUnit.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestOmCalendar.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupEntityUnit.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupUnit.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractSpringTest.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestOmCalendar.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java Wed Mar 8 14:21:52 2017
@@ -338,7 +338,7 @@ public abstract class BaseConverter {
return String.format("%sx%s", r.getFlvWidth(), r.getFlvHeight());
}
- protected List<String> addMp4OutParams(Recording r, List<String> argv, String mp4path) throws IOException {
+ protected List<String> addMp4OutParams(Recording r, List<String> argv, String mp4path) {
argv.addAll(Arrays.asList(
"-c:v", "h264", //
"-crf", "24",
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java Wed Mar 8 14:21:52 2017
@@ -58,7 +58,7 @@ public class FileProcessor {
private GeneratePDF generatePDF;
//FIXME TODO this method need to be refactored to throw exceptions
- public ConverterProcessResultList processFile(Long userId, FileExplorerItem f, InputStream is) throws Exception {
+ public ConverterProcessResultList processFile(FileExplorerItem f, InputStream is) throws Exception {
ConverterProcessResultList returnError = new ConverterProcessResultList();
// Generate a random string to prevent any problems with
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java Wed Mar 8 14:21:52 2017
@@ -46,7 +46,7 @@ public class StreamListener implements I
, RecordingMetaDeltaDao metaDeltaDao) {
streamWriter = isAudio
? new StreamAudioWriter(streamName, scope, metaDataId, isScreenData, isInterview, metaDataDao, metaDeltaDao)
- : new StreamVideoWriter(streamName, scope, metaDataId, isScreenData, isInterview, metaDataDao);
+ : new StreamVideoWriter(streamName, scope, metaDataId, isScreenData, metaDataDao);
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java Wed Mar 8 14:21:52 2017
@@ -37,7 +37,7 @@ public class StreamVideoWriter extends B
private Date startedSessionScreenTimeDate = null;
public StreamVideoWriter(String streamName, IScope scope, Long metaDataId, boolean isScreenData,
- boolean isInterview, RecordingMetaDataDao metaDataDao) {
+ RecordingMetaDataDao metaDataDao) {
super(streamName, scope, metaDataId, isScreenData, metaDataDao);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java Wed Mar 8 14:21:52 2017
@@ -27,7 +27,7 @@ import org.apache.openmeetings.db.dto.ro
/**
* Memory based cache, configured as singleton in spring configuration
- *
+ *
* @author sebawagner
*
*/
@@ -36,7 +36,7 @@ public class WhiteBoardObjectListManager
private volatile AtomicLong whiteboardId = new AtomicLong(0);
- public long getNewWhiteboardId(Long roomId, String name) throws Exception {
+ public long getNewWhiteboardId(Long roomId, String name) {
long wbId = whiteboardId.getAndIncrement();
setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, new WhiteboardObject(name), wbId);
return wbId;
@@ -66,7 +66,7 @@ public class WhiteBoardObjectListManager
/*
* Whiteboard Object List
- *
+ *
*/
public void setWhiteBoardObjectListRoomObj(Long roomId, WhiteboardObjectList whiteboardObjectList){
whiteBoardObjectList.put(roomId, whiteboardObjectList);
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Wed Mar 8 14:21:52 2017
@@ -71,9 +71,9 @@ import org.springframework.beans.factory
/**
* Management of optional LDAP Login
- *
+ *
* @author o.becherer
- *
+ *
*/
public class LdapLoginManagement {
private static final Logger log = Red5LoggerFactory.getLogger(LdapLoginManagement.class, webAppRootKey);
@@ -142,7 +142,7 @@ public class LdapLoginManagement {
}
}
- private static Attribute getAttr(Properties config, Entry entry, String aliasCode, String defaultAlias) throws LdapInvalidAttributeValueException {
+ private static Attribute getAttr(Properties config, Entry entry, String aliasCode, String defaultAlias) {
String alias = config.getProperty(aliasCode, "");
Attribute a = entry.get(Strings.isEmpty(alias) ? defaultAlias : alias);
return a == null ? null : a;
@@ -159,9 +159,9 @@ public class LdapLoginManagement {
/**
* Ldap Login
- *
+ *
* Connection Data is retrieved from ConfigurationFile
- *
+ *
*/
public User login(String login, String passwd, Long domainId) throws OmException {
log.debug("LdapLoginmanagement.doLdapLogin");
@@ -374,7 +374,7 @@ public class LdapLoginManagement {
if (!Strings.isEmpty(options.pictureUri)) {
u.setPictureuri(options.pictureUri);
}
-
+
List<Dn> groups = new ArrayList<>();
if (GroupMode.ATTRIBUTE == options.groupMode) {
Attribute attr = getAttr(config, entry, CONFIGKEY_LDAP_KEY_GROUP, LDAP_KEY_GROUP);
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Wed Mar 8 14:21:52 2017
@@ -19,8 +19,8 @@
package org.apache.openmeetings.core.mail;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SYSTEM_EMAIL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -59,12 +59,12 @@ import org.springframework.beans.factory
import org.springframework.core.task.TaskExecutor;
/**
- *
+ *
* @author swagner
- *
+ *
* For a documentation about Javax mail please see fro example:
* http://connector.sourceforge.net/doc-files/Properties.html
- *
+ *
*/
public class MailHandler {
private static final Logger log = Red5LoggerFactory.getLogger(MailHandler.class, webAppRootKey);
@@ -128,7 +128,7 @@ public class MailHandler {
BodyPart body = new MimeBodyPart();
body.setContent(multiBody);
multipart.addBodyPart(body);
-
+
BodyPart iCalAttachment = new MimeBodyPart();
iCalAttachment.setDataHandler(new DataHandler(new ByteArrayDataSource(new ByteArrayInputStream(m.getIcs()),
"application/ics")));
@@ -154,7 +154,7 @@ public class MailHandler {
// -- Set some other header information --
msg.setHeader("X-Mailer", "XML-Mail");
msg.setSentDate(new Date());
-
+
return msg;
}
@@ -170,7 +170,7 @@ public class MailHandler {
if (mailTls) {
props.put("mail.smtp.starttls.enable", "true");
}
- props.put("mail.smtp.connectiontimeout", smtpConnectionTimeOut);
+ props.put("mail.smtp.connectiontimeout", smtpConnectionTimeOut);
props.put("mail.smtp.timeout", smtpTimeOut);
// Check for Authentication
@@ -208,7 +208,7 @@ public class MailHandler {
}
}
msg.addRecipients(Message.RecipientType.TO, InternetAddress.parse(m.getRecipients(), false));
-
+
return m.getIcs() == null ? appendBody(msg, m) : appendIcsBody(msg, m);
}
@@ -274,7 +274,7 @@ public class MailHandler {
log.debug("... resetSendingStatus done.");
}
- public void sendMails() throws Exception {
+ public void sendMails() {
init();
log.debug("sendMails enter ...");
List<MailMessage> list = mailMessageDao.get(0, 1, MailMessage.Status.NONE);
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Wed Mar 8 14:21:52 2017
@@ -59,9 +59,9 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
/**
- *
+ *
* @author swagner
- *
+ *
*/
public class MainService implements IPendingServiceCallback {
private static final Logger log = Red5LoggerFactory.getLogger(MainService.class, OpenmeetingsVariables.webAppRootKey);
@@ -91,7 +91,7 @@ public class MainService implements IPen
/**
* gets a user by its SID
- *
+ *
* @param sid
* @param userId
* @return - user with SID given
@@ -171,7 +171,7 @@ public class MainService implements IPen
}
return allowed;
}
-
+
public List<Object> loginWicket(String wicketSID, Long wicketroomid) {
log.debug("[loginWicket] wicketSID: '{}'; wicketroomid: '{}'", wicketSID, wicketroomid);
Sessiondata sd = sessionDao.check(wicketSID);
@@ -184,22 +184,22 @@ public class MainService implements IPen
IConnection current = Red5.getConnectionLocal();
String streamId = current.getClient().getId();
Client currentClient = sessionManager.getClientByStreamId(streamId, null);
-
+
if (User.Type.user != u.getType() || (User.Type.user == u.getType() && !u.getGroupUsers().isEmpty())) {
u.setSessionData(sd);
currentClient.setUserId(u.getId());
currentClient.setRoomId(wicketroomid);
SessionVariablesUtil.setUserId(current.getClient(), u.getId());
-
+
currentClient.setUsername(u.getLogin());
currentClient.setFirstname(u.getFirstname());
currentClient.setLastname(u.getLastname());
currentClient.setPicture_uri(u.getPictureuri());
currentClient.setEmail(u.getAddress() == null ? null : u.getAddress().getEmail());
sessionManager.updateClientByStreamId(streamId, currentClient, false, null);
-
+
scopeApplicationAdapter.sendMessageToCurrentScope("roomConnect", currentClient, false);
-
+
return Arrays.<Object>asList(u, r);
}
}
@@ -211,7 +211,7 @@ public class MainService implements IPen
* Function is called if the user loggs in via a secureHash and sets the
* param showNickNameDialog in the Object SOAPLogin to true the user gets
* displayed an additional dialog to enter his nickname
- *
+ *
* @param firstname
* @param lastname
* @param email
@@ -244,7 +244,7 @@ public class MainService implements IPen
/**
* clear this session id
- *
+ *
* @param sid
* @return string value if completed
*/
@@ -253,11 +253,11 @@ public class MainService implements IPen
Sessiondata sd = sessionDao.check(sid);
IConnection current = Red5.getConnectionLocal();
Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null);
-
+
scopeApplicationAdapter.roomLeaveByScope(currentClient,current.getScope(), false);
-
+
currentClient.setUserObject(null, null, null, null);
-
+
return userManager.logout(sid, sd.getUserId());
} catch (Exception err) {
log.error("[logoutUser]",err);
@@ -265,7 +265,7 @@ public class MainService implements IPen
return -1L;
}
- public List<Configuration> getGeneralOptions(String SID) {
+ public List<Configuration> getGeneralOptions() {
try {
return configurationDao.get("exclusive.audio.keycode", CONFIG_SIP_ENABLED, CONFIG_MAX_UPLOAD_SIZE_KEY, "mute.keycode", CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY);
} catch (Exception err) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Wed Mar 8 14:21:52 2017
@@ -328,7 +328,12 @@ public class MobileService {
return result;
}
- //designed to do nothing remain for compatibility
+ /**
+ * designed to do nothing remain for compatibility
+ *
+ * @param SID - sid
+ * @param userId - redundant userId
+ */
public Map<String, Object> roomConnect(String SID, Long userId) {
return new HashMap<>();
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java Wed Mar 8 14:21:52 2017
@@ -89,7 +89,7 @@ public class RecordingService implements
public void resultReceived(IPendingServiceCall arg0) {
}
- private static String generateFileName(Long recordingId, String streamid) throws Exception {
+ private static String generateFileName(Long recordingId, String streamid) {
String dateString = CalendarPatterns.getTimeForStreamId(new Date());
return "rec_" + recordingId + "_stream_" + streamid + "_" + dateString;
}
@@ -435,7 +435,7 @@ public class RecordingService implements
}
}
- public void addRecordingByStreamId(IConnection conn, String streamId, Client rcl, Long recordingId) {
+ public void addRecordingByStreamId(IConnection conn, Client rcl, Long recordingId) {
try {
Recording recording = recordingDao.get(recordingId);
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java Wed Mar 8 14:21:52 2017
@@ -368,7 +368,7 @@ public class WhiteBoardService implement
return;
}
- private static int getNumberOfInitialLoaders(Map<String, WhiteboardSyncLockObject> syncListRoom) throws Exception {
+ private static int getNumberOfInitialLoaders(Map<String, WhiteboardSyncLockObject> syncListRoom) {
int number = 0;
for (Map.Entry<String, WhiteboardSyncLockObject> e : syncListRoom.entrySet()) {
if (e.getValue().isInitialLoaded()) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Wed Mar 8 14:21:52 2017
@@ -761,7 +761,7 @@ public class ScopeApplicationAdapter ext
}
if (rcl.getIsRecording()) {
log.debug("RCL getIsRecording newStream SEND");
- recordingService.addRecordingByStreamId(current, streamid, c, rcl.getRecordingId());
+ recordingService.addRecordingByStreamId(current, c, rcl.getRecordingId());
}
if (rcl.isScreenClient()) {
log.debug("RCL getIsScreenClient newStream SEND");
@@ -966,39 +966,6 @@ public class ScopeApplicationAdapter ext
return true;
}
- /**
- * Invoked by a User whenever he want to become moderator this is needed,
- * cause if the room has no moderator yet there is no-one he can ask to get
- * the moderation, in case its a Non-Moderated Room he should then get the
- * Moderation without any confirmation needed
- *
- * @return Long 1 => means get Moderation, 2 => ask Moderator for
- * Moderation, 3 => wait for Moderator
- */
- public long applyForModeration(String publicSID) {
- try {
- Client currentClient = sessionManager.getClientByPublicSID(publicSID, null);
- if (currentClient == null) {
- log.warn("Unable to find client by publicSID: {}", publicSID);
- return -1L;
- }
-
- List<Client> currentModList = sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId());
-
- if (currentModList.size() > 0) {
- return 2L;
- } else {
- // No moderator in this room at the moment
- Room room = roomDao.get(currentClient.getRoomId());
-
- return room.isModerated() ? 3L : 1L;
- }
- } catch (Exception err) {
- log.error("[applyForModeration]", err);
- }
- return -1L;
- }
-
public static long nextBroadCastId() {
return broadCastCounter.getAndIncrement();
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java Wed Mar 8 14:21:52 2017
@@ -52,7 +52,7 @@ public class ChatDao {
.setMaxResults(count)
.getResultList();
}
-
+
public List<ChatMessage> getRoom(long roomId, int start, int count, boolean all) {
return em.createNamedQuery("getChatMessagesByRoom", ChatMessage.class)
.setParameter("roomId", roomId)
@@ -61,7 +61,7 @@ public class ChatDao {
.setMaxResults(count)
.getResultList();
}
-
+
public List<ChatMessage> getUser(long userId, int start, int count) {
return em.createNamedQuery("getChatMessagesByUser", ChatMessage.class)
.setParameter("userId", userId)
@@ -87,6 +87,10 @@ public class ChatDao {
return entity;
}
+ /**
+ * @param entity - unused
+ * @param userId - unused
+ */
public void delete(ChatMessage entity, long userId) {
// TODO Auto-generated method stub
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java Wed Mar 8 14:21:52 2017
@@ -123,6 +123,10 @@ public class MailMessageDao implements
}
}
+ /**
+ * @param id - entity id
+ * @param userId - unused
+ */
public void delete(Long id, Long userId) {
if (id != null) {
em.remove(get(id));
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java Wed Mar 8 14:21:52 2017
@@ -36,6 +36,9 @@ public class RoomGroupDao {
return em.createNamedQuery("getAllRoomGroups", RoomGroup.class).getResultList();
}
+ /**
+ * @param userId unused
+ */
public RoomGroup update(RoomGroup entity, Long userId) {
if (entity.getId() == null) {
entity.setInserted(new Date());
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java Wed Mar 8 14:21:52 2017
@@ -41,7 +41,7 @@ public class RoomModeratorDao {
}
return null;
}
-
+
public List<RoomModerator> get(Collection<Long> ids) {
return em.createNamedQuery("getRoomModeratorsByIds", RoomModerator.class).setParameter("ids", ids).getResultList();
}
@@ -50,6 +50,9 @@ public class RoomModeratorDao {
return em.createNamedQuery("getRoomModeratorByRoomId", RoomModerator.class).setParameter("roomId", roomId).getResultList();
}
+ /**
+ * @param userId unused
+ */
public RoomModerator update(RoomModerator rm, Long userId) {
if (rm.getId() == null) {
rm.setInserted(new Date());
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Wed Mar 8 14:21:52 2017
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.db
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Collection;
@@ -668,7 +667,7 @@ public class UserDao implements IGroupAd
public User addUser(Set<Right> rights, String firstname, String login, String lastname, long languageId,
String userpass, Address adress, boolean sendSMS, Date age, String hash, TimeZone timezone,
boolean forceTimeZoneCheck, String userOffers, String userSearchs, boolean showContactData,
- boolean showContactDataToContacts, String externalId, String externalType, List<Long> groupIds, String pictureuri) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+ boolean showContactDataToContacts, String externalId, String externalType, List<Long> groupIds, String pictureuri) throws NoSuchAlgorithmException {
User u = new User();
u.setFirstname(firstname);
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java Wed Mar 8 14:21:52 2017
@@ -137,8 +137,9 @@ public class Client implements IDataProv
return rights.contains(Right.superModerator) || rights.contains(Right.moderator) ? true : rights.contains(right);
}
- public void allow(Right... _rights) {
+ public Client allow(Right... _rights) {
allow(Arrays.asList(_rights));
+ return this;
}
public void allow(Iterable<Right> _rights) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Wed Mar 8 14:21:52 2017
@@ -496,21 +496,6 @@
//if ($debug) Debug.write("throw event to drawarea: ", canvas.moderatorStreamID, canvas.ismoderator);
canvas._drawarea.onopenWhiteBoard.sendEvent();
-
- if ($debug) Debug.write("room ", canvas.currentRoomObj);
- if ($debug) Debug.write("room.type ", canvas.currentRoomObj.type);
-
- if (canvas.currentRoomObj.type != 'restricted') {
- if (canvas.currentRoomObj.moderated) {
- if (value.length == 0 && !messageAlreadyThrown){
- new lz.labelerrorPopup(canvas,{errorlabelid:641});
- }
- } else {
- if (value.length == 0 && !messageAlreadyThrown){
- new lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(498)});
- }
- }
- }
]]>
</handler>
</netRemoteCallHib>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx Wed Mar 8 14:21:52 2017
@@ -33,7 +33,6 @@
<include href="editWhiteboardDefault.lzx" />
<include href="confirmationSingle.lzx" />
<include href="autoLoader.lzx" />
- <include href="errorModeratorPopup.lzx" />
<include href="syncWin.lzx" />
<include href="incomingScreenSharing.lzx" />
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupEntityUnit.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupEntityUnit.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupEntityUnit.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupEntityUnit.java Wed Mar 8 14:21:52 2017
@@ -33,13 +33,13 @@ public class CleanupEntityUnit extends C
private long sizeInvalid = 0;
private long sizeDeleted = 0;
protected final int missing;
-
+
public CleanupEntityUnit() {
invalid = new ArrayList<>();
deleted = new ArrayList<>();
missing = 0;
}
-
+
public CleanupEntityUnit(File parent, List<File> invalid, List<File> deleted, int missing) {
super(parent);
this.invalid = invalid;
@@ -52,7 +52,7 @@ public class CleanupEntityUnit extends C
sizeDeleted += OmFileHelper.getSize(i);
}
}
-
+
@Override
public void cleanup() throws IOException {
for (File i : invalid) {
@@ -62,7 +62,7 @@ public class CleanupEntityUnit extends C
FileUtils.deleteQuietly(i);
}
}
-
+
public long getSizeInvalid() {
return sizeInvalid;
}
@@ -78,7 +78,7 @@ public class CleanupEntityUnit extends C
public String getHumanDeleted() {
return OmFileHelper.getHumanSize(sizeDeleted);
}
-
+
public int getMissing() {
return missing;
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupUnit.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupUnit.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupUnit.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupUnit.java Wed Mar 8 14:21:52 2017
@@ -29,12 +29,12 @@ public class CleanupUnit implements Seri
private static final long serialVersionUID = 1L;
private final File parent;
private final long sizeTotal;
-
+
public CleanupUnit() {
parent = new File(".");
sizeTotal = 0;
}
-
+
public CleanupUnit(File parent) {
this.parent = parent;
if (!parent.isDirectory() || !parent.exists()) {
@@ -42,17 +42,20 @@ public class CleanupUnit implements Seri
}
sizeTotal = OmFileHelper.getSize(parent);
}
-
+
+ /**
+ * @throws IOException some of the subclussed can throw
+ */
public void cleanup() throws IOException {
for (File f : getParent().listFiles()) {
FileUtils.deleteQuietly(f);
}
}
-
+
public File getParent() {
return parent;
}
-
+
public long getSizeTotal() {
return sizeTotal;
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Wed Mar 8 14:21:52 2017
@@ -444,7 +444,7 @@ public class ImportInitvalues {
}
}
- public void loadInitialOAuthServers() throws Exception {
+ public void loadInitialOAuthServers() {
// Yandex
OAuthServer yandexServer = new OAuthServer();
yandexServer.setName("Yandex");
Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java Wed Mar 8 14:21:52 2017
@@ -24,7 +24,6 @@ import static org.apache.openmeetings.sc
import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
import static org.slf4j.LoggerFactory.getLogger;
-import java.io.IOException;
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -151,7 +150,7 @@ public class CaptureScreen extends Threa
}
*/
- public void pushVideo(VideoData data, int ts) throws IOException {
+ public void pushVideo(VideoData data, int ts) {
if (startPublish) {
if (Red5.getConnectionLocal() == null) {
Red5.setConnectionLocal(client.getConnection());
Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java Wed Mar 8 14:21:52 2017
@@ -238,6 +238,9 @@ public class Core implements IPendingSer
}
}
+ /**
+ * @param id The streamid sent by server
+ */
public void setId(String id) {
}
@@ -384,6 +387,12 @@ public class Core implements IPendingSer
this.readyToRecord = readyToRecord;
}
+ /**
+ * @param conn - unused
+ * @param channel - unused
+ * @param source - unused
+ * @param command - command to be processed
+ */
protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
if (!(command instanceof Notify)) {
return;
Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java Wed Mar 8 14:21:52 2017
@@ -19,8 +19,8 @@
package org.apache.openmeetings.screenshare.job;
import static java.lang.Boolean.TRUE;
-import static java.lang.Character.toUpperCase;
import static java.lang.Character.isUpperCase;
+import static java.lang.Character.toUpperCase;
import static javax.swing.KeyStroke.getKeyStroke;
import static org.apache.openmeetings.screenshare.util.Util.getInt;
import static org.slf4j.LoggerFactory.getLogger;
@@ -66,7 +66,7 @@ public class OmKeyEvent {
KEY_MAP.put(220, KeyEvent.VK_BACK_SLASH);
KEY_MAP.put(221, KeyEvent.VK_CLOSE_BRACKET);
KEY_MAP.put(222, KeyEvent.VK_QUOTE);
-
+
CHAR_MAP.put(Character.valueOf('#'), KeyEvent.VK_NUMBER_SIGN);
CHAR_MAP.put(Character.valueOf('<'), KeyEvent.VK_LESS);
CHAR_MAP.put(Character.valueOf('.'), KeyEvent.VK_PERIOD);
@@ -87,7 +87,7 @@ public class OmKeyEvent {
private int inKey = 0;
private int key = 0;
private char ch = 0;
-
+
public OmKeyEvent(Map<String, Object> obj) {
alt = TRUE.equals(obj.get("alt"));
ctrl = TRUE.equals(obj.get("ctrl"));
@@ -135,12 +135,12 @@ public class OmKeyEvent {
return vowel;
}
- public void press(RemoteJob r) throws InterruptedException {
+ public void press(RemoteJob r) {
List<Integer> list = new ArrayList<>();
if (UNPRINTABLE.contains(ch)) {
if (SystemUtils.IS_OS_LINUX) {
r.press(KeyEvent.VK_CONTROL, KeyEvent.VK_SHIFT, KeyEvent.VK_U);
- String hex = Integer.toHexString((int)ch);
+ String hex = Integer.toHexString(ch);
log.debug("sequence:: hex {}", hex);
for (int i = 0; i < hex.length(); ++i) {
r.press(KeyStroke.getKeyStroke(toUpperCase(hex.charAt(i)), 0).getKeyCode());
@@ -165,7 +165,7 @@ public class OmKeyEvent {
list.add(KeyEvent.VK_ADD);
String code = String.format("%04", (int)ch);
for (int i = 0; i < code.length(); ++i) {
- list.add(KeyEvent.VK_NUMPAD0 + (int)code.charAt(i));
+ list.add(KeyEvent.VK_NUMPAD0 + code.charAt(i));
}
r.press(list);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java Wed Mar 8 14:21:52 2017
@@ -120,12 +120,12 @@ public class RemoteJob implements Job {
}
}
- public void press(List<Integer> codes) throws InterruptedException {
+ public void press(List<Integer> codes) {
log.debug("sequence:: codes {}", codes);
press(codes.stream().mapToInt(Integer::intValue).toArray());
}
- public void press(int... codes) throws InterruptedException {
+ public void press(int... codes) {
for (int i = 0; i < codes.length; ++i) {
robot.keyPress(codes[i]);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java Wed Mar 8 14:21:52 2017
@@ -20,8 +20,6 @@ package org.apache.openmeetings.screensh
import static org.slf4j.LoggerFactory.getLogger;
-import java.io.IOException;
-
import org.apache.openmeetings.screenshare.CaptureScreen;
import org.quartz.Job;
import org.quartz.JobDataMap;
@@ -34,7 +32,7 @@ public class SendJob implements Job {
private static final Logger log = getLogger(SendJob.class);
public static final String CAPTURE_KEY = "capture";
public SendJob() {}
-
+
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
JobDataMap data = context.getJobDetail().getJobDataMap();
@@ -50,18 +48,14 @@ public class SendJob implements Job {
}
f = f == null ? capture.getEncoder().getUnalteredFrame() : f;
if (f != null) {
- try {
- capture.pushVideo(f, capture.getTimestamp().get());
- if (log.isTraceEnabled()) {
- long real = System.currentTimeMillis() - capture.getStartTime();
- log.trace(String.format("send: Sending video %sk, timestamp: %s, real: %s, diff: %s", f.getData().capacity() / 1024, capture.getTimestamp(), real, real - capture.getTimestamp().get()));
- }
- capture.getTimestamp().addAndGet(capture.getTimestampDelta());
- if (log.isTraceEnabled()) {
- log.trace(String.format("send: new timestamp: %s", capture.getTimestamp()));
- }
- } catch (IOException e) {
- log.error("Error while sending: ", e);
+ capture.pushVideo(f, capture.getTimestamp().get());
+ if (log.isTraceEnabled()) {
+ long real = System.currentTimeMillis() - capture.getStartTime();
+ log.trace(String.format("send: Sending video %sk, timestamp: %s, real: %s, diff: %s", f.getData().capacity() / 1024, capture.getTimestamp(), real, real - capture.getTimestamp().get()));
+ }
+ capture.getTimestamp().addAndGet(capture.getTimestampDelta());
+ if (log.isTraceEnabled()) {
+ log.trace(String.format("send: new timestamp: %s", capture.getTimestamp()));
}
} else if (log.isTraceEnabled()) {
log.trace(String.format("send: nothing to send"));
Modified: openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java Wed Mar 8 14:21:52 2017
@@ -24,7 +24,6 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeoutException;
@@ -59,7 +58,7 @@ public class ProcessHelper {
private final InputStream is;
private final BufferedReader br;
- private StreamWatcher(Process process, boolean isError) throws UnsupportedEncodingException {
+ private StreamWatcher(Process process, boolean isError) {
output = new StringBuilder();
is = isError ? process.getErrorStream() : process.getInputStream();
br = new BufferedReader(new InputStreamReader(is, UTF_8));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java Wed Mar 8 14:21:52 2017
@@ -123,7 +123,7 @@ public class BackupPanel extends AdminPa
progressHolder = new ProgressHolder();
timer.restart(target);
- new Thread(new BackupProcess(getBean(BackupExport.class), backupDir, includeFilesInBackup.getObject(), progressHolder)
+ new Thread(new BackupProcess(getBean(BackupExport.class), backupDir, includeFilesInBackup.getObject())
, "Openmeetings - " + dateString).start();
// repaint the feedback panel so that it is hidden
@@ -211,13 +211,11 @@ public class BackupPanel extends AdminPa
private BackupExport backup;
private File backupDir;
private boolean includeFiles;
- private ProgressHolder progressHolder;
- public BackupProcess(BackupExport backup, File backupDir, boolean includeFiles, ProgressHolder progressHolder) {
+ public BackupProcess(BackupExport backup, File backupDir, boolean includeFiles) {
this.backup = backup;
this.backupDir = backupDir;
this.includeFiles = includeFiles;
- this.progressHolder = progressHolder;
th = null;
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Wed Mar 8 14:21:52 2017
@@ -38,6 +38,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.IApplication;
@@ -418,13 +419,16 @@ public class Application extends Authent
}
public static List<Client> getRoomClients(Long roomId) {
+ return getRoomClients(roomId, null);
+ }
+ public static List<Client> getRoomClients(Long roomId, Predicate<Client> filter) {
List<Client> clients = new ArrayList<>();
if (roomId != null) {
Set<String> uids = ROOMS.get(roomId);
if (uids != null) {
for (String uid : uids) {
Client c = getOnlineClient(uid);
- if (c != null) {
+ if (c != null && (filter == null || filter.test(c))) {
clients.add(c);
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java Wed Mar 8 14:21:52 2017
@@ -62,7 +62,7 @@ public class DownloadMenuItem extends Me
File f = fi.getFile(ext);
if (f != null && f.exists()) {
if (ext == null && (Type.Image == fi.getType() || Type.Presentation == fi.getType())) {
- File[] ff = f.getParentFile().listFiles(new OriginalFilter(fi, ext));
+ File[] ff = f.getParentFile().listFiles(new OriginalFilter(fi));
if (ff.length > 0) {
f = ff[0];
}
@@ -77,7 +77,7 @@ public class DownloadMenuItem extends Me
final FileItem fi;
Set<String> exclusions = new HashSet<>();
- OriginalFilter(FileItem fi, String ext) {
+ OriginalFilter(FileItem fi) {
this.fi = fi;
exclusions.add(EXTENSION_JPG);
if (Type.Presentation == fi.getType()) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Wed Mar 8 14:21:52 2017
@@ -237,7 +237,7 @@ public class ForgetPasswordDialog extend
return new Long(-2);
}
- private static void sendHashByUser(User us, String appLink, UserDao userDao) throws Exception {
+ private static void sendHashByUser(User us, String appLink, UserDao userDao) {
log.debug("User: " + us.getLogin());
us.setResethash(UUID.randomUUID().toString());
userDao.update(us, -1L);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java Wed Mar 8 14:21:52 2017
@@ -67,7 +67,7 @@ public class NicknameDialog extends Abst
private static boolean isVisible(User u) {
return User.Type.external == u.getType() && Strings.isEmpty(u.getFirstname()) && Strings.isEmpty(u.getLastname());
}
-
+
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
@@ -99,6 +99,6 @@ public class NicknameDialog extends Abst
@Override
protected void onSubmit(AjaxRequestTarget target) {
- room.broadcast(target, room.getClient());
+ room.broadcast(room.getClient());
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java Wed Mar 8 14:21:52 2017
@@ -35,19 +35,19 @@ public abstract class OmRedirectTimerBeh
this.delay = delay;
this.labelId = labelId;
}
-
+
protected static String getTime(int remain) {
return Duration.seconds(remain).toString(WebSession.get().getLocale());
}
-
+
public static String getText(String text, int remain) {
return String.format("%s: %s", text, getTime(remain));
}
-
+
protected String getText(int remain) {
return getText(getComponent().getString(labelId), remain);
}
-
+
private int remain(long now) {
return (int)(delay - (now - clock) / 1000);
}
@@ -60,9 +60,12 @@ public abstract class OmRedirectTimerBeh
onTimer(delay);
}
+ /**
+ * @param remain
+ */
protected void onTimer(int remain) {
}
-
+
@Override
protected void onTimer(AjaxRequestTarget target) {
int remain = remain(System.currentTimeMillis());
@@ -75,6 +78,6 @@ public abstract class OmRedirectTimerBeh
onFinish(target);
}
}
-
+
protected abstract void onFinish(AjaxRequestTarget target);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Wed Mar 8 14:21:52 2017
@@ -36,6 +36,7 @@
<div wicket:id="wait-for-recording"></div>
<div wicket:id="nickname"></div>
<div wicket:id="client-kicked"></div>
+ <div wicket:id="wait-for-moderator"></div>
</div>
<div id="disconnected-dlg" wicket:message="title:204, data-reload:753" style="display:none">
<wicket:message key="556"/>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Wed Mar 8 14:21:52 2017
@@ -29,6 +29,7 @@ import static org.apache.openmeetings.we
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.util.Calendar;
+import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
@@ -137,6 +138,7 @@ public class RoomPanel extends BasePanel
};
private RedirectMessageDialog roomClosed;
private MessageDialog clientKicked;
+ private MessageDialog waitForModerator;
private RoomMenuPanel menu;
private RoomSidebar sidebar;
private ActivitiesPanel activities;
@@ -253,7 +255,15 @@ public class RoomPanel extends BasePanel
room.setVisible(false);
}
}
- add(room, accessDenied, eventDetail);
+ waitForModerator = new MessageDialog("wait-for-moderator", getString("204"), getString("696"), DialogButtons.OK, DialogIcon.LIGHT) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
+ // no-op
+ }
+ };
+ add(room, accessDenied, eventDetail, waitForModerator);
if (r.isWaitForRecording()) {
add(new MessageDialog("wait-for-recording", getString("1316"), getString("1315"), DialogButtons.OK, DialogIcon.LIGHT) {
private static final long serialVersionUID = 1L;
@@ -495,8 +505,20 @@ public class RoomPanel extends BasePanel
}
}
- public void requestRight(AjaxRequestTarget target, Right right) {
+ public void requestRight(Right right, IPartialPageRequestHandler handler) {
RoomMessage.Type reqType = null;
+ List<Client> mods = Application.getRoomClients(r.getId(), c -> c.hasRight(Room.Right.moderator));
+ if (mods.size() == 0) {
+ if (r.isModerated()) {
+ //dialog
+ waitForModerator.open(handler);
+ return;
+ } else {
+ // we found no-one we can ask, allow right
+ broadcast(getClient().allow(right));
+ }
+ }
+ // ask
switch (right) {
case moderator:
reqType = Type.requestRightModerator;
@@ -530,12 +552,12 @@ public class RoomPanel extends BasePanel
}
}
- public void allowRight(AjaxRequestTarget target, Client client, Right... rights) {
+ public void allowRight(Client client, Right... rights) {
client.allow(rights);
- broadcast(target, client);
+ broadcast(client);
}
- public void denyRight(AjaxRequestTarget target, Client client, Right... rights) {
+ public void denyRight(Client client, Right... rights) {
for (Right right : rights) {
client.deny(right);
}
@@ -545,14 +567,14 @@ public class RoomPanel extends BasePanel
if (client.hasActivity(Client.Activity.broadcastV) && !client.hasRight(Right.video)) {
client.remove(Client.Activity.broadcastV);
}
- broadcast(target, client);
+ broadcast(client);
}
- public void kickUser(AjaxRequestTarget target, Client client) {
+ public void kickUser(Client client) {
WebSocketHelper.sendRoom(new TextRoomMessage(client.getRoomId(), client.getUserId(), Type.kick, client.getUid()));
}
- public void broadcast(AjaxRequestTarget target, Client client) {
+ public void broadcast(Client client) {
WebSocketHelper.sendRoom(new RoomMessage(getRoom().getId(), getUserId(), RoomMessage.Type.rightUpdated));
RoomBroadcaster.sendUpdatedClient(client);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java Wed Mar 8 14:21:52 2017
@@ -103,35 +103,35 @@ public class ActivitiesPanel extends Bas
switch (a.getType()) {
case reqRightModerator:
sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id));
- room.allowRight(target, client, Right.moderator);
+ room.allowRight(client, Right.moderator);
break;
case reqRightAv:
sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id));
- room.allowRight(target, client, Right.audio, Right.video);
+ room.allowRight(client, Right.audio, Right.video);
break;
case reqRightWb:
sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id));
- room.allowRight(target, client, Right.whiteBoard);
+ room.allowRight(client, Right.whiteBoard);
break;
case reqRightShare:
sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id));
- room.allowRight(target, client, Right.share);
+ room.allowRight(client, Right.share);
break;
case reqRightRemote:
sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id));
- room.allowRight(target, client, Right.remoteControl);
+ room.allowRight(client, Right.remoteControl);
break;
case reqRightA:
sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id));
- room.allowRight(target, client, Right.audio);
+ room.allowRight(client, Right.audio);
break;
case reqRightMute:
sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id));
- room.allowRight(target, client, Right.mute);
+ room.allowRight(client, Right.mute);
break;
case reqRightExclusive:
sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id));
- room.allowRight(target, client, Right.exclusive);
+ room.allowRight(client, Right.exclusive);
break;
default:
break;
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java Wed Mar 8 14:21:52 2017
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.web.room.menu;
-import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
import static org.apache.openmeetings.web.app.Application.getBean;
@@ -38,8 +37,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.util.message.RoomMessage;
-import org.apache.openmeetings.util.message.TextRoomMessage;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ImagePanel;
@@ -82,7 +79,7 @@ public class RoomMenuPanel extends Panel
}
@Override
public void onClick(AjaxRequestTarget target) {
- room.requestRight(target, Room.Right.moderator);
+ room.requestRight(Room.Right.moderator, target);
}
};
private final RoomPanel room;
@@ -126,7 +123,7 @@ public class RoomMenuPanel extends Panel
@Override
public void onClick(AjaxRequestTarget target) {
- sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.requestRightWb, room.getClient().getUid()));
+ room.requestRight(Room.Right.whiteBoard, target);
}
};
private final RoomMenuItem applyAvMenuItem = new RoomMenuItem(Application.getString(786), Application.getString(1482), false) {
@@ -134,7 +131,7 @@ public class RoomMenuPanel extends Panel
@Override
public void onClick(AjaxRequestTarget target) {
- sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.requestRightAv, room.getClient().getUid()));
+ room.requestRight(Room.Right.video, target);
}
};
private final RoomMenuItem pollCreateMenuItem = new RoomMenuItem(Application.getString(24), Application.getString(1483), false) {
@@ -284,7 +281,6 @@ public class RoomMenuPanel extends Panel
//TODO add check "sharing started"
boolean shareVisible = room.screenShareAllowed();
shareMenuItem.setEnabled(shareVisible);
- //FIXME TODO apply* should be enabled if moder is in room
applyModerMenuItem.setEnabled(!moder);
applyWbMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.whiteBoard));
applyAvMenuItem.setEnabled(!room.getClient().hasRight(Room.Right.audio) || !room.getClient().hasRight(Room.Right.video));
@@ -294,7 +290,6 @@ public class RoomMenuPanel extends Panel
sipDialerMenuItem.setEnabled(r.isSipEnabled() && getBean(ConfigurationDao.class).isSipEnabled());
//TODO sip menus
menuPanel.update(handler);
- //FIXME TODO askBtn should be visible if moder is in room
StringBuilder roomClass = new StringBuilder("room name");
StringBuilder roomTitle = new StringBuilder();
if (room.getRecordingUser() != null) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Wed Mar 8 14:21:52 2017
@@ -137,7 +137,7 @@ public class RoomSidebar extends Panel {
} else {
c.remove(Activity.broadcastA);
}
- room.broadcast(target, c);
+ room.broadcast(c);
}
}
break;
@@ -166,19 +166,19 @@ public class RoomSidebar extends Panel {
}
if (client.hasRight(right)) {
if (Right.audio == right) {
- room.denyRight(target, client, right, Right.video);
+ room.denyRight(client, right, Right.video);
} else {
- room.denyRight(target, client, right);
+ room.denyRight(client, right);
}
} else {
if (Right.video == right) {
- room.allowRight(target, client, Right.audio, right);
+ room.allowRight(client, Right.audio, right);
} else {
- room.allowRight(target, client, right);
+ room.allowRight(client, right);
}
}
} else {
- room.requestRight(target, right);
+ room.requestRight(right, target);
}
} catch (Exception e) {
log.error("Unexpected exception while toggle 'right'", e);
@@ -197,7 +197,7 @@ public class RoomSidebar extends Panel {
}
Activity a = Activity.valueOf(getRequest().getRequestParameters().getParameterValue(PARAM_ACTIVITY).toString());
Client c = getOnlineClient(uid);
- toggleActivity(c, a, target);
+ toggleActivity(c, a);
} catch (Exception e) {
log.error("Unexpected exception while toggle 'activity'", e);
}
@@ -220,11 +220,11 @@ public class RoomSidebar extends Panel {
if (!avInited) {
avInited = true;
if (Room.Type.conference == room.getRoom().getType()) {
- toggleActivity(c, Activity.broadcastAV, target);
+ toggleActivity(c, Activity.broadcastAV);
}
}
RoomBroadcaster.sendUpdatedClient(c);
- room.broadcast(target, c);
+ room.broadcast(c);
}
}
};
@@ -321,7 +321,7 @@ public class RoomSidebar extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target) {
- room.kickUser(target, kickedClient);
+ room.kickUser(kickedClient);
}
});
final Form<?> form = new Form<>("form");
@@ -389,7 +389,7 @@ public class RoomSidebar extends Panel {
upload.open(handler);
}
- public void toggleActivity(Client c, Activity a, AjaxRequestTarget target) {
+ public void toggleActivity(Client c, Activity a) {
if (c == null) {
return;
}
@@ -419,7 +419,7 @@ public class RoomSidebar extends Panel {
} else {
c.toggle(a);
}
- room.broadcast(target, c);
+ room.broadcast(c);
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java Wed Mar 8 14:21:52 2017
@@ -199,7 +199,7 @@ public class UploadDialog extends Abstra
f.setInsertedBy(getUserId());
try {
- ConverterProcessResultList logs = getBean(FileProcessor.class).processFile(getUserId(), f, fu.getInputStream());
+ ConverterProcessResultList logs = getBean(FileProcessor.class).processFile(f, fu.getInputStream());
for (Entry<String, ConverterProcessResult> entry : logs.getJobs().entrySet()) {
getBean(FileItemLogDao.class).add(entry.getValue().getProcess(), f, entry.getValue());
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java Wed Mar 8 14:21:52 2017
@@ -19,7 +19,6 @@
package org.apache.openmeetings.web.user;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.util.Arrays;
import java.util.List;
@@ -54,7 +53,7 @@ public class InviteUserMessageDialog ext
public void open(IPartialPageRequestHandler handler, Long roomId, Long userId) {
Room r = getBean(RoomDao.class).get(roomId);
- User u = getBean(UserDao.class).get(getUserId());
+ User u = getBean(UserDao.class).get(userId);
message.setModelObject(String.format("%s %s %s %s", u.getFirstname(), u.getLastname(), getString("1137"), r.getName()));
enterRoom.setModelObject(false);
handler.add(form);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java Wed Mar 8 14:21:52 2017
@@ -120,7 +120,7 @@ public class Chat extends Panel {
}
public JSONObject getMessage(Long userId, List<ChatMessage> list) {
- return WebSocketHelper.getMessage(getUserId(), list, getDateFormat(), (o, u) -> o.put("img", getUrl(getRequestCycle(), u)));
+ return WebSocketHelper.getMessage(userId, list, getDateFormat(), (o, u) -> o.put("img", getUrl(getRequestCycle(), u)));
}
public Chat(String id) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java?rev=1785973&r1=1785972&r2=1785973&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java Wed Mar 8 14:21:52 2017
@@ -90,12 +90,16 @@ public class RoomListPanel extends UserP
/**
* this method need to be overriden to perform custom actions on room container click
+ * @param target
+ * @param r
*/
public void onContainerClick(AjaxRequestTarget target, Room r) {
}
/**
* this method need to be overriden to perform custom actions on room refresh click
+ * @param target
+ * @param r
*/
public void onRefreshClick(AjaxRequestTarget target, Room r) {
}