Repository: openmeetings Updated Branches: refs/heads/master 03a331459 -> ad689f3da
[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/ad689f3d Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ad689f3d Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ad689f3d Branch: refs/heads/master Commit: ad689f3da5544f2fae648f2b579b4b0e74f39215 Parents: 03a3314 Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 17:29:37 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 17:29:37 2017 +0700 ---------------------------------------------------------------------- .../core/converter/BaseConverter.java | 12 ++++++++++-- .../core/converter/FlvExplorerConverter.java | 4 ++-- .../openmeetings/core/remote/MobileService.java | 18 +++++++++++++++--- .../db/dao/basic/ConfigurationDao.java | 4 ++-- .../apache/openmeetings/db/dao/room/RoomDao.java | 2 +- .../openmeetings/db/dao/server/LdapConfigDao.java | 2 +- .../openmeetings/db/dao/server/OAuth2Dao.java | 3 +-- .../apache/openmeetings/db/dao/user/GroupDao.java | 2 +- .../openmeetings/db/dao/user/GroupUserDao.java | 2 +- .../apache/openmeetings/db/dao/user/UserDao.java | 3 +-- 10 files changed, 35 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/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 987c22a..d277c57 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 @@ -71,13 +71,21 @@ public abstract class BaseConverter { protected FileItemLogDao logDao; protected static class Dimension { - public int width = 0; - public int height = 0; + private final int width; + private final int height; public Dimension(int width, int height) { this.width = width; this.height = height; } + + public int getWidth() { + return width; + } + + public int getHeight() { + return height; + } } private String getPath(String key, String app) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java index 9a50a52..9d19f7e 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java @@ -72,8 +72,8 @@ public class FlvExplorerConverter extends BaseConverter { } //Parse the width height from the FFMPEG output Dimension dim = getDimension(res.getError()); - f.setWidth(dim.width); - f.setHeight(dim.height); + f.setWidth(dim.getWidth()); + f.setHeight(dim.getHeight()); convertToPng(f, mp4.getCanonicalPath(), logs); } catch (Exception err) { log.error("[convertToFLV]", err); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java index ddd3b39..2310be9 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java @@ -469,9 +469,9 @@ public class MobileService { public static class Language implements Serializable { private static final long serialVersionUID = 1L; - public long language_id; - public String code; - public String name; + private long language_id; + private String code; + private String name; public Language() {} @@ -480,5 +480,17 @@ public class MobileService { this.code = code; this.name = name; } + + public String getCode() { + return code; + } + + public long getLanguage_id() { + return language_id; + } + + public String getName() { + return name; + } } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/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 85c9ee9..582dedb 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 @@ -53,12 +53,12 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_VIDEO_COD import static org.apache.openmeetings.util.OpenmeetingsVariables.getApplicationName; import static org.apache.openmeetings.util.OpenmeetingsVariables.getConfigKeyCryptClassName; import static org.apache.openmeetings.util.OpenmeetingsVariables.getRoomSettings; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName; import static org.apache.openmeetings.util.OpenmeetingsVariables.setApplicationName; import static org.apache.openmeetings.util.OpenmeetingsVariables.setConfigKeyCryptClassName; import static org.apache.openmeetings.util.OpenmeetingsVariables.setExtProcessTtl; import static org.apache.openmeetings.util.OpenmeetingsVariables.setRoomSettings; -import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.File; import java.io.FileInputStream; @@ -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()); - public final static String[] searchFields = {"key", "value"}; + private final static String[] searchFields = {"key", "value"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/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 175a1c3..e5a5273 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()); - public final static String[] searchFields = {"name"}; + private final static String[] searchFields = {"name"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/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 e71db60..a23077a 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()); - public final static String[] searchFields = {"name", "configFileName", "domain", "comment"}; + private final static String[] searchFields = {"name", "configFileName", "domain", "comment"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/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 e9bb1e7..3793aa3 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,8 +33,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class OAuth2Dao implements IDataProviderDao<OAuthServer> { - - public final static String[] searchFields = {"name"}; + private final static String[] searchFields = {"name"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/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 c610b2e..ea5a0e3 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> { - public final static String[] searchFields = {"name"}; + private final static String[] searchFields = {"name"}; @PersistenceContext private EntityManager em; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/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 a9cacbd..6214d71 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,9 +33,9 @@ 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"}; @PersistenceContext private EntityManager em; - public final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.address.email"}; @Override public GroupUser get(long id) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad689f3d/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 240bb0a..b52376b 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,8 +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()); - - public final static String[] searchFields = {"lastname", "firstname", "login", "address.email", "address.town"}; + private final static String[] searchFields = {"lastname", "firstname", "login", "address.email", "address.town"}; @PersistenceContext private EntityManager em;
