Author: solomax
Date: Wed Mar 1 06:11:13 2017
New Revision: 1784854
URL: http://svn.apache.org/viewvc?rev=1784854&view=rev
Log:
[OPENMEETINGS-1420] initial commit: basic html code is added, code clean-up
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/converter/FlvExplorerConverter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.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/UserService.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-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.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/dto/room/RoomSearchResult.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.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/gui/ScreenSharerFrame.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-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.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/AdminUserChoiceProvider.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/admin/configurations/ConfigForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.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/app/LabelResourceLoader.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.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/pages/auth/RegisterDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.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/MessageDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.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/dashboard/OmDashboardPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.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/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.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/converter/FlvExplorerConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.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/UserService.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-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java
openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.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/dto/room/RoomSearchResult.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.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/gui/ScreenSharerFrame.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.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/AdminUserChoiceProvider.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/admin/configurations/ConfigForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.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/app/LabelResourceLoader.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.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/pages/auth/RegisterDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.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/MessageDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.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/dashboard/OmDashboardPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.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=1784854&r1=1784853&r2=1784854&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 1 06:11:13 2017
@@ -120,7 +120,7 @@ public abstract class BaseConverter {
}
protected String[] mergeAudioToWaves(List<File> waveFiles, File wav)
throws IOException {
- List<String> argv = new ArrayList<String>();
+ List<String> argv = new ArrayList<>();
argv.add(getPathToSoX());
argv.add("-m");
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Wed Mar 1 06:11:13 2017
@@ -58,7 +58,7 @@ public class FlvExplorerConverter extend
}
public List<ConverterProcessResult> convertToMP4(FileExplorerItem f,
String ext) {
- List<ConverterProcessResult> logs = new
ArrayList<ConverterProcessResult>();
+ List<ConverterProcessResult> logs = new ArrayList<>();
try {
File mp4 = f.getFile(EXTENSION_MP4);
f.setType(Type.Video);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
Wed Mar 1 06:11:13 2017
@@ -112,9 +112,9 @@ public class InterviewConverter extends
List<File> waveFiles = new ArrayList<>();
File streamFolder = getStreamFolder(r);
List<RecordingMetaData> metaDataList =
metaDataDao.getAudioMetaDataByRecording(r.getId());
-
+
stripAudioFirstPass(r, logs, waveFiles, streamFolder,
metaDataList);
-
+
// Merge Wave to Full Length
File streamFolderGeneral = getStreamsHibernateDir();
@@ -166,7 +166,7 @@ public class InterviewConverter extends
/*
* CHECK FILE:
* ffmpeg -i
rec_316_stream_567_2013_08_28_11_51_45.flv -v error -f null file.null
- */
+ */
String[] args = new String[]
{getPathToFFMPEG(), "-y"
, "-i", path
, "-an" // only input
files with video will be treated as video sources
@@ -191,7 +191,7 @@ public class InterviewConverter extends
,
"-pix_fmt", "yuv420p" //
, podPB
};
logs.add(ProcessHelper.executeScript("blankFlvPod_" + pod , argsPodB));
-
+
//ffmpeg -y -i out.flv
-i rec_15_stream_4_2014_07_15_20_41_03.flv -filter_complex
'[0:0]setsar=1/1[sarfix];[1:0]scale=320:260,setsar=1/1[scale];[sarfix] [scale]
concat=n=2:v=1:a=0 [v]' -map '[v]' output1.flv
File podF = new
File(streamFolder, OmFileHelper.getName(meta.getStreamName() + "_pod_" + pod,
EXTENSION_FLV));
String podP =
podF.getCanonicalPath();
@@ -202,7 +202,7 @@ public class InterviewConverter extends
,
"-map", "[v]" //
, podP
};
logs.add(ProcessHelper.executeScript("shiftedFlvPod_" + pod , argsPod));
-
+
pods[pod - 1] = podP;
} else {
pods[pod - 1] = path;
@@ -220,7 +220,7 @@ public class InterviewConverter extends
return;
}
boolean shortest = false;
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
for (int i = 0; i < 2; ++i) {
/*
* INSERT BLANK INSTEAD OF BAD PAD:
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
Wed Mar 1 06:11:13 2017
@@ -43,9 +43,9 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
/**
- *
+ *
* @author swagner
- *
+ *
*/
@Transactional
public class RoomManager {
@@ -56,14 +56,14 @@ public class RoomManager {
@Autowired
private ISessionManager sessionManager;
- @Autowired
+ @Autowired
private RoomDao roomDao;
- @Autowired
+ @Autowired
private SipDao sipDao;
public SearchResult<Room> getRooms(int start, int max, String orderby,
boolean asc, String search) {
try {
- SearchResult<Room> sResult = new SearchResult<Room>();
+ SearchResult<Room> sResult = new SearchResult<>();
sResult.setRecords(this.selectMaxFromRooms(search));
sResult.setObjectName(Room.class.getName());
sResult.setResult(this.getRoomsInternatlByHQL(start,
max,
@@ -74,10 +74,10 @@ public class RoomManager {
}
return null;
}
-
+
public SearchResult<Room> getRoomsWithCurrentUsers(int start, int max,
String orderby, boolean asc) {
try {
- SearchResult<Room> sResult = new SearchResult<Room>();
+ SearchResult<Room> sResult = new SearchResult<>();
sResult.setRecords(this.selectMaxFromRooms(""));
sResult.setObjectName(Room.class.getName());
@@ -148,7 +148,7 @@ public class RoomManager {
/**
* gets a list of all availible rooms
- *
+ *
* @param user_level
* @param start
* @param max
@@ -182,7 +182,7 @@ public class RoomManager {
/**
* gets a list of all availible rooms
- *
+ *
* @param user_level
* @param start
* @param max
@@ -203,7 +203,7 @@ public class RoomManager {
}
if (orderby != null) {
hql += " ORDER BY " + (orderby.startsWith("c.")
? "" : "c.") + orderby;
-
+
if (asc) {
hql += " ASC";
} else {
@@ -288,24 +288,24 @@ public class RoomManager {
} catch (Exception ex2) {
log.error("[getRoomsByIds] ", ex2);
}
- return new LinkedList<Room>();
+ return new LinkedList<>();
}
//
---------------------------------------------------------------------------------------------
- /**
- * Returns number of SIP conference participants
- * @param roomId id of room
- * @return number of participants
- */
- public Integer getSipConferenceMembersNumber(Long roomId) {
- Room r = roomDao.get(roomId);
- return r == null || r.getConfno() == null ? null :
sipDao.countUsers(r.getConfno());
- }
+ /**
+ * Returns number of SIP conference participants
+ * @param roomId id of room
+ * @return number of participants
+ */
+ public Integer getSipConferenceMembersNumber(Long roomId) {
+ Room r = roomDao.get(roomId);
+ return r == null || r.getConfno() == null ? null :
sipDao.countUsers(r.getConfno());
+ }
/**
* get List of RoomGroup by group and roomtype
- *
+ *
* @param groupId
* @param typeId
* @return
@@ -324,7 +324,7 @@ public class RoomManager {
/**
* Gets all rooms by an group
- *
+ *
* @param groupId
* @return list of RoomGroup with Rooms as Sub-Objects or null
*/
@@ -347,7 +347,7 @@ public class RoomManager {
public SearchResult<RoomGroup> getRoomGroupByGroupId(long groupId, int
start, int max, String orderby,
boolean asc) {
try {
- SearchResult<RoomGroup> sResult = new
SearchResult<RoomGroup>();
+ SearchResult<RoomGroup> sResult = new SearchResult<>();
sResult.setObjectName(RoomGroup.class.getName());
sResult.setRecords(this.selectMaxFromRoomsByGroup(groupId).longValue());
sResult.setResult(getRoomGroupsByGroupId(groupId,
start, max, orderby, asc));
@@ -374,7 +374,7 @@ public class RoomManager {
}
/**
- *
+ *
* @param groupId
* @param start
* @param max
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.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/BaseStreamWriter.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
Wed Mar 1 06:11:13 2017
@@ -70,7 +70,7 @@ public abstract class BaseStreamWriter i
protected String streamName = "";
protected final RecordingMetaDataDao metaDataDao;
- private final BlockingQueue<CachedEvent> queue = new
LinkedBlockingQueue<CachedEvent>();
+ private final BlockingQueue<CachedEvent> queue = new
LinkedBlockingQueue<>();
public BaseStreamWriter(String streamName, IScope scope, Long
metaDataId, boolean isScreenData, RecordingMetaDataDao metaDataDao) {
startedSessionTimeDate = new Date();
@@ -87,13 +87,13 @@ public abstract class BaseStreamWriter i
RecordingMetaData metaData = metaDataDao.get(metaDataId);
metaData.setStreamStatus(Status.STARTED);
metaDataDao.update(metaData);
-
+
open();
}
/**
* Initialization
- *
+ *
* @throws IOException
* I/O exception
*/
@@ -134,7 +134,7 @@ public abstract class BaseStreamWriter i
try {
CachedEvent item = queue.poll(100,
TimeUnit.MICROSECONDS);
if (item != null) {
- log.trace("##REC:: got packet");
+ log.trace("##REC:: got packet");
lastPackedRecieved =
System.currentTimeMillis();
if (dostopping) {
log.trace("metadatId: {} ::
Recording stopped but still packets to write to file!", metaDataId);
@@ -142,7 +142,7 @@ public abstract class BaseStreamWriter i
packetReceived(item);
} else if (dostopping || lastPackedRecieved +
TIME_TO_WAIT_FOR_FRAME < System.currentTimeMillis()) {
- log.debug(String.format("##REC:: none
packets received for: %s minutes, exiting", (System.currentTimeMillis() -
lastPackedRecieved) / MINUTE_MULTIPLIER));
+ log.debug(String.format("##REC:: none
packets received for: %s minutes, exiting", (System.currentTimeMillis() -
lastPackedRecieved) / MINUTE_MULTIPLIER));
stopping = true;
closeStream();
}
@@ -158,7 +158,7 @@ public abstract class BaseStreamWriter i
/**
* Write the actual packet data to the disk and do calculate any needed
additional information
- *
+ *
* @param streampacket
*/
public abstract void packetReceived(CachedEvent streampacket);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
Wed Mar 1 06:11:13 2017
@@ -29,13 +29,13 @@ import org.slf4j.Logger;
/**
* Memory based, configured as singleton in spring configuration
- *
+ *
* @author sebawagner
*
*/
public class WhiteBoardObjectSyncManager {
- private Map<Long, Map<String, WhiteboardSyncLockObject>>
whiteBoardSyncList = new ConcurrentHashMap<Long, Map<String,
WhiteboardSyncLockObject>>();
- private Map<Long, Map<String, Map<String, WhiteboardSyncLockObject>>>
whiteBoardObjectSyncList = new ConcurrentHashMap<Long, Map<String, Map<String,
WhiteboardSyncLockObject>>>();
+ private Map<Long, Map<String, WhiteboardSyncLockObject>>
whiteBoardSyncList = new ConcurrentHashMap<>();
+ private Map<Long, Map<String, Map<String, WhiteboardSyncLockObject>>>
whiteBoardObjectSyncList = new ConcurrentHashMap<>();
private static final Logger log =
Red5LoggerFactory.getLogger(WhiteBoardObjectSyncManager.class, webAppRootKey);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java
Wed Mar 1 06:11:13 2017
@@ -31,9 +31,9 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
public class LoadLibraryPresentationToObject {
-
+
private static final Logger log =
Red5LoggerFactory.getLogger(LoadLibraryPresentationToObject.class,
OpenmeetingsVariables.webAppRootKey);
-
+
private static LoadLibraryPresentationToObject instance;
private LoadLibraryPresentationToObject() {}
@@ -43,25 +43,25 @@ public class LoadLibraryPresentationToOb
instance = new LoadLibraryPresentationToObject();
}
return instance;
- }
-
+ }
+
public PresentationObject parseLibraryFileToObject(String filePath){
try {
PresentationObject lMap = new PresentationObject();
-
- SAXReader reader = new SAXReader();
- Document document = reader.read(filePath);
-
- Element root = document.getRootElement();
- Integer k = 0;
-
- for (@SuppressWarnings("unchecked")
+
+ SAXReader reader = new SAXReader();
+ Document document = reader.read(filePath);
+
+ Element root = document.getRootElement();
+ Integer k = 0;
+
+ for (@SuppressWarnings("unchecked")
Iterator<Element> i = root.elementIterator();
i.hasNext(); ) {
- Element item = i.next();
- log.error(item.getName());
-
- String nodeVal = item.getName();
-
+ Element item = i.next();
+ log.error(item.getName());
+
+ String nodeVal = item.getName();
+
if (nodeVal.equals("originalDocument")){
lMap.setOriginalDocument(this.createListObjectLibraryByFileDocument(item));
} else if (nodeVal.equals("pdfDocument")){
@@ -71,21 +71,21 @@ public class LoadLibraryPresentationToOb
} else if (nodeVal.equals("thumbs")) {
lMap.setThumbs(this.createListObjectLibraryByFileDocumentThumbs(item));
}
-
- k++;
- }
-
+ k++;
+
+ }
+
return lMap;
} catch (Exception err) {
log.error("parseLibraryFileToObject",err);
return null;
}
}
-
+
public FileExplorerItemDTO
createListObjectLibraryByFileDocument(Element fileElement){
try {
-
+
log.info("createListObjectLibraryByFileDocument"+fileElement);
FileExplorerItemDTO fileObject = new
FileExplorerItemDTO();
fileObject.setName(fileElement.getText());
@@ -96,13 +96,13 @@ public class LoadLibraryPresentationToOb
log.error("createListObjectLibraryByFileDocument",err);
}
return null;
- }
-
+ }
+
public LinkedList<FileExplorerItemDTO>
createListObjectLibraryByFileDocumentThumbs(Element fileElement){
try {
- LinkedList<FileExplorerItemDTO> thumbMap = new
LinkedList<FileExplorerItemDTO>();
-
+ LinkedList<FileExplorerItemDTO> thumbMap = new
LinkedList<>();
+
for (@SuppressWarnings("unchecked")
Iterator<Element> i = fileElement.elementIterator();
i.hasNext(); ) {
Element thumbElement = i.next();
@@ -114,13 +114,13 @@ public class LoadLibraryPresentationToOb
//FIXME TODO
singleThumb.setSize(thumbElement.attribute("size").getText());
thumbMap.add(singleThumb);
}
-
+
return thumbMap;
-
+
} catch (Exception err) {
log.error("createListObjectLibraryByFileDocumentThumbs",err);
}
return null;
- }
-
+ }
+
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Wed Mar 1 06:11:13 2017
@@ -177,7 +177,7 @@ public class ConferenceLibrary implement
whiteboardManagement.addWhiteBoardObjectById(roomId,
whiteboardObj, wbId);
}
- Map<String, Object> sendObject = new HashMap<String, Object>();
+ Map<String, Object> sendObject = new HashMap<>();
sendObject.put("id", wbId);
sendObject.put("roomitems", roomItems);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java
Wed Mar 1 06:11:13 2017
@@ -31,9 +31,9 @@ import org.apache.openmeetings.db.dao.la
import org.springframework.beans.factory.annotation.Autowired;
/**
- *
+ *
* @author sebastianwagner
- *
+ *
*/
public class LanguageService {
@Autowired
@@ -45,7 +45,7 @@ public class LanguageService {
* @return - List of all available Languages
*/
public List<Language> getLanguages() {
- List<Language> result = new ArrayList<Language>();
+ List<Language> result = new ArrayList<>();
for (Map.Entry<Long, Locale> e : LabelDao.languages.entrySet())
{
result.add(new Language(e.getKey(),
e.getValue().toLanguageTag(), e.getValue().getDisplayName(Locale.ENGLISH)));
}
@@ -58,7 +58,7 @@ public class LanguageService {
/**
* get all fields of a given Language_id by params
- *
+ *
* @param language_id
* @param start
* @param count
@@ -73,9 +73,9 @@ public class LanguageService {
public long language_id;
public String code;
public String name;
-
+
public Language() {}
-
+
public Language(long language_id, String code, String name) {
this.language_id = language_id;
this.code = code;
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=1784854&r1=1784853&r2=1784854&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 1 06:11:13 2017
@@ -382,7 +382,7 @@ public class MobileService {
}
public void sendChatMessage(Client c, ChatMessage m, FastDateFormat
fmt) {
- HashMap<String, Object> hsm = new HashMap<String, Object>();
+ Map<String, Object> hsm = new HashMap<>();
hsm.put("client", c);
hsm.put("message", Arrays.asList("chat", encodeChatMessage(m,
fmt)));
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=1784854&r1=1784853&r2=1784854&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 1 06:11:13 2017
@@ -65,7 +65,7 @@ public class RecordingService implements
* red5 stream object might be gone when the user closes the browser.
But each listener has an asynchronous
* component that needs to be closed no matter how the user leaves the
application!
*/
- private static final Map<Long, StreamListener> streamListeners = new
ConcurrentHashMap<Long, StreamListener>();
+ private static final Map<Long, StreamListener> streamListeners = new
ConcurrentHashMap<>();
// Spring Beans
@Autowired
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
Wed Mar 1 06:11:13 2017
@@ -23,6 +23,7 @@ import static org.apache.openmeetings.ut
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
@@ -44,9 +45,9 @@ import org.springframework.beans.factory
/**
* Provides method to manipulate {@link User}
- *
+ *
* @author sebawagner
- *
+ *
*/
public class UserService implements IUserService {
private static final Logger log =
Red5LoggerFactory.getLogger(UserService.class, webAppRootKey);
@@ -66,7 +67,7 @@ public class UserService implements IUse
/**
* get user by id, admin only
- *
+ *
* @param sid
* @param userId
* @return User with the id given
@@ -81,7 +82,7 @@ public class UserService implements IUse
/**
* refreshes the current SID
- *
+ *
* @param SID
* @return "ok" string in case of success, "error" string in case of
the error
*/
@@ -97,7 +98,7 @@ public class UserService implements IUse
/**
* gets a whole user-list(admin-role only)
- *
+ *
* @param sid
* @param start
* @param max
@@ -115,7 +116,7 @@ public class UserService implements IUse
/**
* kicks a user from the server, also from slaves if needed, this
method is
* only invoked by the connection administration UI
- *
+ *
* @param sid
* @param streamid
* @param serverId
@@ -141,7 +142,7 @@ public class UserService implements IUse
}
IScope currentScope =
scopeApplicationAdapter.getRoomScope(scopeName);
- HashMap<Integer, String> messageObj =
new HashMap<Integer, String>();
+ Map<Integer, String> messageObj = new
HashMap<>();
messageObj.put(0, "kick");
scopeApplicationAdapter.sendMessageById(messageObj, streamid, currentScope);
@@ -153,7 +154,7 @@ public class UserService implements IUse
Client rcl =
sessionManager.getClientByStreamId(
streamid, server);
slaveHTTPConnectionManager.kickSlaveUser(server, rcl.getPublicSID());
-
+
// true means only the REST call is
performed, it is no
// confirmation that the user is really
kicked from the
// slave
@@ -170,10 +171,10 @@ public class UserService implements IUse
* Kick a user by its publicSID.<br/>
* <br/>
* <i>Note:</i>
- * This method will not perform a call to the slave, cause this call
can only be
+ * This method will not perform a call to the slave, cause this call
can only be
* invoked from inside the conference room, that means all clients are
on the
* same server, no matter if clustered or not.
- *
+ *
* @param sid
* @param publicSID
* @return - true in case user have sufficient permissions, null
otherwise
@@ -194,7 +195,7 @@ public class UserService implements IUse
}
IScope currentScope =
scopeApplicationAdapter.getRoomScope(scopeName);
- HashMap<Integer, String> messageObj = new
HashMap<Integer, String>();
+ Map<Integer, String> messageObj = new
HashMap<>();
messageObj.put(0, "kick");
scopeApplicationAdapter.sendMessageById(messageObj, rcl.getStreamid(),
currentScope);
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=1784854&r1=1784853&r2=1784854&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 1 06:11:13 2017
@@ -200,7 +200,7 @@ public class WhiteBoardService implement
rcl.setCanDraw(canDraw);
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
- HashMap<Integer, Object>
newMessage = new HashMap<Integer, Object>();
+ Map<Integer, Object> newMessage
= new HashMap<>();
newMessage.put(0,
"updateDrawStatus");
newMessage.put(1, rcl);
scopeAdapter.sendMessageWithClientWithSyncObject(newMessage, true);
@@ -229,7 +229,7 @@ public class WhiteBoardService implement
rcl.setCanShare(canShare);
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
- HashMap<Integer, Object>
newMessage = new HashMap<Integer, Object>();
+ Map<Integer, Object> newMessage
= new HashMap<>();
newMessage.put(0,
"updateDrawStatus");
newMessage.put(1, rcl);
scopeAdapter.sendMessageWithClientWithSyncObject(newMessage, true);
@@ -258,7 +258,7 @@ public class WhiteBoardService implement
rcl.setCanRemote(canRemote);
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
- HashMap<Integer, Object>
newMessage = new HashMap<Integer, Object>();
+ Map<Integer, Object> newMessage
= new HashMap<>();
newMessage.put(0,
"updateDrawStatus");
newMessage.put(1, rcl);
scopeAdapter.sendMessageWithClientWithSyncObject(newMessage, true);
@@ -288,7 +288,7 @@ public class WhiteBoardService implement
rcl.setCanGiveAudio(canGiveAudio);
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
- HashMap<Integer, Object>
newMessage = new HashMap<Integer, Object>();
+ Map<Integer, Object> newMessage
= new HashMap<>();
newMessage.put(0,
"updateGiveAudioStatus");
newMessage.put(1, rcl);
scopeAdapter.sendMessageWithClientWithSyncObject(newMessage, true);
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=1784854&r1=1784853&r2=1784854&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 1 06:11:13 2017
@@ -215,6 +215,7 @@ public class ScopeApplicationAdapter ext
log.warn("Security code is invalid, client is
rejected");
return rejectClient();
}
+ rcm.setUsername(parent.getUsername());
rcm.setFirstname(parent.getFirstname());
rcm.setLastname(parent.getLastname());
rcm.setUserId(parent.getUserId());
@@ -270,6 +271,7 @@ public class ScopeApplicationAdapter ext
log.error("Attempt of unauthorized room
enter: USER not found, client is rejected");
return rejectClient();
}
+ rcm.setUsername(u.getLogin());
rcm.setFirstname(u.getFirstname());
rcm.setLastname(u.getLastname());
rcm.setEmail(u.getAddress() == null ? null :
u.getAddress().getEmail());
@@ -319,7 +321,7 @@ public class ScopeApplicationAdapter ext
}
public Map<String, String> screenSharerAction(Map<String, Object> map) {
- Map<String, String> returnMap = new HashMap<String, String>();
+ Map<String, String> returnMap = new HashMap<>();
try {
log.debug("----------- screenSharerAction ENTER");
IConnection current = Red5.getConnectionLocal();
@@ -377,7 +379,7 @@ public class ScopeApplicationAdapter ext
log.debug("checkScreenSharing -2- " + streamid);
- List<Client> screenSharerList = new
LinkedList<Client>();
+ List<Client> screenSharerList = new LinkedList<>();
Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
@@ -432,7 +434,7 @@ public class ScopeApplicationAdapter ext
client.setStreamPublishName("" +
map.get("publishName"));
sessionManager.updateClientByStreamId(current.getClient().getId(), client,
false, null);
- Map<String, Object> returnMap = new
HashMap<String, Object>();
+ Map<String, Object> returnMap = new HashMap<>();
returnMap.put("alreadyPublished", false);
// if is already started screen sharing, then
there is no need
@@ -509,7 +511,7 @@ public class ScopeApplicationAdapter ext
}
}
}
- return new ArrayList<Long>(broadcastList);
+ return new ArrayList<>(broadcastList);
}
/**
@@ -944,7 +946,7 @@ public class ScopeApplicationAdapter ext
currentClient.setMicMuted(mute);
sessionManager.updateClientByStreamId(currentClient.getStreamid(),
currentClient, false, null);
- HashMap<Integer, Object> newMessage = new
HashMap<Integer, Object>();
+ Map<Integer, Object> newMessage = new HashMap<>();
newMessage.put(0, "updateMuteStatus");
newMessage.put(1, currentClient);
sendMessageWithClient(newMessage);
@@ -1231,8 +1233,8 @@ public class ScopeApplicationAdapter ext
* @param message
* @return the list of room clients
*/
- public HashMap<String, Client> sendMessageByRoomAndDomain(Long roomId,
Object message) {
- HashMap<String, Client> roomClientList = new HashMap<String,
Client>();
+ public Map<String, Client> sendMessageByRoomAndDomain(Long roomId,
Object message) {
+ Map<String, Client> roomClientList = new HashMap<>();
try {
log.debug("sendMessageByRoomAndDomain " + roomId);
@@ -1441,7 +1443,7 @@ public class ScopeApplicationAdapter ext
whiteboardManagement.addWhiteBoardObjectById(roomId, whiteboardObj, wbId);
}
- Map<String, Object> sendObject = new HashMap<String,
Object>();
+ Map<String, Object> sendObject = new HashMap<>();
sendObject.put("id", wbId);
sendObject.put("param", wbObj);
@@ -1666,7 +1668,7 @@ public class ScopeApplicationAdapter ext
IConnection current = Red5.getConnectionLocal();
Client currentClient =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
- HashMap<String, Object> hsm = new HashMap<String,
Object>();
+ Map<String, Object> hsm = new HashMap<>();
hsm.put("client", currentClient);
hsm.put("message", newMessage);
@@ -1692,7 +1694,7 @@ public class ScopeApplicationAdapter ext
try {
log.debug("### sendMessageById ###" + clientId);
- HashMap<String, Object> hsm = new HashMap<String,
Object>();
+ Map<String, Object> hsm = new HashMap<>();
hsm.put("message", newMessage);
// broadcast Message to specific user with id inside
the same Scope
@@ -1724,7 +1726,7 @@ public class ScopeApplicationAdapter ext
IConnection current = Red5.getConnectionLocal();
Client currentClient =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
- HashMap<String, Object> hsm = new HashMap<String,
Object>();
+ Map<String, Object> hsm = new HashMap<>();
hsm.put("client", currentClient);
hsm.put("message", newMessage);
@@ -1832,7 +1834,7 @@ public class ScopeApplicationAdapter ext
current_rcl.setIsRecording(true);
sessionManager.updateClientByStreamId(current.getClient().getId(), current_rcl,
false, null);
- Map<String, String> interviewStatus = new
HashMap<String, String>();
+ Map<String, String> interviewStatus = new HashMap<>();
interviewStatus.put("action", "start");
for (IConnection conn :
current.getScope().getClientConnections()) {
@@ -1922,7 +1924,7 @@ public class ScopeApplicationAdapter ext
recordingService.stopRecordAndSave(scope,
currentClient, clientRecordingId);
- Map<String, String> interviewStatus = new
HashMap<String, String>();
+ Map<String, String> interviewStatus = new HashMap<>();
interviewStatus.put("action", "stop");
sendMessageToCurrentScope("interviewStatus",
interviewStatus, true);
@@ -1949,7 +1951,7 @@ public class ScopeApplicationAdapter ext
} catch (Exception err) {
log.debug("[getClientListScope]", err);
}
- return new ArrayList<Client>();
+ return new ArrayList<>();
}
private boolean getWhiteboardDrawStatus() {
@@ -1976,7 +1978,7 @@ public class ScopeApplicationAdapter ext
*/
private List<Long> getVerifiedActiveRoomIds(Server s) {
- List<Long> result = new
ArrayList<Long>(sessionManager.getActiveRoomIdsByServer(s));
+ List<Long> result = new
ArrayList<>(sessionManager.getActiveRoomIdsByServer(s));
//verify
for (Iterator<Long> i = result.iterator(); i.hasNext();) {
Long id = i.next();
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
Wed Mar 1 06:11:13 2017
@@ -30,15 +30,15 @@ import org.apache.openmeetings.db.entity
import org.springframework.beans.factory.annotation.Autowired;
public class DatabaseStore implements IClientPersistenceStore {
-
+
@Autowired
private ClientDao clientDao;
-
+
@Override
public void clear() {
clientDao.cleanAllClients();
}
-
+
@Override
public void put(String streamId, Client rcl) {
if (rcl.getId() != null) {
@@ -65,20 +65,20 @@ public class DatabaseStore implements IC
@Override
public Map<Long, List<Client>> getClientsByPublicSID(String publicSID) {
- Map<Long, List<Client>> returnMap = new HashMap<Long,
List<Client>>();
+ Map<Long, List<Client>> returnMap = new HashMap<>();
List<Client> clientList =
clientDao.getClientsByPublicSID(publicSID);
for (Client cl : clientList) {
if (cl.getServer() == null) {
List<Client> clList = returnMap.get(null);
if (clList == null) {
- clList = new ArrayList<Client>();
+ clList = new ArrayList<>();
}
clList.add(cl);
returnMap.put(null, clList);
} else {
List<Client> clList =
returnMap.get(cl.getServer().getId());
if (clList == null) {
- clList = new ArrayList<Client>();
+ clList = new ArrayList<>();
}
clList.add(cl);
returnMap.put(cl.getServer().getId(), clList);
@@ -86,12 +86,12 @@ public class DatabaseStore implements IC
}
return returnMap;
}
-
+
@Override
public Collection<Client> getClients() {
return clientDao.getClients();
}
-
+
@Override
public Collection<Client> getClientsWithServer() {
return clientDao.getClientsWithServer();
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
Wed Mar 1 06:11:13 2017
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
/**
* Stores the session in the memory.
* Is NOT designed to be clustered across multiple servers.
- *
+ *
* <ul>
* <li>client by streamid</li>
* <li>client by publicSID</li>
@@ -45,20 +45,20 @@ import org.slf4j.Logger;
* <li>clients by roomId</li>
* <li>roomIds by server</li>
* </ul>
- *
+ *
* @author sebawagner
- *
+ *
*/
public class HashMapStore implements IClientPersistenceStore {
protected static final Logger log =
Red5LoggerFactory.getLogger(HashMapStore.class, webAppRootKey);
-
+
private Map<String, Client> clientsByStreamId = new
ConcurrentHashMap<>();
@Override
public void clear() {
clientsByStreamId = new ConcurrentHashMap<>();
}
-
+
@Override
public void put(String streamId, Client rcl) {
clientsByStreamId.put(rcl.getStreamid(), rcl);
@@ -73,7 +73,7 @@ public class HashMapStore implements ICl
public Client get(Server server, String streamId) {
return clientsByStreamId.get(streamId);
}
-
+
@Override
public List<Client> getClientsByPublicSID(Server server, String
publicSID) {
List<Client> clientList = new ArrayList<>();
@@ -85,7 +85,7 @@ public class HashMapStore implements ICl
}
return clientList;
}
-
+
@Override
public Map<Long,List<Client>> getClientsByPublicSID(String publicSID) {
Map<Long,List<Client>> clientMapList = new HashMap<>();
@@ -99,24 +99,24 @@ public class HashMapStore implements ICl
clientMapList.put(null, clientList);
return clientMapList;
}
-
+
@Override
public Collection<Client> getClients() {
return clientsByStreamId.values();
}
-
+
@Override
public Collection<Client> getClientsWithServer() {
//there is no server object to be loaded, memory cache means
//there is no cluster enabled
return getClients();
}
-
+
@Override
public Collection<Client> getClientsByServer(Server server) {
return clientsByStreamId.values();
}
-
+
@Override
public List<Client> getClientsByUserId(Server server, Long userId) {
List<Client> clientList = new ArrayList<>();
@@ -128,7 +128,7 @@ public class HashMapStore implements ICl
}
return clientList;
}
-
+
@Override
public List<Client> getClientsByRoomId(Long roomId) {
List<Client> clientList = new ArrayList<>();
@@ -150,7 +150,7 @@ public class HashMapStore implements ICl
public int size() {
return clientsByStreamId.size();
}
-
+
@Override
public int sizeByServer(Server server) {
return clientsByStreamId.size();
@@ -160,14 +160,14 @@ public class HashMapStore implements ICl
public Collection<Client> values() {
return clientsByStreamId.values();
}
-
+
public int getTotalNumberOfSessions() {
return clientsByStreamId.size();
}
-
+
/**
* Print some session statistics to the debug out
- *
+ *
* @param detailLevel
*/
public void printDebugInformation(List<DEBUG_DETAILS> detailLevel) {
@@ -201,7 +201,7 @@ public class HashMapStore implements ICl
rooms.add(roomId);
}
}
- return new ArrayList<Long>(rooms);
+ return new ArrayList<>(rooms);
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
Wed Mar 1 06:11:13 2017
@@ -171,7 +171,7 @@ public class WebSocketHelper {
IWebSocketConnectionRegistry reg =
settings.getConnectionRegistry();
Executor executor = settings.getWebSocketPushMessageExecutor();
for (Client c : func.apply(app)) {
- if (check == null || (check != null && check.test(c))) {
+ if (check == null || check.test(c)) {
final IWebSocketConnection wc =
reg.getConnection(app, c.getSessionId(), new PageIdKey(c.getPageId()));
if (wc != null && wc.isOpen()) {
executor.run(() -> consumer.accept(wc));
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java
Wed Mar 1 06:11:13 2017
@@ -53,16 +53,16 @@ public class LoadTestRtmpClient extends
this.ended = ended;
}
}
-
+
private int counterCalls = 0; // a call is always 2 steps
- private Map<Integer, CallObject> calls = new HashMap<Integer,
CallObject>();
+ private Map<Integer, CallObject> calls = new HashMap<>();
private boolean isConnected = false;
private final int instanceId;
public LoadTestRtmpClient(int instanceId) {
this.instanceId = instanceId;
}
-
+
public boolean performCall() {
// System.err.println("performCall " + isConnected);
@@ -70,7 +70,7 @@ public class LoadTestRtmpClient extends
if (!isConnected) {
return false;
}
-
+
if (counterCalls % 2 == 0) {
if (counterCalls > 10) {
@@ -82,7 +82,7 @@ public class LoadTestRtmpClient extends
System.err.println("Rest o do new call " +
counterCalls);
counterCalls++;
- Map<String, Integer> map = new HashMap<String,
Integer>();
+ Map<String, Integer> map = new HashMap<>();
map.put("instanceId", instanceId);
map.put("count", counterCalls);
calls.put(counterCalls, new CallObject(new Date()));
@@ -91,12 +91,12 @@ public class LoadTestRtmpClient extends
} else {
System.err.println("Call running " + counterCalls);
}
-
-
-
+
+
+
return false;
}
-
+
public double getAverageTime() {
long overallTime = 0L;
@@ -117,7 +117,7 @@ public class LoadTestRtmpClient extends
return averageTime;
}
-
+
@Override
public void resultReceived(IPendingServiceCall call) {
String method = call == null ? null :
call.getServiceMethodName();
@@ -162,11 +162,11 @@ public class LoadTestRtmpClient extends
@Override
public void onStreamEvent(Notify notify) {
// TODO Auto-generated method stub
-
+
}
public int getNumberOfCalls() {
return calls.size();
}
-
+
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
Wed Mar 1 06:11:13 2017
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
public class SimulateLoadTest {
private static final Logger log =
Red5LoggerFactory.getLogger(SimulateLoadTest.class, webAppRootKey);
private int numberOfClients = 25;
- private List<SimulateLoad> simulateLoadList = new
ArrayList<SimulateLoad>();
+ private List<SimulateLoad> simulateLoadList = new ArrayList<>();
private String host = "192.168.1.7";
private final int port = 1935;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
Wed Mar 1 06:11:13 2017
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.db.dao.basic;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.APPLICATION_NAME;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_NAME;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
@@ -27,7 +28,6 @@ import static org.apache.openmeetings.ut
import static
org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.whiteboardDrawStatus;
-import static
org.apache.openmeetings.util.OpenmeetingsVariables.APPLICATION_NAME;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
@@ -55,9 +55,9 @@ import org.springframework.transaction.a
* {@link #getConfValue(String, Class, String)} <br/>
* <br/>
* <b> {@link #get(String)} is deprecated!</b>
- *
+ *
* @author swagner
- *
+ *
*/
@Transactional
public class ConfigurationDao implements IDataProviderDao<Configuration> {
@@ -74,7 +74,7 @@ public class ConfigurationDao implements
/**
* Retrieves Configuration regardless of its deleted status
- *
+ *
* @param confKey
* @return
*/
@@ -90,8 +90,8 @@ public class ConfigurationDao implements
}
public List<Configuration> get(String... keys) {
- List<Configuration> result = new ArrayList<Configuration>();
- for (String key : keys) { //iteration is necessary to fill list
with all values
+ List<Configuration> result = new ArrayList<>();
+ for (String key : keys) { //iteration is necessary to fill list
with all values
List<Configuration> r =
em.createNamedQuery("getConfigurationsByKeys", Configuration.class)
.setParameter("keys",
Arrays.asList(key))
.getResultList();
@@ -103,9 +103,9 @@ public class ConfigurationDao implements
/**
* Return a object using a custom type and a default value if the key
is not
* present, or value is not set
- *
+ *
* Example: Integer my_key = getConfValue("my_key", Integer.class,
"15");
- *
+ *
* @param key
* @param type
* @param defaultValue
@@ -196,7 +196,7 @@ public class ConfigurationDao implements
public Configuration get(long id) {
return get(Long.valueOf(id));
}
-
+
@Override
public Configuration get(Long id) {
if (id == null) {
@@ -219,7 +219,7 @@ public class ConfigurationDao implements
q.setMaxResults(count);
return q.getResultList();
}
-
+
@Override
public long count() {
return em.createNamedQuery("countConfigurations",
Long.class).getSingleResult();
@@ -230,12 +230,12 @@ public class ConfigurationDao implements
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Configuration", "c", search, true,
true, null, searchFields), Long.class);
return q.getSingleResult();
}
-
+
@Override
public Configuration update(Configuration entity, Long userId) {
return update(entity, userId, false);
}
-
+
public Configuration update(Configuration entity, Long userId, boolean
deleted) {
String key = entity.getKey();
String value = entity.getValue();
@@ -270,7 +270,7 @@ public class ConfigurationDao implements
/**
* returns the max upload size configured by max_upload_size config key
- *
+ *
* @param configurationDao
* @return
*/
@@ -282,7 +282,7 @@ public class ConfigurationDao implements
}
return DEFAULT_MAX_UPLOAD_SIZE;
}
-
+
public String getCryptKey() {
if (configKeyCryptClassName == null) {
String cryptClass = getConfValue(CONFIG_CRYPT_KEY,
String.class, null);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
Wed Mar 1 06:11:13 2017
@@ -111,7 +111,7 @@ public class AppointmentDao {
}
roomDao.update(r, userId);
if (sendmails) {
- Set<Long> mmIds = a.getId() == null ? new
HashSet<Long>()
+ Set<Long> mmIds = a.getId() == null ? new HashSet<>()
:
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
// update meeting members
Appointment a0 = a.getId() == null ? null :
get(a.getId());
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
Wed Mar 1 06:11:13 2017
@@ -57,11 +57,11 @@ public class MeetingMemberDao {
public Set<Long> getMeetingMemberIdsByAppointment(Long appointmentId) {
log.debug("getMeetingMemberIdsByAppointment: " + appointmentId);
- return new
HashSet<Long>(em.createNamedQuery("getMeetingMemberIdsByAppointment",
Long.class)
+ return new
HashSet<>(em.createNamedQuery("getMeetingMemberIdsByAppointment", Long.class)
.setParameter("id", appointmentId)
.getResultList());
}
-
+
/**
* Updating MeetingMember
*/
