You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/10/15 16:43:32 UTC
svn commit: r1708828 - in /openmeetings:
branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/
branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/
branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/
trunk/single...
Author: solomax
Date: Thu Oct 15 14:43:31 2015
New Revision: 1708828
URL: http://svn.apache.org/viewvc?rev=1708828&view=rev
Log:
[OPENMEETINGS-1268] additional flag is added to RoomDTO
Modified:
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.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-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Modified: openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1708828&r1=1708827&r2=1708828&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java Thu Oct 15 14:43:31 2015
@@ -519,7 +519,7 @@ public class RoomWebService {
return roomManager.addRoom(name, roomtypes_id, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null, true,
- false, true, false //isClosed
+ false, true, false //closed
, "", "", null, null,
true, // allowRecording
false, // hideTopBar
@@ -590,7 +590,7 @@ public class RoomWebService {
return roomManager.addRoom(name, roomtypes_id, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, false, true, false //isClosed
+ allowUserQuestions, false, true, false //closed
, "", "", null,
null,
true, // allowRecording
@@ -664,7 +664,7 @@ public class RoomWebService {
return roomManager.addRoom(name, roomtypes_id, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, isAudioOnly, true, false //isClosed
+ allowUserQuestions, isAudioOnly, true, false //closed
, "", "",
null, null,
true, // allowRecording
@@ -758,7 +758,7 @@ public class RoomWebService {
return roomManager.addRoom(name, roomtypes_id, comment,
numberOfPartizipants, ispublic, null, appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, isAudioOnly, true, false //isClosed
+ allowUserQuestions, isAudioOnly, true, false //closed
, "", "",
null, null,
true, // allowRecording
@@ -1916,7 +1916,7 @@ public class RoomWebService {
isModeratedRoom, null, null, externalRoomType, false, // allowUserQuestions
false, // isAudioOnly
true, // allowFontStyles
- false, // isClosed
+ false, // closed
redirectURL, false, true, false);
if (rooms_id <= 0) {
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=1708828&r1=1708827&r2=1708828&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 Thu Oct 15 14:43:31 2015
@@ -34,6 +34,7 @@ public class RoomDTO {
private String confno;
private boolean isPublic;
private boolean demo;
+ private boolean closed;
private Integer demoTime;
private boolean moderated;
private boolean allowUserQuestions;
@@ -46,8 +47,7 @@ public class RoomDTO {
private boolean screenSharingHidden;
private boolean whiteboardHidden;
- public RoomDTO() {
- }
+ public RoomDTO() {}
public RoomDTO(Room r) {
id = r.getRooms_id();
@@ -59,6 +59,7 @@ public class RoomDTO {
confno = r.getConfno();
isPublic = Boolean.TRUE.equals(r.getIspublic());
demo = Boolean.TRUE.equals(r.getIsDemoRoom());
+ closed = r.getIsClosed();
demoTime = r.getDemoTime();
moderated = Boolean.TRUE.equals(r.getIsModeratedRoom());
allowUserQuestions = Boolean.TRUE.equals(r.getAllowUserQuestions());
@@ -128,16 +129,6 @@ public class RoomDTO {
this.confno = confno;
}
- public static List<RoomDTO> list(List<Room> l) {
- List<RoomDTO> rList = new ArrayList<>();
- if (l != null) {
- for (Room r : l) {
- rList.add(new RoomDTO(r));
- }
- }
- return rList;
- }
-
public boolean isDemo() {
return demo;
}
@@ -241,4 +232,22 @@ public class RoomDTO {
public void setPublic(boolean isPublic) {
this.isPublic = isPublic;
}
+
+ public boolean isClosed() {
+ return closed;
+ }
+
+ public void setClosed(boolean closed) {
+ this.closed = closed;
+ }
+
+ public static List<RoomDTO> list(List<Room> l) {
+ List<RoomDTO> rList = new ArrayList<>();
+ if (l != null) {
+ for (Room r : l) {
+ rList.add(new RoomDTO(r));
+ }
+ }
+ return rList;
+ }
}
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1708828&r1=1708827&r2=1708828&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java Thu Oct 15 14:43:31 2015
@@ -160,7 +160,7 @@ public class Room implements Serializabl
@Column(name = "is_closed")
@Element(data = true, required = false)
- private Boolean isClosed;
+ private boolean isClosed;
@Column(name = "redirect_url")
@Element(data = true, required = false)
@@ -408,11 +408,11 @@ public class Room implements Serializabl
this.allowFontStyles = allowFontStyles;
}
- public Boolean getIsClosed() {
+ public boolean getIsClosed() {
return isClosed;
}
- public void setIsClosed(Boolean isClosed) {
+ public void setIsClosed(boolean isClosed) {
this.isClosed = isClosed;
}
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=1708828&r1=1708827&r2=1708828&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 Thu Oct 15 14:43:31 2015
@@ -41,6 +41,7 @@ public class RoomDTO implements Serializ
private String confno;
private boolean isPublic;
private boolean demo;
+ private boolean closed;
private Integer demoTime;
private Long externalId;
private String externalType;
@@ -70,6 +71,7 @@ public class RoomDTO implements Serializ
confno = r.getConfno();
isPublic = r.getIspublic();
demo = r.getIsDemoRoom();
+ closed = r.isClosed();
demoTime = r.getDemoTime();
externalId = r.getExternalId();
externalType = r.getExternalType();
@@ -318,6 +320,14 @@ public class RoomDTO implements Serializ
this.redirectUrl = redirectUrl;
}
+ public boolean isClosed() {
+ return closed;
+ }
+
+ public void setClosed(boolean closed) {
+ this.closed = closed;
+ }
+
public static List<RoomDTO> list(List<Room> l) {
List<RoomDTO> rList = new ArrayList<>();
if (l != null) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1708828&r1=1708827&r2=1708828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Thu Oct 15 14:43:31 2015
@@ -207,7 +207,7 @@ public class Room implements IDataProvid
@Column(name = "is_closed")
@Element(data = true, required = false)
- private boolean isClosed;
+ private boolean closed;
@Column(name = "redirect_url")
@Element(data = true, required = false)
@@ -455,12 +455,12 @@ public class Room implements IDataProvid
this.allowFontStyles = allowFontStyles;
}
- public boolean getIsClosed() {
- return isClosed;
+ public boolean isClosed() {
+ return closed;
}
- public void setIsClosed(boolean isClosed) {
- this.isClosed = isClosed;
+ public void setClosed(boolean closed) {
+ this.closed = closed;
}
public String getRedirectURL() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1708828&r1=1708827&r2=1708828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Thu Oct 15 14:43:31 2015
@@ -447,7 +447,7 @@ public class ImportInitvalues {
r.setDeleted(false);
- r.setIsClosed(false);
+ r.setClosed(false);
r.setRedirectURL(null);
r.setOwnerId(null);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1708828&r1=1708827&r2=1708828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Thu Oct 15 14:43:31 2015
@@ -159,7 +159,7 @@ public class RoomForm extends AdminBaseF
add(new CheckBox("allowUserQuestions"));
add(new CheckBox("audioOnly"));
add(new CheckBox("allowFontStyles"));
- add(new CheckBox("isClosed"));
+ add(new CheckBox("closed"));
add(new TextField<String>("redirectURL"));
add(new CheckBox("waitForRecording"));
add(new CheckBox("allowRecording"));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1708828&r1=1708827&r2=1708828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html Thu Oct 15 14:43:31 2015
@@ -118,7 +118,7 @@
</div>
<div class="formelement">
<div class="info-text"><wicket:message key="1101" /></div>
- <label><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="isClosed" />
+ <label><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="closed" />
</div>
<div class="formelement">
<label><wicket:message key="1100" /></label><input type="text" wicket:id="redirectURL" />
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1708828&r1=1708827&r2=1708828&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Thu Oct 15 14:43:31 2015
@@ -308,7 +308,7 @@ public class RoomWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Room room = roomDao.get(id);
- room.setIsClosed(true);
+ room.setClosed(true);
roomDao.update(room, userId);
@@ -354,7 +354,7 @@ public class RoomWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Room room = roomDao.get(id);
- room.setIsClosed(false);
+ room.setClosed(false);
roomDao.update(room, userId);
return new ServiceResult(1L, "Opened", Type.SUCCESS);