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 2017/09/18 05:25:46 UTC
[07/18] openmeetings git commit: Room parameter NumberOfPartizipants
is renamed to Capacity
Room parameter NumberOfPartizipants is renamed to Capacity
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f10ba389
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f10ba389
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f10ba389
Branch: refs/heads/3.3.x
Commit: f10ba389af252d2e27bdb8db12dc676b9a98eca9
Parents: 0a058f6
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Sep 14 12:05:06 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Sep 14 12:05:06 2017 +0700
----------------------------------------------------------------------
.../openmeetings/core/remote/MobileService.java | 2 +-
.../db/dao/calendar/AppointmentDao.java | 2 +-
.../apache/openmeetings/db/dao/room/RoomDao.java | 2 +-
.../apache/openmeetings/db/dto/room/RoomDTO.java | 16 ++++++++--------
.../apache/openmeetings/db/entity/room/Room.java | 16 ++++++++--------
.../openmeetings/installation/ImportInitvalues.java | 2 +-
.../openmeetings/web/admin/rooms/RoomForm.java | 2 +-
.../openmeetings/web/admin/rooms/RoomsPanel.html | 2 +-
.../org/apache/openmeetings/web/room/RoomPanel.java | 2 +-
.../apache/openmeetings/web/user/MessageDialog.java | 2 +-
.../openmeetings/web/user/rooms/RoomListPanel.java | 2 +-
.../test/webservice/TestCalendarService.java | 2 +-
.../test/webservice/TestRoomService.java | 2 +-
.../openmeetings/webservice/RoomWebService.java | 2 +-
14 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/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 1e953da..eb19689 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
@@ -288,7 +288,7 @@ public class MobileService {
}
room.put("first", first);
room.put("users", sessionManager.listByRoom(r.getId()).size());
- room.put("total", r.getNumberOfPartizipants());
+ room.put("total", r.getCapacity());
room.put("audioOnly", r.isAudioOnly());
result.add(room);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index 694784d..8f66079 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -107,7 +107,7 @@ public class AppointmentDao {
Room r = a.getRoom();
if (r.getId() == null) {
r.setName(a.getTitle());
- r.setNumberOfPartizipants(cfgDao.getConfValue("calendar.conference.rooms.default.size", Long.class, "50"));
+ r.setCapacity(cfgDao.getConfValue("calendar.conference.rooms.default.size", Long.class, "50"));
}
roomDao.update(r, userId);
if (sendmails) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
index 6dd79a8..d3b307b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
@@ -260,7 +260,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> {
room.setName(name);
room.setType(type);
room.setComment("My Rooms of ownerId " + ownerId);
- room.setNumberOfPartizipants(Room.Type.conference == type ? 25L : 120L);
+ room.setCapacity(Room.Type.conference == type ? 25L : 120L);
room.setAllowUserQuestions(true);
room.setOwnerId(ownerId);
room.setAllowRecording(true);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/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 4206cd6..de7cea4 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
@@ -46,7 +46,7 @@ public class RoomDTO implements Serializable {
private String name;
private String comment;
private Room.Type type;
- private Long numberOfPartizipants = new Long(4);
+ private Long capacity = new Long(4);
private boolean appointment;
private String confno;
private boolean isPublic;
@@ -70,7 +70,7 @@ public class RoomDTO implements Serializable {
name = r.getName();
comment = r.getComment();
type = r.getType();
- numberOfPartizipants = r.getNumberOfPartizipants();
+ capacity = r.getCapacity();
appointment = r.isAppointment();
confno = r.getConfno();
isPublic = r.getIspublic();
@@ -94,7 +94,7 @@ public class RoomDTO implements Serializable {
r.setName(name);
r.setComment(comment);
r.setType(type);
- r.setNumberOfPartizipants(numberOfPartizipants);
+ r.setCapacity(capacity);
r.setAppointment(appointment);
r.setConfno(confno);
r.setIspublic(isPublic);
@@ -144,12 +144,12 @@ public class RoomDTO implements Serializable {
this.type = type;
}
- public Long getNumberOfPartizipants() {
- return numberOfPartizipants;
+ public Long getCapacity() {
+ return capacity;
}
- public void setNumberOfPartizipants(Long numberOfPartizipants) {
- this.numberOfPartizipants = numberOfPartizipants;
+ public void setCapacity(Long capacity) {
+ this.capacity = capacity;
}
public boolean isAppointment() {
@@ -295,7 +295,7 @@ public class RoomDTO implements Serializable {
r.name = o.optString("name");
r.comment = o.optString("comment");
r.type = optEnum(Room.Type.class, o, "type");
- r.numberOfPartizipants = o.optLong("numberOfPartizipants", 4);
+ r.capacity = o.optLong("capacity", 4);
r.appointment = o.optBoolean("appointment", false);
r.confno = o.optString("confno");
r.isPublic = o.optBoolean("isPublic", false);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index 84ed8e6..524068b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -78,7 +78,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getSipRoomIdsByIds", query = "SELECT r.id FROM Room r WHERE r.deleted = false AND r.sipEnabled = true AND r.id IN :ids"),
@NamedQuery(name = "countRooms", query = "SELECT COUNT(r) FROM Room r WHERE r.deleted = false"),
@NamedQuery(name = "getBackupRooms", query = "SELECT r FROM Room r ORDER BY r.id"),
- @NamedQuery(name = "getRoomsCapacityByIds", query = "SELECT SUM(r.numberOfPartizipants) FROM Room r WHERE r.deleted = false AND r.id IN :ids")
+ @NamedQuery(name = "getRoomsCapacityByIds", query = "SELECT SUM(r.capacity) FROM Room r WHERE r.deleted = false AND r.id IN :ids")
, @NamedQuery(name = "getGroupRooms", query = "SELECT DISTINCT r.room FROM RoomGroup r LEFT JOIN FETCH r.room "
+ "WHERE r.group.id = :groupId AND r.deleted = false AND r.room.deleted = false AND r.room.appointment = false "
+ "AND r.group.deleted = false ORDER BY r.room.name ASC")
@@ -192,9 +192,9 @@ public class Room implements IDataProviderEntity {
@Element(name = "ispublic", data = true, required = false)
private boolean ispublic;
- @Column(name = "numberOfPartizipants")
- @Element(data = true, required = false)
- private long numberOfPartizipants = 4L;
+ @Column(name = "capacity")
+ @Element(name = "numberOfPartizipants", data = true, required = false)
+ private long capacity = 4L;
@Column(name = "appointment", nullable = false)
@Element(data = true, required = false)
@@ -384,12 +384,12 @@ public class Room implements IDataProviderEntity {
this.currentusers = currentusers;
}
- public long getNumberOfPartizipants() {
- return numberOfPartizipants;
+ public long getCapacity() {
+ return capacity;
}
- public void setNumberOfPartizipants(long numberOfPartizipants) {
- this.numberOfPartizipants = numberOfPartizipants;
+ public void setCapacity(long capacity) {
+ this.capacity = capacity;
}
public boolean isAppointment() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index 8530d70..7082b8a 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -318,7 +318,7 @@ public class ImportInitvalues {
r.setName(name);
r.setComment("");
r.setInserted(new Date());
- r.setNumberOfPartizipants(capacity);
+ r.setCapacity(capacity);
r.setType(type);
r.setIspublic(isPublic);
r.setAllowUserQuestions(true);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index 156b2df..42e5b64 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -119,7 +119,7 @@ public class RoomForm extends AdminBaseForm<Room> {
name.setLabel(new Model<>(Application.getString(193)));
add(name);
- add(new DropDownChoice<>("numberOfPartizipants", //
+ add(new DropDownChoice<>("capacity", //
DROPDOWN_NUMBER_OF_PARTICIPANTS, //
new ChoiceRenderer<Long>() {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
index a424408..8631b38 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
@@ -55,7 +55,7 @@
<label wicket:for="name"><wicket:message key="193" /></label><input type="text" wicket:id="name" />
</div>
<div class="formelement">
- <label wicket:for="numberOfPartizipants"><wicket:message key="482" /></label><select wicket:id="numberOfPartizipants"/>
+ <label wicket:for="capacity"><wicket:message key="482" /></label><select wicket:id="capacity"/>
</div>
<div class="formelement">
<label wicket:for="type"><wicket:message key="194" /></label><select wicket:id="type"/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 5689ba3..1143b51 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -209,7 +209,7 @@ public class RoomPanel extends BasePanel {
add(roomClosed = new RedirectMessageDialog("room-closed", "1098", r.isClosed(), r.getRedirectURL()));
if (r.isClosed()) {
room.setVisible(false);
- } else if (getRoomClients(r.getId()).size() >= r.getNumberOfPartizipants()) {
+ } else if (getRoomClients(r.getId()).size() >= r.getCapacity()) {
accessDenied = new ExpiredMessageDialog(ACCESS_DENIED_ID, getString("99"), menu);
room.setVisible(false);
} else if (r.getId().equals(WebSession.get().getRoomId())) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index 7b6141f..729234f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
@@ -193,7 +193,7 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> {
Room r = m.getRoom();
r.setName(m.getSubject());
r.setComment("");
- r.setNumberOfPartizipants(100L);
+ r.setCapacity(100L);
r.setAppointment(true);
r.setAllowUserQuestions(true);
r = getBean(RoomDao.class).update(r, getUserId());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
index 454300f..f1aa056 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
@@ -69,7 +69,7 @@ public class RoomListPanel extends UserPanel {
.add(AttributeModifier.append("title", getString(String.format("room.type.%s.desc", r.getType().name())))));
final Label curUsers = new Label("curUsers", new Model<>(Application.getRoomClients(r.getId()).size()));
roomContainer.add(curUsers.setOutputMarkupId(true));
- roomContainer.add(new Label("totalUsers", r.getNumberOfPartizipants()));
+ roomContainer.add(new Label("totalUsers", r.getCapacity()));
item.add(new Button("btn").add(new Label("label", label)).add(new RoomEnterBehavior(r.getId()) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
index 8af988b..366b7a1 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
@@ -101,7 +101,7 @@ public class TestCalendarService extends AbstractWebServiceTest {
.put("name", "test24")
.put("comment", "appointment test room")
.put("type", "conference")
- .put("numberOfPartizipants", 15)
+ .put("capacity", 15)
.put("appointment", true)
.put("isPublic", false)
.put("demo", false)
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java
index 7d91c09..0998ceb 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java
@@ -43,7 +43,7 @@ public class TestRoomService extends AbstractWebServiceTest {
r.setType(type);
r.setName(name);
r.setComment(comment);
- r.setNumberOfPartizipants(num);
+ r.setCapacity(num);
RoomDTO room = getClient(ROOM_SERVICE_URL).path(String.format("/%s/%s/%s", type, UNIT_TEST_EXT_TYPE, extId))
.query("sid", sr.getMessage())
.query("room", r.toString())
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f10ba389/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
index ee17762..63b2b65 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
@@ -422,7 +422,7 @@ public class RoomWebService extends BaseWebService {
RoomCountDTO rCountBean = new RoomCountDTO();
rCountBean.setRoomId(room.getId());
rCountBean.setRoomName(room.getName());
- rCountBean.setMaxUser(room.getNumberOfPartizipants());
+ rCountBean.setMaxUser(room.getCapacity());
rCountBean.setRoomCount(app.getOmRoomClients(room.getId()).size());
roomBeans.add(rCountBean);