Author: solomax
Date: Wed Jun 3 10:59:16 2015
New Revision: 1683280
URL: http://svn.apache.org/r1683280
Log:
Code clean-up, name unification
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/navi/TestNavi.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Wed Jun 3 10:59:16 2015
@@ -75,11 +75,11 @@ public class GenerateImage extends BaseC
return returnMap;
}
- public ConverterProcessResultList convertImageUserProfile(File file,
Long users_id, boolean skipConvertion) throws Exception {
+ public ConverterProcessResultList convertImageUserProfile(File file,
Long userId, boolean skipConvertion) throws Exception {
ConverterProcessResultList returnMap = new
ConverterProcessResultList();
// User Profile Update
- for (File f : getUploadProfilesUserDir(users_id).listFiles(new
FileFilter() {
+ for (File f : getUploadProfilesUserDir(userId).listFiles(new
FileFilter() {
public boolean accept(File pathname) {
return
pathname.getName().endsWith(JPG_EXTENTION);
}
@@ -87,7 +87,7 @@ public class GenerateImage extends BaseC
FileHelper.removeRec(f);
}
- File destinationFile =
OmFileHelper.getNewFile(getUploadProfilesUserDir(users_id), profileFileName,
JPG_EXTENTION);
+ File destinationFile =
OmFileHelper.getNewFile(getUploadProfilesUserDir(userId), profileFileName,
JPG_EXTENTION);
if (!skipConvertion) {
returnMap.addItem("processJPG",
convertSingleJpg(file.getCanonicalPath(), destinationFile));
} else {
@@ -103,13 +103,13 @@ public class GenerateImage extends BaseC
}
String pictureuri = destinationFile.getName();
- User us = usersDao.get(users_id);
- us.setUpdatetime(new java.util.Date());
+ User us = usersDao.get(userId);
+ us.setUpdated(new java.util.Date());
us.setPictureuri(pictureuri);
- usersDao.update(us, users_id);
+ usersDao.update(us, userId);
//FIXME: After uploading a new picture all other clients should
refresh
- //scopeApplicationAdapter.updateUserSessionObject(users_id,
pictureuri);
+ //scopeApplicationAdapter.updateUserSessionObject(userId,
pictureuri);
return returnMap;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
Wed Jun 3 10:59:16 2015
@@ -310,14 +310,14 @@ public class RoomManager implements IRoo
return null;
}
- public List<RoomOrganisation> getOrganisationsByRoom(long rooms_id) {
+ public List<RoomOrganisation> getOrganisationsByRoom(long roomId) {
try {
String hql = "select c from RoomOrganisation as c "
- + "where c.room.id = :rooms_id "
+ + "where c.room.id = :id "
+ "AND c.deleted = false";
TypedQuery<RoomOrganisation> q = em.createQuery(hql,
RoomOrganisation.class);
- q.setParameter("rooms_id", rooms_id);
+ q.setParameter("id", roomId);
List<RoomOrganisation> ll = q.getResultList();
return ll;
} catch (Exception ex2) {
@@ -337,11 +337,11 @@ public class RoomManager implements IRoo
queryString += "(";
int i = 0;
- for (Integer room_id : roomIds) {
+ for (Integer roomId : roomIds) {
if (i != 0) {
queryString += " OR ";
}
- queryString += " r.id = " + room_id;
+ queryString += " r.id = " + roomId;
i++;
}
@@ -363,11 +363,11 @@ public class RoomManager implements IRoo
/**
* Returns number of SIP conference participants
- * @param rooms_id id of room
+ * @param roomId id of room
* @return number of participants
*/
- public Integer getSipConferenceMembersNumber(Long rooms_id) {
- Room r = roomDao.get(rooms_id);
+ public Integer getSipConferenceMembersNumber(Long roomId) {
+ Room r = roomDao.get(roomId);
return r == null || r.getConfno() == null ? null :
sipDao.countUsers(r.getConfno());
}
@@ -419,7 +419,7 @@ public class RoomManager implements IRoo
Room r = new Room();
r.setName(name);
r.setComment(comment);
- r.setStarttime(new Date());
+ r.setInserted(new Date());
r.setNumberOfPartizipants(numberOfPartizipants);
r.setRoomtype(roomTypeDao.get(roomtypesId));
r.setIspublic(ispublic);
@@ -521,7 +521,7 @@ public class RoomManager implements IRoo
Room r = new Room();
r.setName(name);
r.setComment(comment);
- r.setStarttime(new Date());
+ r.setInserted(new Date());
r.setNumberOfPartizipants(numberOfPartizipants);
r.setRoomtype(roomTypeDao.get(roomtypesId));
r.setIspublic(ispublic);
@@ -576,19 +576,18 @@ public class RoomManager implements IRoo
/**
* adds a new record to the table rooms_organisation
*
- * @param rooms_id
- * @param organisation_id
+ * @param roomId
+ * @param organisationId
* @return the id of the newly created Rooms_Organisation or NULL
*/
- public Long addRoomToOrganisation(long rooms_id,
- long organisation_id) {
+ public Long addRoomToOrganisation(long roomId, long organisationId) {
try {
RoomOrganisation rOrganisation = new RoomOrganisation();
- rOrganisation.setRoom(roomDao.get(rooms_id));
+ rOrganisation.setRoom(roomDao.get(roomId));
log.debug("addRoomToOrganisation rooms '"
+ rOrganisation.getRoom().getName() +
"'");
- rOrganisation.setStarttime(new Date());
-
rOrganisation.setOrganisation(orgDao.get(organisation_id));
+ rOrganisation.setInserted(new Date());
+
rOrganisation.setOrganisation(orgDao.get(organisationId));
rOrganisation.setDeleted(false);
rOrganisation = em.merge(rOrganisation);
@@ -603,15 +602,15 @@ public class RoomManager implements IRoo
/**
* get List of Rooms_Organisation by organisation and roomtype
*
- * @param organisation_id
+ * @param organisationId
* @param roomtypesId
* @return
*/
- public List<RoomOrganisation>
getRoomsOrganisationByOrganisationIdAndRoomType(long organisation_id, long
roomtypesId) {
+ public List<RoomOrganisation>
getRoomsOrganisationByOrganisationIdAndRoomType(long organisationId, long
roomtypesId) {
try {
TypedQuery<RoomOrganisation> q =
em.createNamedQuery("getRoomsOrganisationByOrganisationIdAndRoomType",
RoomOrganisation.class);
q.setParameter("roomtypesId", roomtypesId);
- q.setParameter("organisation_id", organisation_id);
+ q.setParameter("organisationId", organisationId);
return q.getResultList();
} catch (Exception ex2) {
log.error("[getRoomsByOrganisation] ", ex2);
@@ -622,15 +621,15 @@ public class RoomManager implements IRoo
/**
* Gets all rooms by an organisation
*
- * @param organisation_id
+ * @param organisationId
* @return list of Rooms_Organisation with Rooms as Sub-Objects or null
*/
- public List<RoomOrganisation> getRoomsOrganisationByOrganisationId(long
organisation_id) {
+ public List<RoomOrganisation> getRoomsOrganisationByOrganisationId(long
organisationId) {
try {
TypedQuery<RoomOrganisation> query = em.
createNamedQuery("getRoomsOrganisationByOrganisationId",
RoomOrganisation.class);
- query.setParameter("organisation_id", organisation_id);
+ query.setParameter("organisationId", organisationId);
List<RoomOrganisation> ll = query.getResultList();
@@ -641,14 +640,13 @@ public class RoomManager implements IRoo
return null;
}
- public SearchResult<RoomOrganisation>
getRoomsOrganisationsByOrganisationId(long organisation_id, int start, int max,
String orderby,
+ public SearchResult<RoomOrganisation>
getRoomsOrganisationsByOrganisationId(long organisationId, int start, int max,
String orderby,
boolean asc) {
try {
SearchResult<RoomOrganisation> sResult = new
SearchResult<RoomOrganisation>();
sResult.setObjectName(RoomOrganisation.class.getName());
-
sResult.setRecords(this.selectMaxFromRoomsByOrganisation(
- organisation_id).longValue());
-
sResult.setResult(getRoomsOrganisationByOrganisationId(organisation_id, start,
max, orderby, asc));
+
sResult.setRecords(this.selectMaxFromRoomsByOrganisation(organisationId).longValue());
+
sResult.setResult(getRoomsOrganisationByOrganisationId(organisationId, start,
max, orderby, asc));
return sResult;
} catch (Exception ex2) {
log.error("[getRoomsByOrganisation] ", ex2);
@@ -656,12 +654,12 @@ public class RoomManager implements IRoo
return null;
}
- public Integer selectMaxFromRoomsByOrganisation(long organisation_id) {
+ public Integer selectMaxFromRoomsByOrganisation(long organisationId) {
try {
// get all users
TypedQuery<RoomOrganisation> q =
em.createNamedQuery("selectMaxFromRoomsByOrganisation", RoomOrganisation.class);
- q.setParameter("organisation_id", organisation_id);
+ q.setParameter("organisationId", organisationId);
List<RoomOrganisation> ll = q.getResultList();
return ll.size();
@@ -673,18 +671,17 @@ public class RoomManager implements IRoo
/**
*
- * @param organisation_id
+ * @param organisationId
* @param start
* @param max
* @param orderby
* @param asc
* @return
*/
- private List<RoomOrganisation> getRoomsOrganisationByOrganisationId(
- long organisation_id, int start, int max, String
orderby,
+ private List<RoomOrganisation>
getRoomsOrganisationByOrganisationId(long organisationId, int start, int max,
String orderby,
boolean asc) {
try {
- String hql = "select c from RoomOrganisation as c where
c.organisation.id = :organisation_id AND c.deleted = false";
+ String hql = "select c from RoomOrganisation as c where
c.organisation.id = :organisationId AND c.deleted = false";
if (orderby.startsWith("c.")) {
hql += "ORDER BY " + orderby;
} else {
@@ -698,7 +695,7 @@ public class RoomManager implements IRoo
TypedQuery<RoomOrganisation> q = em.createQuery(hql,
RoomOrganisation.class);
- q.setParameter("organisation_id", organisation_id);
+ q.setParameter("organisationId", organisationId);
q.setFirstResult(start);
q.setMaxResults(max);
List<RoomOrganisation> ll = q.getResultList();
@@ -710,14 +707,13 @@ public class RoomManager implements IRoo
return null;
}
- public RoomOrganisation getRoomsOrganisationByOrganisationIdAndRoomId(
- long organisation_id, long rooms_id) {
+ public RoomOrganisation
getRoomsOrganisationByOrganisationIdAndRoomId(long organisationId, long roomId)
{
try {
TypedQuery<RoomOrganisation> q = em.
createNamedQuery("getRoomsOrganisationByOrganisationIdAndRoomId",
RoomOrganisation.class);
- q.setParameter("rooms_id", rooms_id);
- q.setParameter("organisation_id", organisation_id);
+ q.setParameter("roomId", roomId);
+ q.setParameter("organisationId", organisationId);
List<RoomOrganisation> ll = q.getResultList();
if (ll.size() > 0) {
@@ -731,13 +727,13 @@ public class RoomManager implements IRoo
/**
*
- * @param organisation_id
+ * @param roomId
* @return
*/
- public List<RoomOrganisation> getRoomsOrganisationByRoomsId(long
rooms_id) {
+ public List<RoomOrganisation> getRoomsOrganisationByRoomsId(long
roomId) {
try {
TypedQuery<RoomOrganisation> q =
em.createNamedQuery("getRoomsOrganisationByRoomsId", RoomOrganisation.class);
- q.setParameter("rooms_id", rooms_id);
+ q.setParameter("roomId", roomId);
return q.getResultList();
} catch (Exception ex2) {
log.error("[getRoomsByOrganisation] ", ex2);
@@ -745,7 +741,7 @@ public class RoomManager implements IRoo
return null;
}
- public Long updateRoomInternal(long rooms_id, long roomtypesId,
+ public Long updateRoomInternal(long roomId, long roomtypesId,
String name, boolean ispublic, String comment,
Long numberOfPartizipants, List<Integer> organisations,
Boolean appointment, Boolean isDemoRoom, Integer
demoTime,
@@ -760,14 +756,14 @@ public class RoomManager implements IRoo
try {
log.debug("*** updateRoom numberOfPartizipants: "
+ numberOfPartizipants);
- Room r = roomDao.get(rooms_id);
+ Room r = roomDao.get(roomId);
r.setComment(comment);
r.setIspublic(ispublic);
r.setNumberOfPartizipants(numberOfPartizipants);
r.setName(name);
r.setRoomtype(roomTypeDao.get(roomtypesId));
- r.setUpdatetime(new Date());
+ r.setUpdated(new Date());
r.setAllowUserQuestions(allowUserQuestions);
r.setAudioOnly(isAudioOnly);
r.setAllowFontStyles(allowFontStyles);
@@ -878,15 +874,15 @@ public class RoomManager implements IRoo
}
/**
- * delete all Rooms_Organisations and Room by a given room_id
+ * delete all Rooms_Organisations and Room by a given roomId
*
- * @param rooms_id
+ * @param roomId
*/
- public Long deleteRoomById(long rooms_id) {
+ public Long deleteRoomById(long roomId) {
try {
- deleteAllRoomsOrganisationOfRoom(rooms_id);
- roomDao.delete(roomDao.get(rooms_id), -1L);
- return rooms_id;
+ deleteAllRoomsOrganisationOfRoom(roomId);
+ roomDao.delete(roomDao.get(roomId), -1L);
+ return roomId;
} catch (Exception ex2) {
log.error("[deleteRoomById] ", ex2);
}
@@ -894,14 +890,14 @@ public class RoomManager implements IRoo
}
/**
- * delete all Rooms_Organisation by a rooms_id
+ * delete all Rooms_Organisation by a roomId
*
- * @param rooms_id
+ * @param roomId
*/
@SuppressWarnings("rawtypes")
- public void deleteAllRoomsOrganisationOfRoom(long rooms_id) {
+ public void deleteAllRoomsOrganisationOfRoom(long roomId) {
try {
- List ll = this.getRoomsOrganisationByRoomsId(rooms_id);
+ List ll = this.getRoomsOrganisationByRoomsId(roomId);
for (Iterator it = ll.iterator(); it.hasNext();) {
RoomOrganisation rOrg = (RoomOrganisation)
it.next();
this.deleteRoomsOrganisation(rOrg);
@@ -914,11 +910,11 @@ public class RoomManager implements IRoo
/**
* Delete all room of a given Organisation
*
- * @param organisation_id
+ * @param organisationId
*/
- public void deleteAllRoomsOrganisationOfOrganisation(long
organisation_id) {
+ public void deleteAllRoomsOrganisationOfOrganisation(long
organisationId) {
try {
- for (RoomOrganisation rOrg :
getRoomsOrganisationByOrganisationId(organisation_id)) {
+ for (RoomOrganisation rOrg :
getRoomsOrganisationByOrganisationId(organisationId)) {
this.deleteRoomsOrganisation(rOrg);
}
} catch (Exception ex2) {
@@ -926,12 +922,9 @@ public class RoomManager implements IRoo
}
}
- private Long deleteRoomFromOrganisationByRoomAndOrganisation(long
rooms_id,
- long organisation_id) {
+ private Long deleteRoomFromOrganisationByRoomAndOrganisation(long
roomId, long organisationId) {
try {
- RoomOrganisation rOrganisation = this
-
.getRoomsOrganisationByOrganisationIdAndRoomId(
- organisation_id,
rooms_id);
+ RoomOrganisation rOrganisation =
getRoomsOrganisationByOrganisationIdAndRoomId(organisationId, roomId);
return this.deleteRoomsOrganisation(rOrganisation);
} catch (Exception ex2) {
log.error("[deleteRoomFromOrganisationByRoomAndOrganisation] ", ex2);
@@ -947,7 +940,7 @@ public class RoomManager implements IRoo
public Long deleteRoomsOrganisation(RoomOrganisation rOrg) {
try {
rOrg.setDeleted(true);
- rOrg.setUpdatetime(new Date());
+ rOrg.setUpdated(new Date());
if (rOrg.getId() == null) {
em.persist(rOrg);
} else {
@@ -964,10 +957,10 @@ public class RoomManager implements IRoo
//
--------------------------------------------------------------------------------------------
- public void closeRoom(Long rooms_id, Boolean status) {
+ public void closeRoom(Long roomId, Boolean status) {
try {
- Room room = roomDao.get(rooms_id);
+ Room room = roomDao.get(roomId);
room.setIsClosed(status);
@@ -981,7 +974,9 @@ public class RoomManager implements IRoo
/**
* Get a Rooms-Object or NULL
*
- * @param rooms_id
+ * @param ownerId
+ * @param roomtypesId
+ * @param roomName
* @return Rooms-Object or NULL
*/
public Room getRoomByOwnerAndTypeId(Long ownerId, Long roomtypesId,
String roomName) {
@@ -1005,7 +1000,7 @@ public class RoomManager implements IRoo
} else {
log.debug("Could not find room " + ownerId + "
|| " + roomtypesId);
- Long rooms_id = addRoom(roomName, roomtypesId,
+ Long roomId = addRoom(roomName, roomtypesId,
"My Rooms of ownerId " +
ownerId,
(roomtypesId == 1) ? 25L :
150L, // numberOfPartizipants
false, // ispublic
@@ -1038,8 +1033,8 @@ public class RoomManager implements IRoo
false //sipEnabled
);
- if (rooms_id != null) {
- return roomDao.get(rooms_id);
+ if (roomId != null) {
+ return roomDao.get(roomId);
}
}
} catch (Exception ex2) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
Wed Jun 3 10:59:16 2015
@@ -59,7 +59,7 @@ public class FileProcessor {
@Autowired
private GeneratePDF generatePDF;
- public ConverterProcessResultList processFile(Long userId, Long
room_id,
+ public ConverterProcessResultList processFile(Long userId, Long roomId,
boolean isOwner, InputStream is, Long parentFolderId,
String fileSystemName,
Long externalFileId, String externalType) throws
Exception {
@@ -136,7 +136,7 @@ public class FileProcessor {
Long fileExplorerItemId = fileExplorerItemDao.add(
fileSystemName, fileHashName, // The Hashname of the file
- parentFolderId, ownerId, room_id, userId, false, // isFolder
+ parentFolderId, ownerId, roomId, userId, false, // isFolder
isImage, isPresentation, "", false, isChart,
externalFileId, externalType);
log.debug("fileExplorerItemId: " + fileExplorerItemId);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
Wed Jun 3 10:59:16 2015
@@ -82,10 +82,10 @@ public class FileUtils {
return 0;
}
- public void setFileToOwnerOrRoomByParent(FileExplorerItem file, Long
users_id, Long room_id) {
+ public void setFileToOwnerOrRoomByParent(FileExplorerItem file, Long
userId, Long roomId) {
try {
- file.setOwnerId(users_id);
- file.setRoomId(room_id);
+ file.setOwnerId(userId);
+ file.setRoomId(roomId);
log.debug("calling [2]
FileExplorerItemDaoImpl.updateFileOrFolder()");
fileExplorerItemDao.update(file);
@@ -93,7 +93,7 @@ public class FileUtils {
FileExplorerItem[] childElements =
fileExplorerItemDao.getByParent(file.getId()).toArray(new FileExplorerItem[0]);
for (FileExplorerItem childExplorerItem :
childElements) {
- setFileToOwnerOrRoomByParent(childExplorerItem,
users_id, room_id);
+ setFileToOwnerOrRoomByParent(childExplorerItem,
userId, roomId);
}
} catch (Exception err) {
log.error("[setFileToOwnerOrRoomByParent] ", err);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
Wed Jun 3 10:59:16 2015
@@ -53,10 +53,7 @@ public class BatikMethods {
public void paintTextByWidthHeight(SVGGraphics2D g2d, int x1, int y1,
int width, int height,
String text, int style, int size, Color fontColor)
throws Exception {
- //String default_export_font =
Configurationmanagement.getInstance().getConfKey(3,"default_export_font").getConf_value();
-
this.drawTextByJTextArea(g2d, x1, y1, width, height, text,
"Verdana", style, size, fontColor);
-
}
public void _paintTextByWidthHeight(SVGGraphics2D g2d, int x1, int y1,
int width, int height,
@@ -244,9 +241,6 @@ public class BatikMethods {
public void paintTextByWidthHeightAndDocument(SVGGraphics2D g2d, int
x1, int y1, int width, int height,
String text, int style, int size, Color fontColor,
Document document) throws Exception {
- // String default_export_font =
- //
Configurationmanagement.getInstance().getConfKey("default_export_font").getConf_value();
-
this.drawText(g2d, x1, y1, width, height, text, "Verdana",
style, size, fontColor, document);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
Wed Jun 3 10:59:16 2015
@@ -35,25 +35,25 @@ public class WhiteBoardObjectListManager
private Long whiteboardId = 0L;
- public Long getNewWhiteboardId(Long room_id) throws Exception {
+ public Long getNewWhiteboardId(Long roomId) throws Exception {
whiteboardId++;
- this.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id, new
WhiteboardObject(), whiteboardId);
+ this.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, new
WhiteboardObject(), whiteboardId);
return whiteboardId;
}
/*
* Room items a Whiteboard
*/
- public synchronized WhiteboardObjectList
getWhiteBoardObjectListByRoomId(Long room_id){
- WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(room_id);
+ public synchronized WhiteboardObjectList
getWhiteBoardObjectListByRoomId(Long roomId){
+ WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(roomId);
if (whiteboardObjectList == null) {
whiteboardObjectList = new WhiteboardObjectList();
}
return whiteboardObjectList;
}
- public synchronized WhiteboardObject
getWhiteBoardObjectListByRoomIdAndWhiteboard(Long room_id, Long whiteBoardId){
- WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(room_id);
+ public synchronized WhiteboardObject
getWhiteBoardObjectListByRoomIdAndWhiteboard(Long roomId, Long whiteBoardId){
+ WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(roomId);
if (whiteboardObjectList == null) {
whiteboardObjectList = new WhiteboardObjectList();
}
@@ -69,18 +69,18 @@ public class WhiteBoardObjectListManager
*
*/
- public synchronized void setWhiteBoardObjectListRoomObj(Long room_id,
WhiteboardObjectList whiteboardObjectList){
- whiteBoardObjectList.put(room_id, whiteboardObjectList);
+ public synchronized void setWhiteBoardObjectListRoomObj(Long roomId,
WhiteboardObjectList whiteboardObjectList){
+ whiteBoardObjectList.put(roomId, whiteboardObjectList);
}
- public synchronized void
setWhiteBoardObjectListRoomObjAndWhiteboardId(Long room_id, WhiteboardObject
whiteboardObjects, Long whiteBoardId){
- WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(room_id);
+ public synchronized void
setWhiteBoardObjectListRoomObjAndWhiteboardId(Long roomId, WhiteboardObject
whiteboardObjects, Long whiteBoardId){
+ WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(roomId);
if (whiteboardObjectList == null) {
whiteboardObjectList = new WhiteboardObjectList();
- whiteboardObjectList.setRoom_id(room_id);
+ whiteboardObjectList.setRoomId(roomId);
}
whiteboardObjects.setWhiteBoardId(whiteBoardId);
whiteboardObjectList.getWhiteboardObjects().put(whiteBoardId,
whiteboardObjects);
- whiteBoardObjectList.put(room_id, whiteboardObjectList);
+ whiteBoardObjectList.put(roomId, whiteboardObjectList);
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
Wed Jun 3 10:59:16 2015
@@ -45,15 +45,12 @@ public class WhiteBoardObjectSyncManager
/*
* Initial Sync Process
*/
- public synchronized void setWhiteBoardSyncListByRoomid(Long room_id,
- Map<String, WhiteboardSyncLockObject> mapObject) {
- whiteBoardSyncList.put(room_id, mapObject);
+ public synchronized void setWhiteBoardSyncListByRoomid(Long roomId,
Map<String, WhiteboardSyncLockObject> mapObject) {
+ whiteBoardSyncList.put(roomId, mapObject);
}
- public synchronized Map<String, WhiteboardSyncLockObject>
getWhiteBoardSyncListByRoomid(
- Long room_id) {
- Map<String, WhiteboardSyncLockObject> roomList =
whiteBoardSyncList
- .get(room_id);
+ public synchronized Map<String, WhiteboardSyncLockObject>
getWhiteBoardSyncListByRoomid(Long roomId) {
+ Map<String, WhiteboardSyncLockObject> roomList =
whiteBoardSyncList.get(roomId);
if (roomList == null) {
roomList = new HashMap<String,
WhiteboardSyncLockObject>();
}
@@ -63,56 +60,53 @@ public class WhiteBoardObjectSyncManager
/*
* Image Sync Process
*/
- public synchronized void setWhiteBoardImagesSyncListByRoomid(Long
room_id,
+ public synchronized void setWhiteBoardImagesSyncListByRoomid(Long
roomId,
Map<String, Map<String, WhiteboardSyncLockObject>>
mapObject) {
- whiteBoardObjectSyncList.put(room_id, mapObject);
+ whiteBoardObjectSyncList.put(roomId, mapObject);
}
public synchronized void setWhiteBoardImagesSyncListByRoomAndObjectId(
- Long room_id, String object_id,
+ Long roomId, String objectId,
Map<String, WhiteboardSyncLockObject> imageSyncList) {
Map<String, Map<String, WhiteboardSyncLockObject>> roomList =
whiteBoardObjectSyncList
- .get(room_id);
+ .get(roomId);
if (roomList == null) {
roomList = new HashMap<String, Map<String,
WhiteboardSyncLockObject>>();
}
if (imageSyncList.size() == 0) {
- roomList.remove(object_id);
+ roomList.remove(objectId);
} else {
- roomList.put(object_id, imageSyncList);
+ roomList.put(objectId, imageSyncList);
}
- setWhiteBoardImagesSyncListByRoomid(room_id, roomList);
+ setWhiteBoardImagesSyncListByRoomid(roomId, roomList);
}
- public synchronized Map<String, Map<String, WhiteboardSyncLockObject>>
getWhiteBoardObjectSyncListByRoomid(
- Long room_id) {
- Map<String, Map<String, WhiteboardSyncLockObject>> roomList =
whiteBoardObjectSyncList
- .get(room_id);
+ public synchronized Map<String, Map<String, WhiteboardSyncLockObject>>
getWhiteBoardObjectSyncListByRoomid(Long roomId) {
+ Map<String, Map<String, WhiteboardSyncLockObject>> roomList =
whiteBoardObjectSyncList.get(roomId);
if (roomList == null) {
roomList = new HashMap<String, Map<String,
WhiteboardSyncLockObject>>();
}
return roomList;
}
- public synchronized Map<String, WhiteboardSyncLockObject>
getWhiteBoardObjectSyncListByRoomAndObjectId(
- Long room_id, String object_id) {
- log.debug("getWhiteBoardImagesSyncListByRoomAndImageid room_id:
"
- + room_id);
+ public synchronized Map<String, WhiteboardSyncLockObject>
getWhiteBoardObjectSyncListByRoomAndObjectId(Long roomId, String objectId) {
+ log.debug("getWhiteBoardImagesSyncListByRoomAndImageid roomId: "
+ + roomId);
Map<String, Map<String, WhiteboardSyncLockObject>> roomList =
whiteBoardObjectSyncList
- .get(room_id);
+ .get(roomId);
if (roomList == null) {
roomList = new HashMap<String, Map<String,
WhiteboardSyncLockObject>>();
}
log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
roomList: "
+ roomList);
- log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
object_id: "
- + object_id);
+ log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
objectId: "
+ + objectId);
if (roomList.size() == 1) {
- log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
roomList Key image_id: "
+ log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
roomList Key imageId: "
+ roomList.keySet().iterator().next());
}
Map<String, WhiteboardSyncLockObject> imageSyncList = roomList
- .get(object_id);
+ .get(objectId);
if (imageSyncList == null) {
imageSyncList = new HashMap<String,
WhiteboardSyncLockObject>();
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
Wed Jun 3 10:59:16 2015
@@ -39,7 +39,7 @@ public class WhiteboardManager {
private WhiteBoardObjectListManagerById wbListManagerById;
@SuppressWarnings({ "rawtypes", "unchecked" })
- public void addWhiteBoardObjectById(Long room_id, Map whiteboardObj,
Long whiteBoardId) {
+ public void addWhiteBoardObjectById(Long roomId, Map whiteboardObj,
Long whiteBoardId) {
try {
log.debug("addWhiteBoardObjectById: ", whiteboardObj);
@@ -60,18 +60,18 @@ public class WhiteboardManager {
if (action.equals("moveMap")) {
WhiteboardObject whiteboardObject =
wbListManagerById
-
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
+
.getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId,
whiteBoardId);
whiteboardObject.setX(Integer.valueOf(actionObject.get(1).toString()));
whiteboardObject.setY(Integer.valueOf(actionObject.get(2).toString()));
wbListManagerById
-
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
+
.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
} else if (action.equals("draw") ||
action.equals("redo")) {
WhiteboardObject whiteboardObject =
wbListManagerById
-
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
+
.getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId,
whiteBoardId);
// log.debug(actionObject);
@@ -86,19 +86,19 @@ public class WhiteboardManager {
.put(objectOID,
actionObject);
wbListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(
-
room_id, whiteboardObject, whiteBoardId);
+ roomId,
whiteboardObject, whiteBoardId);
}
} else if (action.equals("clear")) {
WhiteboardObject whiteboardObject =
wbListManagerById
-
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
+
.getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId,
whiteBoardId);
whiteboardObject.setRoomItems(new
HashMap<String, List>());
wbListManagerById
-
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
+
.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
} else if (action.equals("delete") ||
action.equals("undo")) {
WhiteboardObject whiteboardObject =
wbListManagerById
-
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
+
.getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId,
whiteBoardId);
String objectOID =
actionObject.get(actionObject.size() - 1)
.toString();
@@ -171,7 +171,7 @@ public class WhiteboardManager {
whiteboardObject.getRoomItems().remove(objectOID);
wbListManagerById
-
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
+
.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
} else if (action.equals("size") ||
action.equals("editProp")
|| action.equals("editTextMindMapNode")
@@ -180,7 +180,7 @@ public class WhiteboardManager {
|| action.equals("editTextMindMapColor")
||
action.equals("editTextMindMapFontColor")) {
WhiteboardObject whiteboardObject =
wbListManagerById
-
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
+
.getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId,
whiteBoardId);
String objectOID =
actionObject.get(actionObject.size() - 1).toString();
// List roomItem = roomList.get(objectOID);
@@ -240,12 +240,12 @@ public class WhiteboardManager {
}
wbListManagerById
-
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
+
.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
} else if (action.equals("clearSlide")) {
WhiteboardObject whiteboardObject =
wbListManagerById
-
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
+
.getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId,
whiteBoardId);
Map roomList = whiteboardObject.getRoomItems();
@@ -257,18 +257,18 @@ public class WhiteboardManager {
}
wbListManagerById
-
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
+
.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
} else if (action.equals("whiteboardObj")) {
WhiteboardObject whiteboardObject =
wbListManagerById
-
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
+
.getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId,
whiteBoardId);
whiteboardObject.setFullFit((Boolean)
actionObject.get(1));
whiteboardObject.setZoom((Integer)
actionObject.get(2));
wbListManagerById
-
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
+
.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId,
whiteboardObject, whiteBoardId);
} else {
log.warn("Unkown Type: " + action + "
actionObject: "
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Wed Jun 3 10:59:16 2015
@@ -338,14 +338,14 @@ public class LdapLoginManagement {
}
u.setLastname(getAttr(config, entry,
CONFIGKEY_LDAP_KEY_LASTNAME, LDAP_KEY_LASTNAME));
u.setFirstname(getAttr(config, entry,
CONFIGKEY_LDAP_KEY_FIRSTNAME, LDAP_KEY_FIRSTNAME));
-
u.getAdresses().setEmail(getAttr(config, entry, CONFIGKEY_LDAP_KEY_MAIL,
LDAP_KEY_MAIL));
-
u.getAdresses().setStreet(getAttr(config, entry, CONFIGKEY_LDAP_KEY_STREET,
LDAP_KEY_STREET));
-
u.getAdresses().setAdditionalname(getAttr(config, entry,
CONFIGKEY_LDAP_KEY_ADDITIONAL_NAME, LDAP_KEY_ADDITIONAL_NAME));
- u.getAdresses().setFax(getAttr(config,
entry, CONFIGKEY_LDAP_KEY_FAX, LDAP_KEY_FAX));
- u.getAdresses().setZip(getAttr(config,
entry, CONFIGKEY_LDAP_KEY_ZIP, LDAP_KEY_ZIP));
-
u.getAdresses().setStates(stateDao.getStateByName(getAttr(config, entry,
CONFIGKEY_LDAP_KEY_COUNTRY, LDAP_KEY_COUNTRY)));
- u.getAdresses().setTown(getAttr(config,
entry, CONFIGKEY_LDAP_KEY_TOWN, LDAP_KEY_TOWN));
-
u.getAdresses().setPhone(getAttr(config, entry, CONFIGKEY_LDAP_KEY_PHONE,
LDAP_KEY_PHONE));
+ u.getAddress().setEmail(getAttr(config,
entry, CONFIGKEY_LDAP_KEY_MAIL, LDAP_KEY_MAIL));
+
u.getAddress().setStreet(getAttr(config, entry, CONFIGKEY_LDAP_KEY_STREET,
LDAP_KEY_STREET));
+
u.getAddress().setAdditionalname(getAttr(config, entry,
CONFIGKEY_LDAP_KEY_ADDITIONAL_NAME, LDAP_KEY_ADDITIONAL_NAME));
+ u.getAddress().setFax(getAttr(config,
entry, CONFIGKEY_LDAP_KEY_FAX, LDAP_KEY_FAX));
+ u.getAddress().setZip(getAttr(config,
entry, CONFIGKEY_LDAP_KEY_ZIP, LDAP_KEY_ZIP));
+
u.getAddress().setState(stateDao.get(getAttr(config, entry,
CONFIGKEY_LDAP_KEY_COUNTRY, LDAP_KEY_COUNTRY)));
+ u.getAddress().setTown(getAttr(config,
entry, CONFIGKEY_LDAP_KEY_TOWN, LDAP_KEY_TOWN));
+ u.getAddress().setPhone(getAttr(config,
entry, CONFIGKEY_LDAP_KEY_PHONE, LDAP_KEY_PHONE));
String tz = getAttr(config, entry,
CONFIGKEY_LDAP_TIMEZONE_NAME, LDAP_KEY_TIMEZONE);
if (tz == null) {
tz =
config.getProperty(CONFIGKEY_LDAP_TIMEZONE_NAME, null);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
Wed Jun 3 10:59:16 2015
@@ -66,9 +66,9 @@ public class SMSHandler {
return gateway.queryBalance() >= 1;
}
- public boolean sendSMS(String phone, String subj, long language_id) {
+ public boolean sendSMS(String phone, String subj, long languageId) {
try {
- taskExecutor.execute(new SMSSenderTask(phone, subj,
language_id));
+ taskExecutor.execute(new SMSSenderTask(phone, subj,
languageId));
return true;
} catch (Exception ex) {
log.error("sendSMS", ex);
@@ -79,12 +79,12 @@ public class SMSHandler {
protected class SMSSenderTask implements Runnable {
private final String phone;
private final String subject;
- private long language_id;
+ private long languageId;
- public SMSSenderTask(String phone, String subject, long
language_id) {
+ public SMSSenderTask(String phone, String subject, long
languageId) {
this.phone = phone;
this.subject = subject;
- this.language_id = language_id;
+ this.languageId = languageId;
}
public void run() {
@@ -100,7 +100,7 @@ public class SMSHandler {
log.debug("SMS sending to: " + phone + ",
subject is: " + subject);
if (checkBalance()) {
OutboundMessage msg = new
OutboundMessage(phone, subject);
- if (language_id != 1) {
+ if (languageId != 1) {
msg.setEncoding(MessageEncodings.ENCUCS2);
}
return
Service.getInstance().sendMessage(msg);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Wed Jun 3 10:59:16 2015
@@ -273,7 +273,7 @@ public class ConferenceLibrary implement
Client currentClient = this.sessionManager
.getClientByStreamId(streamid,
null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
if (room_id != null) {
File outputFullFlvFile = new
File(OmFileHelper.getStreamsHibernateDir()
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
Wed Jun 3 10:59:16 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.core.remote;
-import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.ArrayList;
@@ -48,7 +47,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.RoomOrganisation;
import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.openmeetings.db.entity.server.Server;
-import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
@@ -93,15 +91,15 @@ public class ConferenceService {
* (non-appointments)
*
* @param SID
- * @param organisation_id
+ * @param organisationId
* @return - all available Rooms of this organization
*/
- public List<RoomOrganisation> getRoomsByOrganisationAndType(String SID,
long organisation_id, long roomtypesId) {
+ public List<RoomOrganisation> getRoomsByOrganisationAndType(String SID,
long organisationId, long roomTypeId) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
log.debug("getRoomsByOrganisationAndType");
- List<RoomOrganisation> roomOrgsList =
roomManager.getRoomsOrganisationByOrganisationIdAndRoomType(organisation_id,
roomtypesId);
+ List<RoomOrganisation> roomOrgsList =
roomManager.getRoomsOrganisationByOrganisationIdAndRoomType(organisationId,
roomTypeId);
List<RoomOrganisation> filtered = new
ArrayList<RoomOrganisation>();
@@ -125,12 +123,12 @@ public class ConferenceService {
}
public List<RoomOrganisation> getRoomsByOrganisationWithoutType(
- String SID, long organisation_id) {
+ String SID, long organisationId) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
log.debug("getRoomsByOrganisationAndType");
- List<RoomOrganisation> roomOrgsList =
roomManager.getRoomsOrganisationByOrganisationId(organisation_id);
+ List<RoomOrganisation> roomOrgsList =
roomManager.getRoomsOrganisationByOrganisationId(organisationId);
for (RoomOrganisation roomOrg : roomOrgsList) {
roomOrg.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomOrg.getRoom().getId()));
@@ -149,18 +147,18 @@ public class ConferenceService {
* also member of that organization
*
* @param SID
- * @param organisation_id
+ * @param organisationId
* @return - all rooms of an organization
*/
public SearchResult<RoomOrganisation> getRoomsByOrganisation(String SID,
- long organisation_id, int start, int max, String
orderby,
+ long organisationId, int start, int max, String orderby,
boolean asc) {
log.debug("getRoomsByOrganisation");
Long user_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasModLevel(userDao.get(user_id),
organisation_id)) {
- return
roomManager.getRoomsOrganisationsByOrganisationId(organisation_id, start, max,
orderby, asc);
+ if (AuthLevelUtil.hasModLevel(userDao.get(user_id),
organisationId)) {
+ return
roomManager.getRoomsOrganisationsByOrganisationId(organisationId, start, max,
orderby, asc);
}
return null;
}
@@ -176,8 +174,8 @@ public class ConferenceService {
try {
log.debug("getRoomsPublic");
- Long users_id = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
List<Room> roomList =
roomDao.getPublicRooms(roomtypesId);
@@ -205,8 +203,8 @@ public class ConferenceService {
public List<Room> getRoomsPublicWithoutType(String SID) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
List<Room> roomList = roomDao.getPublicRooms();
@@ -241,19 +239,19 @@ public class ConferenceService {
*
* retrieving Appointment for Room
*
- * @param room_id
+ * @param roomId
* @return - Appointment in case the room is appointment, null otherwise
*/
- public Appointment getAppointMentDataForRoom(Long room_id) {
+ public Appointment getAppointMentDataForRoom(Long roomId) {
log.debug("getAppointMentDataForRoom");
- Room room = roomDao.get(room_id);
+ Room room = roomDao.get(roomId);
if (room.isAppointment() == false)
return null;
try {
- Appointment ment =
appointmentDao.getAppointmentByRoom(room_id);
+ Appointment ment =
appointmentDao.getAppointmentByRoom(roomId);
return ment;
} catch (Exception e) {
@@ -269,30 +267,30 @@ public class ConferenceService {
*
*/
//
--------------------------------------------------------------------------------------------
- public List<Room> getAppointedMeetings(String SID, Long room_types_id) {
+ public List<Room> getAppointedMeetings(String SID, Long roomTypeId) {
log.debug("ConferenceService.getAppointedMeetings");
- Long users_id = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
+ if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- List<Appointment> points =
appointmentDao.getTodaysAppointmentsbyRangeAndMember(users_id);
+ List<Appointment> points =
appointmentDao.getTodaysAppointmentsbyRangeAndMember(userId);
List<Room> result = new ArrayList<Room>();
if (points != null) {
for (int i = 0; i < points.size(); i++) {
Appointment ment = points.get(i);
- Long rooms_id = ment.getRoom().getId();
- Room rooom = roomDao.get(rooms_id);
+ Long roomId = ment.getRoom().getId();
+ Room room = roomDao.get(roomId);
- if (!rooom.getRoomtype().getId()
- .equals(room_types_id))
+ if (!room.getRoomtype().getId()
+ .equals(roomTypeId))
continue;
-
rooom.setCurrentusers(getRoomClientsListByRoomId(rooom
+
room.setCurrentusers(getRoomClientsListByRoomId(room
.getId()));
- result.add(rooom);
+ result.add(room);
}
}
@@ -310,10 +308,10 @@ public class ConferenceService {
public List<Room> getAppointedMeetingRoomsWithoutType(String SID) {
log.debug("ConferenceService.getAppointedMeetings");
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- List<Appointment> appointments =
appointmentDao.getTodaysAppointmentsbyRangeAndMember(users_id);
+ if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
+ List<Appointment> appointments =
appointmentDao.getTodaysAppointmentsbyRangeAndMember(userId);
List<Room> result = new ArrayList<Room>();
if (appointments != null) {
@@ -344,11 +342,9 @@ public class ConferenceService {
* @return - all room types available
*/
public List<RoomType> getRoomTypes(String SID) {
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- User user = userDao.get(users_id);
- return roomTypeDao.getAll(user == null
- ?
cfgDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1") :
user.getLanguageId());
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
+ return roomTypeDao.get();
}
return null;
}
@@ -356,22 +352,22 @@ public class ConferenceService {
/**
*
* @param SID
- * @param rooms_id
+ * @param roomId
* @return - room with the id given
*/
- public Room getRoomById(String SID, long rooms_id) {
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- return roomDao.get(rooms_id);
+ public Room getRoomById(String SID, long roomId) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
+ return roomDao.get(roomId);
}
return null;
}
- public Room getRoomWithCurrentUsersById(String SID, long rooms_id) {
+ public Room getRoomWithCurrentUsersById(String SID, long roomId) {
Room room = null;
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- room = roomDao.get(rooms_id);
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
+ room = roomDao.get(roomId);
room.setCurrentusers(sessionManager.getClientListByRoom(room.getId()));
}
return room;
@@ -386,8 +382,8 @@ public class ConferenceService {
* @return - room with the given external id
*/
public Room getRoomByExternalId(String SID, Long externalUserId, String
externalUserType, long roomtypesId) {
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return roomManager.getRoomByExternalId(externalUserId,
externalUserType, roomtypesId);
}
return null;
@@ -407,8 +403,8 @@ public class ConferenceService {
String orderby, boolean asc, String search) {
log.debug("getRooms");
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRooms(start, max, orderby, asc,
search);
}
return null;
@@ -418,8 +414,8 @@ public class ConferenceService {
int max, String orderby, boolean asc) {
log.debug("getRooms");
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRoomsWithCurrentUsers(start, max,
orderby, asc);
}
return null;
@@ -429,9 +425,9 @@ public class ConferenceService {
Long roomId) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
+ if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return roomModeratorsDao.getByRoomId(roomId);
@@ -447,13 +443,13 @@ public class ConferenceService {
/**
*
* @param SID
- * @param rooms_id
+ * @param roomId
* @return - id of the room being deleted
*/
- public Long deleteRoom(String SID, long rooms_id) {
- Long users_id = sessiondataDao.checkSession(SID);
- if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- return roomManager.deleteRoomById(rooms_id);
+ public Long deleteRoom(String SID, long roomId) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
+ return roomManager.deleteRoomById(roomId);
}
return null;
}
@@ -461,15 +457,15 @@ public class ConferenceService {
/**
* return all participants of a room
*
- * @param room_id
+ * @param roomId
* @return - true if room is full, false otherwise
*/
- public boolean isRoomFull(Long room_id) {
+ public boolean isRoomFull(Long roomId) {
try {
- Room room = roomDao.get(room_id);
+ Room room = roomDao.get(roomId);
if (room.getNumberOfPartizipants() <=
this.sessionManager
- .getClientListByRoom(room_id).size()) {
+ .getClientListByRoom(roomId).size()) {
return true;
}
@@ -483,18 +479,18 @@ public class ConferenceService {
/**
* return all participants of a room
*
- * @param room_id
+ * @param roomId
* @return - all participants of a room
*/
- public List<Client> getRoomClientsListByRoomId(Long room_id) {
- return sessionManager.getClientListByRoom(room_id);
+ public List<Client> getRoomClientsListByRoomId(Long roomId) {
+ return sessionManager.getClientListByRoom(roomId);
}
public List<Room> getRoomsWithCurrentUsersByList(String SID, int start,
int max, String orderby, boolean asc) {
log.debug("getRoomsWithCurrentUsersByList");
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return
roomManager.getRoomsWithCurrentUsersByList(start, max, orderby, asc);
}
return null;
@@ -503,17 +499,17 @@ public class ConferenceService {
public List<Room> getRoomsWithCurrentUsersByListAndType(String SID, int
start, int max, String orderby, boolean asc, String externalRoomType) {
log.debug("getRoomsWithCurrentUsersByListAndType");
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return
roomManager.getRoomsWithCurrentUsersByListAndType(start, max, orderby, asc,
externalRoomType);
}
return null;
}
public Room getRoomByOwnerAndType(String SID, Long roomtypesId, String
roomName) {
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- return roomManager.getRoomByOwnerAndTypeId(users_id,
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
+ return roomManager.getRoomByOwnerAndTypeId(userId,
roomtypesId, roomName);
}
return null;
@@ -528,8 +524,8 @@ public class ConferenceService {
* {@link Server} entity is returned
*/
public ServerDTO getServerForSession(String SID, long roomId) {
- Long users_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
List<Server> serverList = serverDao.getActiveServers();
long minimum = -1;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
Wed Jun 3 10:59:16 2015
@@ -104,7 +104,7 @@ public class FLVRecorderService implemen
try {
log.debug("##REC:: recordMeetingStream ::");
- Long room_id = client.getRoom_id();
+ Long room_id = client.getRoomId();
Date now = new Date();
@@ -112,7 +112,7 @@ public class FLVRecorderService implemen
flvRecording.setFileHash("");
flvRecording.setFileName(roomRecordingName);
- Long ownerId = client.getUser_id();
+ Long ownerId = client.getUserId();
if (ownerId != null && ownerId < 0) {
User c = userDao.get(-ownerId);
if (c != null) {
@@ -392,9 +392,9 @@ public class FLVRecorderService implemen
Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
- log.debug("getCurrentRoomClient
-#########################- " + currentClient.getRoom_id());
+ log.debug("getCurrentRoomClient
-#########################- " + currentClient.getRoomId());
- for (Client rcl :
sessionManager.getClientListByRoomAll(currentClient.getRoom_id())) {
+ for (Client rcl :
sessionManager.getClientListByRoomAll(currentClient.getRoomId())) {
if (rcl.getIsRecording()) {
return rcl;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
Wed Jun 3 10:59:16 2015
@@ -95,7 +95,7 @@ public class InvitationService implement
* @param validFromTime
* @param validToDate
* @param validToTime
- * @param language_id
+ * @param languageId
* @param iCalTz
* @return - invitation object in case of success, "Sys - Error" string
or null in case of error
*/
@@ -104,7 +104,7 @@ public class InvitationService implement
Long room_id, String conferencedomain, Boolean
isPasswordProtected,
String invitationpass, Integer valid, String
validFromDate,
String validFromTime, String validToDate, String
validToTime,
- Long language_id, String iCalTz, boolean sendMail) {
+ Long languageId, String iCalTz, boolean sendMail) {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -123,7 +123,7 @@ public class InvitationService implement
User invitee = userDao.getContact(email,
firstname, lastname, users_id);
Invitation invitation =
invitationManager.getInvitation(invitee, roomDao.get(room_id),
isPasswordProtected, invitationpass, Valid.fromInt(valid)
- ,
userDao.get(users_id), language_id,
+ ,
userDao.get(users_id), languageId,
calFrom.getTime(), calTo.getTime(), null);
if (invitation != null) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Wed Jun 3 10:59:16 2015
@@ -184,8 +184,8 @@ public class MainService implements IPen
String streamId = current.getClient().getId();
Client currentClient =
sessionManager.getClientByStreamId(streamId, null);
- if (currentClient.getUser_id() != null) {
- sessiondataDao.updateUser(SID,
currentClient.getUser_id());
+ if (currentClient.getUserId() != null) {
+ sessiondataDao.updateUser(SID,
currentClient.getUserId());
}
currentClient.setAllowRecording(soapLogin.isAllowRecording());
@@ -214,10 +214,10 @@ public class MainService implements IPen
SOAPLogin returnSoapLogin = new SOAPLogin();
-
returnSoapLogin.setRoom_id(soapLogin.getRoom_id());
+
returnSoapLogin.setRoomId(soapLogin.getRoomId());
returnSoapLogin.setBecomemoderator(soapLogin.getBecomemoderator());
returnSoapLogin.setShowAudioVideoTest(soapLogin.getShowAudioVideoTest());
-
returnSoapLogin.setRoomRecordingId(soapLogin.getRoomRecordingId());
+
returnSoapLogin.setRecordingId(soapLogin.getRecordingId());
returnSoapLogin.setShowNickNameDialog(soapLogin.getShowNickNameDialog());
returnSoapLogin.setLandingZone(soapLogin.getLandingZone());
@@ -254,12 +254,8 @@ public class MainService implements IPen
// Log the User
conferenceLogDao.addConferenceLog(
- "nicknameEnter",
currentClient.getUser_id(), streamId,
- null, currentClient.getUserip(),
currentClient.getScope(),
- currentClient.getExternalUserId(),
- currentClient.getExternalUserType(),
- currentClient.getEmail(),
currentClient.getFirstname(),
- currentClient.getLastname());
+ "nicknameEnter",
currentClient.getUserId(), streamId,
+ null, currentClient.getUserip(),
currentClient.getScope());
this.sessionManager.updateClientByStreamId(streamId,
currentClient, false, null);
@@ -284,10 +280,10 @@ public class MainService implements IPen
Long users_id = sessiondataDao.checkSession(SID);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
Sessiondata sd =
sessiondataDao.getSessionByHash(SID);
- if (sd == null || sd.getSessionXml() == null) {
+ if (sd == null || sd.getXml() == null) {
return new Long(-37);
} else {
- RemoteSessionObject userObject =
RemoteSessionObject.fromXml(sd.getSessionXml());
+ RemoteSessionObject userObject =
RemoteSessionObject.fromXml(sd.getXml());
log.debug(userObject.toString());
@@ -319,19 +315,19 @@ public class MainService implements IPen
, userObject.getExternalUserType(), null, userObject.getPictureUrl());
long userId = u.getId();
-
currentClient.setUser_id(userId);
+
currentClient.setUserId(userId);
SessionVariablesUtil.setUserId(current.getClient(), userId);
} else {
user.setPictureuri(userObject.getPictureUrl());
userDao.update(user,
users_id);
-
currentClient.setUser_id(user.getId());
+
currentClient.setUserId(user.getId());
SessionVariablesUtil.setUserId(current.getClient(), user.getId());
}
}
-
log.debug("userObject.getExternalUserId() -2- " + currentClient.getUser_id());
+
log.debug("userObject.getExternalUserId() -2- " + currentClient.getUserId());
currentClient.setUserObject(userObject.getUsername(),
userObject.getFirstname(), userObject.getLastname());
currentClient.setPicture_uri(userObject.getPictureUrl());
@@ -339,8 +335,8 @@ public class MainService implements IPen
log.debug("UPDATE USER BY STREAMID " +
streamId);
- if (currentClient.getUser_id() != null)
{
- sessiondataDao.updateUser(SID,
currentClient.getUser_id());
+ if (currentClient.getUserId() != null) {
+ sessiondataDao.updateUser(SID,
currentClient.getUserId());
}
sessionManager.updateClientByStreamId(streamId, currentClient, false, null);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1683280&r1=1683279&r2=1683280&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Wed Jun 3 10:59:16 2015
@@ -77,7 +77,7 @@ public class MobileService {
User u = userDao.login(login, password);
if (u != null) {
Sessiondata sd = sessionDao.startsession();
- Boolean bool =
sessionDao.updateUser(sd.getSession_id(), u.getId(), false, u.getLanguageId());
+ Boolean bool =
sessionDao.updateUser(sd.getSessionId(), u.getId(), false, u.getLanguageId());
if (bool == null) {
// Exception
} else if (!bool) {
@@ -93,20 +93,20 @@ public class MobileService {
}
SessionVariablesUtil.initClient(conn.getClient(), false, c.getPublicSID());
- c.setUser_id(u.getId());
+ c.setUserId(u.getId());
c.setFirstname(u.getFirstname());
c.setLastname(u.getLastname());
c.setMobile(true);
sessionManager.updateClientByStreamId(streamId, c, false, null);
- add(result, "sid", sd.getSession_id());
+ add(result, "sid", sd.getSessionId());
add(result, "publicSid",
c.getPublicSID());
add(result, "status", 0);
add(result, "userId", u.getId());
add(result, "firstname",
u.getFirstname());
add(result, "lastname",
u.getLastname());
add(result, "login", u.getLogin());
- add(result, "email", u.getAdresses() ==
null ? "" : u.getAdresses().getEmail());
+ add(result, "email", u.getAddress() ==
null ? "" : u.getAddress().getEmail());
add(result, "language",
u.getLanguageId()); //TODO rights
}
}
@@ -127,7 +127,7 @@ public class MobileService {
Map<String, Object> map = new
Hashtable<String, Object>();
add(map, "streamId", c.getStreamid());
add(map, "broadCastId",
c.getBroadCastID());
- add(map, "userId", c.getUser_id());
+ add(map, "userId", c.getUserId());
add(map, "firstname", c.getFirstname());
add(map, "lastname", c.getLastname());
add(map, "publicSid", c.getPublicSID());
@@ -165,7 +165,7 @@ public class MobileService {
// FIXME duplicated code
IConnection current = Red5.getConnectionLocal();
Client c =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
- User u = userDao.get(c.getUser_id());
+ User u = userDao.get(c.getUserId());
//my rooms
List<Room> myl = new ArrayList<Room>();
myl.add(roomManager.getRoomByOwnerAndTypeId(u.getId(), 1L,
labelDao.getString(1306L, u.getLanguageId())));
@@ -199,7 +199,7 @@ public class MobileService {
//TODO check if we need anything here
long broadcastId = scopeAdapter.getBroadCastId();
c.setSipTransport(true);
- c.setRoom_id(Long.parseLong(c.getScope()));
+ c.setRoomId(Long.parseLong(c.getScope()));
c.setRoomEnter(new Date());
c.setBroadCastID(broadcastId);
c.setMobile(true);
