Repository: openmeetings Updated Branches: refs/heads/master fc2e5abd5 -> 65b178a1c
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/65b178a1 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/65b178a1 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/65b178a1 Branch: refs/heads/master Commit: 65b178a1c8eb3a088650d71dc4f42366c89713a1 Parents: fc2e5ab Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 23:38:17 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 23:38:17 2017 +0700 ---------------------------------------------------------------------- .../core/converter/BaseConverter.java | 2 +- .../record/listener/async/BaseStreamWriter.java | 4 +- .../openmeetings/core/ldap/LdapOptions.java | 2 +- .../db/dao/basic/ConfigurationDao.java | 2 +- .../openmeetings/db/dao/room/RoomDao.java | 2 +- .../db/dao/server/LdapConfigDao.java | 2 +- .../openmeetings/db/dao/server/OAuth2Dao.java | 2 +- .../openmeetings/db/dao/user/GroupDao.java | 2 +- .../openmeetings/db/dao/user/GroupUserDao.java | 2 +- .../openmeetings/db/dao/user/UserDao.java | 2 +- .../db/entity/user/PrivateMessage.java | 6 +-- .../openmeetings/screenshare/CaptureScreen.java | 4 +- .../apache/openmeetings/screenshare/Core.java | 6 +-- .../apache/openmeetings/util/OmException.java | 4 +- .../apache/openmeetings/util/StoredFile.java | 10 ++--- .../openmeetings/util/mail/IcalHandler.java | 6 +-- .../openmeetings/web/admin/AdminBasePanel.java | 4 +- .../openmeetings/web/admin/rooms/RoomForm.java | 2 +- .../openmeetings/web/app/Application.java | 14 +++--- .../web/common/menu/MenuFunctionsBehavior.java | 2 +- .../web/common/tree/FileItemTree.java | 8 ++-- .../web/common/tree/FileTreePanel.java | 20 ++++----- .../web/pages/install/InstallWizard.java | 2 +- .../apache/openmeetings/web/room/SwfPanel.java | 2 +- .../openmeetings/web/room/VideoSettings.java | 10 ++--- .../openmeetings/web/room/poll/VoteDialog.java | 2 +- .../web/room/wb/InterviewWbPanel.java | 2 +- .../openmeetings/web/room/wb/WbPanel.java | 4 +- .../apache/openmeetings/web/room/wb/player.js | 34 +++++++------- .../openmeetings/web/room/wb/tool-apointer.js | 18 ++++---- .../openmeetings/web/room/wb/tool-arrow.js | 2 +- .../openmeetings/web/room/wb/tool-base.js | 2 +- .../openmeetings/web/room/wb/tool-clipart.js | 2 +- .../openmeetings/web/room/wb/tool-text.js | 12 ++--- .../openmeetings/web/room/wb/tool-uline.js | 2 +- .../apache/openmeetings/web/room/wb/wb-area.js | 42 ++++++++--------- .../apache/openmeetings/web/room/wb/wb-board.js | 47 ++++++++++---------- .../apache/openmeetings/web/user/chat/Chat.java | 6 ++- .../web/user/chat/EmotionsResources.java | 28 ------------ .../web/user/profile/MessagesContactsPanel.java | 12 ++--- .../web/user/profile/UserSearchPanel.java | 2 +- .../web/util/UserChoiceProvider.java | 2 +- .../upload/BootstrapFileUploadBehavior.java | 6 +-- .../test/webservice/AbstractWebServiceTest.java | 14 +++--- .../test/webservice/TestCalendarService.java | 2 +- .../test/webservice/TestGroupService.java | 2 +- .../test/webservice/TestRecordingService.java | 2 +- .../test/webservice/TestRoomService.java | 4 +- .../webservice/util/DateParamConverter.java | 2 +- 49 files changed, 171 insertions(+), 202 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java index d277c57..0c1b084 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java @@ -59,7 +59,7 @@ import org.springframework.beans.factory.annotation.Autowired; public abstract class BaseConverter { private static final Logger log = Red5LoggerFactory.getLogger(BaseConverter.class, getWebAppRootKey()); private static final Pattern p = Pattern.compile("\\d{2,5}(x)\\d{2,5}"); - public final static String EXEC_EXT = System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") < 0 ? "" : ".exe"; + public static final String EXEC_EXT = System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") < 0 ? "" : ".exe"; @Autowired protected ConfigurationDao cfgDao; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java index 182d38c..808db25 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java @@ -44,8 +44,8 @@ import org.slf4j.Logger; public abstract class BaseStreamWriter implements Runnable { private static final Logger log = Red5LoggerFactory.getLogger(BaseStreamWriter.class, getWebAppRootKey()); - private final static int MINUTE_MULTIPLIER = 60 * 1000; - public final static int TIME_TO_WAIT_FOR_FRAME = 15 * MINUTE_MULTIPLIER; + private static final int MINUTE_MULTIPLIER = 60 * 1000; + public static final int TIME_TO_WAIT_FOR_FRAME = 15 * MINUTE_MULTIPLIER; protected int startTimeStamp = -1; protected long initialDelta = 0; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java index 4cddf09..d72ad1a 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; public class LdapOptions { private static final Logger log = Red5LoggerFactory.getLogger(LdapOptions.class, getWebAppRootKey()); - private final static String EMPTY_FORMAT = "%s"; + private static final String EMPTY_FORMAT = "%s"; private static final String CONFIGKEY_LDAP_HOST = "ldap_conn_host"; private static final String CONFIGKEY_LDAP_PORT = "ldap_conn_port"; private static final String CONFIGKEY_LDAP_SECURE = "ldap_conn_secure"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java index 582dedb..e050978 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java @@ -110,7 +110,7 @@ import com.github.openjson.JSONObject; @Transactional public class ConfigurationDao implements IDataProviderDao<Configuration> { private static final Logger log = Red5LoggerFactory.getLogger(ConfigurationDao.class, getWebAppRootKey()); - private final static String[] searchFields = {"key", "value"}; + private static final String[] searchFields = {"key", "value"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java index e5a5273..971309a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java @@ -57,7 +57,7 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class RoomDao implements IGroupAdminDataProviderDao<Room> { private static final Logger log = Red5LoggerFactory.getLogger(RoomDao.class, getWebAppRootKey()); - private final static String[] searchFields = {"name"}; + private static final String[] searchFields = {"name"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java index a23077a..73c9742 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java @@ -50,7 +50,7 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class LdapConfigDao implements IDataProviderDao<LdapConfig> { private static final Logger log = Red5LoggerFactory.getLogger(LdapConfigDao.class, getWebAppRootKey()); - private final static String[] searchFields = {"name", "configFileName", "domain", "comment"}; + private static final String[] searchFields = {"name", "configFileName", "domain", "comment"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java index 3793aa3..1c2ab37 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java @@ -33,7 +33,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class OAuth2Dao implements IDataProviderDao<OAuthServer> { - private final static String[] searchFields = {"name"}; + private static final String[] searchFields = {"name"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java index ea5a0e3..c4f2a43 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java @@ -35,7 +35,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class GroupDao implements IGroupAdminDataProviderDao<Group> { - private final static String[] searchFields = {"name"}; + private static final String[] searchFields = {"name"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java index 6214d71..4c80342 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java @@ -33,7 +33,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class GroupUserDao implements IDataProviderDao<GroupUser> { - private final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.address.email"}; + private static final String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.address.email"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java index 8a1df74..8537178 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java @@ -76,7 +76,7 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class UserDao implements IGroupAdminDataProviderDao<User> { private static final Logger log = Red5LoggerFactory.getLogger(UserDao.class, getWebAppRootKey()); - private final static String[] searchFields = {"lastname", "firstname", "login", "address.email", "address.town"}; + private static final String[] searchFields = {"lastname", "firstname", "login", "address.email", "address.town"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java index 000b101..4b1272d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java @@ -53,9 +53,9 @@ import org.simpleframework.xml.Root; @Root(name = "privatemessage") public class PrivateMessage implements IDataProviderEntity { private static final long serialVersionUID = 1L; - public final static Long INBOX_FOLDER_ID = Long.valueOf(0); - public final static Long SENT_FOLDER_ID = Long.valueOf(-1); - public final static Long TRASH_FOLDER_ID = Long.valueOf(-2); + public static final Long INBOX_FOLDER_ID = Long.valueOf(0); + public static final Long SENT_FOLDER_ID = Long.valueOf(-1); + public static final Long TRASH_FOLDER_ID = Long.valueOf(-2); @Id @GeneratedValue(strategy = GenerationType.IDENTITY) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java index f361834..f63339c 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java @@ -48,8 +48,8 @@ import org.slf4j.Logger; public class CaptureScreen extends Thread { private static final Logger log = getLogger(CaptureScreen.class); - private final static String QUARTZ_CURSOR_TRIGGER_NAME = "CursorTrigger"; - private final static String QUARTZ_CURSOR_JOB_NAME = "CursorJob"; + private static final String QUARTZ_CURSOR_TRIGGER_NAME = "CursorTrigger"; + private static final String QUARTZ_CURSOR_JOB_NAME = "CursorJob"; private final Core core; private int timestampDelta; private volatile AtomicInteger timestamp = new AtomicInteger(0); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java index 1ac34cf..0deb5a0 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java @@ -60,9 +60,9 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; public class Core implements IPendingServiceCallback, INetStreamEventHandler { private static final Logger log = getLogger(Core.class); - final static String QUARTZ_GROUP_NAME = "ScreenShare"; - final static String QUARTZ_REMOTE_JOB_NAME = "RemoteJob"; - final static String QUARTZ_REMOTE_TRIGGER_NAME = "RemoteTrigger"; + static final String QUARTZ_GROUP_NAME = "ScreenShare"; + static final String QUARTZ_REMOTE_JOB_NAME = "RemoteJob"; + static final String QUARTZ_REMOTE_TRIGGER_NAME = "RemoteTrigger"; private static final String CONNECT_REJECTED = "NetConnection.Connect.Rejected"; private static final String CONNECT_FAILED = "NetConnection.Connect.Failed"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java index 642b858..4927e4e 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java @@ -20,8 +20,8 @@ package org.apache.openmeetings.util; public class OmException extends Exception { private static final long serialVersionUID = 1L; - public final static OmException UNKNOWN = new OmException("error.unknown"); - public final static OmException BAD_CREDENTIALS = new OmException("error.bad.credentials"); + public static final OmException UNKNOWN = new OmException("error.unknown"); + public static final OmException BAD_CREDENTIALS = new OmException("error.bad.credentials"); private final String key; public OmException(String key) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java index 57d1351..67d6de3 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java @@ -43,11 +43,11 @@ import org.slf4j.Logger; public class StoredFile { private static final Logger log = Red5LoggerFactory.getLogger(StoredFile.class, getWebAppRootKey()); - private final static String MIME_AUDIO = "audio"; - private final static String MIME_VIDEO = "video"; - private final static String MIME_IMAGE = "image"; - private final static String MIME_TEXT = "text"; - private final static String MIME_APP = "application"; + private static final String MIME_AUDIO = "audio"; + private static final String MIME_VIDEO = "video"; + private static final String MIME_IMAGE = "image"; + private static final String MIME_TEXT = "text"; + private static final String MIME_APP = "application"; private static final Set<MediaType> CONVERT_TYPES = new HashSet<>(Arrays.asList( application("x-tika-msoffice"), application("x-tika-ooxml"), application("msword") , application("vnd.wordperfect"), application("rtf"))); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java index c0d0aa6..7724c40 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java @@ -69,9 +69,9 @@ public class IcalHandler { private final Calendar icsCalendar; /** Creation of a new Event */ - public final static Method ICAL_METHOD_REQUEST = Method.REQUEST; - public final static Method ICAL_METHOD_CANCEL = Method.CANCEL; - public final static Method ICAL_METHOD_REFRESH = Method.REFRESH; + public static final Method ICAL_METHOD_REQUEST = Method.REQUEST; + public static final Method ICAL_METHOD_CANCEL = Method.CANCEL; + public static final Method ICAL_METHOD_REFRESH = Method.REFRESH; /** * Constructor http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java index 488bba2..97ea37e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java @@ -31,8 +31,8 @@ public abstract class AdminBasePanel extends BasePanel { private static final long serialVersionUID = 1L; private static final JavaScriptResourceReference ADMIN_SCRIPT = new JavaScriptResourceReference(AdminBasePanel.class, "admin.js"); - protected final static String BASE_ROW_CLASS = "ui-widget-content"; - protected final static String ROW_CLASS = BASE_ROW_CLASS + " clickable"; + protected static final String BASE_ROW_CLASS = "ui-widget-content"; + protected static final String ROW_CLASS = BASE_ROW_CLASS + " clickable"; public AdminBasePanel(String id) { super(id); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java index 879758a..573ea0c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java @@ -87,7 +87,7 @@ import com.googlecode.wicket.jquery.ui.form.button.AjaxButton; public class RoomForm extends AdminBaseForm<Room> { private static final long serialVersionUID = 1L; - private final static List<Long> DROPDOWN_NUMBER_OF_PARTICIPANTS = Arrays.asList(2L, 4L, 6L, 8L, 10L, 12L, 14L, 16L, 20L, 25L, 32L, 50L, + private static final List<Long> DROPDOWN_NUMBER_OF_PARTICIPANTS = Arrays.asList(2L, 4L, 6L, 8L, 10L, 12L, 14L, 16L, 20L, 25L, 32L, 50L, 100L, 150L, 200L, 500L, 1000L); private final WebMarkupContainer roomList; private final TextField<String> pin = new TextField<>("pin"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 830d91d..53b8700 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 @@ -149,13 +149,13 @@ import com.hazelcast.core.MessageListener; public class Application extends AuthenticatedWebApplication implements IApplication { private static final Logger log = getLogger(Application.class, getWebAppRootKey()); private static boolean isInstalled; - private final static String ONLINE_USERS_KEY = "ONLINE_USERS_KEY"; - private final static String UID_BY_SID_KEY = "UID_BY_SID_KEY"; - private final static String INVALID_SESSIONS_KEY = "INVALID_SESSIONS_KEY"; - private final static String ROOMS_KEY = "ROOMS_KEY"; - private final static String WBS_KEY = "WBS_KEY"; - private final static String STREAM_CLIENT_KEY = "STREAM_CLIENT_KEY"; - public final static String NAME_ATTR_KEY = "name"; + private static final String ONLINE_USERS_KEY = "ONLINE_USERS_KEY"; + private static final String UID_BY_SID_KEY = "UID_BY_SID_KEY"; + private static final String INVALID_SESSIONS_KEY = "INVALID_SESSIONS_KEY"; + private static final String ROOMS_KEY = "ROOMS_KEY"; + private static final String WBS_KEY = "WBS_KEY"; + private static final String STREAM_CLIENT_KEY = "STREAM_CLIENT_KEY"; + public static final String NAME_ATTR_KEY = "name"; //additional maps for faster searching should be created private DashboardContext dashboardContext; private static Set<String> STRINGS_WITH_APP = new HashSet<>(); //FIXME need to be removed http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java index 5b6160c..14ab973 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java @@ -30,7 +30,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference; public class MenuFunctionsBehavior extends Behavior { private static final long serialVersionUID = 1L; - private final static JavaScriptResourceReference MENU_FUNCTIONS = new JavaScriptResourceReference(MenuFunctionsBehavior.class, "menu-functions.js"); + private static final JavaScriptResourceReference MENU_FUNCTIONS = new JavaScriptResourceReference(MenuFunctionsBehavior.class, "menu-functions.js"); private final String menuContainerId; private final String menuId; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java index c927df4..9cc8c73 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java @@ -41,10 +41,10 @@ import com.github.openjson.JSONObject; public class FileItemTree extends DefaultNestedTree<BaseFileItem> { private static final long serialVersionUID = 1L; - private final static String CSS_CLASS_FILE = "file "; - private final static String PARAM_MOD = "mod"; - private final static String PARAM_SHIFT = "s"; - private final static String PARAM_CTRL = "c"; + private static final String CSS_CLASS_FILE = "file "; + private static final String PARAM_MOD = "mod"; + private static final String PARAM_SHIFT = "s"; + private static final String PARAM_CTRL = "c"; final FileTreePanel treePanel; public FileItemTree(String id, FileTreePanel treePanel, ITreeProvider<BaseFileItem> tp) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java index b89a67d..b12eaef 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java @@ -37,9 +37,9 @@ import java.util.UUID; import org.apache.openmeetings.db.dao.file.FileItemDao; import org.apache.openmeetings.db.dao.record.RecordingDao; -import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.file.BaseFileItem; import org.apache.openmeetings.db.entity.file.BaseFileItem.Type; +import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.record.Recording; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog; @@ -74,13 +74,13 @@ import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; public abstract class FileTreePanel extends Panel { private static final long serialVersionUID = 1L; - private final static String ALIGN_LEFT_CLASS = " align-left"; - private final static String ALIGN_RIGHT_CLASS = " align-right"; - private final static String BASE_CLASS = " om-icon big clickable"; - private final static String UPLOAD_CLASS = "add" + BASE_CLASS + ALIGN_LEFT_CLASS; - private final static String CREATE_DIR_CLASS = "folder-create" + BASE_CLASS + ALIGN_LEFT_CLASS; - private final static String TRASH_CLASS = "trash" + BASE_CLASS + ALIGN_RIGHT_CLASS; - private final static String DISABLED_CLASS = " disabled"; + private static final String ALIGN_LEFT_CLASS = " align-left"; + private static final String ALIGN_RIGHT_CLASS = " align-right"; + private static final String BASE_CLASS = " om-icon big clickable"; + private static final String UPLOAD_CLASS = "add" + BASE_CLASS + ALIGN_LEFT_CLASS; + private static final String CREATE_DIR_CLASS = "folder-create" + BASE_CLASS + ALIGN_LEFT_CLASS; + private static final String TRASH_CLASS = "trash" + BASE_CLASS + ALIGN_RIGHT_CLASS; + private static final String DISABLED_CLASS = " disabled"; final WebMarkupContainer trees = new WebMarkupContainer("tree-container"); private final WebMarkupContainer sizes = new WebMarkupContainer("sizes"); private BaseFileItem lastSelected = null; @@ -267,9 +267,9 @@ public abstract class FileTreePanel extends Panel { Long id = f.getId(); if (id != null) { if (f instanceof Recording) { - getBean(RecordingDao.class).delete((Recording)f); + getBean(RecordingDao.class).delete(f); } else { - getBean(FileItemDao.class).delete((FileItem)f); + getBean(FileItemDao.class).delete(f); } } update(handler); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java index b9d4a13..6bdb77e 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 @@ -847,7 +847,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { option = op; } list.add(op); - if (option == null && me.getKey().toString().equals(InstallWizard.this.getModelObject().getDefaultLangId())) { + if (option == null && me.getKey().intValue() == InstallWizard.this.getModelObject().getDefaultLangId()) { option = op; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java index bbbfd08..92fcb94 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java @@ -51,7 +51,7 @@ import com.github.openjson.JSONObject; public class SwfPanel extends BasePanel { private static final long serialVersionUID = 1L; - private final static Logger log = Red5LoggerFactory.getLogger(SwfPanel.class, getWebAppRootKey()); + private static final Logger log = Red5LoggerFactory.getLogger(SwfPanel.class, getWebAppRootKey()); public static final String SWF = "swf"; public static final String SWF_TYPE_NETWORK = "network"; public static final String SWF_TYPE_SETTINGS = "settings"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java index beeeb05..74f861e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java @@ -50,11 +50,11 @@ import com.github.openjson.JSONObject; import com.hazelcast.core.Member; public class VideoSettings extends Panel { - private final static long serialVersionUID = 1L; - private final static Logger log = Red5LoggerFactory.getLogger(VideoSettings.class, getWebAppRootKey()); - private final static ResourceReference SETTINGS_JS_REFERENCE = new JavaScriptResourceReference(VideoSettings.class, "settings.js"); - public final static String URL = "url"; - public final static String FALLBACK = "fallback"; + private static final long serialVersionUID = 1L; + private static final Logger log = Red5LoggerFactory.getLogger(VideoSettings.class, getWebAppRootKey()); + private static final ResourceReference SETTINGS_JS_REFERENCE = new JavaScriptResourceReference(VideoSettings.class, "settings.js"); + public static final String URL = "url"; + public static final String FALLBACK = "fallback"; public VideoSettings(String id) { super(id); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java ---------------------------------------------------------------------- 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 3c4a9d5..096821d 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 @@ -56,7 +56,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; */ public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> { private static final long serialVersionUID = 1L; - private final static List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); //TODO max vote should be added + private static final List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); //TODO max vote should be added private final PollAnswerForm form; private final DialogButton vote = new DialogButton("vote", Application.getString("32")); private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel")); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java index 40212a7..4517bb6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java @@ -37,7 +37,7 @@ import com.github.openjson.JSONObject; public class InterviewWbPanel extends AbstractWbPanel { private static final long serialVersionUID = 1L; - public final static ResourceReference INTERVIEWWB_JS_REFERENCE = new JavaScriptResourceReference(WbPanel.class, "interviewwb.js"); + public static final ResourceReference INTERVIEWWB_JS_REFERENCE = new JavaScriptResourceReference(WbPanel.class, "interviewwb.js"); public InterviewWbPanel(String id, RoomPanel rp) { super(id, rp); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java index bad7eb8..7698f5f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java @@ -99,8 +99,8 @@ public class WbPanel extends AbstractWbPanel { private static final int DEFAULT_WIDTH = 640; private static final int DEFAULT_HEIGHT = 480; private static final int UNDO_SIZE = 20; - public final static ResourceReference WB_JS_REFERENCE = new JavaScriptResourceReference(WbPanel.class, "wb.js"); - private final static ResourceReference FABRIC_JS_REFERENCE = new JavaScriptResourceReference(WbPanel.class, "fabric.js"); + public static final ResourceReference WB_JS_REFERENCE = new JavaScriptResourceReference(WbPanel.class, "wb.js"); + private static final ResourceReference FABRIC_JS_REFERENCE = new JavaScriptResourceReference(WbPanel.class, "fabric.js"); private final Long roomId; private long wb2save = -1; private final Map<Long, Deque<UndoObject>> undoList = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js index 81a20cf..658b9cd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Player = (function() { - let player = {}, mainColor = '#ff6600', rad = 20; + const player = {}, mainColor = '#ff6600', rad = 20; function _filter(_o, props) { return props.reduce((result, key) => { result[key] = _o[key]; return result; }, {}); } @@ -18,7 +18,7 @@ var Player = (function() { } player.create = function(canvas, _o, _role) { - let vid = $('<video>').hide().attr('class', 'wb-video slide-' + canvas.slide).attr('id', 'wb-video-' + _o.uid) + const vid = $('<video>').hide().attr('class', 'wb-video slide-' + canvas.slide).attr('id', 'wb-video-' + _o.uid) .attr("width", _o.width).attr("height", _o.height) .append($('<source>').attr('type', 'video/mp4').attr('src', _o._src)); $('#wb-tab-' + canvas.wbId).append(vid); @@ -31,7 +31,7 @@ var Player = (function() { _o.status = {paused: true}; } let playable = false; - let trg = new fabric.Triangle({ + const trg = new fabric.Triangle({ left: 2.7 * rad , top: _o.height - 2.5 * rad , visible: _o.status.paused @@ -41,7 +41,7 @@ var Player = (function() { , stroke: mainColor , fill: mainColor }); - let rectPause1 = new fabric.Rect({ + const rectPause1 = new fabric.Rect({ left: 1.6 * rad , top: _o.height - 2.5 * rad , visible: !_o.status.paused @@ -50,7 +50,7 @@ var Player = (function() { , stroke: mainColor , fill: mainColor }); - let rectPause2 = new fabric.Rect({ + const rectPause2 = new fabric.Rect({ left: 2.1 * rad , top: _o.height - 2.5 * rad , visible: !_o.status.paused @@ -59,7 +59,7 @@ var Player = (function() { , stroke: mainColor , fill: mainColor }); - let play = new fabric.Group([ + const play = new fabric.Group([ new fabric.Circle({ left: rad , top: _o.height - 3 * rad @@ -73,7 +73,7 @@ var Player = (function() { objectCaching: false , visible: false }); - let cProgress = new fabric.Rect({ + const cProgress = new fabric.Rect({ left: 3.5 * rad , top: _o.height - 1.5 * rad , visible: false @@ -84,14 +84,14 @@ var Player = (function() { , rx: 5 , ry: 5 }); - let isDone = function() { + const isDone = function() { return video.getElement().currentTime === video.getElement().duration; }; - let updateProgress = function() { + const updateProgress = function() { progress.set('width', (video.getElement().currentTime * cProgress.width) / video.getElement().duration); canvas.renderAll(); }; - let progress = new fabric.Rect({ + const progress = new fabric.Rect({ left: 3.5 * rad , top: _o.height - 1.5 * rad , visible: false @@ -104,15 +104,15 @@ var Player = (function() { }); let request; - let opts = $.extend({ + const opts = $.extend({ subTargetCheck: true , objectCaching: false , omType: 'Video' , selectable: canvas.selection }, _filter(_o, ['fileId', 'fileType', 'slide', 'uid', '_poster', '_src', 'width', 'height', 'status'])); - let group = new fabric.Group([video, poster, play, progress, cProgress], opts); + const group = new fabric.Group([video, poster, play, progress, cProgress], opts); - let updateControls = function() { + const updateControls = function() { video.visible = true; poster.visible = false; @@ -121,7 +121,7 @@ var Player = (function() { rectPause2.visible = !group.status.paused; canvas.renderAll(); }; - let render = function () { + const render = function () { if (isDone()) { _sendStatus(group, true, video.getElement().duration); updateControls(); @@ -136,7 +136,7 @@ var Player = (function() { }; cProgress.on({ 'mousedown': function (evt) { - let _ptr = canvas.getPointer(evt.e) + const _ptr = canvas.getPointer(evt.e) , ptr = canvas._normalizePointer(group, _ptr) , l = (group.width / 2 + ptr.x) * canvas.getZoom() - cProgress.aCoords.bl.x; _sendStatus(group, group.status.paused, l * video.getElement().duration / cProgress.width) @@ -211,12 +211,12 @@ var Player = (function() { canvas.renderAll(); player.modify(group, _o); - let pos = {left: play.left, top: play.top}; + const pos = {left: play.left, top: play.top}; }); }); }; player.modify = function(g, _o) { - let opts = $.extend({ + const opts = $.extend({ angle: 0 , left: 10 , scaleX: 1 http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-apointer.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-apointer.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-apointer.js index c7c9d8e..af52f86 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-apointer.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-apointer.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var APointer = function(wb) { - let pointer = Base(); + const pointer = Base(); pointer.user = ''; pointer.create = function(canvas, o) { fabric.Image.fromURL('./css/images/pointer.png', function(img) { @@ -9,7 +9,7 @@ var APointer = function(wb) { , originX: 'right' , originY: 'top' }); - let circle1 = new fabric.Circle({ + const circle1 = new fabric.Circle({ radius: 20 , stroke: '#ff6600' , strokeWidth: 2 @@ -17,7 +17,7 @@ var APointer = function(wb) { , originX: 'center' , originY: 'center' }); - let circle2 = new fabric.Circle({ + const circle2 = new fabric.Circle({ radius: 6 , stroke: '#ff6600' , strokeWidth: 2 @@ -25,13 +25,13 @@ var APointer = function(wb) { , originX: 'center' , originY: 'center' }); - let text = new fabric.Text(o.user, { + const text = new fabric.Text(o.user, { fontSize: 12 , left: 10 , originX: 'left' , originY: 'bottom' }); - let group = new fabric.Group([circle1, circle2, img, text], { + const group = new fabric.Group([circle1, circle2, img, text], { left: o.x - 20 , top: o.y - 20 }); @@ -40,7 +40,7 @@ var APointer = function(wb) { group.uid = o.uid; group.loaded = !!o.loaded; - let count = 3; + const count = 3; function go(_cnt) { if (_cnt < 0) { canvas.remove(group); @@ -66,18 +66,18 @@ var APointer = function(wb) { }); } pointer.mouseUp = function(o) { - let canvas = this + const canvas = this , ptr = canvas.getPointer(o.e); if (pointer.user === '') { pointer.user = $('.room.sidebar.left .user.list .current .name').text(); } - let obj = { + const obj = { type: 'pointer' , x: ptr.x , y: ptr.y , user: pointer.user }; - obj.uid = uid = pointer.objectCreated(obj, canvas); + obj.uid = pointer.objectCreated(obj, canvas); pointer.create(canvas, obj); } pointer.activate = function() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js index cec004b..f71bb99 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Arrow = function(wb, s) { - let arrow = Line(wb, s); + const arrow = Line(wb, s); arrow.createShape = function(canvas) { arrow.obj = new fabric.Polygon([ {x: 0, y: 0}, http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-base.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-base.js index dc983c5..e50aef6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-base.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-base.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Base = function() { - let base = {}; + const base = {}; base.objectCreated = function(o, canvas) { o.uid = UUID.generate(); o.slide = canvas.slide; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js index 8949086..ec16f16 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Clipart = function(wb, btn) { - let art = Shape(wb); + const art = Shape(wb); art.add2Canvas = function(canvas) {} art.createShape = function(canvas) { fabric.Image.fromURL(btn.data('image'), function(img) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js index 145aac0..c24b72a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Text = function(wb, s) { - let text = ShapeBase(); + const text = ShapeBase(); text.obj = null; text.fill.color = '#000000'; text.stroke.width = 1; @@ -9,9 +9,9 @@ var Text = function(wb, s) { //TODO font size, background color text.mouseDown = function(o) { - var canvas = this; - var pointer = canvas.getPointer(o.e); - var ao = canvas.getActiveObject(); + let canvas = this + , pointer = canvas.getPointer(o.e) + , ao = canvas.getActiveObject(); if (!!ao && ao.type === 'i-text') { text.obj = ao; } else { @@ -45,13 +45,13 @@ var Text = function(wb, s) { }); }); text.enableAllProps(s); - var b = s.find('.wb-prop-b').button("enable"); + let b = s.find('.wb-prop-b').button("enable"); if (text.style.bold) { b.addClass('ui-state-active selected'); } else { b.removeClass('ui-state-active selected'); } - var i = s.find('.wb-prop-i').button("enable"); + let i = s.find('.wb-prop-i').button("enable"); if (text.style.italic) { i.addClass('ui-state-active selected'); } else { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-uline.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-uline.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-uline.js index ffdc76b..7006f02 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-uline.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-uline.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var ULine = function(wb, s) { - let uline = Line(wb, s); + const uline = Line(wb, s); uline.stroke.width = 20; uline.opacity = .5; return uline; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js index aa0858a..ee3919c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js @@ -2,15 +2,16 @@ var PRESENTER = 'presenter'; var WHITEBOARD = 'whiteBoard'; var WbArea = (function() { - let container, area, tabs, scroll, role = NONE, self = {}, _inited = false; + const self = {}; + let container, area, tabs, scroll, role = NONE, _inited = false; function refreshTabs() { tabs.tabs("refresh").find('ul').removeClass('ui-corner-all').removeClass('ui-widget-header'); } function getActive() { - var idx = tabs.tabs("option", 'active'); + let idx = tabs.tabs("option", 'active'); if (idx > -1) { - var href = tabs.find('a')[idx]; + let href = tabs.find('a')[idx]; if (!!href) { return $($(href).attr('href')); } @@ -22,10 +23,10 @@ var WbArea = (function() { case 8: // backspace case 46: // delete { - var wb = getActive().data(); - var canvas = wb.getCanvas(); + let wb = getActive().data(); + let canvas = wb.getCanvas(); if (!!canvas) { - var arr = []; + let arr = []; if (!!canvas.getActiveGroup()) { canvas.getActiveGroup().forEachObject(function(o) { arr.push({ @@ -34,7 +35,7 @@ var WbArea = (function() { }); }); } else { - var o = canvas.getActiveObject(); + let o = canvas.getActiveObject(); if (!!o) { arr.push({ uid: o.uid @@ -62,12 +63,12 @@ var WbArea = (function() { }); } function _resizeWbs() { - var w = area.width(), hh = area.height(); - var wbTabs = area.find(".tabs.ui-tabs"); - var tabPanels = wbTabs.find(".ui-tabs-panel"); - var wbah = hh - 5 - wbTabs.find("ul.ui-tabs-nav").height(); + let w = area.width(), hh = area.height(); + let wbTabs = area.find(".tabs.ui-tabs"); + let tabPanels = wbTabs.find(".ui-tabs-panel"); + let wbah = hh - 5 - wbTabs.find("ul.ui-tabs-nav").height(); tabPanels.height(wbah); - tabPanels.each(function(idx) { + tabPanels.each(function() { $(this).data().resize(w - 25, wbah - 20); }); wbTabs.find(".ui-tabs-panel .scroll-container").height(wbah); @@ -82,7 +83,6 @@ var WbArea = (function() { }); } function _getImage(cnv, fmt) { - //TODO zoom ??? return cnv.toDataURL({ format: fmt , width: cnv.width @@ -131,7 +131,7 @@ var WbArea = (function() { tabs.find('.next.om-icon').click(function() { scroll.scrollLeft(scroll.scrollLeft() + 30); }); - tabsNav.find('li').each(function(idx) { + tabsNav.find('li').each(function() { var li = $(this); _addCloseBtn(li); }); @@ -145,14 +145,14 @@ var WbArea = (function() { } $(window).off('keyup', deleteHandler); } - tabs.find(".ui-tabs-panel").each(function(idx) { + tabs.find(".ui-tabs-panel").each(function() { $(this).data().setRole(role); }); } self.init = function() { container = $(".room.wb.area"); tabs = container.find('.tabs').tabs({ - beforeActivate: function(e, ui) { + beforeActivate: function(e) { var res = true; if (e.originalEvent && e.originalEvent.type === 'click') { res = role === PRESENTER; @@ -285,14 +285,8 @@ $(function() { return; //ping } var m = jQuery.parseJSON(msg); - if (m) { - switch(m.type) { - case "wb": - if (typeof WbArea !== 'undefined') { - eval(m.func); - } - break; - } + if (m && 'wb' === m.type && typeof WbArea !== 'undefined') { + eval(m.func); } } catch (err) { console.log(err); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js index 402cf32..ab85a29 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js @@ -1,15 +1,16 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Wb = function() { - const ACTIVE = 'active'; - const BUMPER = 100; - let wb = {id: -1, name: ''}, a, t, z, s, canvases = [], mode, slide = 0, width = 0, height = 0 - , zoom = 1., zoomMode = 'fullFit', role = null, extraProps = ['uid', 'fileId', 'fileType', 'count', 'slide']; + const ACTIVE = 'active', BUMPER = 100 + , wb = {id: -1, name: ''}, canvases = [] + , extraProps = ['uid', 'fileId', 'fileType', 'count', 'slide']; + let a, t, z, s, mode, slide = 0, width = 0, height = 0 + , zoom = 1., zoomMode = 'fullFit', role = null; function getBtn(m) { return !!t ? t.find(".om-icon." + (m || mode)) : null; } function initToolBtn(m, def, obj) { - var btn = getBtn(m); + let btn = getBtn(m); btn.data({ obj: obj , activate: function() { @@ -38,7 +39,7 @@ var Wb = function() { var c = $('#wb-area-cliparts').clone().attr('id', ''); getBtn('arrow').after(c); c.find('a').prepend(c.find('div.om-icon.big:first')); - c.find('.om-icon.clipart').each(function(idx) { + c.find('.om-icon.clipart').each(function() { var cur = $(this); cur.css('background-image', 'url(' + cur.data('image') + ')') .click(function() { @@ -224,12 +225,12 @@ var Wb = function() { s.draggable({ scroll: false , containment: "body" - , start: function(event, ui) { + , start: function() { if (!!s.css("bottom")) { s.css("bottom", "").css("right", ""); } } - , drag: function(event, ui) { + , drag: function() { if (s.position().x + s.width() >= s.parent().width()) { return false; } @@ -322,18 +323,18 @@ var Wb = function() { break; case 'Presentation': { - let ccount = canvases.length; - let count = _o.deleted ? 1 : _o.count; + const ccount = canvases.length + , count = _o.deleted ? 1 : _o.count; for (let i = 0; i < count; ++i) { if (canvases.length < i + 1) { addCanvas(); } - let canvas = canvases[i]; + const canvas = canvases[i]; canvas.setBackgroundImage(_o._src + "&slide=" + i, canvas.renderAll.bind(canvas), {}); } _updateZoomPanel(); if (ccount !== canvases.length) { - let b = getBtn(); + const b = getBtn(); if (b.length && b.hasClass(ACTIVE)) { b.data().deactivate(); b.data().activate(); @@ -343,7 +344,7 @@ var Wb = function() { break; default: { - let canvas = canvases[_o.slide]; + const canvas = canvases[_o.slide]; if (!!canvas) { _o.selectable = canvas.selection; canvas.add(_o); @@ -358,8 +359,8 @@ var Wb = function() { canvas.renderOnAddRemove = false; }); - for (var i = 0; i < objects.length; ++i) { - var _o = objects[i]; + for (let i = 0; i < objects.length; ++i) { + let _o = objects[i]; _o.loaded = true; handler(_o); } @@ -422,8 +423,8 @@ var Wb = function() { o.clone(function(_o) { // ungrouping _o.includeDefaultValues = false; - var _items = _o.destroy().getObjects(); - for (var i = 0; i < _items.length; ++i) { + let _items = _o.destroy().getObjects(); + for (let i = 0; i < _items.length; ++i) { items.push(toOmJson(_items[i])); } }, extraProps); @@ -449,7 +450,7 @@ var Wb = function() { }; function scrollHandler(e) { $(this).find('.canvas-container').each(function(idx) { - var h = $(this).height(), pos = $(this).position(); + let h = $(this).height(), pos = $(this).position(); if (slide !== idx && pos.top > BUMPER - h && pos.top < BUMPER) { //TODO FIXME might be done without iterating //console.log("Found:", idx); @@ -507,17 +508,17 @@ var Wb = function() { } } function addCanvas() { - var sl = canvases.length; - var cid = 'can-' + a.attr('id') + '-slide-' + sl; - var c = $('<canvas></canvas>').attr('id', cid); + let sl = canvases.length; + let cid = 'can-' + a.attr('id') + '-slide-' + sl; + let c = $('<canvas></canvas>').attr('id', cid); a.find('.canvases').append(c); - var canvas = new fabric.Canvas(c.attr('id'), { + let canvas = new fabric.Canvas(c.attr('id'), { preserveObjectStacking: true }); canvas.wbId = wb.id; canvas.slide = sl; canvases.push(canvas); - var cc = $('#' + cid).closest('.canvas-container'); + let cc = $('#' + cid).closest('.canvas-container'); if (role === NONE) { if (sl === slide) { cc.show(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java index 59479f5..a1035c4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java @@ -31,8 +31,6 @@ import static org.apache.openmeetings.web.app.WebSession.getDateFormat; import static org.apache.openmeetings.web.app.WebSession.getRights; import static org.apache.openmeetings.web.app.WebSession.getUserId; import static org.apache.openmeetings.web.room.RoomPanel.isModerator; -import static org.apache.openmeetings.web.user.chat.EmotionsResources.EMOTIONS_CSS_REFERENCE; -import static org.apache.openmeetings.web.user.chat.EmotionsResources.EMOTIONS_JS_REFERENCE; import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction; import static org.apache.openmeetings.web.util.ProfileImageResourceReference.getUrl; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -67,7 +65,9 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.HiddenField; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; +import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.request.resource.JavaScriptResourceReference; +import org.apache.wicket.request.resource.ResourceReference; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -78,6 +78,8 @@ import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor; public class Chat extends Panel { private static final long serialVersionUID = 1L; private static final Logger log = Red5LoggerFactory.getLogger(Chat.class, getWebAppRootKey()); + public static final ResourceReference EMOTIONS_JS_REFERENCE = new JavaScriptResourceReference(Chat.class, "cssemoticons.js"); + public static final ResourceReference EMOTIONS_CSS_REFERENCE = new CssResourceReference(Chat.class, "cssemoticons.css"); private static final String PARAM_MSG_ID = "msgid"; private static final String PARAM_ROOM_ID = "roomid"; private static final String PARAM_TYPE = "type"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/EmotionsResources.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/EmotionsResources.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/EmotionsResources.java deleted file mode 100644 index 4e50a0d..0000000 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/EmotionsResources.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.web.user.chat; - -import org.apache.wicket.request.resource.CssResourceReference; -import org.apache.wicket.request.resource.JavaScriptResourceReference; -import org.apache.wicket.request.resource.ResourceReference; - -public class EmotionsResources { - public final static ResourceReference EMOTIONS_JS_REFERENCE = new JavaScriptResourceReference(EmotionsResources.class, "cssemoticons.js"); - public final static ResourceReference EMOTIONS_CSS_REFERENCE = new CssResourceReference(EmotionsResources.class, "cssemoticons.css"); -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java index e08319b..d5d0e70 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java @@ -84,12 +84,12 @@ import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTable public class MessagesContactsPanel extends UserBasePanel { private static final long serialVersionUID = 1L; - private final static Long MOVE_CHOOSE = Long.valueOf(-1); - private final static String SELECT_CHOOSE = "1252"; - private final static String SELECT_ALL = "1239"; - private final static String SELECT_NONE = "1240"; - private final static String SELECT_UNREAD = "1241"; - private final static String SELECT_READ = "1242"; + private static final Long MOVE_CHOOSE = Long.valueOf(-1); + private static final String SELECT_CHOOSE = "1252"; + private static final String SELECT_ALL = "1239"; + private static final String SELECT_NONE = "1240"; + private static final String SELECT_UNREAD = "1241"; + private static final String SELECT_READ = "1242"; private final WebMarkupContainer container = new WebMarkupContainer("container"); private final WebMarkupContainer folders = new WebMarkupContainer("folders"); private final Label unread = new Label("unread", Model.of(0L)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java index 7aaf439..d1e4151 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java @@ -53,7 +53,7 @@ import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTable public class UserSearchPanel extends UserBasePanel { private static final long serialVersionUID = 1L; - private final static List<Integer> itemsPerPage = Arrays.asList(10, 25, 50, 75, 100, 200, 500, 1000, 2500, 5000); + private static final List<Integer> itemsPerPage = Arrays.asList(10, 25, 50, 75, 100, 200, 500, 1000, 2500, 5000); private String text; private String search; private String offer; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java index b5af755..e755c2f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java @@ -38,7 +38,7 @@ import com.github.openjson.JSONStringer; public class UserChoiceProvider extends RestrictiveChoiceProvider<User> { private static final long serialVersionUID = 1L; - private final static int PAGE_SIZE = 10; + private static final int PAGE_SIZE = 10; private final Map<String, User> newContacts = new HashMap<>(); public static User getUser(String value) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java index e029631..a68f64b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java @@ -29,11 +29,11 @@ import org.apache.wicket.request.resource.ResourceReference; public class BootstrapFileUploadBehavior extends Behavior { private static final long serialVersionUID = 1L; - private final static ResourceReference BOOTSTRAP_FILEINPUT_JS_REFERENCE + private static final ResourceReference BOOTSTRAP_FILEINPUT_JS_REFERENCE = new JavaScriptResourceReference(BootstrapFileUploadBehavior.class, "fileinput.js"); - private final static ResourceReference BOOTSTRAP_FILEINPUT_CSS_REFERENCE + private static final ResourceReference BOOTSTRAP_FILEINPUT_CSS_REFERENCE = new CssResourceReference(BootstrapFileUploadBehavior.class, "fileinput.css"); - public final static BootstrapFileUploadBehavior INSTANCE = new BootstrapFileUploadBehavior(); + public static final BootstrapFileUploadBehavior INSTANCE = new BootstrapFileUploadBehavior(); private BootstrapFileUploadBehavior() { } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java index 17cfd57..ff08b7f 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/AbstractWebServiceTest.java @@ -59,13 +59,13 @@ import org.junit.BeforeClass; public class AbstractWebServiceTest extends AbstractJUnitDefaults { private static Tomcat tomcat; - public final static String CONTEXT = "/openmeetings"; - public final static String BASE_SERVICES_URL = "http://localhost:8080"; + CONTEXT + "/services"; - public final static String USER_SERVICE_URL = BASE_SERVICES_URL + "/user"; - public final static String INFO_SERVICE_URL = BASE_SERVICES_URL + "/info"; - public final static String FILE_SERVICE_URL = BASE_SERVICES_URL + "/file"; - public final static String UNIT_TEST_EXT_TYPE = "om_unit_tests"; - public final static long TIMEOUT = 5 * 60 * 1000; + public static final String CONTEXT = "/openmeetings"; + public static final String BASE_SERVICES_URL = "http://localhost:8080"; + CONTEXT + "/services"; + public static final String USER_SERVICE_URL = BASE_SERVICES_URL + "/user"; + public static final String INFO_SERVICE_URL = BASE_SERVICES_URL + "/info"; + public static final String FILE_SERVICE_URL = BASE_SERVICES_URL + "/file"; + public static final String UNIT_TEST_EXT_TYPE = "om_unit_tests"; + public static final long TIMEOUT = 5 * 60 * 1000; protected WicketTester tester; public static WebClient getClient(String url) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java index 63019c6..55d5abe 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java @@ -53,7 +53,7 @@ import com.github.openjson.JSONArray; import com.github.openjson.JSONObject; public class TestCalendarService extends AbstractWebServiceTest { - public final static String CALENDAR_SERVICE_URL = BASE_SERVICES_URL + "/calendar"; + public static final String CALENDAR_SERVICE_URL = BASE_SERVICES_URL + "/calendar"; @Autowired private GroupDao groupDao; @Autowired http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java index 729a243..773ede6 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java @@ -28,7 +28,7 @@ import org.apache.openmeetings.db.dto.basic.ServiceResult.Type; import org.junit.Test; public class TestGroupService extends AbstractWebServiceTest { - public final static String GROUP_SERVICE_URL = BASE_SERVICES_URL + "/group"; + public static final String GROUP_SERVICE_URL = BASE_SERVICES_URL + "/group"; @Test public void putTest() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRecordingService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRecordingService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRecordingService.java index e2cab71..b553ab6 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRecordingService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRecordingService.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; public class TestRecordingService extends AbstractWebServiceTest { - public final static String RECORD_SERVICE_URL = BASE_SERVICES_URL + "/record"; + public static final String RECORD_SERVICE_URL = BASE_SERVICES_URL + "/record"; @Autowired private RecordingDao recordingDao; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java index 60dd0ec..2a552c1 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java @@ -39,8 +39,8 @@ import org.apache.openmeetings.db.entity.room.Room; import org.junit.Test; public class TestRoomService extends AbstractWebServiceTest { - public final static String ROOM_SERVICE_URL = BASE_SERVICES_URL + "/room"; - private final static long CAPACITY = 666L; + public static final String ROOM_SERVICE_URL = BASE_SERVICES_URL + "/room"; + private static final long CAPACITY = 666L; @Test public void testExternal() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/65b178a1/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/DateParamConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/DateParamConverter.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/DateParamConverter.java index 8d195ff..0b45405 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/DateParamConverter.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/DateParamConverter.java @@ -31,7 +31,7 @@ import org.apache.commons.lang3.time.FastDateFormat; import org.apache.wicket.util.string.Strings; public class DateParamConverter implements ParamConverter<Date> { - private final static FastDateFormat[] formats = new FastDateFormat[] { ISO8601_FULL_FORMAT, ISO8601_DATETIME_FORMAT, ISO8601_DATE_FORMAT }; + private static final FastDateFormat[] formats = new FastDateFormat[] { ISO8601_FULL_FORMAT, ISO8601_DATETIME_FORMAT, ISO8601_DATE_FORMAT }; public static Date get(String val) { if (Strings.isEmpty(val)) {
