Author: solomax
Date: Mon Mar 30 03:51:56 2015
New Revision: 1669982
URL: http://svn.apache.org/r1669982
Log:
[OPENMEETINGS-1188] additional fields are added to room DTO
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java?rev=1669982&r1=1669981&r2=1669982&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
Mon Mar 30 03:51:56 2015
@@ -32,6 +32,22 @@ public class RoomDTO {
private Long numberOfPartizipants = new Long(4);
private boolean appointment;
private String confno;
+ private boolean isPublic;
+ private boolean demo;
+ private Integer demoTime;
+ private boolean moderated;
+ private boolean allowUserQuestions;
+ private boolean audioOnly;
+ private boolean topBarHidden;
+ private boolean chatHidden;
+ private boolean activitiesHidden;
+ private boolean filesExplorerHidden;
+ private boolean actionsMenuHidden;
+ private boolean screenSharingHidden;
+ private boolean whiteboardHidden;
+
+ public RoomDTO() {
+ }
public RoomDTO(Room r) {
id = r.getRooms_id();
@@ -41,6 +57,19 @@ public class RoomDTO {
numberOfPartizipants = r.getNumberOfPartizipants();
appointment = r.getAppointment();
confno = r.getConfno();
+ isPublic = Boolean.TRUE.equals(r.getIspublic());
+ demo = Boolean.TRUE.equals(r.getIsDemoRoom());
+ demoTime = r.getDemoTime();
+ moderated = Boolean.TRUE.equals(r.getIsModeratedRoom());
+ allowUserQuestions =
Boolean.TRUE.equals(r.getAllowUserQuestions());
+ audioOnly = Boolean.TRUE.equals(r.getIsAudioOnly());
+ topBarHidden = Boolean.TRUE.equals(r.getHideTopBar());
+ chatHidden = Boolean.TRUE.equals(r.getHideChat());
+ activitiesHidden =
Boolean.TRUE.equals(r.getHideActivitiesAndActions());
+ filesExplorerHidden =
Boolean.TRUE.equals(r.getHideFilesExplorer());
+ actionsMenuHidden = Boolean.TRUE.equals(r.getHideActionsMenu());
+ screenSharingHidden =
Boolean.TRUE.equals(r.getHideScreenSharing());
+ whiteboardHidden = Boolean.TRUE.equals(r.getHideWhiteboard());
}
public Long getId() {
@@ -108,4 +137,108 @@ public class RoomDTO {
}
return rList;
}
+
+ public boolean isDemo() {
+ return demo;
+ }
+
+ public void setDemo(boolean demo) {
+ this.demo = demo;
+ }
+
+ public Integer getDemoTime() {
+ return demoTime;
+ }
+
+ public void setDemoTime(Integer demoTime) {
+ this.demoTime = demoTime;
+ }
+
+ public boolean isModerated() {
+ return moderated;
+ }
+
+ public void setModerated(boolean moderated) {
+ this.moderated = moderated;
+ }
+
+ public boolean isAllowUserQuestions() {
+ return allowUserQuestions;
+ }
+
+ public void setAllowUserQuestions(boolean allowUserQuestions) {
+ this.allowUserQuestions = allowUserQuestions;
+ }
+
+ public boolean isAudioOnly() {
+ return audioOnly;
+ }
+
+ public void setAudioOnly(boolean audioOnly) {
+ this.audioOnly = audioOnly;
+ }
+
+ public boolean isTopBarHidden() {
+ return topBarHidden;
+ }
+
+ public void setTopBarHidden(boolean topBarHidden) {
+ this.topBarHidden = topBarHidden;
+ }
+
+ public boolean isChatHidden() {
+ return chatHidden;
+ }
+
+ public void setChatHidden(boolean chatHidden) {
+ this.chatHidden = chatHidden;
+ }
+
+ public boolean isActivitiesHidden() {
+ return activitiesHidden;
+ }
+
+ public void setActivitiesHidden(boolean activitiesHidden) {
+ this.activitiesHidden = activitiesHidden;
+ }
+
+ public boolean isFilesExplorerHidden() {
+ return filesExplorerHidden;
+ }
+
+ public void setFilesExplorerHidden(boolean filesExplorerHidden) {
+ this.filesExplorerHidden = filesExplorerHidden;
+ }
+
+ public boolean isActionsMenuHidden() {
+ return actionsMenuHidden;
+ }
+
+ public void setActionsMenuHidden(boolean actionsMenuHidden) {
+ this.actionsMenuHidden = actionsMenuHidden;
+ }
+
+ public boolean isScreenSharingHidden() {
+ return screenSharingHidden;
+ }
+
+ public void setScreenSharingHidden(boolean screenSharingHidden) {
+ this.screenSharingHidden = screenSharingHidden;
+ }
+
+ public boolean isWhiteboardHidden() {
+ return whiteboardHidden;
+ }
+
+ public void setWhiteboardHidden(boolean whiteboardHidden) {
+ this.whiteboardHidden = whiteboardHidden;
+ }
+
+ public boolean isPublic() {
+ return isPublic;
+ }
+
+ public void setPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java?rev=1669982&r1=1669981&r2=1669982&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
Mon Mar 30 03:51:56 2015
@@ -32,6 +32,19 @@ public class RoomDTO {
private Long numberOfPartizipants = new Long(4);
private boolean appointment;
private String confno;
+ private boolean isPublic;
+ private boolean demo;
+ private Integer demoTime;
+ private boolean moderated;
+ private boolean allowUserQuestions;
+ private boolean audioOnly;
+ private boolean topBarHidden;
+ private boolean chatHidden;
+ private boolean activitiesHidden;
+ private boolean filesExplorerHidden;
+ private boolean actionsMenuHidden;
+ private boolean screenSharingHidden;
+ private boolean whiteboardHidden;
public RoomDTO() {
}
@@ -44,6 +57,19 @@ public class RoomDTO {
numberOfPartizipants = r.getNumberOfPartizipants();
appointment = r.isAppointment();
confno = r.getConfno();
+ isPublic = Boolean.TRUE.equals(r.getIspublic());
+ demo = Boolean.TRUE.equals(r.getIsDemoRoom());
+ demoTime = r.getDemoTime();
+ moderated = r.isModerated();
+ allowUserQuestions =
Boolean.TRUE.equals(r.getAllowUserQuestions());
+ audioOnly = r.isAudioOnly();
+ topBarHidden = Boolean.TRUE.equals(r.getHideTopBar());
+ chatHidden = r.isChatHidden();
+ activitiesHidden = r.isActivitiesHidden();
+ filesExplorerHidden =
Boolean.TRUE.equals(r.getHideFilesExplorer());
+ actionsMenuHidden = Boolean.TRUE.equals(r.getHideActionsMenu());
+ screenSharingHidden =
Boolean.TRUE.equals(r.getHideScreenSharing());
+ whiteboardHidden = Boolean.TRUE.equals(r.getHideWhiteboard());
}
public Long getId() {
@@ -111,4 +137,108 @@ public class RoomDTO {
}
return rList;
}
+
+ public boolean isDemo() {
+ return demo;
+ }
+
+ public void setDemo(boolean demo) {
+ this.demo = demo;
+ }
+
+ public Integer getDemoTime() {
+ return demoTime;
+ }
+
+ public void setDemoTime(Integer demoTime) {
+ this.demoTime = demoTime;
+ }
+
+ public boolean isModerated() {
+ return moderated;
+ }
+
+ public void setModerated(boolean moderated) {
+ this.moderated = moderated;
+ }
+
+ public boolean isAllowUserQuestions() {
+ return allowUserQuestions;
+ }
+
+ public void setAllowUserQuestions(boolean allowUserQuestions) {
+ this.allowUserQuestions = allowUserQuestions;
+ }
+
+ public boolean isAudioOnly() {
+ return audioOnly;
+ }
+
+ public void setAudioOnly(boolean audioOnly) {
+ this.audioOnly = audioOnly;
+ }
+
+ public boolean isTopBarHidden() {
+ return topBarHidden;
+ }
+
+ public void setTopBarHidden(boolean topBarHidden) {
+ this.topBarHidden = topBarHidden;
+ }
+
+ public boolean isChatHidden() {
+ return chatHidden;
+ }
+
+ public void setChatHidden(boolean chatHidden) {
+ this.chatHidden = chatHidden;
+ }
+
+ public boolean isActivitiesHidden() {
+ return activitiesHidden;
+ }
+
+ public void setActivitiesHidden(boolean activitiesHidden) {
+ this.activitiesHidden = activitiesHidden;
+ }
+
+ public boolean isFilesExplorerHidden() {
+ return filesExplorerHidden;
+ }
+
+ public void setFilesExplorerHidden(boolean filesExplorerHidden) {
+ this.filesExplorerHidden = filesExplorerHidden;
+ }
+
+ public boolean isActionsMenuHidden() {
+ return actionsMenuHidden;
+ }
+
+ public void setActionsMenuHidden(boolean actionsMenuHidden) {
+ this.actionsMenuHidden = actionsMenuHidden;
+ }
+
+ public boolean isScreenSharingHidden() {
+ return screenSharingHidden;
+ }
+
+ public void setScreenSharingHidden(boolean screenSharingHidden) {
+ this.screenSharingHidden = screenSharingHidden;
+ }
+
+ public boolean isWhiteboardHidden() {
+ return whiteboardHidden;
+ }
+
+ public void setWhiteboardHidden(boolean whiteboardHidden) {
+ this.whiteboardHidden = whiteboardHidden;
+ }
+
+ public boolean isPublic() {
+ return isPublic;
+ }
+
+ public void setPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
}
