This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 9b6d2d3 [OPENMEETINGS-2176] some enum values are renamed
9b6d2d3 is described below
commit 9b6d2d3bd35502bcdffc78ad26aa796634627054
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sat Mar 7 23:47:00 2020 +0700
[OPENMEETINGS-2176] some enum values are renamed
---
.../org/apache/openmeetings/core/remote/KRoom.java | 6 +-
.../apache/openmeetings/core/remote/KStream.java | 2 +-
.../openmeetings/core/remote/KurentoHandler.java | 2 +-
.../openmeetings/core/remote/StreamProcessor.java | 10 ++--
.../db/dao/calendar/AppointmentDao.java | 12 ++--
.../openmeetings/db/dao/room/InvitationDao.java | 6 +-
.../openmeetings/db/dto/room/InvitationDTO.java | 8 +--
.../openmeetings/db/dto/room/Whiteboard.java | 8 +--
.../openmeetings/db/entity/room/Invitation.java | 16 ++---
.../openmeetings/db/util/ws/RoomMessage.java | 50 ++++++++--------
.../java/org/apache/openmeetings/cli/Admin.java | 40 ++++++-------
.../cli/ConnectionPropertiesPatcher.java | 16 ++---
.../service/notifier/MailNotifier.java | 2 +-
.../service/room/InvitationManager.java | 18 +++---
.../openmeetings/util/ConnectionProperties.java | 28 ++++++---
.../org/apache/openmeetings/util/OmFileHelper.java | 8 +--
.../apache/openmeetings/web/app/Application.java | 2 +-
.../web/app/Application.properties.xml | 4 +-
.../web/app/Application_ar.properties.xml | 4 +-
.../web/app/Application_bg.properties.xml | 4 +-
.../web/app/Application_bn.properties.xml | 4 +-
.../web/app/Application_ca.properties.xml | 4 +-
.../web/app/Application_cs.properties.xml | 4 +-
.../web/app/Application_da.properties.xml | 4 +-
.../web/app/Application_de.properties.xml | 4 +-
.../web/app/Application_el.properties.xml | 4 +-
.../web/app/Application_es.properties.xml | 4 +-
.../web/app/Application_fa.properties.xml | 4 +-
.../web/app/Application_fi.properties.xml | 4 +-
.../web/app/Application_fr.properties.xml | 4 +-
.../web/app/Application_gl.properties.xml | 4 +-
.../web/app/Application_he.properties.xml | 4 +-
.../web/app/Application_hu.properties.xml | 4 +-
.../web/app/Application_in.properties.xml | 4 +-
.../web/app/Application_it.properties.xml | 4 +-
.../web/app/Application_ja.properties.xml | 4 +-
.../web/app/Application_ko.properties.xml | 4 +-
.../web/app/Application_nl.properties.xml | 4 +-
.../web/app/Application_pl.properties.xml | 4 +-
.../web/app/Application_pt.properties.xml | 4 +-
.../web/app/Application_pt_BR.properties.xml | 4 +-
.../web/app/Application_ru.properties.xml | 4 +-
.../web/app/Application_sk.properties.xml | 4 +-
.../web/app/Application_sv.properties.xml | 4 +-
.../web/app/Application_th.properties.xml | 4 +-
.../web/app/Application_tr.properties.xml | 4 +-
.../web/app/Application_uk.properties.xml | 4 +-
.../web/app/Application_zh_CN.properties.xml | 4 +-
.../web/app/Application_zh_TW.properties.xml | 4 +-
.../apache/openmeetings/web/app/ClientManager.java | 2 +-
.../openmeetings/web/app/QuickPollManager.java | 6 +-
.../apache/openmeetings/web/app/TimerService.java | 2 +-
.../openmeetings/web/app/WhiteboardManager.java | 2 +-
.../openmeetings/web/common/InvitationForm.java | 14 ++---
.../apache/openmeetings/web/pages/HashPage.java | 2 +-
.../web/pages/install/InstallWizard.java | 24 ++++----
.../apache/openmeetings/web/room/RoomPanel.java | 70 +++++++++++-----------
.../web/room/activities/ActivitiesPanel.java | 2 +-
.../web/room/menu/RoomInvitationForm.java | 2 +-
.../openmeetings/web/room/menu/RoomMenuPanel.java | 2 +-
.../web/room/poll/CreatePollDialog.java | 2 +-
.../web/room/poll/PollResultsDialog.java | 4 +-
.../openmeetings/web/room/poll/VoteDialog.java | 2 +-
.../openmeetings/web/room/sidebar/RoomSidebar.java | 4 +-
.../apache/openmeetings/web/room/wb/WbPanel.html | 4 +-
.../openmeetings/web/room/wb/raw-wb-board.js | 18 +++---
.../openmeetings/web/user/MessageDialog.java | 2 +-
.../web/user/profile/InvitationDetails.java | 4 +-
.../org/apache/openmeetings/cli/TestPatcher.java | 6 +-
.../openmeetings/invitiation/TestInvitation.java | 4 +-
.../openmeetings/web/pages/TestHashPage.java | 10 ++--
.../web/pages/install/TestInstall.java | 5 +-
.../openmeetings/webservice/TestRoomService.java | 2 +-
.../openmeetings/webservice/RoomWebService.java | 4 +-
74 files changed, 286 insertions(+), 275 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
index 3e42b7e..5f0587f 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
@@ -185,7 +185,7 @@ public class KRoom {
}
// Send notification to all users that the recording
has been started
- WebSocketHelper.sendRoom(new RoomMessage(roomId, u,
RoomMessage.Type.recordingToggled));
+ WebSocketHelper.sendRoom(new RoomMessage(roomId, u,
RoomMessage.Type.RECORDING_TOGGLED));
log.debug("##REC:: recording in room {} is started {}
::", roomId, recordingId);
}
}
@@ -216,7 +216,7 @@ public class KRoom {
}
}
// Send notification to all users that the recording
has been started
- WebSocketHelper.sendRoom(new RoomMessage(roomId, u,
RoomMessage.Type.recordingToggled));
+ WebSocketHelper.sendRoom(new RoomMessage(roomId, u,
RoomMessage.Type.RECORDING_TOGGLED));
log.debug("##REC:: recording in room {} is stopped ::",
roomId);
}
}
@@ -249,7 +249,7 @@ public class KRoom {
sd.addActivity(a);
cm.update(c);
h.sendShareUpdated(sd);
- WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), c, RoomMessage.Type.rightUpdated, c.getUid()));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), c, RoomMessage.Type.RIGHT_UPDATED, c.getUid()));
WebSocketHelper.sendRoomOthers(roomId, c.getUid(),
newKurentoMsg()
.put("id", "newStream")
.put(PARAM_ICE,
processor.getHandler().getTurnServers())
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index e2124d4..e0e6193 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -147,7 +147,7 @@ public class KStream extends AbstractStream {
startRecord(processor);
}
Client c = sd.getClient();
- WebSocketHelper.sendRoom(new TextRoomMessage(c.getRoomId(), c,
RoomMessage.Type.rightUpdated, c.getUid()));
+ WebSocketHelper.sendRoom(new TextRoomMessage(c.getRoomId(), c,
RoomMessage.Type.RIGHT_UPDATED, c.getUid()));
if (hasAudio || hasVideo || hasScreen) {
WebSocketHelper.sendRoomOthers(room.getRoomId(),
c.getUid(), newKurentoMsg()
.put("id", "newStream")
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index 88942db..c7abd4c 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -353,7 +353,7 @@ public class KurentoHandler {
}
private void notifyRooms() {
- WebSocketHelper.sendServer(new TextRoomMessage(null,
new User(), RoomMessage.Type.kurentoStatus, new JSONObject().put("connected",
isConnected()).toString()));
+ WebSocketHelper.sendServer(new TextRoomMessage(null,
new User(), RoomMessage.Type.KURENTO_STATUS, new JSONObject().put("connected",
isConnected()).toString()));
}
@Override
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index d3efd1c..2fcd157 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -96,7 +96,7 @@ public class StreamProcessor implements IStreamProcessor {
c.remove(Activity.VIDEO);
}
sd.setActivities();
- WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), cm.update(c), RoomMessage.Type.rightUpdated,
c.getUid()));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), cm.update(c), RoomMessage.Type.RIGHT_UPDATED,
c.getUid()));
}
break;
case "toggleActivity":
@@ -237,7 +237,7 @@ public class StreamProcessor implements IStreamProcessor {
if (!closed.isEmpty()) {
cm.update(c);
checkStreams(c.getRoomId());
- WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), c, RoomMessage.Type.rightUpdated, c.getUid()));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), c, RoomMessage.Type.RIGHT_UPDATED, c.getUid()));
}
} else {
StreamDesc sd = c.addStream(StreamType.WEBCAM);
@@ -282,7 +282,7 @@ public class StreamProcessor implements IStreamProcessor {
}
});
}
- WebSocketHelper.sendRoom(new TextRoomMessage(c.getRoomId(), c,
RoomMessage.Type.rightUpdated, c.getUid()));
+ WebSocketHelper.sendRoom(new TextRoomMessage(c.getRoomId(), c,
RoomMessage.Type.RIGHT_UPDATED, c.getUid()));
}
private void checkStreams(Long roomId) {
@@ -397,7 +397,7 @@ public class StreamProcessor implements IStreamProcessor {
c.removeStream(uid);
cm.update(c);
checkStreams(c.getRoomId());
- WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), c, RoomMessage.Type.rightUpdated, c.getUid()));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), c, RoomMessage.Type.RIGHT_UPDATED, c.getUid()));
kHandler.sendShareUpdated(sd
.removeActivity(Activity.SCREEN)
.removeActivity(Activity.RECORD));
@@ -509,7 +509,7 @@ public class StreamProcessor implements IStreamProcessor {
}
}
cm.update(c);
- WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), c, RoomMessage.Type.rightUpdated, c.getUid()));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), c, RoomMessage.Type.RIGHT_UPDATED, c.getUid()));
}
}
streamByUid.remove(uid);
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 0783070..10c91dc 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
@@ -113,25 +113,25 @@ public class AppointmentDao implements
IDataProviderDao<Appointment>{
if (mmList != null){
for (MeetingMember mm : mmList) {
if (mm.getId() == null ||
!mmIds.contains(mm.getId())) {
-
invitationManager.processInvitation(a, mm, MessageType.Create);
+
invitationManager.processInvitation(a, mm, MessageType.CREATE);
} else {
mmIds.remove(mm.getId());
-
invitationManager.processInvitation(a, mm, MessageType.Update, sendMail);
+
invitationManager.processInvitation(a, mm, MessageType.UPDATE, sendMail);
}
}
}
for (long id : mmIds) {
- invitationManager.processInvitation(a,
meetingMemberDao.get(id), MessageType.Cancel);
+ invitationManager.processInvitation(a,
meetingMemberDao.get(id), MessageType.CANCEL);
}
//notify owner
MeetingMember owner = new MeetingMember();
owner.setUser(a.getOwner());
if (a.getId() == null) {
- invitationManager.processInvitation(a, owner,
MessageType.Create);
+ invitationManager.processInvitation(a, owner,
MessageType.CREATE);
} else if (a.isDeleted()) {
- invitationManager.processInvitation(a, owner,
MessageType.Cancel);
+ invitationManager.processInvitation(a, owner,
MessageType.CANCEL);
} else if (sendMail) {
- invitationManager.processInvitation(a, owner,
MessageType.Update, sendMail);
+ invitationManager.processInvitation(a, owner,
MessageType.UPDATE, sendMail);
}
}
if (a.getId() == null) {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
index 7dc4e40..331d13a 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
@@ -144,7 +144,7 @@ public class InvitationDao implements
IDataProviderDao<Invitation> {
Invitation i = list != null && list.size() == 1 ? list.get(0) :
null;
if (i != null) {
switch (i.getValid()) {
- case OneTime:
+ case ONE_TIME:
// one-time invitation
i.setAllowEntry(!i.isUsed());
if (markUsed) {
@@ -153,7 +153,7 @@ public class InvitationDao implements
IDataProviderDao<Invitation> {
em.flush(); // flash is
required to eliminate 'detach' effect
}
break;
- case Period:
+ case PERIOD:
String tzId =
i.getInvitee().getTimeZoneId();
if (Strings.isEmpty(tzId) &&
i.getAppointment() != null) {
log.warn("User with NO timezone
found: {}", i.getInvitee().getId());
@@ -168,7 +168,7 @@ public class InvitationDao implements
IDataProviderDao<Invitation> {
LocalDateTime to =
CalendarHelper.getDateTime(i.getValidTo(), tzId);
i.setAllowEntry(now.isAfter(from) &&
now.isBefore(to));
break;
- case Endless:
+ case ENDLESS:
default:
i.setAllowEntry(true);
break;
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 45e9ed3..245f020 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
@@ -211,12 +211,12 @@ public class InvitationDTO implements Serializable {
try {
// valid period of Invitation
switch (valid) {
- case Period:
+ case PERIOD:
i.setValidFrom(new
Date(SDF.parse(validFrom).getTime() - (5 * 60 * 1000)));
i.setValidTo(SDF.parse(validTo));
break;
- case Endless:
- case OneTime:
+ case ENDLESS:
+ case ONE_TIME:
default:
break;
}
@@ -255,7 +255,7 @@ public class InvitationDTO implements Serializable {
i.subject = o.optString("subject");
i.roomId = o.getLong("roomId");
i.message = o.optString("message");
- i.valid = Valid.valueOf(o.optString("valid",
Valid.Period.name()));
+ i.valid = Valid.valueOf(o.optString("valid",
Valid.PERIOD.name()));
i.validFrom = o.optString("validFrom");
i.validTo = o.optString("validTo");
return i;
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 07f7b2e..1be4c5b 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
@@ -55,16 +55,16 @@ public class Whiteboard implements Serializable {
public static final String ATTR_HEIGHT = "height";
public static final String ATTR_ZOOM = "zoom";
public enum ZoomMode {
- fullFit
- , pageWidth
- , zoom
+ FULL_FIT
+ , PAGE_WIDTH
+ , ZOOM
}
public static final String ITEMS_KEY = "roomItems";
private static final int DEFAULT_WIDTH = 1920;
private static final int DEFAULT_HEIGHT = 1080;
private long id;
private double zoom = 1.;
- private ZoomMode zoomMode = ZoomMode.pageWidth;
+ private ZoomMode zoomMode = ZoomMode.PAGE_WIDTH;
private int width = DEFAULT_WIDTH;
private int height = DEFAULT_HEIGHT;
private Map<String, String> roomItems = Collections.synchronizedMap(new
LinkedHashMap<>());
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 83c618d..99766f6 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
@@ -61,18 +61,18 @@ public class Invitation extends HistoricalEntity {
public static final String BY_USER = BY_ALL + " AND i.invitedBy.id =
:userId";
public enum MessageType {
- Create
- , Update
- , Cancel
+ CREATE
+ , UPDATE
+ , CANCEL
}
public enum Valid {
- OneTime
- , Period
- , Endless;
+ ONE_TIME
+ , PERIOD
+ , ENDLESS;
public static Valid fromInt(int valid) {
- return valid == 1 ? Endless : (valid == 2 ? Period :
OneTime);
+ return valid == 1 ? ENDLESS : (valid == 2 ? PERIOD :
ONE_TIME);
}
}
@@ -115,7 +115,7 @@ public class Invitation extends HistoricalEntity {
// TimeStamp
@Column(name = "valid")
@Enumerated(EnumType.STRING)
- private Valid valid = Valid.Period;
+ private Valid valid = Valid.PERIOD;
@Column(name = "valid_from")
private Date validFrom;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ws/RoomMessage.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ws/RoomMessage.java
index 9d21420..cb9896d 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ws/RoomMessage.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ws/RoomMessage.java
@@ -31,31 +31,31 @@ import
org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage;
public class RoomMessage implements IWebSocketPushMessage {
private static final long serialVersionUID = 1L;
public enum Type {
- roomEnter
- , roomExit
- , roomClosed
- , pollCreated
- , pollUpdated
- , recordingToggled
- , sharingToggled
- , rightUpdated
- , activityRemove
- , requestRightModerator
- , requestRightPresenter
- , requestRightWb
- , requestRightShare
- , requestRightRemote
- , requestRightA
- , requestRightAv
- , requestRightMuteOthers
- , haveQuestion
- , kick
- , mute
- , muteOthers
- , quickPollUpdated
- , kurentoStatus
- , wbReload
- , moderatorInRoom
+ ROOM_ENTER
+ , ROOM_EXIT
+ , ROOM_CLOSED
+ , POLL_CREATED
+ , POLL_UPDATED
+ , RECORDING_TOGGLED
+ , SHARING_TOGGLED
+ , RIGHT_UPDATED
+ , ACTIVITY_REMOVE
+ , REQUEST_RIGHT_MODERATOR
+ , REQUEST_RIGHT_PRESENTER
+ , REQUEST_RIGHT_WB
+ , REQUEST_RIGHT_SHARE
+ , REQUEST_RIGHT_REMOTE
+ , REQUEST_RIGHT_A
+ , REQUEST_RIGHT_AV
+ , REQUEST_RIGHT_MUTE_OTHERS
+ , HAVE_QUESTION
+ , KICK
+ , MUTE
+ , MUTE_OTHERS
+ , QUICK_POLL_UPDATED
+ , KURENTO_STATUS
+ , WB_RELOAD
+ , MODERATOR_IN_ROOM
}
private final Date timestamp;
private final String uid;
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
index 9e7891c..b9f110d 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
@@ -174,12 +174,12 @@ public class Admin {
}
private enum Command {
- install
- , backup
- , restore
- , files
- , ldap
- , usage
+ INSTALL
+ , BACKUP
+ , RESTORE
+ , FILES
+ , LDAP
+ , USAGE
}
private void usage() {
@@ -239,42 +239,42 @@ public class Admin {
}
verbose = cmdl.hasOption('v');
- Command cmd = Command.usage;
+ Command cmd = Command.USAGE;
if (cmdl.hasOption('i')) {
- cmd = Command.install;
+ cmd = Command.INSTALL;
} else if (cmdl.hasOption('b')) {
- cmd = Command.backup;
+ cmd = Command.BACKUP;
} else if (cmdl.hasOption('r')) {
- cmd = Command.restore;
+ cmd = Command.RESTORE;
} else if (cmdl.hasOption('f')) {
- cmd = Command.files;
+ cmd = Command.FILES;
} else if (cmdl.hasOption('l')) {
- cmd = Command.ldap;
+ cmd = Command.LDAP;
}
String file = cmdl.getOptionValue("file", "");
switch(cmd) {
- case install:
+ case INSTALL:
step = "Install";
processInstall(file);
break;
- case backup:
+ case BACKUP:
step = "Backup";
processBackup(file);
break;
- case restore:
+ case RESTORE:
step = "Restore";
processRestore(checkRestoreFile(file));
break;
- case files:
+ case FILES:
step = "Files";
processFiles();
break;
- case ldap:
+ case LDAP:
step = "LDAP import";
processLdap();
break;
- case usage:
+ case USAGE:
default:
usage();
break;
@@ -320,8 +320,8 @@ public class Admin {
|| cmdl.hasOption(OPTION_DB_PORT) ||
cmdl.hasOption(OPTION_DB_NAME) || cmdl.hasOption(OPTION_DB_USER)
|| cmdl.hasOption(OPTION_DB_PASS))
{
- String dbType = cmdl.getOptionValue(OPTION_DB_TYPE,
DbType.h2.name());
- connectionProperties =
ConnectionPropertiesPatcher.patch(dbType
+ String dbType = cmdl.getOptionValue(OPTION_DB_TYPE);
+ connectionProperties =
ConnectionPropertiesPatcher.patch(DbType.of(dbType)
, cmdl.getOptionValue(OPTION_DB_HOST,
"localhost")
, cmdl.getOptionValue(OPTION_DB_PORT,
null)
, cmdl.getOptionValue(OPTION_DB_NAME,
null)
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
index ad5b05e..32f36bf 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
@@ -50,22 +50,22 @@ public abstract class ConnectionPropertiesPatcher {
public static ConnectionPropertiesPatcher
getPatcher(ConnectionProperties props) {
ConnectionPropertiesPatcher patcher;
switch (props.getDbType()) {
- case db2:
+ case DB2:
patcher = new Db2Patcher();
break;
- case mssql:
+ case MSSQL:
patcher = new MssqlPatcher();
break;
- case mysql:
+ case MYSQL:
patcher = new MysqlPatcher();
break;
- case oracle:
+ case ORACLE:
patcher = new OraclePatcher();
break;
- case postgresql:
+ case POSTGRESQL:
patcher = new PostgresPatcher();
break;
- case h2:
+ case H2:
default:
patcher = new H2Patcher();
break;
@@ -112,7 +112,7 @@ public abstract class ConnectionPropertiesPatcher {
transformer.transform(source, new
StreamResult(OmFileHelper.getPersistence().getCanonicalPath())); //this
constructor is used to avoid transforming path to URI
}
- public static ConnectionProperties patch(String dbType, String host,
String port, String db, String user, String pass) throws Exception {
+ public static ConnectionProperties patch(DbType dbType, String host,
String port, String db, String user, String pass) throws Exception {
ConnectionProperties props =
getConnectionProperties(OmFileHelper.getPersistence(dbType));
props.setLogin(user);
props.setPassword(pass);
@@ -165,7 +165,7 @@ public abstract class ConnectionPropertiesPatcher {
try {
//will try to "guess" dbType
String[] parts = prop.split(":");
-
connectionProperties.setDbType("sqlserver".equals(parts[1]) ? DbType.mssql :
DbType.valueOf(parts[1]));
+
connectionProperties.setDbType(DbType.of(parts[1]));
} catch (Exception e) {
//ignore
}
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
index 1c2f80d..3be75b2 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
@@ -52,6 +52,6 @@ public class MailNotifier implements INotifier {
public void notify(User u, Appointment a, Invitation inv) throws
Exception {
TimeZone tz = getTimeZone(u);
SubjectEmailTemplate t = AppointmentReminderTemplate.get(u, a,
tz);
- invitationManager.sendInvitationLink(inv, MessageType.Create,
t.getSubject(), t.getEmail(), false, null);
+ invitationManager.sendInvitationLink(inv, MessageType.CREATE,
t.getSubject(), t.getEmail(), false, null);
}
}
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index 93a224f..444bd90 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -84,13 +84,13 @@ public class InvitationManager implements
IInvitationManager {
TimeZone tz = getTimeZone(mm.getUser());
SubjectEmailTemplate t;
switch (type) {
- case Cancel:
+ case CANCEL:
t =
CanceledAppointmentTemplate.get(mm.getUser(), a, tz, invitorName);
break;
- case Create:
+ case CREATE:
t =
CreatedAppointmentTemplate.get(mm.getUser(), a, tz, invitorName);
break;
- case Update:
+ case UPDATE:
default:
t =
UpdatedAppointmentTemplate.get(mm.getUser(), a, tz, invitorName);
break;
@@ -101,7 +101,7 @@ public class InvitationManager implements
IInvitationManager {
@Override
public void sendInvitationLink(Invitation i, MessageType type, String
subject, String message, boolean ical, String baseUrl) throws Exception {
String invitationLink = null;
- if (type != MessageType.Cancel) {
+ if (type != MessageType.CANCEL) {
IApplication app = ensureApplication(1L);
invitationLink = app.getOmInvitationLink(i, baseUrl);
}
@@ -115,7 +115,7 @@ public class InvitationManager implements
IInvitationManager {
if (ical) {
String username = i.getInvitee().getLogin();
boolean isOwner =
owner.getId().equals(i.getInvitee().getId());
- IcalHandler handler = new
IcalHandler(MessageType.Cancel == type ? IcalHandler.ICAL_METHOD_CANCEL :
IcalHandler.ICAL_METHOD_REQUEST);
+ IcalHandler handler = new
IcalHandler(MessageType.CANCEL == type ? IcalHandler.ICAL_METHOD_CANCEL :
IcalHandler.ICAL_METHOD_REQUEST);
Map<String, String> attendeeList =
handler.getAttendeeData(email, username, isOwner);
@@ -172,7 +172,7 @@ public class InvitationManager implements
IInvitationManager {
try {
mm.setInvitation(getInvitation(mm.getInvitation()
, mm.getUser(), a.getRoom(),
a.isPasswordProtected(), a.getPassword()
- , Valid.Period, a.getOwner(), null,
a.getStart(), a.getEnd(), a));
+ , Valid.PERIOD, a.getOwner(), null,
a.getStart(), a.getEnd(), a));
if (sendMail) {
sendInvitionLink(a, mm, type, Reminder.ICAL ==
reminder);
}
@@ -203,12 +203,12 @@ public class InvitationManager implements
IInvitationManager {
// valid period of Invitation
switch (valid) {
- case Period:
+ case PERIOD:
invitation.setValidFrom(new
Date(gmtTimeStart.getTime() - (5 * 60 * 1000)));
invitation.setValidTo(gmtTimeEnd);
break;
- case Endless:
- case OneTime:
+ case ENDLESS:
+ case ONE_TIME:
default:
break;
}
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java
index 5f338d4..13f23fc 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java
@@ -19,24 +19,38 @@
package org.apache.openmeetings.util;
import java.io.Serializable;
+import java.util.Locale;
+
+import org.apache.wicket.util.string.Strings;
public class ConnectionProperties implements Serializable {
private static final long serialVersionUID = 1L;
public enum DbType {
- db2
- , h2
- , mssql
- , mysql
- , oracle
- , postgresql
+ DB2
+ , H2
+ , MSSQL
+ , MYSQL
+ , ORACLE
+ , POSTGRESQL;
+
+ public static DbType of(String val) {
+ if (Strings.isEmpty(val)) {
+ return DbType.H2;
+ }
+ return "sqlserver".equals(val) ? DbType.MSSQL :
DbType.valueOf(val.toUpperCase(Locale.ROOT));
+ }
+
+ public String dbName() {
+ return name().toLowerCase(Locale.ROOT);
+ }
}
private String driver = "org.h2.Driver";
private String url = "jdbc:h2:./omdb";
private String login = "user";
private String password = "secret";
- private DbType dbType = DbType.h2;
+ private DbType dbType = DbType.H2;
public String getDriver() {
return driver;
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
index 3c7ec65..593c05f 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
@@ -264,15 +264,11 @@ public class OmFileHelper {
}
public static File getPersistence() {
- return getPersistence((DbType) null);
- }
-
- public static File getPersistence(String dbType) {
- return getPersistence(DbType.valueOf(dbType));
+ return getPersistence(null);
}
public static File getPersistence(DbType dbType) {
- return new File(getWebinfDir(), dbType == null ?
PERSISTENCE_NAME : String.format(DB_PERSISTENCE_NAME, dbType));
+ return new File(getWebinfDir(), dbType == null ?
PERSISTENCE_NAME : String.format(DB_PERSISTENCE_NAME, dbType.dbName()));
}
public static File getLdapConf(String name) {
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 25063a3..887f2ec 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
@@ -417,7 +417,7 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
public static void kickUser(Client client) {
if (client != null) {
- WebSocketHelper.sendRoom(new
TextRoomMessage(client.getRoom().getId(), client, RoomMessage.Type.kick,
client.getUid()));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(client.getRoom().getId(), client, RoomMessage.Type.KICK,
client.getUid()));
get().cm.exitRoom(client);
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 9459a6d..8e9581a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 07ed6bc..007df38 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[الطريق إلى المؤتمر:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 9f40dde..adcdbd1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
index d72e9c8..73aa4e0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 51283dd..a901844 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Instruccions
Conferència:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Pantalla completa]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Pantalla completa]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index be70af9..beb5ded 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index edf9278..3c66292 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Sådan gør du]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Fyldig]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Fyldig]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 524e37a..3c54727 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -923,8 +923,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Wie starte ich eine
Konferenz]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Ende]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Vollformat]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Seitenbreite]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Vollformat]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Seitenbreite]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index cf4aba5..43fb9ca 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Διαδικασία
Συνδιάσκεψης:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index 7523ae2..e96cdcb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -916,8 +916,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Instrucciones
Conferencia:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finalizar]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Pantalla completa]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Pantalla completa]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 4c6d1cd..e0374ab 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -910,8 +910,8 @@ target="_blank">Custom Crypt Mechanism</a>
<entry key="widget.start.header"><![CDATA[ایجاد یک کنفرانس،
سریع!]]></entry>
<entry key="widget.start.title"><![CDATA[شروع]]></entry>
<entry key="wizard.button.finish"><![CDATA[پایان]]></entry>
- <entry key="zoom.fullFit"><![CDATA[کاملا مناسب]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[عرض صفحه]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[کاملا مناسب]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[عرض صفحه]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 64ace57..79b833c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 0ff78ca..9fa38ea 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Chronologie
d'emploi:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Terminer]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index f96ff33..af8efd0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Instruccións
«Conferencia»:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Pantalla completa]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Pantalla completa]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index 9459a6d..8e9581a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index c793f9a..130fab4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -906,8 +906,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Hogyan indíthat
konferenciát]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Teljes méret]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Teljes méret]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
index b5b1cc2..3ea6048 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index e94b2d3..9b0053c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -919,8 +919,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Come fare una
videoconferenza:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Termina]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Schermo-Intero]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Schermo-Intero]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index e17e4dc..171742b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[使用方法:]]></entry>
<entry key="widget.start.title"><![CDATA[さあ始めましょう]]></entry>
<entry key="wizard.button.finish"><![CDATA[インストール]]></entry>
- <entry key="zoom.fullFit"><![CDATA[画面サイズに合わせる]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[ページ幅に合わせる]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[画面サイズに合わせる]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[ページ幅に合わせる]]></entry>
<entry key="label.dock.panel"><![CDATA[クリックしてパネルを連結する]]></entry>
<entry key="label.undock.panel"><![CDATA[クリックしてパネルを切り離す]]></entry>
<entry key="activities.autoclean"><![CDATA[自動クリーンアップ]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 28139b2..222c559 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index b42e0c0..e83888c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Beeldvullend]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Beeldvullend]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 44a55f1..a16fbe4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Stwórz konferencję,
szybko!]]></entry>
<entry key="widget.start.title"><![CDATA[Szybki start]]></entry>
<entry key="wizard.button.finish"><![CDATA[Zakończ]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Wypełnienie]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Szerokość strony]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Wypełnienie]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Szerokość strony]]></entry>
<entry key="label.dock.panel"><![CDATA[Kliknij, aby zadokować
panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Kliknij, aby oddokować
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index fd5e93d..3188c80 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index 2e2aac4..b425e62 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Passos para a
conferência:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Ajuste]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Ajuste]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index ae09784..e8ba7bf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Как участвовать в
конференции]]></entry>
<entry key="widget.start.title"><![CDATA[Быстрый старт]]></entry>
<entry key="wizard.button.finish"><![CDATA[Закончить]]></entry>
- <entry key="zoom.fullFit"><![CDATA[По размеру страницы]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[По ширине страницы]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[По размеру страницы]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[По ширине страницы]]></entry>
<entry key="label.dock.panel"><![CDATA[Кликните чтобы "прилепить"
панель]]></entry>
<entry key="label.undock.panel"><![CDATA[Кликните чтобы "отлепить"
панель]]></entry>
<entry key="activities.autoclean"><![CDATA[Авто-очистка]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index e3af89c..a2edf93 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Ako konferencovať:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Napasovanie]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Napasovanie]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 00cb169..41ffb65 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 98ae965..8ceaa4e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 2322737..b91e881 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 9c2cabb..dd6d0db 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -917,8 +917,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Як брати участь у
конференції:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Закінчити]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index ea800e2..e9ce8ce 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[参加视频会议的步骤如下:]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[满屏]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[满屏]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index bfc43a8..a514567 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -918,8 +918,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for
Details
<entry key="widget.start.header"><![CDATA[Create a conference,
quickly!]]></entry>
<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
- <entry key="zoom.fullFit"><![CDATA[Full-Fit]]></entry>
- <entry key="zoom.pageWidth"><![CDATA[Page Width]]></entry>
+ <entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
+ <entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock
panel]]></entry>
<entry key="activities.autoclean"><![CDATA[Auto-clean]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index de96804..8163d2d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -134,7 +134,7 @@ public class ClientManager implements IClientManager {
Long roomId = c.getRoomId();
removeFromRoom(c);
if (roomId != null) {
- sendRoom(new RoomMessage(roomId, c,
RoomMessage.Type.roomExit));
+ sendRoom(new RoomMessage(roomId, c,
RoomMessage.Type.ROOM_EXIT));
confLogDao.add(
ConferenceLog.Type.ROOM_LEAVE
, c.getUserId(), "0", roomId
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
index 09767ed..4c9f8d8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
@@ -60,7 +60,7 @@ public class QuickPollManager {
polls.lock(roomId);
polls.putIfAbsent(roomId, new ConcurrentHashMap<Long,
Boolean>());
polls.unlock(roomId);
- WebSocketHelper.sendRoom(new TextRoomMessage(roomId, c,
Type.quickPollUpdated, c.getUid()));
+ WebSocketHelper.sendRoom(new TextRoomMessage(roomId, c,
Type.QUICK_POLL_UPDATED, c.getUid()));
}
public void vote(Client c, boolean vote) {
@@ -72,7 +72,7 @@ public class QuickPollManager {
if (!votes.containsKey(c.getUserId())) {
votes.put(c.getUserId(), vote);
polls.put(roomId, votes);
- WebSocketHelper.sendRoom(new
TextRoomMessage(roomId, c, Type.quickPollUpdated, c.getUid()));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(roomId, c, Type.QUICK_POLL_UPDATED, c.getUid()));
}
}
polls.unlock(roomId);
@@ -84,7 +84,7 @@ public class QuickPollManager {
return;
}
map().remove(roomId);
- WebSocketHelper.sendRoom(new TextRoomMessage(roomId, c,
Type.quickPollUpdated, c.getUid()));
+ WebSocketHelper.sendRoom(new TextRoomMessage(roomId, c,
Type.QUICK_POLL_UPDATED, c.getUid()));
}
public JSONObject toJson(Long roomId) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java
index f292839..906426f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java
@@ -62,7 +62,7 @@ public class TimerService {
if (cm.listByRoom(roomId).isEmpty()) {
modCheckMap.remove(roomId);
} else {
- WebSocketHelper.sendRoom(new
TextRoomMessage(roomId, sysUser, RoomMessage.Type.moderatorInRoom, "" +
!cm.listByRoom(roomId, c -> c.hasRight(Right.MODERATOR)).isEmpty()));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(roomId, sysUser, RoomMessage.Type.MODERATOR_IN_ROOM, "" +
!cm.listByRoom(roomId, c -> c.hasRight(Right.MODERATOR)).isEmpty()));
doModCheck(roomId);
}
return null;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
index 9ccf6f4..2ed9fee 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
@@ -115,7 +115,7 @@ public class WhiteboardManager implements
IWhiteboardManager {
ensureApplication();
User u = new User();
u.setId(userId);
- WebSocketHelper.sendRoom(new
RoomMessage(roomId, u, RoomMessage.Type.wbReload));
+ WebSocketHelper.sendRoom(new
RoomMessage(roomId, u, RoomMessage.Type.WB_RELOAD));
}).start();
} catch (InterruptedException e) {
log.warn("Unexpected exception while map clean-up", e);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
index c9ff472..9658678 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
@@ -122,13 +122,13 @@ public abstract class InvitationForm extends
Form<Invitation> {
@Override
protected void onUpdate(AjaxRequestTarget target) {
- boolean dateEnabled =
InvitationForm.this.getModelObject().getValid() == Valid.Period;
+ boolean dateEnabled =
InvitationForm.this.getModelObject().getValid() == Valid.PERIOD;
target.add(from.setEnabled(dateEnabled),
to.setEnabled(dateEnabled), timeZoneId.setEnabled(dateEnabled));
}
});
- add(valid.add(new Radio<>("one", Model.of(Valid.OneTime))
- , new Radio<>("period", Model.of(Valid.Period))
- , new Radio<>("endless",
Model.of(Valid.Endless))));
+ add(valid.add(new Radio<>("one", Model.of(Valid.ONE_TIME))
+ , new Radio<>("period", Model.of(Valid.PERIOD))
+ , new Radio<>("endless",
Model.of(Valid.ENDLESS))));
add(passwd);
Invitation i = getModelObject();
passwd.setLabel(new
ResourceModel("110")).setOutputMarkupId(true).setEnabled(i.isPasswordProtected());
@@ -207,7 +207,7 @@ public abstract class InvitationForm extends
Form<Invitation> {
recipients.setModelObject(new ArrayList<User>());
recipients.setEnabled(true);
passwd.setEnabled(false);
- final boolean isPeriod = i.getValid() == Valid.Period;
+ final boolean isPeriod = i.getValid() == Valid.PERIOD;
from.setEnabled(isPeriod);
to.setEnabled(isPeriod);
timeZoneId.setEnabled(isPeriod);
@@ -230,7 +230,7 @@ public abstract class InvitationForm extends
Form<Invitation> {
for (User u : recipients.getModelObject()) {
Invitation i = create(u);
try {
-
inviteManager.sendInvitationLink(i, MessageType.Create,
subject.getModelObject(), message.getModelObject(), false, userbaseUrl);
+
inviteManager.sendInvitationLink(i, MessageType.CREATE,
subject.getModelObject(), message.getModelObject(), false, userbaseUrl);
} catch (Exception e) {
log.error("error while sending
invitation by User ", e);
}
@@ -238,7 +238,7 @@ public abstract class InvitationForm extends
Form<Invitation> {
} else {
Invitation i = getModelObject();
try {
- inviteManager.sendInvitationLink(i,
MessageType.Create, subject.getModelObject(), message.getModelObject(), false,
userbaseUrl);
+ inviteManager.sendInvitationLink(i,
MessageType.CREATE, subject.getModelObject(), message.getModelObject(), false,
userbaseUrl);
} catch (Exception e) {
log.error("error while sending
invitation by URL ", e);
}
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 161987b..c6fedca 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
@@ -120,7 +120,7 @@ public class HashPage extends BaseInitedPage implements
IUpdatable {
errorMsg = getString("error.hash.invalid");
} else if (!i.isAllowEntry()) {
FastDateFormat sdf =
FormatHelper.getDateTimeFormat(i.getInvitee());
- errorMsg = Valid.OneTime == i.getValid()
+ errorMsg = Valid.ONE_TIME == i.getValid()
? getString("error.hash.used")
: String.format("%s %s - %s,
%s", getString("error.hash.period")
,
sdf.format(i.getValidFrom()), sdf.format(i.getValidTo())
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 d6c5480..8b664a8 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
@@ -214,7 +214,7 @@ public class InstallWizard extends
AbstractWizard<InstallationConfig> {
@Override
public Object getDisplayValue(DbType object) {
- return
getString(String.format("install.wizard.db.step.%s.name", object.name()));
+ return
getString(String.format("install.wizard.db.step.%s.name", object.dbName()));
}
@Override
@@ -252,7 +252,7 @@ public class InstallWizard extends
AbstractWizard<InstallationConfig> {
}
private String getDbName(ConnectionProperties props) {
- return
getString("install.wizard.db.step.instructions." + props.getDbType().name());
+ return
getString("install.wizard.db.step.instructions." + props.getDbType().dbName());
}
@Override
@@ -271,10 +271,10 @@ public class InstallWizard extends
AbstractWizard<InstallationConfig> {
valid = conn.isValid(0); //no timeout
String sql = null;
switch (props.getDbType()) {
- case db2:
+ case DB2:
sql = "select count(*)
from systables";
break;
- case oracle:
+ case ORACLE:
sql = "SELECT 1 FROM
DUAL";
break;
default:
@@ -332,7 +332,7 @@ public class InstallWizard extends
AbstractWizard<InstallationConfig> {
return props; // initial select
}
props =
ConnectionPropertiesPatcher.getConnectionProperties(conf);
- if (DbType.h2 != props.getDbType()) {
+ if (DbType.H2 != props.getDbType()) {
// resetting default login/password
props.setLogin(null);
props.setPassword(null);
@@ -346,13 +346,13 @@ public class InstallWizard extends
AbstractWizard<InstallationConfig> {
private void initForm(boolean getProps, AjaxRequestTarget
target) {
ConnectionProperties props = getProps ?
getProps(form.getModelObject().getDbType()) : form.getModelObject();
form.setModelObject(props);
- host.setVisible(props.getDbType() != DbType.h2);
- port.setVisible(props.getDbType() != DbType.h2);
- user.setVisible(props.getDbType() != DbType.h2);
- pass.setVisible(props.getDbType() != DbType.h2);
+ host.setVisible(props.getDbType() != DbType.H2);
+ port.setVisible(props.getDbType() != DbType.H2);
+ user.setVisible(props.getDbType() != DbType.H2);
+ pass.setVisible(props.getDbType() != DbType.H2);
try {
switch (props.getDbType()) {
- case mssql: {
+ case MSSQL: {
String url =
props.getURL().substring("jdbc:sqlserver://".length());
String[] parts = url.split(";");
String[] hp =
parts[0].split(":");
@@ -361,14 +361,14 @@ public class InstallWizard extends
AbstractWizard<InstallationConfig> {
dbname.setModelObject(parts[1].substring(parts[1].indexOf('=') + 1));
}
break;
- case oracle: {
+ case ORACLE: {
String[] parts =
props.getURL().split(":");
host.setModelObject(parts[3].substring(1));
port.setModelObject(Integer.parseInt(parts[4]));
dbname.setModelObject(parts[5]);
}
break;
- case h2: {
+ case H2: {
host.setModelObject("");
port.setModelObject(0);
String[] parts =
props.getURL().split(";");
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 d96748e..676587d 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
@@ -150,7 +150,7 @@ public class RoomPanel extends BasePanel {
.append(wb.getInitScript())
.append(getQuickPollJs());
target.appendJavaScript(sb);
- WebSocketHelper.sendRoom(new RoomMessage(r.getId(), c,
RoomMessage.Type.roomEnter));
+ WebSocketHelper.sendRoom(new RoomMessage(r.getId(), c,
RoomMessage.Type.ROOM_ENTER));
// play video from other participants
initVideos(target);
getMainPanel().getChat().roomEnter(r, target);
@@ -430,20 +430,20 @@ public class RoomPanel extends BasePanel {
RoomMessage m =
(RoomMessage)wsEvent.getMessage();
IPartialPageRequestHandler handler =
wsEvent.getHandler();
switch (m.getType()) {
- case pollCreated:
+ case POLL_CREATED:
menu.updatePoll(handler,
m.getUserId());
break;
- case pollUpdated:
+ case POLL_UPDATED:
menu.updatePoll(handler, null);
break;
- case recordingToggled:
+ case RECORDING_TOGGLED:
menu.update(handler);
updateInterviewRecordingButtons(handler);
break;
- case sharingToggled:
+ case SHARING_TOGGLED:
menu.update(handler);
break;
- case rightUpdated:
+ case RIGHT_UPDATED:
{
String uid =
((TextRoomMessage)m).getText();
Client c = cm.get(uid);
@@ -460,53 +460,53 @@ public class RoomPanel extends BasePanel {
updateInterviewRecordingButtons(handler);
}
break;
- case roomEnter:
+ case ROOM_ENTER:
sidebar.update(handler);
menu.update(handler);
sidebar.addActivity(new
Activity(m, Activity.Type.roomEnter), handler);
break;
- case roomExit:
+ case ROOM_EXIT:
sidebar.update(handler);
sidebar.addActivity(new
Activity(m, Activity.Type.roomExit), handler);
handler.appendJavaScript("Chat.removeTab('" + ID_USER_PREFIX + m.getUserId() +
"');");
break;
- case roomClosed:
+ case ROOM_CLOSED:
handler.add(room.setVisible(false));
roomClosed.show(handler);
break;
- case requestRightModerator:
+ case REQUEST_RIGHT_MODERATOR:
sidebar.addActivity(new
Activity((TextRoomMessage)m, Activity.Type.reqRightModerator), handler);
break;
- case requestRightPresenter:
+ case REQUEST_RIGHT_PRESENTER:
sidebar.addActivity(new
Activity((TextRoomMessage)m, Activity.Type.reqRightPresenter), handler);
break;
- case requestRightWb:
+ case REQUEST_RIGHT_WB:
sidebar.addActivity(new
Activity((TextRoomMessage)m, Activity.Type.reqRightWb), handler);
break;
- case requestRightShare:
+ case REQUEST_RIGHT_SHARE:
sidebar.addActivity(new
Activity((TextRoomMessage)m, Activity.Type.reqRightShare), handler);
break;
- case requestRightRemote:
+ case REQUEST_RIGHT_REMOTE:
sidebar.addActivity(new
Activity((TextRoomMessage)m, Activity.Type.reqRightRemote), handler);
break;
- case requestRightA:
+ case REQUEST_RIGHT_A:
sidebar.addActivity(new
Activity((TextRoomMessage)m, Activity.Type.reqRightA), handler);
break;
- case requestRightAv:
+ case REQUEST_RIGHT_AV:
sidebar.addActivity(new
Activity((TextRoomMessage)m, Activity.Type.reqRightAv), handler);
break;
- case requestRightMuteOthers:
+ case REQUEST_RIGHT_MUTE_OTHERS:
sidebar.addActivity(new
Activity((TextRoomMessage)m, Activity.Type.reqRightMuteOthers), handler);
break;
- case activityRemove:
+ case ACTIVITY_REMOVE:
sidebar.removeActivity(((TextRoomMessage)m).getText(), handler);
break;
- case haveQuestion:
+ case HAVE_QUESTION:
if
(_c.hasRight(Room.Right.MODERATOR) || getUserId().equals(m.getUserId())) {
sidebar.addActivity(new
Activity((TextRoomMessage)m, Activity.Type.haveQuestion), handler);
}
break;
- case kick:
+ case KICK:
{
String uid =
((TextRoomMessage)m).getText();
if
(_c.getUid().equals(uid)) {
@@ -517,7 +517,7 @@ public class RoomPanel extends BasePanel {
}
}
break;
- case mute:
+ case MUTE:
{
JSONObject obj = new
JSONObject(((TextRoomMessage)m).getText());
Client c =
cm.getBySid(obj.getString("sid"));
@@ -530,7 +530,7 @@ public class RoomPanel extends BasePanel {
}
}
break;
- case muteOthers:
+ case MUTE_OTHERS:
{
String uid =
((TextRoomMessage)m).getText();
Client c = cm.get(uid);
@@ -541,21 +541,21 @@ public class RoomPanel extends BasePanel {
handler.appendJavaScript(String.format("if (typeof(VideoManager) !==
'undefined') {VideoManager.muteOthers('%s');}", uid));
}
break;
- case quickPollUpdated:
+ case QUICK_POLL_UPDATED:
{
menu.update(handler);
handler.appendJavaScript(getQuickPollJs());
}
break;
- case kurentoStatus:
+ case KURENTO_STATUS:
menu.update(handler);
break;
- case wbReload:
+ case WB_RELOAD:
if (Room.Type.INTERVIEW !=
r.getType()) {
wb.reloadWb(handler);
}
break;
- case moderatorInRoom: {
+ case MODERATOR_IN_ROOM: {
if (!r.isModerated() ||
!r.isWaitModerator()) {
log.warn("Something
weird: `moderatorInRoom` in wrong room {}", r);
} else if
(!_c.hasRight(Room.Right.MODERATOR)) {
@@ -681,28 +681,28 @@ public class RoomPanel extends BasePanel {
// ask
switch (right) {
case MODERATOR:
- reqType = Type.requestRightModerator;
+ reqType = Type.REQUEST_RIGHT_MODERATOR;
break;
case PRESENTER:
- reqType = Type.requestRightPresenter;
+ reqType = Type.REQUEST_RIGHT_PRESENTER;
break;
case WHITEBOARD:
- reqType = Type.requestRightWb;
+ reqType = Type.REQUEST_RIGHT_WB;
break;
case SHARE:
- reqType = Type.requestRightWb;
+ reqType = Type.REQUEST_RIGHT_WB;
break;
case AUDIO:
- reqType = Type.requestRightA;
+ reqType = Type.REQUEST_RIGHT_A;
break;
case MUTE_OTHERS:
- reqType = Type.requestRightMuteOthers;
+ reqType = Type.REQUEST_RIGHT_MUTE_OTHERS;
break;
case REMOTE_CONTROL:
- reqType = Type.requestRightRemote;
+ reqType = Type.REQUEST_RIGHT_REMOTE;
break;
case VIDEO:
- reqType = Type.requestRightAv;
+ reqType = Type.REQUEST_RIGHT_AV;
break;
default:
break;
@@ -736,7 +736,7 @@ public class RoomPanel extends BasePanel {
public void broadcast(Client client) {
cm.update(client);
- WebSocketHelper.sendRoom(new TextRoomMessage(getRoom().getId(),
getClient(), RoomMessage.Type.rightUpdated, client.getUid()));
+ WebSocketHelper.sendRoom(new TextRoomMessage(getRoom().getId(),
getClient(), RoomMessage.Type.RIGHT_UPDATED, client.getUid()));
}
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
index 0a15dc1..41c9b41 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
@@ -69,7 +69,7 @@ public class ActivitiesPanel extends Panel {
private static final long serialVersionUID = 1L;
private TextRoomMessage getRemoveMsg(String id) {
- return new TextRoomMessage(room.getRoom().getId(),
room.getClient(), RoomMessage.Type.activityRemove, id);
+ return new TextRoomMessage(room.getRoom().getId(),
room.getClient(), RoomMessage.Type.ACTIVITY_REMOVE, id);
}
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
index 2032ec5..08228cf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
@@ -144,7 +144,7 @@ public class RoomInvitationForm extends InvitationForm {
for (GroupUser ou : groupUserDao.get(g.getId(),
0, Integer.MAX_VALUE)) {
Invitation i = create(ou.getUser());
try {
-
invitationManager.sendInvitationLink(i, MessageType.Create,
subject.getModelObject(), message.getModelObject(), false, userbaseUrl);
+
invitationManager.sendInvitationLink(i, MessageType.CREATE,
subject.getModelObject(), message.getModelObject(), false, userbaseUrl);
} catch (Exception e) {
log.error("error while sending
invitation by Group ", e);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 56202cf..dfd2721 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -86,7 +86,7 @@ public class RoomMenuPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
Client c = room.getClient();
- WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoom().getId(), c, Type.haveQuestion, c.getUid()));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoom().getId(), c, Type.HAVE_QUESTION, c.getUid()));
}
};
private final RoomPanel room;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
index 9608457..276897d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
@@ -78,7 +78,7 @@ public class CreatePollDialog extends Modal<RoomPoll> {
protected void onSubmit(AjaxRequestTarget target) {
pollDao.close(roomId);
pollDao.update(form.getModelObject());
- sendRoom(new RoomMessage(roomId,
findParent(MainPanel.class).getClient(), RoomMessage.Type.pollCreated));
+ sendRoom(new RoomMessage(roomId,
findParent(MainPanel.class).getClient(), RoomMessage.Type.POLL_CREATED));
close(target);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index 98664ee..f996f76 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -115,7 +115,7 @@ public class PollResultsDialog extends Modal<RoomPoll> {
RoomPoll p = pollDao.get(id);
selForm.select.setModelObject(p);
dispForm.updateModel(p, true, target);
- sendRoom(new RoomMessage(roomId,
findParent(MainPanel.class).getClient(), RoomMessage.Type.pollUpdated));
+ sendRoom(new RoomMessage(roomId,
findParent(MainPanel.class).getClient(), RoomMessage.Type.POLL_UPDATED));
close(target);
}
});
@@ -129,7 +129,7 @@ public class PollResultsDialog extends Modal<RoomPoll> {
pollDao.delete(dispForm.getModelObject());
selForm.updateModel(target);
dispForm.updateModel(selForm.select.getModelObject(), true, target);
- sendRoom(new RoomMessage(roomId,
findParent(MainPanel.class).getClient(), RoomMessage.Type.pollUpdated));
+ sendRoom(new RoomMessage(roomId,
findParent(MainPanel.class).getClient(), RoomMessage.Type.POLL_UPDATED));
close(target);
}
});
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
index cceb622..0bea815 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
@@ -90,7 +90,7 @@ public class VoteDialog extends Modal<RoomPollAnswer> {
a.getRoomPoll().getAnswers().add(a);
pollDao.update(a.getRoomPoll());
}
- sendRoom(new RoomMessage(roomId,
findParent(MainPanel.class).getClient(), RoomMessage.Type.pollUpdated));
+ sendRoom(new RoomMessage(roomId,
findParent(MainPanel.class).getClient(), RoomMessage.Type.POLL_UPDATED));
close(target);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 1d771c9..7531f66 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -255,7 +255,7 @@ public class RoomSidebar extends Panel {
break;
case muteOthers:
if
(room.getClient().hasRight(Right.MUTE_OTHERS)) {
- WebSocketHelper.sendRoom(new
TextRoomMessage(room.getRoom().getId(), self, RoomMessage.Type.muteOthers,
uid));
+ WebSocketHelper.sendRoom(new
TextRoomMessage(room.getRoom().getId(), self, RoomMessage.Type.MUTE_OTHERS,
uid));
}
break;
case mute:
@@ -265,7 +265,7 @@ public class RoomSidebar extends Panel {
return;
}
if (self.hasRight(Right.MODERATOR) ||
self.getUid().equals(c.getUid())) {
- WebSocketHelper.sendRoom(new
TextRoomMessage(room.getRoom().getId(), self, RoomMessage.Type.mute
+ WebSocketHelper.sendRoom(new
TextRoomMessage(room.getRoom().getId(), self, RoomMessage.Type.MUTE
, new
JSONObject()
.put("sid", self.getSid())
.put(PARAM_UID, uid)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 37276a4..5ba44dc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -114,8 +114,8 @@
</button>
</div>
<select class="zoom" data-custom-val="1.20">
- <option value="fullFit"><wicket:message
key="zoom.fullFit"/></option>
- <option value="pageWidth"><wicket:message
key="zoom.pageWidth"/></option>
+ <option value="FULL_FIT"><wicket:message
key="zoom.FULL_FIT"/></option>
+ <option value="PAGE_WIDTH"><wicket:message
key="zoom.PAGE_WIDTH"/></option>
<option value="custom">120%</option>
<option value="0.50">50%</option>
<option value="0.75">75%</option>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index bb82eca..103e8e5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -4,7 +4,7 @@ var Wb = function() {
, area = $('.room-block .wb-block .wb-area .tabs'), bar =
area.find('.wb-tabbar')
, extraProps = ['uid', 'fileId', 'fileType', 'count', 'slide',
'omType', '_src', 'formula'];
let c, t, z, s, f, mode, slide = 0, width = 0, height = 0
- , zoom = 1., zoomMode = 'pageWidth', role = null,
scrollTimeout = null;
+ , zoom = 1., zoomMode = 'PAGE_WIDTH', role = null,
scrollTimeout = null;
function _getBtn(m) {
return !!t ? t.find('.om-icon.' + (m || mode) + ':not(.stub)')
: null;
@@ -385,21 +385,21 @@ var Wb = function() {
if (zoom < .1) {
zoom = .1;
}
- zoomMode = 'zoom';
+ zoomMode = 'ZOOM';
_sendSetSize();
});
z.find('.zoom-in').click(function() {
zoom += .2;
- zoomMode = 'zoom';
+ zoomMode = 'ZOOM';
_sendSetSize();
});
z.find('.zoom').change(function() {
const zzz = $(this).val();
- zoomMode = 'zoom';
+ zoomMode = 'ZOOM';
if (isNaN(zzz)) {
switch (zzz) {
- case 'fullFit':
- case 'pageWidth':
+ case 'FULL_FIT':
+ case 'PAGE_WIDTH':
zoomMode = zzz;
break;
case 'custom':
@@ -727,11 +727,11 @@ var Wb = function() {
}
function _setSize() {
switch (zoomMode) {
- case 'fullFit':
+ case 'FULL_FIT':
zoom = Math.min((area.width() - 30) / width,
(area.height() - bar.height() - 30) / height);
z.find('.zoom').val(zoomMode);
break;
- case 'pageWidth':
+ case 'PAGE_WIDTH':
zoom = (area.width() - 30) / width;
z.find('.zoom').val(zoomMode);
break;
@@ -850,7 +850,7 @@ var Wb = function() {
, collision: 'fit'
});
}
- if (zoomMode !== 'zoom') {
+ if (zoomMode !== 'ZOOM') {
_setSize();
}
};
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 df4092d..0399af7 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
@@ -180,7 +180,7 @@ public class MessageDialog extends Modal<PrivateMessage> {
String invitationLink = "";
if (p.isBookedRoom()) {
Invitation i =
inviteManager.getInvitation(to, p.getRoom(),
- false,
null, Valid.Period, owner, to.getLanguageId()
+ false,
null, Valid.PERIOD, owner, to.getLanguageId()
,
CalendarHelper.getDate(start.getModelObject(), to.getTimeZoneId())
,
CalendarHelper.getDate(end.getModelObject(), to.getTimeZoneId()), null);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationDetails.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationDetails.java
index 6d31180..4e528c3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationDetails.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationDetails.java
@@ -83,8 +83,8 @@ public class InvitationDetails extends Form<Invitation>{
Valid v = i.getValid();
valid.setDefaultModelObject(v.name());
invitee.setDefaultModelObject(formatUser(i.getInvitee()));
- from.setDefaultModelObject(Valid.Period == v ? i.getValidFrom()
: null);
- to.setDefaultModelObject(Valid.Period == v ? i.getValidTo() :
null);
+ from.setDefaultModelObject(Valid.PERIOD == v ? i.getValidFrom()
: null);
+ to.setDefaultModelObject(Valid.PERIOD == v ? i.getValidTo() :
null);
delBtn.setEnabled(i.getId() != null);
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
index 367c89b..ab6c750 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
@@ -51,9 +51,9 @@ public class TestPatcher {
@Test
public void test() throws Exception {
for (DbType dbType : DbType.values()) {
- ConnectionProperties props =
ConnectionPropertiesPatcher.patch(dbType.name(), HOST, PORT, DB, USER, PASS);
+ ConnectionProperties props =
ConnectionPropertiesPatcher.patch(dbType, HOST, PORT, DB, USER, PASS);
assertEquals(dbType, props.getDbType(), "DB type should
match");
- if (DbType.mysql == dbType) {
+ if (DbType.MYSQL == dbType) {
Url url = Url.parse(props.getURL());
PageParameters pp = new
PageParametersEncoder().decodePageParameters(url);
StringValue tz = pp.get("serverTimezone");
@@ -64,6 +64,6 @@ public class TestPatcher {
@AfterAll
public static void cleanup() throws IOException {
- Files.copy(OmFileHelper.getPersistence(DbType.h2),
OmFileHelper.getPersistence());
+ Files.copy(OmFileHelper.getPersistence(DbType.H2),
OmFileHelper.getPersistence());
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
index ddd400e..7eedb06 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
@@ -45,10 +45,10 @@ public class TestInvitation extends AbstractWicketTester {
LocalDateTime from =
LocalDateTime.now().plusDays(1).withHour(12).withMinute(0).withSecond(0);
User invitee = userDao.getContact("[email protected]",
"Testname", "Testlastname", us.getId());
Invitation i = invitationManager.getInvitation(invitee,
roomDao.get(1L),
- false, "", Valid.OneTime
+ false, "", Valid.ONE_TIME
, us, us.getLanguageId(),
getDate(from, "GMT"),
getDate(from.plusHours(2), "GMT"), null);
- invitationManager.sendInvitationLink(i, MessageType.Create,
"subject", "message", false, null);
+ invitationManager.sendInvitationLink(i, MessageType.CREATE,
"subject", "message", false, null);
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
index 19ec9f6..f6a83f5 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
@@ -118,12 +118,12 @@ public class TestHashPage extends AbstractWicketTester {
// valid period of Invitation
switch (valid) {
- case Period:
+ case PERIOD:
i.setValidFrom(new Date(from.getTime() - (5 *
60 * 1000)));
i.setValidTo(to);
break;
- case Endless:
- case OneTime:
+ case ENDLESS:
+ case ONE_TIME:
default:
break;
}
@@ -171,7 +171,7 @@ public class TestHashPage extends AbstractWicketTester {
@Test
public void testValidOneTimeRoom() {
- Invitation i = get(1L, 2L, null, null, Valid.OneTime, null,
null, null);
+ Invitation i = get(1L, 2L, null, null, Valid.ONE_TIME, null,
null, null);
checkMainPanel(new PageParameters().add(INVITATION_HASH,
i.getHash()), RoomPanel.class);
}
@@ -181,7 +181,7 @@ public class TestHashPage extends AbstractWicketTester {
Recording rec = new Recording();
rec.setOwnerId(1L);
recDao.update(rec);
- Invitation i = get(1L, null, null, rec.getId(), Valid.OneTime,
null, null, null);
+ Invitation i = get(1L, null, null, rec.getId(), Valid.ONE_TIME,
null, null, null);
checkRecordingPanel(new PageParameters().add(INVITATION_HASH,
i.getHash()), VideoInfo.class);
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
index 795703e..f851669 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
@@ -46,6 +46,7 @@ import java.util.TimeZone;
import org.apache.openmeetings.AbstractSpringTest;
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.cli.ConnectionPropertiesPatcher;
+import org.apache.openmeetings.util.ConnectionProperties.DbType;
import org.apache.openmeetings.util.crypt.SCryptImplementation;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -80,11 +81,11 @@ public class TestInstall {
}
public static void setH2Home(File f) throws Exception {
- ConnectionPropertiesPatcher.patch("h2", null, null,
getH2Home(f), null, null);
+ ConnectionPropertiesPatcher.patch(DbType.H2, null, null,
getH2Home(f), null, null);
}
public static void resetH2Home() throws Exception {
- ConnectionPropertiesPatcher.patch("h2", null, null, null, null,
null);
+ ConnectionPropertiesPatcher.patch(DbType.H2, null, null, null,
null, null);
}
@BeforeEach
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
index 520cbdc..760a366 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
@@ -158,7 +158,7 @@ public class TestRoomService extends AbstractWebServiceTest
{
.setSubject("Health Meeting")
.setRoomId(rooms.get(0).getId())
.setMessage("Meeting")
- .setValid(Valid.Period)
+ .setValid(Valid.PERIOD)
.setValidFrom("2018-03-19
02:25:12")
.setValidTo("2018-04-20
02:25:12")
.toString())
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 4d24537..dd4a83c 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
@@ -257,7 +257,7 @@ public class RoomWebService extends BaseWebService {
roomDao.update(room, userId);
- WebSocketHelper.sendRoom(new RoomMessage(room.getId(),
userDao.get(userId), RoomMessage.Type.roomClosed));
+ WebSocketHelper.sendRoom(new RoomMessage(room.getId(),
userDao.get(userId), RoomMessage.Type.ROOM_CLOSED));
return new ServiceResult("Closed", Type.SUCCESS);
});
@@ -396,7 +396,7 @@ public class RoomWebService extends BaseWebService {
if (i != null) {
if (sendmail) {
try {
-
inviteManager.sendInvitationLink(i, MessageType.Create, invite.getSubject(),
invite.getMessage(), false, null);
+
inviteManager.sendInvitationLink(i, MessageType.CREATE, invite.getSubject(),
invite.getMessage(), false, null);
} catch (Exception e) {
throw new
ServiceException(e.getMessage());
}
