Repository: openmeetings Updated Branches: refs/heads/master c1d679c4a -> fc2e5abd5
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/fc2e5abd Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fc2e5abd Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fc2e5abd Branch: refs/heads/master Commit: fc2e5abd52a3d07c1367560c8155a656141d5264 Parents: c1d679c Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 22:26:21 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 22:26:21 2017 +0700 ---------------------------------------------------------------------- .../listener/async/StreamVideoWriter.java | 1 + .../core/documents/LibraryChartLoader.java | 4 +-- .../openmeetings/core/remote/MobileService.java | 4 ++- .../core/remote/RecordingService.java | 1 + .../openmeetings/db/dto/basic/SearchResult.java | 2 -- .../db/dto/basic/ServiceResult.java | 4 ++- .../db/dto/calendar/AppointmentDTO.java | 4 ++- .../db/dto/calendar/MeetingMemberDTO.java | 4 ++- .../db/dto/file/FileExplorerObject.java | 10 ------ .../openmeetings/db/dto/file/FileItemDTO.java | 4 ++- .../db/dto/record/RecordingContainerData.java | 5 +-- .../db/dto/record/RecordingDTO.java | 4 ++- .../openmeetings/db/dto/room/InvitationDTO.java | 33 ++++++++++++++++++-- .../openmeetings/db/dto/room/RoomCountDTO.java | 2 -- .../openmeetings/db/dto/room/RoomDTO.java | 4 ++- .../openmeetings/db/dto/room/RoomFileDTO.java | 4 ++- .../db/dto/room/RoomOptionsDTO.java | 4 ++- .../openmeetings/db/dto/room/Whiteboard.java | 4 ++- .../openmeetings/db/dto/room/Whiteboards.java | 4 ++- .../db/dto/user/ExternalUserDTO.java | 4 ++- .../openmeetings/db/dto/user/UserDTO.java | 4 ++- .../db/dto/user/UserSearchResult.java | 4 ++- .../openmeetings/db/entity/basic/Client.java | 1 + .../openmeetings/db/entity/room/Invitation.java | 4 ++- .../openmeetings/db/entity/room/RoomFile.java | 4 ++- .../openmeetings/db/entity/room/RoomGroup.java | 14 ++++++--- .../db/entity/room/StreamClient.java | 3 +- .../db/entity/server/RemoteSessionObject.java | 1 + .../db/entity/server/Sessiondata.java | 3 -- .../openmeetings/db/entity/user/GroupUser.java | 4 ++- .../db/entity/user/PrivateMessage.java | 1 + .../org/apache/openmeetings/util/Version.java | 6 ++-- .../openmeetings/web/admin/email/EmailForm.java | 4 --- .../web/admin/users/UsersPanel.java | 1 + .../openmeetings/web/app/Application.java | 1 + .../web/common/ComunityUserForm.java | 4 --- .../web/common/UploadableImagePanel.java | 9 ------ .../web/common/tree/ConvertingErrorsDialog.java | 1 + .../web/pages/AccessDeniedPage.java | 1 + .../apache/openmeetings/web/pages/HashPage.java | 1 + .../openmeetings/web/pages/auth/SignInPage.java | 10 ++++-- .../web/pages/install/InstallWizard.java | 8 ++--- .../web/room/EventDetailDialog.java | 1 + .../test/webservice/TestFileService.java | 13 ++++++++ 44 files changed, 135 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java index d8956bf..87bbfec 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java @@ -94,5 +94,6 @@ public class StreamVideoWriter extends BaseStreamWriter { @Override protected void internalCloseStream() { + //should be empty for video writer } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java index 70227a6..0cbde69 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java @@ -37,7 +37,7 @@ import com.thoughtworks.xstream.io.xml.XppDriver; public class LibraryChartLoader { private static final Logger log = Red5LoggerFactory.getLogger(LibraryChartLoader.class, getWebAppRootKey()); - private static final String fileExt = ".xchart"; + private static final String CHART_EXT = ".xchart"; private static LibraryChartLoader instance; @@ -54,7 +54,7 @@ public class LibraryChartLoader { @SuppressWarnings("rawtypes") public ArrayList loadChart(File dir, String fileName) { try { - File file = new File(dir, fileName + fileExt); + File file = new File(dir, fileName + CHART_EXT); log.error("filepathComplete: " + file); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java index b61ffba..10ec198 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java @@ -473,7 +473,9 @@ public class MobileService { private String code; private String name; - public Language() {} + public Language() { + //for creating via reflection + } public Language(long language_id, String code, String name) { this.language_id = language_id; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java index 88b4d93..3346aa6 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java @@ -95,6 +95,7 @@ public class RecordingService implements IPendingServiceCallback { @Override public void resultReceived(IPendingServiceCall arg0) { + //no-op } private static String generateFileName(Long recordingId, String streamid) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java index ccc5767..26d40d3 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java @@ -26,8 +26,6 @@ public class SearchResult<T> { private Collection<T> result; private String errorKey; - public SearchResult() {} - public String getObjectName() { return objectName; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java index 1bed23b..de3ed5d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java @@ -41,7 +41,9 @@ public class ServiceResult implements Serializable { , SUCCESS } - public ServiceResult() {} + public ServiceResult() { + //def constructor + } public ServiceResult(String message, String type) { super(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java index e0ce566..a036969 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java @@ -65,7 +65,9 @@ public class AppointmentDTO implements Serializable { private boolean connectedEvent; private boolean reminderEmailSend; - public AppointmentDTO() {} + public AppointmentDTO() { + //def constructor + } public AppointmentDTO(Appointment a) { id = a.getId(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java index 69131e8..2678f1e 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java @@ -41,7 +41,9 @@ public class MeetingMemberDTO implements Serializable { private Long id; private UserDTO user; - public MeetingMemberDTO() {} + public MeetingMemberDTO() { + //def constructor + } public MeetingMemberDTO(MeetingMember mm) { this.id = mm.getId(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java index 8196e46..e1c77ea 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java @@ -41,16 +41,10 @@ public class FileExplorerObject implements Serializable { private Long userHomeSize; private Long roomHomeSize; - public FileExplorerObject() {} - public List<FileItemDTO> getUserHome() { return userHome; } - public void setUserHome(List<FileItemDTO> userHome) { - this.userHome = userHome; - } - public void setUser(List<FileItem> list, long size) { this.userHome = FileItemDTO.list(list); this.userHomeSize = size; @@ -60,10 +54,6 @@ public class FileExplorerObject implements Serializable { return roomHome; } - public void setRoomHome(List<FileItemDTO> roomHome) { - this.roomHome = roomHome; - } - public void setRoom(List<FileItem> list, long size) { this.roomHome = FileItemDTO.list(list); this.roomHomeSize = size; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileItemDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileItemDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileItemDTO.java index 125b1ba..d929775 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileItemDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileItemDTO.java @@ -53,7 +53,9 @@ public class FileItemDTO implements Serializable { private Integer width; private Integer height; - public FileItemDTO() {} + public FileItemDTO() { + //def constructor + } public FileItemDTO(FileItem f) { id = f.getId(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java index 9cfda04..4f0bbb7 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java @@ -26,17 +26,18 @@ public class RecordingContainerData implements Serializable { private long userHomeSize; private long publicFileSize; - public RecordingContainerData() {} - public long getUserHomeSize() { return userHomeSize; } + public void setUserHomeSize(long userHomeSize) { this.userHomeSize = userHomeSize; } + public long getPublicFileSize() { return publicFileSize; } + public void setPublicFileSize(long publicFileSize) { this.publicFileSize = publicFileSize; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java index 7f00e57..5000ed8 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java @@ -45,7 +45,9 @@ public class RecordingDTO implements Serializable { private Integer height; private Long ownerId; - public RecordingDTO() {} + public RecordingDTO() { + //def constructor + } public RecordingDTO(Recording r) { this.id = r.getId(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java index ceaab26..31eb0ac 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java @@ -64,62 +64,82 @@ public class InvitationDTO implements Serializable { private String validTo; private long languageId; - public InvitationDTO() {} + public InvitationDTO() { + //def constructor + } public String getEmail() { return email; } + public void setEmail(String email) { this.email = email; } + public String getFirstname() { return firstname; } + public void setFirstname(String firstname) { this.firstname = firstname; } + public String getLastname() { return lastname; } + public void setLastname(String lastname) { this.lastname = lastname; } + public String getMessage() { return message; } + public void setMessage(String message) { this.message = message; } + public String getSubject() { return subject; } + public void setSubject(String subject) { this.subject = subject; } + public Long getRoomId() { return roomId; } + public void setRoomId(Long roomId) { this.roomId = roomId; } + public boolean isPasswordProtected() { return passwordProtected; } + public void setPasswordProtected(boolean passwordProtected) { this.passwordProtected = passwordProtected; } + public String getPassword() { return password; } + public void setPassword(String password) { this.password = password; } + public Valid getValid() { return valid; } + public void setValid(Valid valid) { this.valid = valid; } + /** * Method to get valid from date-time in format YYYY-MM-dd HH:mm:ss * @@ -128,14 +148,17 @@ public class InvitationDTO implements Serializable { public String getValidFrom() { return validFrom; } + /** * Method to set valid from date-time in format YYYY-MM-dd HH:mm:ss * - * @param validFrom date-time in format YYYY-MM-dd HH:mm:ss + * @param validFrom + * date-time in format YYYY-MM-dd HH:mm:ss */ public void setValidFrom(String validFrom) { this.validFrom = validFrom; } + /** * Method to get valid to date-time in format YYYY-MM-dd HH:mm:ss * @@ -144,17 +167,21 @@ public class InvitationDTO implements Serializable { public String getValidTo() { return validTo; } + /** * Method to set valid to date-time in format YYYY-MM-dd HH:mm:ss * - * @param validFrom date-time in format YYYY-MM-dd HH:mm:ss + * @param validFrom + * date-time in format YYYY-MM-dd HH:mm:ss */ public void setValidTo(String validTo) { this.validTo = validTo; } + public long getLanguageId() { return languageId; } + public void setLanguageId(long languageId) { this.languageId = languageId; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountDTO.java index 3a6c168..fd4eb3e 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountDTO.java @@ -30,8 +30,6 @@ public class RoomCountDTO { private int roomCount; private long maxUser; - public RoomCountDTO() {} - public Long getRoomId() { return roomId; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java index 030d59b..c019127 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java @@ -66,7 +66,9 @@ public class RoomDTO implements Serializable { private Set<RoomElement> hiddenElements = new HashSet<>(); private List<RoomFileDTO> files = new ArrayList<>(); - public RoomDTO() {} + public RoomDTO() { + //def constructor + } public RoomDTO(Room r) { id = r.getId(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomFileDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomFileDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomFileDTO.java index bb6cc7a..c6d7de2 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomFileDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomFileDTO.java @@ -41,7 +41,9 @@ public class RoomFileDTO implements Serializable { private long fileId; private long wbIdx = 0; - public RoomFileDTO() {} + public RoomFileDTO() { + //def constructor + } public RoomFileDTO(RoomFile rf) { id = rf.getId(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java index 950859b..90ef239 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java @@ -39,7 +39,9 @@ public class RoomOptionsDTO implements Serializable { private boolean allowSameURLMultipleTimes; private boolean allowRecording; - public RoomOptionsDTO() {} + public RoomOptionsDTO() { + //def constructor + } public Long getRoomId() { return roomId; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java index cda1013..c351e9a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java @@ -52,7 +52,9 @@ public class Whiteboard implements Serializable { private int slide = 0; private String name; - public Whiteboard() {} + public Whiteboard() { + //def constructor + } public Whiteboard(String name) { this.name = name; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java index ab0cbeb..1fb191d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java @@ -32,7 +32,9 @@ public class Whiteboards implements Serializable { private volatile AtomicLong whiteboardId = new AtomicLong(0); private volatile AtomicLong activeWb = new AtomicLong(0); - public Whiteboards() {} + public Whiteboards() { + //def constructor + } public Whiteboards(Long roomId) { this.roomId = roomId; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java index b5e6b3d..ad9945e 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java @@ -38,7 +38,9 @@ public class ExternalUserDTO implements Serializable { private String externalId; private String externalType; - public ExternalUserDTO() {} + public ExternalUserDTO() { + //def constructor + } public String getLogin() { return login; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java index 4cfd63b..fdb1e15 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java @@ -54,7 +54,9 @@ public class UserDTO implements Serializable { private String externalType; private Type type = Type.user; - public UserDTO() {} + public UserDTO() { + //def constructor + } public UserDTO(User u) { id = u.getId(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java index 262af14..04530d1 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java @@ -33,7 +33,9 @@ public class UserSearchResult { private List<UserDTO> result; private String errorKey; - public UserSearchResult() {} + public UserSearchResult() { + //def constructor + } public UserSearchResult(SearchResult<User> copy) { this.objectName = copy.getObjectName(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java index 5f2e47c..d9cd0f2 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java @@ -259,6 +259,7 @@ public class Client implements IClient { @Override public void setId(Long id) { + //no-op } public Room getRoom() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java index 4a81523..bd002aa 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java @@ -136,7 +136,9 @@ public class Invitation implements IDataProviderEntity { @Transient private boolean allowEntry = true; - public Invitation() {} + public Invitation() { + //def constructor + } public Invitation(Invitation i) { id = i.id; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomFile.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomFile.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomFile.java index 528c300..025615c 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomFile.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomFile.java @@ -61,7 +61,9 @@ public class RoomFile implements IDataProviderEntity { @Column(name = "wb_idx", nullable = false) private long wbIdx = 0; - public RoomFile() {} + public RoomFile() { + //def constructor + } public RoomFile(Long roomId, BaseFileItem file, long wbIdx) { this.roomId = roomId; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java index 9001a8d..feb4625 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java @@ -93,17 +93,19 @@ public class RoomGroup implements IDataProviderEntity { @Element(data = true) private boolean deleted; + public RoomGroup() { + //def constructor + } + public RoomGroup(Group org, Room room) { this.group = org; this.room = room; } - public RoomGroup() { - } - public Group getGroup() { return group; } + public void setGroup(Group group) { this.group = group; } @@ -111,6 +113,7 @@ public class RoomGroup implements IDataProviderEntity { public Room getRoom() { return room; } + public void setRoom(Room room) { this.room = room; } @@ -119,6 +122,7 @@ public class RoomGroup implements IDataProviderEntity { public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; @@ -127,6 +131,7 @@ public class RoomGroup implements IDataProviderEntity { public Date getInserted() { return inserted; } + public void setInserted(Date inserted) { this.inserted = inserted; } @@ -134,6 +139,7 @@ public class RoomGroup implements IDataProviderEntity { public Date getUpdated() { return updated; } + public void setUpdated(Date updated) { this.updated = updated; } @@ -141,8 +147,8 @@ public class RoomGroup implements IDataProviderEntity { public boolean isDeleted() { return deleted; } + public void setDeleted(boolean deleted) { this.deleted = deleted; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java index a423489..72ec691 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java @@ -73,8 +73,6 @@ public class StreamClient implements IClient { private Long roomId; private Type type = Type.video; - public StreamClient() {} - @Override public Long getId() { return null; @@ -82,6 +80,7 @@ public class StreamClient implements IClient { @Override public void setId(Long id) { + //no-op } public String getScope() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java index 2b62fc3..ad8eaff 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java @@ -56,6 +56,7 @@ public class RemoteSessionObject { private String externalUserType; public RemoteSessionObject() { + //def constructor } public RemoteSessionObject(String username, String firstname, String lastname, http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java index 9041b40..1bb5a1d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java @@ -71,9 +71,6 @@ public class Sessiondata implements Serializable { @Column(name = "language_id") private long languageId; - public Sessiondata() { - } - public Long getId() { return id; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java index 941713d..c9f2339 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java @@ -75,7 +75,9 @@ public class GroupUser implements IDataProviderEntity { @Element(data = true, required = false) private boolean moderator; - public GroupUser() {} + public GroupUser() { + //def constructor + } public GroupUser(Group group, User u) { this.group = group; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java index 2401432..000b101 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java @@ -125,6 +125,7 @@ public class PrivateMessage implements IDataProviderEntity { private Long userContactId; public PrivateMessage() { + //def constructor } public PrivateMessage(PrivateMessage copy) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java index 1ec3289..dc74023 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; public class Version { private static final Logger log = Red5LoggerFactory.getLogger(Version.class, OpenmeetingsVariables.getWebAppRootKey()); - private static final int startedStringLength = 78; + private static final int TOTAL_LENGTH = 78; private static String version = null; private static String revision = null; private static String buildDate = null; @@ -78,12 +78,12 @@ public class Version { private static void getLine(StringBuilder sb, String text, char fill) { sb.append("\t#"); int l = text.length(); - int headLength = (startedStringLength - l) / 2; + int headLength = (TOTAL_LENGTH - l) / 2; for (int i = 0; i < headLength; ++i) { sb.append(fill); } sb.append(text); - for (int i = 0; i < (startedStringLength - l - headLength); ++i) { + for (int i = 0; i < (TOTAL_LENGTH - l - headLength); ++i) { sb.append(fill); } sb.append("#\n"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java index e120860..87d977d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java @@ -78,10 +78,6 @@ public class EmailForm extends Form<MailMessage> { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target) { - } - - @Override protected void onSubmit(AjaxRequestTarget target) { getBean(MailMessageDao.class).delete(getModelObject().getId(), getUserId()); setModelObject(new MailMessage()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java index 2561921..bfb425f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java @@ -53,6 +53,7 @@ public class UsersPanel extends AdminBasePanel { @Override public void onClose(IPartialPageRequestHandler handler, DialogButton button) { + //no-op } }; private UserForm form; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index f433ff7..830d91d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -212,6 +212,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica @Override public void memberAttributeChanged(MemberAttributeEvent evt) { + //no-op } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java index 582a946..60b0020 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java @@ -62,10 +62,6 @@ public class ComunityUserForm extends Form<User> { u.setShowContactDataToContacts(false); } } - - @Override - public void detach() { - } }); add(rg.add(new Radio<>("everybody", Model.of(1L)), new Radio<>("contact", Model.of(2L)) , new Radio<>("nobody", Model.of(3L))).setOutputMarkupId(true).setRenderBodyOnly(false) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java index 5bc94f4..78eb481 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java @@ -44,15 +44,6 @@ public abstract class UploadableImagePanel extends ImagePanel { private final FileUploadField fileUploadField = new FileUploadField("image", new IModel<List<FileUpload>>() { private static final long serialVersionUID = 1L; - //FIXME this need to be eliminated - @Override - public void detach() { - } - - @Override - public void setObject(List<FileUpload> object) { - } - @Override public List<FileUpload> getObject() { return null; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java index 24119bd..c63e3f1 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java @@ -101,6 +101,7 @@ public class ConvertingErrorsDialog extends AbstractDialog<BaseFileItem> { @Override public void onClose(IPartialPageRequestHandler handler, DialogButton button) { + //no-op } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.java index 80c6279..1b15ba5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.java @@ -60,5 +60,6 @@ public class AccessDeniedPage extends BaseInitedPage { @Override protected void onParameterArrival(IRequestParameters requestParameters, AjaxRequestTarget target) { + //no-op } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java index c50c08d..8bcb98f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java @@ -186,6 +186,7 @@ public class HashPage extends BaseInitedPage implements IUpdatable { @Override protected void onParameterArrival(IRequestParameters requestParameters, AjaxRequestTarget target) { + //no-op } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java index da979f3..1848c35 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java @@ -205,15 +205,19 @@ public class SignInPage extends BaseInitedPage { } TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() { @Override - public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {} + public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException { + //no-op + } + @Override - public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {} + public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException { + //no-op + } @Override public X509Certificate[] getAcceptedIssuers() { return null; } - }}; try { HttpsURLConnection connection = (HttpsURLConnection)_connection; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java index 84fe1d4..b9d4a13 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java @@ -493,7 +493,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { private final class ParamsStep3 extends BaseStep { private static final long serialVersionUID = 1L; - private static final String regex = "\\r\\n|\\r|\\n"; + private static final String REGEX = "\\r\\n|\\r|\\n"; private final TextField<String> ffmpegPath; private final TextField<String> imageMagicPath; private final TextField<String> soxPath; @@ -546,7 +546,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { private boolean checkToolPath(TextField<String> path, String[] args) { ConverterProcessResult result = ProcessHelper.executeScript(path.getInputName() + " path:: '" + path.getValue() + "'", args); if (!result.isOk()) { - path.error(result.getError().replaceAll(regex, "")); + path.error(result.getError().replaceAll(REGEX, "")); } return result.isOk(); } @@ -562,12 +562,12 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { try { officeManager.start(); } catch (OfficeException ex) { - err = ex.getMessage().replaceAll(regex, ""); + err = ex.getMessage().replaceAll(REGEX, ""); } finally { officeManager.stop(); } } catch (Exception ex) { - err = ex.getMessage().replaceAll(regex, ""); + err = ex.getMessage().replaceAll(REGEX, ""); } if (!err.isEmpty()) { officePath.error(err); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java index b1dd623..651d2d6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java @@ -62,6 +62,7 @@ public class EventDetailDialog extends AbstractDialog<Appointment> { @Override public void onClose(IPartialPageRequestHandler handler, DialogButton button) { + //no-op } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc2e5abd/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestFileService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestFileService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestFileService.java index d4c7ad5..f742430 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestFileService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestFileService.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.test.webservice; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.awt.Graphics; import java.awt.image.BufferedImage; @@ -27,6 +28,8 @@ import java.io.IOException; import javax.imageio.ImageIO; +import org.apache.openmeetings.db.dto.basic.ServiceResult; +import org.apache.openmeetings.db.dto.file.FileExplorerObject; import org.apache.openmeetings.db.dto.file.FileItemDTO; import org.apache.openmeetings.db.entity.file.BaseFileItem; import org.apache.openmeetings.util.NonJenkinsTests; @@ -57,4 +60,14 @@ public class TestFileService extends AbstractWebServiceTest { } } } + + @Test + public void testGetRoom() { + ServiceResult r = login(); + FileExplorerObject fo = getClient(FILE_SERVICE_URL) + .path("/room/5") + .query("sid", r.getMessage()) + .get(FileExplorerObject.class); + assertNotNull(fo); + } }
