Author: solomax
Date: Wed Dec 2 18:52:32 2015
New Revision: 1717669
URL: http://svn.apache.org/viewvc?rev=1717669&view=rev
Log:
[OPENMEETINGS-1288] search user page seems to be fixed
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Wed Dec 2 18:52:32 2015
@@ -104,15 +104,15 @@ public class MainService implements IPen
* gets a user by its SID
*
* @param SID
- * @param USER_ID
+ * @param userId
* @return - user with SID given
*/
- public User getUser(String SID, int USER_ID) {
+ public User getUser(String SID, long userId) {
User users = new User();
Long users_id = sessiondataDao.checkSession(SID);
Set<Right> rights = userDao.getRights(users_id);
if (AuthLevelUtil.hasAdminLevel(rights) ||
AuthLevelUtil.hasWebServiceLevel(rights)) {
- users = userDao.get(USER_ID);
+ users = userDao.get(userId);
} else {
users.setFirstname("No rights to do this");
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
Wed Dec 2 18:52:32 2015
@@ -37,7 +37,7 @@ public interface IDataProviderDao<T exte
* @param id - id of instance to retrieve
* @return instance with the id gived
*/
- T get(long id);
+ T get(Long id);
/**
* Get a list of instances of {@link T}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
Wed Dec 2 18:52:32 2015
@@ -192,7 +192,8 @@ public class ConfigurationDao implements
return val;
}
- public Configuration get(long id) {
+ @Override
+ public Configuration get(Long id) {
if (id <= 0) {
return null;
}
@@ -200,11 +201,13 @@ public class ConfigurationDao implements
.setParameter("id", id).getSingleResult();
}
+ @Override
public List<Configuration> get(int start, int count) {
return em.createNamedQuery("getNondeletedConfiguration",
Configuration.class)
.setFirstResult(start).setMaxResults(count).getResultList();
}
+ @Override
public List<Configuration> get(String search, int start, int count,
String sort) {
TypedQuery<Configuration> q =
em.createQuery(DaoHelper.getSearchQuery("Configuration", "c", search, true,
false, sort, searchFields), Configuration.class);
q.setFirstResult(start);
@@ -212,15 +215,18 @@ public class ConfigurationDao implements
return q.getResultList();
}
+ @Override
public long count() {
return em.createNamedQuery("countConfigurations",
Long.class).getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Configuration", "c", search, true,
true, null, searchFields), Long.class);
return q.getSingleResult();
}
+ @Override
public Configuration update(Configuration entity, Long userId) {
return update(entity, userId, false);
}
@@ -251,6 +257,7 @@ public class ConfigurationDao implements
return entity;
}
+ @Override
public void delete(Configuration entity, Long userId) {
entity.setUpdated(new Date());
this.update(entity, userId, true);
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
Wed Dec 2 18:52:32 2015
@@ -34,24 +34,29 @@ public class MailMessageDao implements
@PersistenceContext
private EntityManager em;
- public MailMessage get(long id) {
+ @Override
+ public MailMessage get(Long id) {
return em.createNamedQuery("getMailMessageById",
MailMessage.class).setParameter("id", id).getSingleResult();
}
+ @Override
public List<MailMessage> get(int start, int count) {
return em.createNamedQuery("getMailMessages",
MailMessage.class).setParameter("status", Status.NONE)
.setFirstResult(start).setMaxResults(count).getResultList();
}
+ @Override
public List<MailMessage> get(String search, int start, int count,
String order) {
return get(start, count);
}
+ @Override
public long count() {
return em.createNamedQuery("countMailMessages",
Long.class).setParameter("status", Status.NONE)
.getSingleResult();
}
+ @Override
public long count(String search) {
return count();
}
@@ -65,6 +70,7 @@ public class MailMessageDao implements
.executeUpdate();
}
+ @Override
public MailMessage update(MailMessage m, Long userId) {
if (m.getId() == null) {
m.setInserted(Calendar.getInstance());
@@ -76,6 +82,7 @@ public class MailMessageDao implements
return m;
}
+ @Override
public void delete(MailMessage m, Long userId) {
em.remove(m);
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
Wed Dec 2 18:52:32 2015
@@ -305,7 +305,7 @@ public class LabelDao implements IDataPr
}
@Override
- public StringLabel get(long id) {
+ public StringLabel get(Long id) {
return null;
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
Wed Dec 2 18:52:32 2015
@@ -59,7 +59,8 @@ public class RoomDao implements IDataPro
@Autowired
private TimezoneUtil timezoneUtil;
- public Room get(long id) {
+ @Override
+ public Room get(Long id) {
TypedQuery<Room> q = em.createNamedQuery("getRoomById",
Room.class);
q.setParameter("id", id);
@SuppressWarnings("unchecked")
@@ -81,6 +82,7 @@ public class RoomDao implements IDataPro
return em.createNamedQuery("getRoomsByIds",
Room.class).setParameter("ids", ids).getResultList();
}
+ @Override
public List<Room> get(int start, int count) {
TypedQuery<Room> q = em.createNamedQuery("getNondeletedRooms",
Room.class);
q.setFirstResult(start);
@@ -88,6 +90,7 @@ public class RoomDao implements IDataPro
return q.getResultList();
}
+ @Override
public List<Room> get(String search, int start, int count, String sort)
{
TypedQuery<Room> q =
em.createQuery(DaoHelper.getSearchQuery("Room", "r", search, true, false, sort,
searchFields), Room.class);
q.setFirstResult(start);
@@ -95,11 +98,13 @@ public class RoomDao implements IDataPro
return q.getResultList();
}
+ @Override
public long count() {
TypedQuery<Long> q = em.createNamedQuery("countRooms",
Long.class);
return q.getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Room", "r", search, true, true, null,
searchFields), Long.class);
return q.getSingleResult();
@@ -164,6 +169,7 @@ public class RoomDao implements IDataPro
return null;
}
+ @Override
public Room update(Room entity, Long userId) {
if (entity.getId() == null) {
entity.setInserted(new Date());
@@ -186,6 +192,7 @@ public class RoomDao implements IDataPro
return entity;
}
+ @Override
public void delete(Room entity, Long userId) {
entity.setDeleted(true);
entity.setSipEnabled(false);
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
Wed Dec 2 18:52:32 2015
@@ -149,7 +149,8 @@ public class LdapConfigDao implements ID
return -1L;
}
- public LdapConfig get(long id) {
+ @Override
+ public LdapConfig get(Long id) {
try {
TypedQuery<LdapConfig> query =
em.createNamedQuery("getLdapConfigById", LdapConfig.class);
@@ -192,6 +193,7 @@ public class LdapConfigDao implements ID
return result;
}
+ @Override
public List<LdapConfig> get(int start, int count) {
TypedQuery<LdapConfig> q =
em.createNamedQuery("getNondeletedLdapConfigs", LdapConfig.class);
q.setFirstResult(start);
@@ -199,6 +201,7 @@ public class LdapConfigDao implements ID
return q.getResultList();
}
+ @Override
public List<LdapConfig> get(String search, int start, int count, String
sort) {
TypedQuery<LdapConfig> q =
em.createQuery(DaoHelper.getSearchQuery("LdapConfig", "lc", search, true,
false, sort, searchFields), LdapConfig.class);
q.setFirstResult(start);
@@ -206,6 +209,7 @@ public class LdapConfigDao implements ID
return q.getResultList();
}
+ @Override
public long count() {
try {
TypedQuery<Long> query =
em.createNamedQuery("countNondeletedLdapConfigs", Long.class);
@@ -218,11 +222,13 @@ public class LdapConfigDao implements ID
return 0L;
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("LdapConfig", "lc", search, true, true,
null, searchFields), Long.class);
return q.getSingleResult();
}
+ @Override
public LdapConfig update(LdapConfig entity, Long userId) {
try {
if (entity.getId() == null) {
@@ -246,6 +252,7 @@ public class LdapConfigDao implements ID
return entity;
}
+ @Override
public void delete(LdapConfig entity, Long userId) {
if (entity.getId() != null) {
entity.setUpdated(new Date());
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
Wed Dec 2 18:52:32 2015
@@ -42,7 +42,8 @@ public class OAuth2Dao implements IDataP
return query.getResultList();
}
- public OAuthServer get(long id) {
+ @Override
+ public OAuthServer get(Long id) {
TypedQuery<OAuthServer> query =
em.createNamedQuery("getOAuthServerById", OAuthServer.class);
query.setParameter("id", id);
OAuthServer result = null;
@@ -52,6 +53,7 @@ public class OAuth2Dao implements IDataP
return result;
}
+ @Override
public List<OAuthServer> get(int start, int count) {
TypedQuery<OAuthServer> query =
em.createNamedQuery("getAllOAuthServers", OAuthServer.class);
query.setFirstResult(start);
@@ -59,6 +61,7 @@ public class OAuth2Dao implements IDataP
return query.getResultList();
}
+ @Override
public List<OAuthServer> get(String search, int start, int count,
String order) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true,
false, null, searchFields), Long.class);
q.setFirstResult(start);
@@ -66,16 +69,19 @@ public class OAuth2Dao implements IDataP
return null;
}
+ @Override
public long count() {
TypedQuery<Long> q = em.createNamedQuery("countOAuthServers",
Long.class);
return q.getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true, true,
null, searchFields), Long.class);
return q.getSingleResult();
}
+ @Override
public OAuthServer update(OAuthServer server, Long userId) {
if (server.getId() == null) {
em.persist(server);
@@ -85,6 +91,7 @@ public class OAuth2Dao implements IDataP
return server;
}
+ @Override
public void delete(OAuthServer server, Long userId) {
server.setDeleted(true);
update(server, userId);
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
Wed Dec 2 18:52:32 2015
@@ -72,6 +72,7 @@ public class ServerDao implements IDataP
*
* @see org.apache.openmeetings.data.OmDAO#get(int, int)
*/
+ @Override
public List<Server> get(int start, int max) {
TypedQuery<Server> q = em.createNamedQuery("getAllServers",
Server.class);
q.setFirstResult(start);
@@ -79,6 +80,7 @@ public class ServerDao implements IDataP
return q.getResultList();
}
+ @Override
public List<Server> get(String search, int start, int count, String
order) {
TypedQuery<Server> q = em.createQuery(DaoHelper.getSearchQuery(
"Server", "s", search, true, false, order,
searchFields),
@@ -104,6 +106,7 @@ public class ServerDao implements IDataP
*
* @see org.apache.openmeetings.data.OmDAO#count()
*/
+ @Override
public long count() {
log.debug("getServerCount enter");
TypedQuery<Long> q = em.createNamedQuery("getServerCount",
Long.class);
@@ -111,6 +114,7 @@ public class ServerDao implements IDataP
return q.getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Server",
"s", search, true, true, null, searchFields),
Long.class);
@@ -122,7 +126,8 @@ public class ServerDao implements IDataP
*
* @see org.apache.openmeetings.data.OmDAO#get(long)
*/
- public Server get(long id) {
+ @Override
+ public Server get(Long id) {
Server result = null;
log.debug("getServer enter, id = " + id);
TypedQuery<Server> q = em.createNamedQuery("getServerById",
@@ -158,6 +163,7 @@ public class ServerDao implements IDataP
*
org.apache.openmeetings.data.OmDAO#update(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
+ @Override
public Server update(Server entity, Long userId) {
entity.setDeleted(false);
if (entity.getId() > 0) {
@@ -183,6 +189,7 @@ public class ServerDao implements IDataP
*
org.apache.openmeetings.data.OmDAO#delete(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
+ @Override
public void delete(Server entity, Long userId) {
if (entity.getId() > 0) {
entity.setUpdated(new Date());
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
Wed Dec 2 18:52:32 2015
@@ -38,7 +38,8 @@ public class GroupDao implements IDataPr
@PersistenceContext
private EntityManager em;
- public Group get(long id) {
+ @Override
+ public Group get(Long id) {
TypedQuery<Group> query = em.createNamedQuery("getGroupById",
Group.class);
query.setParameter("id", id);
Group o = null;
@@ -55,6 +56,7 @@ public class GroupDao implements IDataPr
return groups == null || groups.isEmpty() ? null :
groups.get(0);
}
+ @Override
public List<Group> get(int start, int count) {
TypedQuery<Group> q =
em.createNamedQuery("getNondeletedGroups", Group.class);
q.setFirstResult(start);
@@ -62,6 +64,7 @@ public class GroupDao implements IDataPr
return q.getResultList();
}
+ @Override
public List<Group> get(String search, int start, int count, String
sort) {
TypedQuery<Group> q =
em.createQuery(DaoHelper.getSearchQuery("Group", "o", search, true, false,
sort, searchFields), Group.class);
q.setFirstResult(start);
@@ -69,11 +72,13 @@ public class GroupDao implements IDataPr
return q.getResultList();
}
+ @Override
public long count() {
TypedQuery<Long> q = em.createNamedQuery("countGroups",
Long.class);
return q.getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Group", "o", search, true, true, null,
searchFields), Long.class);
return q.getSingleResult();
@@ -83,6 +88,7 @@ public class GroupDao implements IDataPr
return em.createNamedQuery("getGroupsByIds",
Group.class).setParameter("ids", ids).getResultList();
}
+ @Override
public Group update(Group entity, Long userId) {
if (entity.getId() == null) {
if (userId != null) {
@@ -100,6 +106,7 @@ public class GroupDao implements IDataPr
return entity;
}
+ @Override
public void delete(Group entity, Long userId) {
em.createNamedQuery("deleteUsersFromGroup")
.setParameter("id", entity.getId())
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
Wed Dec 2 18:52:32 2015
@@ -40,16 +40,19 @@ public class GroupUserDao implements IDa
private UserDao userDao;
public final static String[] searchFields = {"user.lastname",
"user.firstname", "user.login", "user.address.email"};
- public GroupUser get(long id) {
+ @Override
+ public GroupUser get(Long id) {
TypedQuery<GroupUser> q =
em.createNamedQuery("getGroupUsersById", GroupUser.class);
q.setParameter("id", id);
return q.getSingleResult();
}
+ @Override
public List<GroupUser> get(int start, int count) {
throw new RuntimeException("Should not be used");
}
+ @Override
public List<GroupUser> get(String search, int start, int count, String
sort) {
throw new RuntimeException("Should not be used");
}
@@ -88,10 +91,12 @@ public class GroupUserDao implements IDa
.setParameter("groupId",
groupId).setParameter("userId", userId).getResultList().size() > 0;
}
+ @Override
public long count() {
throw new RuntimeException("Should not be used");
}
+ @Override
public long count(String search) {
throw new RuntimeException("Should not be used");
}
@@ -113,6 +118,7 @@ public class GroupUserDao implements IDa
}
}
+ @Override
public GroupUser update(GroupUser entity, Long userId) {
if (entity.getId() == null) {
entity.setInserted(new Date());
@@ -138,6 +144,7 @@ public class GroupUserDao implements IDa
userDao.update(u, userId);
}
+ @Override
public void delete(GroupUser entity, Long userId) {
if (entity.getId() != null) {
updateUser(entity, true, userId);
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
Wed Dec 2 18:52:32 2015
@@ -75,13 +75,15 @@ public class PrivateMessageDao implement
return null;
}
+ @Override
public List<PrivateMessage> get(int first, int count) {
return em.createNamedQuery("getPrivateMessages",
PrivateMessage.class)
.setFirstResult(first).setMaxResults(count)
.getResultList();
}
- public PrivateMessage get(long id) {
+ @Override
+ public PrivateMessage get(Long id) {
TypedQuery<PrivateMessage> query =
em.createNamedQuery("getPrivateMessageById", PrivateMessage.class);
query.setParameter("id", id);
PrivateMessage privateMessage = null;
@@ -92,6 +94,7 @@ public class PrivateMessageDao implement
return privateMessage;
}
+ @Override
public PrivateMessage update(PrivateMessage entity, Long userId) {
if (entity.getId() == null) {
entity.setInserted(new Date());
@@ -172,23 +175,26 @@ public class PrivateMessageDao implement
.setParameter("roomId", roomId).getResultList();
}
+ @Override
public List<PrivateMessage> get(String search, int start, int count,
String order) {
// TODO Auto-generated method stub
return null;
}
+ @Override
public long count() {
// TODO Auto-generated method stub
return 0;
}
+ @Override
public long count(String search) {
// TODO Auto-generated method stub
return 0;
}
+ @Override
public void delete(PrivateMessage entity, Long userId) {
// TODO Auto-generated method stub
-
}
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
Wed Dec 2 18:52:32 2015
@@ -66,7 +66,8 @@ public class PrivateMessageFolderDao imp
return privateMessageFolderId;
}
- public PrivateMessageFolder get(long id) {
+ @Override
+ public PrivateMessageFolder get(Long id) {
String hql = "select c from PrivateMessageFolder c where c.id =
:id ";
TypedQuery<PrivateMessageFolder> query = em.createQuery(hql,
PrivateMessageFolder.class);
@@ -81,12 +82,14 @@ public class PrivateMessageFolderDao imp
return folder;
}
+ @Override
public List<PrivateMessageFolder> get(int start, int count) {
return em.createQuery("SELECT c FROM PrivateMessageFolder c
ORDER BY c.id", PrivateMessageFolder.class)
.setFirstResult(start).setMaxResults(count)
.getResultList();
}
+ @Override
public PrivateMessageFolder update(PrivateMessageFolder folder, Long
userId) {
if (folder.getId() == 0) {
em.persist(folder);
@@ -112,21 +115,25 @@ public class PrivateMessageFolderDao imp
return null;
}
+ @Override
public void delete(PrivateMessageFolder folder, Long userId) {
folder = em.find(PrivateMessageFolder.class, folder.getId());
em.remove(folder);
}
+ @Override
public List<PrivateMessageFolder> get(String search, int start, int
count, String order) {
// TODO Auto-generated method stub
return null;
}
+ @Override
public long count() {
// TODO Auto-generated method stub
return 0;
}
+ @Override
public long count(String search) {
// TODO Auto-generated method stub
return 0;
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
Wed Dec 2 18:52:32 2015
@@ -116,6 +116,7 @@ public class UserDao implements IDataPro
return user;
}
+ @Override
public List<User> get(int first, int count) {
TypedQuery<User> q = em.createNamedQuery("getNondeletedUsers",
User.class);
q.setFirstResult(first);
@@ -161,12 +162,14 @@ public class UserDao implements IDataPro
return q.getResultList();
}
+ @Override
public long count() {
// get all users
TypedQuery<Long> q =
em.createNamedQuery("countNondeletedUsers", Long.class);
return q.getSingleResult();
}
+ @Override
public long count(String search) {
return count(search, false, -1);
}
@@ -202,6 +205,7 @@ public class UserDao implements IDataPro
return q.getResultList();
}
+ @Override
public User update(User u, Long userId) {
if (u.getGroupUsers() != null) {
for (GroupUser ou : u.getGroupUsers()) {
@@ -240,7 +244,8 @@ public class UserDao implements IDataPro
return u;
}
- public User get(long id) {
+ @Override
+ public User get(Long id) {
return get(id, false);
}
@@ -269,6 +274,7 @@ public class UserDao implements IDataPro
return u;
}
+ @Override
public void delete(User u, Long userId) {
if (u != null && u.getId() != null) {
for (GroupUser ou : u.getGroupUsers()){
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
Wed Dec 2 18:52:32 2015
@@ -61,8 +61,16 @@ public abstract class BasePanel extends
/**
* This method should be overridden to perform necessary cleanup:
remove timers etc.
*
- * @param target
+ * @param handler
*/
public void cleanup(IPartialPageRequestHandler handler) {
}
+
+ /**
+ * This method should be overridden to perform after "new message"
dialog was closed.
+ *
+ * @param handler
+ */
+ public void onNewMessageClose(IPartialPageRequestHandler handler) {
+ }
}
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
Wed Dec 2 18:52:32 2015
@@ -55,5 +55,7 @@
<div wicket:id="contents"><div wicket:id="child"></div></div>
<div wicket:id="chatPanel"></div>
<div wicket:id="aboutDialog"></div>
+ <div wicket:id="userInfoDialog"></div>
+ <div wicket:id="newMessageDialog"></div>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
Wed Dec 2 18:52:32 2015
@@ -24,10 +24,13 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.Application.getClientByKeys;
import static org.apache.openmeetings.web.app.Application.removeOnlineUser;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static
org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
+import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getParam;
import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_EDIT;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
import static org.apache.openmeetings.web.util.OmUrlFragment.getPanel;
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.util.ArrayList;
import java.util.List;
@@ -35,6 +38,7 @@ import java.util.List;
import org.apache.openmeetings.db.dao.basic.NavigationDao;
import org.apache.openmeetings.db.entity.basic.Naviglobal;
import org.apache.openmeetings.db.entity.basic.Navimain;
+import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.Client;
@@ -46,19 +50,27 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.common.menu.MenuPanel;
import org.apache.openmeetings.web.user.AboutDialog;
import org.apache.openmeetings.web.user.ChatPanel;
+import org.apache.openmeetings.web.user.profile.MessageDialog;
+import org.apache.openmeetings.web.user.profile.UserInfoDialog;
+import org.apache.openmeetings.web.util.ContactsHelper;
import org.apache.openmeetings.web.util.OmUrlFragment;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.devutils.debugbar.DebugBar;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.panel.EmptyPanel;
+import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
import org.apache.wicket.protocol.ws.api.message.ClosedMessage;
import org.apache.wicket.protocol.ws.api.message.ConnectedMessage;
@@ -69,16 +81,21 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
import org.wicketstuff.urlfragment.UrlFragment;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+
@AuthorizeInstantiation({"Admin", "Dashboard", "Room"})
public class MainPage extends BaseInitedPage {
private static final long serialVersionUID = 1L;
private static final Logger log =
Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
+ private final static String PARAM_USER_ID = "userId";
private final MenuPanel menu;
private final WebMarkupContainer topLinks = new
WebMarkupContainer("topLinks");
private final MarkupContainer contents;
private final AbstractAjaxTimerBehavior areaBehavior;
private final Component dev;
private final ChatPanel chat;
+ private final MessageDialog newMessage;
+ private final UserInfoDialog userInfo;
public MainPage(PageParameters pp) {
super();
@@ -132,6 +149,66 @@ public class MainPage extends BaseInited
topLinks.add(new ExternalLink("bug",
"https://issues.apache.org/jira/browse/OPENMEETINGS";));//FIXME hardcoded
add(chat = new ChatPanel("chatPanel"));
+ add(newMessage = new MessageDialog("newMessageDialog", new
CompoundPropertyModel<PrivateMessage>(new PrivateMessage())) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onOpen(IPartialPageRequestHandler
handler) {
+ super.onOpen(handler);
+ setDefaultModelObject(new
CompoundPropertyModel<PrivateMessage>(new PrivateMessage()));
+ }
+
+ @Override
+ public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
+ BasePanel bp = getCurrentPanel();
+ if (send.equals(button) && bp != null) {
+ bp.onNewMessageClose(handler);
+ }
+ }
+ });
+ add(userInfo = new UserInfoDialog("userInfoDialog",
newMessage));
+ add(new AbstractDefaultAjaxBehavior() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ userInfo.open(target, getParam(getComponent(),
PARAM_USER_ID).toLong());
+ }
+
+ @Override
+ public void renderHead(Component component,
IHeaderResponse response) {
+ super.renderHead(component, response);
+ response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("showUserInfo",
this, explicit(PARAM_USER_ID)), "showUserInfo")));
+ }
+ });
+ add(new AbstractDefaultAjaxBehavior() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+
ContactsHelper.addUserToContactList(getParam(getComponent(),
PARAM_USER_ID).toLong());
+ }
+
+ @Override
+ public void renderHead(Component component,
IHeaderResponse response) {
+ super.renderHead(component, response);
+ response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("addContact",
this, explicit(PARAM_USER_ID)), "addContact")));
+ }
+ });
+ add(new AbstractDefaultAjaxBehavior() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ newMessage.reset(true).open(target,
getParam(getComponent(), PARAM_USER_ID).toOptionalLong());
+ }
+
+ @Override
+ public void renderHead(Component component,
IHeaderResponse response) {
+ super.renderHead(component, response);
+ response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("privateMessage",
this, explicit(PARAM_USER_ID)), "privateMessage")));
+ }
+ });
add(new WebSocketBehavior() {
private static final long serialVersionUID = 1L;
@@ -189,12 +266,20 @@ public class MainPage extends BaseInited
updateContents(f, handler, true);
}
+ private BasePanel getCurrentPanel() {
+ Component prev = contents.get(CHILD_ID);
+ if (prev != null && prev instanceof BasePanel) {
+ return (BasePanel)prev;
+ }
+ return null;
+ }
+
public void updateContents(OmUrlFragment f, IPartialPageRequestHandler
handler, boolean updateFragment) {
BasePanel panel = getPanel(f.getArea(), f.getType());
if (panel != null) {
- Component prev = contents.get(CHILD_ID);
- if (prev != null && prev instanceof BasePanel) {
- ((BasePanel)prev).cleanup(handler);
+ BasePanel prev = getCurrentPanel();
+ if (prev != null) {
+ prev.cleanup(handler);
}
handler.add(contents.replace(panel));
if (updateFragment) {
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
Wed Dec 2 18:52:32 2015
@@ -33,6 +33,7 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.room.RoomPanel.PARAM_PORT;
import static org.apache.openmeetings.web.room.RoomPanel.PARAM_PROTOCOL;
import static org.apache.openmeetings.web.room.RoomPanel.PARAM_PUBLIC_SID;
+import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getParam;
import java.io.File;
import java.io.FileInputStream;
@@ -87,10 +88,6 @@ public class StartSharingEventBehavior e
getComponent().add(download);
}
- private String getParam(String name) {
- return
getComponent().getRequest().getRequestParameters().getParameterValue(name).toString();
- }
-
@Override
protected void respond(AjaxRequestTarget target) {
//TODO deny download in case other screen sharing is in progress
@@ -101,15 +98,15 @@ public class StartSharingEventBehavior e
String baseUrl = cfgDao.getBaseUrl();
URL url = new URL(baseUrl);
Room room = getBean(RoomDao.class).get(roomId);
- Client rc = getClient(getParam(PARAM_PUBLIC_SID));
+ Client rc = getClient(getParam(getComponent(),
PARAM_PUBLIC_SID).toString());
SessionManager sessionManager =
getBean(SessionManager.class);
String path = url.getPath();
path = path.substring(1, path.indexOf('/', 2) + 1);
- String port = getParam(PARAM_PORT);
+ String port = getParam(getComponent(),
PARAM_PORT).toString();
if (Strings.isEmpty(port)) {
cfgDao.getConfValue(CONFIG_FLASH_PORT,
String.class, "");
}
- String _protocol = getParam(PARAM_PROTOCOL);
+ String _protocol = getParam(getComponent(),
PARAM_PROTOCOL).toString();
if (Strings.isEmpty(_protocol)) {
_protocol =
cfgDao.getConfValue(CONFIG_FLASH_PROTOCOL, String.class, "");
}
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
Wed Dec 2 18:52:32 2015
@@ -80,7 +80,7 @@ public class MessageDialog extends Abstr
private static final long serialVersionUID = 1L;
private final Form<PrivateMessage> form;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
- DialogButton send = new DialogButton("send",
Application.getString(218));
+ protected DialogButton send = new DialogButton("send",
Application.getString(218));
private DialogButton cancel = new DialogButton("cancel",
Application.getString(219));
private final WebMarkupContainer roomParamsBlock = new
WebMarkupContainer("roomParamsBlock");
private final WebMarkupContainer roomParams = new
WebMarkupContainer("roomParams");
@@ -94,7 +94,7 @@ public class MessageDialog extends Abstr
return 650;
}
- public void open(IPartialPageRequestHandler handler, long userId) {
+ public void open(IPartialPageRequestHandler handler, Long userId) {
getModelObject().setTo(getBean(UserDao.class).get(userId));
open(handler);
}
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
Wed Dec 2 18:52:32 2015
@@ -24,7 +24,7 @@
<table class="messages">
<tr>
<td class="side left">
- <div class="email new clickable"
wicket:id="new" wicket:message="title:1208"><wicket:message key="1207"/></div>
+ <div class="email new clickable"
onclick="privateMessage();" wicket:message="title:1208"><wicket:message
key="1207"/></div>
<div wicket:id="folders">
<div wicket:id="inbox"><wicket:message
key="1222"/></div>
<div wicket:id="sent"><wicket:message
key="1223"/></div>
@@ -120,7 +120,5 @@
</tr>
</table>
<div wicket:id="addFolder"></div>
- <div wicket:id="newMessage"></div>
- <div wicket:id="infoDialog"></div>
</wicket:panel>
</html>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Wed Dec 2 18:52:32 2015
@@ -73,7 +73,6 @@ import org.apache.wicket.markup.html.lis
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.util.ListModel;
@@ -81,7 +80,6 @@ import org.apache.wicket.model.util.List
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
import
com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTableBehavior;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import ro.fortsoft.wicket.dashboard.web.util.ConfirmAjaxCallListener;
@@ -107,7 +105,6 @@ public class MessagesContactsPanel exten
private final WebMarkupContainer roomContainer = new
WebMarkupContainer("roomContainer");
private final WebMarkupContainer buttons = new
WebMarkupContainer("buttons");
private final WebMarkupContainer contacts = new
WebMarkupContainer("contacts");
- private final MessageDialog newMessage;
private final DataViewContainer<PrivateMessage> dataContainer;
private final Set<Long> selectedMessages = new HashSet<Long>();
private final Set<Long> allMessages = new HashSet<Long>();
@@ -263,16 +260,6 @@ public class MessagesContactsPanel exten
NOT_MOVE_FOLDER.setFolderName(Application.getString(1243));
foldersModel.setObject(getBean(PrivateMessageFolderDao.class).get(0,
Integer.MAX_VALUE));
updateMoveModel();
- add(newMessage = new MessageDialog("newMessage", new
CompoundPropertyModel<PrivateMessage>(new PrivateMessage())) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
- if (send.equals(button)) {
- handler.add(container);
- }
- }
- });
final AddFolderDialog addFolder = new
AddFolderDialog("addFolder") {
private static final long serialVersionUID = 1L;
@@ -288,14 +275,7 @@ public class MessagesContactsPanel exten
}
};
add(addFolder);
- add(new WebMarkupContainer("new").add(new
AjaxEventBehavior("click") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onEvent(AjaxRequestTarget target) {
- newMessage.reset(true).open(target);
- }
- }).add(new JQueryBehavior(".email.new", "button")));
+ add(new JQueryBehavior(".email.new", "button"));
folders.add(inbox.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -556,7 +536,6 @@ public class MessagesContactsPanel exten
return Model.of(object);
}
};
- final UserInfoDialog d = new UserInfoDialog("infoDialog",
newMessage);
final DataView<UserContact> dw = new
DataView<UserContact>("users", dp) {
private static final long serialVersionUID = 1L;
@@ -591,22 +570,8 @@ public class MessagesContactsPanel exten
updateContacts(target);
}
}).setVisible(uc.isPending()));
- item.add(new WebMarkupContainer("view").add(new
AjaxEventBehavior("click") {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onEvent(AjaxRequestTarget target) {
- d.open(target, userId);
- }
- }));
- item.add(new
WebMarkupContainer("message").add(new AjaxEventBehavior("click") {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onEvent(AjaxRequestTarget target) {
-
newMessage.reset(true).open(target, userId);
- }
- }).setVisible(!uc.isPending()));
+ item.add(new
WebMarkupContainer("view").add(AttributeAppender.append("onclick",
String.format("showUserInfo(%s);", userId))));
+ item.add(new
WebMarkupContainer("message").add(AttributeAppender.append("onclick",
String.format("privateMessage(%s);", userId))).setVisible(!uc.isPending()));
item.add(new
WebMarkupContainer("delete").add(new AjaxEventBehavior("click") {
private static final long
serialVersionUID = 1L;
@@ -619,7 +584,7 @@ public class MessagesContactsPanel exten
}
};
updateContacts(null);
- add(d, contacts.add(dw, pendingContacts,
allContacts).setOutputMarkupId(true));//TODO update
+ add(contacts.add(dw, pendingContacts,
allContacts).setOutputMarkupId(true));//TODO update
//hack to add FixedHeaderTable after Tabs.
add(new AbstractDefaultAjaxBehavior() {
@@ -640,6 +605,11 @@ public class MessagesContactsPanel exten
}
@Override
+ public void onNewMessageClose(IPartialPageRequestHandler handler) {
+ handler.add(container);
+ }
+
+ @Override
protected void onDetach() {
foldersModel.detach();
selectedFolderModel.detach();
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
Wed Dec 2 18:52:32 2015
@@ -32,7 +32,7 @@
<div><wicket:message key="1178"/></div>
<input type="text"
wicket:id="search"/><br/>
<br/>
- <input type="submit"
wicket:message="value:1176"/>
+ <button wicket:id="submit"
type="button"><wicket:message key="1176"/></button>
</form>
</td>
<td valign="top">
@@ -64,7 +64,5 @@
</td>
</tr>
</table>
- <div wicket:id="infoDialog"></div>
- <div wicket:id="newMessage"></div>
</wicket:panel>
</html>
\ No newline at end of file
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Wed Dec 2 18:52:32 2015
@@ -29,16 +29,13 @@ import java.util.List;
import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.web.common.PagingNavigatorPanel;
import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.openmeetings.web.util.ContactsHelper;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -52,8 +49,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
import
com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTableBehavior;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class UserSearchPanel extends UserPanel {
private static final long serialVersionUID = 1L;
@@ -64,7 +61,6 @@ public class UserSearchPanel extends Use
private String orderBy = "u.firstname";
private boolean asc = true;
private boolean searched = false;
- private final MessageDialog newMessage;
private final WebMarkupContainer container = new
WebMarkupContainer("container");
private final FixedHeaderTableBehavior fixedHeader = new
FixedHeaderTableBehavior("#searchUsersTable", new Options("height", 400));
@@ -81,27 +77,17 @@ public class UserSearchPanel extends Use
add(new TextField<String>("text", new
PropertyModel<String>(UserSearchPanel.this, "text")));
add(new TextField<String>("offer", new
PropertyModel<String>(UserSearchPanel.this, "offer")));
add(new TextField<String>("search", new
PropertyModel<String>(UserSearchPanel.this, "search")));
- add(new AjaxFormSubmitBehavior(this, "submit") {
+ add(new AjaxButton("submit") {
private static final long
serialVersionUID = 1L;
@Override
- protected void
onSubmit(AjaxRequestTarget target) {
+ protected void
onSubmit(AjaxRequestTarget target, Form<?> form) {
searched = true;
refresh(target);
}
});
}
});
- add(newMessage = new MessageDialog("newMessage", new
CompoundPropertyModel<PrivateMessage>(new PrivateMessage())) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
- if (send.equals(button)) {
- refresh(handler);
- }
- }
- });
IDataProvider<User> dp = new IDataProvider<User>() {
private static final long serialVersionUID = 1L;
@@ -122,8 +108,7 @@ public class UserSearchPanel extends Use
}
};
- final UserInfoDialog d = new UserInfoDialog("infoDialog",
newMessage);
- final DataView<User> dv = new DataView<User>("users", dp) {
+ final DataView<User> dw = new DataView<User>("users", dp) {
private static final long serialVersionUID = 1L;
@Override
@@ -136,36 +121,15 @@ public class UserSearchPanel extends Use
item.add(new Label("tz",
getBean(TimezoneUtil.class).getTimeZone(u).getID()));
item.add(new Label("offer", u.getUserOffers()));
item.add(new Label("search",
u.getUserSearchs()));
- item.add(new WebMarkupContainer("view").add(new
AjaxEventBehavior("click") {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onEvent(AjaxRequestTarget target) {
- d.open(target, userId);
- }
- }));
- item.add(new WebMarkupContainer("add").add(new
AjaxEventBehavior("click") {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onEvent(AjaxRequestTarget target) {
-
ContactsHelper.addUserToContactList(userId);
- refresh(target);
- }
- }).setVisible(userId != getUserId() &&
!contactsDao.isContact(userId, getUserId())));
- item.add(new
WebMarkupContainer("message").add(new AjaxEventBehavior("click") {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onEvent(AjaxRequestTarget target) {
-
newMessage.reset(true).open(target, userId);
- }
- })).setVisible(userId != getUserId());
+ item.add(new
WebMarkupContainer("view").add(AttributeAppender.append("onclick",
String.format("showUserInfo(%s);", userId))));
+ item.add(new
WebMarkupContainer("add").setVisible(userId != getUserId() &&
!contactsDao.isContact(userId, getUserId()))
+
.add(AttributeAppender.append("onclick", String.format("addContact(%s);",
userId))));
+ item.add(new
WebMarkupContainer("message").setVisible(userId !=
getUserId()).add(AttributeAppender.append("onclick",
String.format("privateMessage(%s);", userId))));
//item.add(new TooltipBehavior(new
Options("content", "TODO:: Picture will be displayed"))); //FIXME
}
};
- add(d, container.add(dv, new PagingNavigatorPanel("navigator",
dv, itemsPerPage, 100) {
+ add(container.add(dw, new PagingNavigatorPanel("navigator", dw,
itemsPerPage, 100) {
private static final long serialVersionUID = 1L;
@Override
@@ -178,5 +142,9 @@ public class UserSearchPanel extends Use
private String getName(User u) {
return "" + u.getFirstname() + " " + u.getLastname() + " [" +
u.getLogin() + "]"; //FIXME salutation
}
-
+
+ @Override
+ public void onNewMessageClose(IPartialPageRequestHandler handler) {
+ refresh(handler);
+ }
}
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
Wed Dec 2 18:52:32 2015
@@ -16,11 +16,12 @@
*/
package org.apache.openmeetings.web.util;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.attributes.CallbackParameter;
+import org.apache.wicket.util.string.StringValue;
public class CallbackFunctionHelper {
-
public static StringBuilder getNamedFunction(String name,
AbstractDefaultAjaxBehavior b, CallbackParameter... extraParameters) {
StringBuilder sb = new StringBuilder();
sb.append("function ").append(name).append("(");
@@ -41,4 +42,8 @@ public class CallbackFunctionHelper {
sb.append("}\n");
return sb;
}
+
+ public static StringValue getParam(Component cmp, String name) {
+ return
cmp.getRequest().getRequestParameters().getParameterValue(name);
+ }
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Wed Dec 2 18:52:32 2015
@@ -93,15 +93,15 @@ public class MainService implements IPen
* gets a user by its SID
*
* @param SID
- * @param USER_ID
+ * @param userId
* @return - user with SID given
*/
- public User getUser(String SID, int USER_ID) {
+ public User getUser(String SID, long userId) {
User users = new User();
Long users_id = sessiondataDao.checkSession(SID);
Set<Right> rights = userDao.getRights(users_id);
if (AuthLevelUtil.hasAdminLevel(rights) ||
AuthLevelUtil.hasWebServiceLevel(rights)) {
- users = userDao.get(USER_ID);
+ users = userDao.get(userId);
} else {
users.setFirstname("No rights to do this");
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
Wed Dec 2 18:52:32 2015
@@ -37,7 +37,7 @@ public interface IDataProviderDao<T exte
* @param id - id of instance to retrieve
* @return instance with the id gived
*/
- T get(long id);
+ T get(Long id);
/**
* Get a list of instances of {@link T}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
Wed Dec 2 18:52:32 2015
@@ -192,7 +192,8 @@ public class ConfigurationDao implements
return val;
}
- public Configuration get(long id) {
+ @Override
+ public Configuration get(Long id) {
if (id <= 0) {
return null;
}
@@ -200,11 +201,13 @@ public class ConfigurationDao implements
.setParameter("id", id).getSingleResult();
}
+ @Override
public List<Configuration> get(int start, int count) {
return em.createNamedQuery("getNondeletedConfiguration",
Configuration.class)
.setFirstResult(start).setMaxResults(count).getResultList();
}
+ @Override
public List<Configuration> get(String search, int start, int count,
String sort) {
TypedQuery<Configuration> q =
em.createQuery(DaoHelper.getSearchQuery("Configuration", "c", search, true,
false, sort, searchFields), Configuration.class);
q.setFirstResult(start);
@@ -212,15 +215,18 @@ public class ConfigurationDao implements
return q.getResultList();
}
+ @Override
public long count() {
return em.createNamedQuery("countConfigurations",
Long.class).getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Configuration", "c", search, true,
true, null, searchFields), Long.class);
return q.getSingleResult();
}
+ @Override
public Configuration update(Configuration entity, Long userId) {
return update(entity, userId, false);
}
@@ -251,6 +257,7 @@ public class ConfigurationDao implements
return entity;
}
+ @Override
public void delete(Configuration entity, Long userId) {
entity.setUpdated(new Date());
this.update(entity, userId, true);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
Wed Dec 2 18:52:32 2015
@@ -34,24 +34,29 @@ public class MailMessageDao implements
@PersistenceContext
private EntityManager em;
- public MailMessage get(long id) {
+ @Override
+ public MailMessage get(Long id) {
return em.createNamedQuery("getMailMessageById",
MailMessage.class).setParameter("id", id).getSingleResult();
}
+ @Override
public List<MailMessage> get(int start, int count) {
return em.createNamedQuery("getMailMessages",
MailMessage.class).setParameter("status", Status.NONE)
.setFirstResult(start).setMaxResults(count).getResultList();
}
+ @Override
public List<MailMessage> get(String search, int start, int count,
String order) {
return get(start, count);
}
+ @Override
public long count() {
return em.createNamedQuery("countMailMessages",
Long.class).setParameter("status", Status.NONE)
.getSingleResult();
}
+ @Override
public long count(String search) {
return count();
}
@@ -65,6 +70,7 @@ public class MailMessageDao implements
.executeUpdate();
}
+ @Override
public MailMessage update(MailMessage m, Long userId) {
if (m.getId() == null) {
m.setInserted(Calendar.getInstance());
@@ -76,6 +82,7 @@ public class MailMessageDao implements
return m;
}
+ @Override
public void delete(MailMessage m, Long userId) {
em.remove(m);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
Wed Dec 2 18:52:32 2015
@@ -293,7 +293,7 @@ public class LabelDao implements IDataPr
}
@Override
- public StringLabel get(long id) {
+ public StringLabel get(Long id) {
return null;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
Wed Dec 2 18:52:32 2015
@@ -59,7 +59,8 @@ public class RoomDao implements IDataPro
@Autowired
private TimezoneUtil timezoneUtil;
- public Room get(long id) {
+ @Override
+ public Room get(Long id) {
TypedQuery<Room> q = em.createNamedQuery("getRoomById",
Room.class);
q.setParameter("id", id);
@SuppressWarnings("unchecked")
@@ -81,6 +82,7 @@ public class RoomDao implements IDataPro
return em.createNamedQuery("getRoomsByIds",
Room.class).setParameter("ids", ids).getResultList();
}
+ @Override
public List<Room> get(int start, int count) {
TypedQuery<Room> q = em.createNamedQuery("getNondeletedRooms",
Room.class);
q.setFirstResult(start);
@@ -88,6 +90,7 @@ public class RoomDao implements IDataPro
return q.getResultList();
}
+ @Override
public List<Room> get(String search, int start, int count, String sort)
{
TypedQuery<Room> q =
em.createQuery(DaoHelper.getSearchQuery("Room", "r", search, true, false, sort,
searchFields), Room.class);
q.setFirstResult(start);
@@ -95,11 +98,13 @@ public class RoomDao implements IDataPro
return q.getResultList();
}
+ @Override
public long count() {
TypedQuery<Long> q = em.createNamedQuery("countRooms",
Long.class);
return q.getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Room", "r", search, true, true, null,
searchFields), Long.class);
return q.getSingleResult();
@@ -164,6 +169,7 @@ public class RoomDao implements IDataPro
return null;
}
+ @Override
public Room update(Room entity, Long userId) {
if (entity.getId() == null) {
entity.setInserted(new Date());
@@ -186,6 +192,7 @@ public class RoomDao implements IDataPro
return entity;
}
+ @Override
public void delete(Room entity, Long userId) {
entity.setDeleted(true);
entity.setSipEnabled(false);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
Wed Dec 2 18:52:32 2015
@@ -149,7 +149,8 @@ public class LdapConfigDao implements ID
return -1L;
}
- public LdapConfig get(long id) {
+ @Override
+ public LdapConfig get(Long id) {
try {
TypedQuery<LdapConfig> query =
em.createNamedQuery("getLdapConfigById", LdapConfig.class);
@@ -192,6 +193,7 @@ public class LdapConfigDao implements ID
return result;
}
+ @Override
public List<LdapConfig> get(int start, int count) {
TypedQuery<LdapConfig> q =
em.createNamedQuery("getNondeletedLdapConfigs", LdapConfig.class);
q.setFirstResult(start);
@@ -199,6 +201,7 @@ public class LdapConfigDao implements ID
return q.getResultList();
}
+ @Override
public List<LdapConfig> get(String search, int start, int count, String
sort) {
TypedQuery<LdapConfig> q =
em.createQuery(DaoHelper.getSearchQuery("LdapConfig", "lc", search, true,
false, sort, searchFields), LdapConfig.class);
q.setFirstResult(start);
@@ -206,6 +209,7 @@ public class LdapConfigDao implements ID
return q.getResultList();
}
+ @Override
public long count() {
try {
TypedQuery<Long> query =
em.createNamedQuery("countNondeletedLdapConfigs", Long.class);
@@ -218,11 +222,13 @@ public class LdapConfigDao implements ID
return 0L;
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("LdapConfig", "lc", search, true, true,
null, searchFields), Long.class);
return q.getSingleResult();
}
+ @Override
public LdapConfig update(LdapConfig entity, Long userId) {
try {
if (entity.getId() == null) {
@@ -246,6 +252,7 @@ public class LdapConfigDao implements ID
return entity;
}
+ @Override
public void delete(LdapConfig entity, Long userId) {
if (entity.getId() != null) {
entity.setUpdated(new Date());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
Wed Dec 2 18:52:32 2015
@@ -42,7 +42,8 @@ public class OAuth2Dao implements IDataP
return query.getResultList();
}
- public OAuthServer get(long id) {
+ @Override
+ public OAuthServer get(Long id) {
TypedQuery<OAuthServer> query =
em.createNamedQuery("getOAuthServerById", OAuthServer.class);
query.setParameter("id", id);
OAuthServer result = null;
@@ -52,6 +53,7 @@ public class OAuth2Dao implements IDataP
return result;
}
+ @Override
public List<OAuthServer> get(int start, int count) {
TypedQuery<OAuthServer> query =
em.createNamedQuery("getAllOAuthServers", OAuthServer.class);
query.setFirstResult(start);
@@ -59,6 +61,7 @@ public class OAuth2Dao implements IDataP
return query.getResultList();
}
+ @Override
public List<OAuthServer> get(String search, int start, int count,
String order) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true,
false, null, searchFields), Long.class);
q.setFirstResult(start);
@@ -66,16 +69,19 @@ public class OAuth2Dao implements IDataP
return null;
}
+ @Override
public long count() {
TypedQuery<Long> q = em.createNamedQuery("countOAuthServers",
Long.class);
return q.getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("OAuthServer", "s", search, true, true,
null, searchFields), Long.class);
return q.getSingleResult();
}
+ @Override
public OAuthServer update(OAuthServer server, Long userId) {
if (server.getId() == null) {
em.persist(server);
@@ -85,6 +91,7 @@ public class OAuth2Dao implements IDataP
return server;
}
+ @Override
public void delete(OAuthServer server, Long userId) {
server.setDeleted(true);
update(server, userId);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
Wed Dec 2 18:52:32 2015
@@ -72,6 +72,7 @@ public class ServerDao implements IDataP
*
* @see org.apache.openmeetings.data.OmDAO#get(int, int)
*/
+ @Override
public List<Server> get(int start, int max) {
TypedQuery<Server> q = em.createNamedQuery("getAllServers",
Server.class);
q.setFirstResult(start);
@@ -79,6 +80,7 @@ public class ServerDao implements IDataP
return q.getResultList();
}
+ @Override
public List<Server> get(String search, int start, int count, String
order) {
TypedQuery<Server> q = em.createQuery(DaoHelper.getSearchQuery(
"Server", "s", search, true, false, order,
searchFields),
@@ -104,6 +106,7 @@ public class ServerDao implements IDataP
*
* @see org.apache.openmeetings.data.OmDAO#count()
*/
+ @Override
public long count() {
log.debug("getServerCount enter");
TypedQuery<Long> q = em.createNamedQuery("getServerCount",
Long.class);
@@ -111,6 +114,7 @@ public class ServerDao implements IDataP
return q.getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Server",
"s", search, true, true, null, searchFields),
Long.class);
@@ -122,7 +126,8 @@ public class ServerDao implements IDataP
*
* @see org.apache.openmeetings.data.OmDAO#get(long)
*/
- public Server get(long id) {
+ @Override
+ public Server get(Long id) {
Server result = null;
log.debug("getServer enter, id = " + id);
TypedQuery<Server> q = em.createNamedQuery("getServerById",
@@ -158,6 +163,7 @@ public class ServerDao implements IDataP
*
org.apache.openmeetings.data.OmDAO#update(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
+ @Override
public Server update(Server entity, Long userId) {
entity.setDeleted(false);
if (entity.getId() > 0) {
@@ -183,6 +189,7 @@ public class ServerDao implements IDataP
*
org.apache.openmeetings.data.OmDAO#delete(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
+ @Override
public void delete(Server entity, Long userId) {
if (entity.getId() > 0) {
entity.setUpdated(new Date());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
Wed Dec 2 18:52:32 2015
@@ -38,7 +38,8 @@ public class GroupDao implements IDataPr
@PersistenceContext
private EntityManager em;
- public Group get(long id) {
+ @Override
+ public Group get(Long id) {
TypedQuery<Group> query = em.createNamedQuery("getGroupById",
Group.class);
query.setParameter("id", id);
Group o = null;
@@ -55,6 +56,7 @@ public class GroupDao implements IDataPr
return groups == null || groups.isEmpty() ? null :
groups.get(0);
}
+ @Override
public List<Group> get(int start, int count) {
TypedQuery<Group> q =
em.createNamedQuery("getNondeletedGroups", Group.class);
q.setFirstResult(start);
@@ -62,6 +64,7 @@ public class GroupDao implements IDataPr
return q.getResultList();
}
+ @Override
public List<Group> get(String search, int start, int count, String
sort) {
TypedQuery<Group> q =
em.createQuery(DaoHelper.getSearchQuery("Group", "o", search, true, false,
sort, searchFields), Group.class);
q.setFirstResult(start);
@@ -69,11 +72,13 @@ public class GroupDao implements IDataPr
return q.getResultList();
}
+ @Override
public long count() {
TypedQuery<Long> q = em.createNamedQuery("countGroups",
Long.class);
return q.getSingleResult();
}
+ @Override
public long count(String search) {
TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Group", "o", search, true, true, null,
searchFields), Long.class);
return q.getSingleResult();
@@ -83,6 +88,7 @@ public class GroupDao implements IDataPr
return em.createNamedQuery("getGroupsByIds",
Group.class).setParameter("ids", ids).getResultList();
}
+ @Override
public Group update(Group entity, Long userId) {
if (entity.getId() == null) {
if (userId != null) {
@@ -100,6 +106,7 @@ public class GroupDao implements IDataPr
return entity;
}
+ @Override
public void delete(Group entity, Long userId) {
em.createNamedQuery("deleteUsersFromGroup")
.setParameter("id", entity.getId())
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
Wed Dec 2 18:52:32 2015
@@ -40,16 +40,19 @@ public class GroupUserDao implements IDa
private UserDao userDao;
public final static String[] searchFields = {"user.lastname",
"user.firstname", "user.login", "user.address.email"};
- public GroupUser get(long id) {
+ @Override
+ public GroupUser get(Long id) {
TypedQuery<GroupUser> q =
em.createNamedQuery("getGroupUsersById", GroupUser.class);
q.setParameter("id", id);
return q.getSingleResult();
}
+ @Override
public List<GroupUser> get(int start, int count) {
throw new RuntimeException("Should not be used");
}
+ @Override
public List<GroupUser> get(String search, int start, int count, String
sort) {
throw new RuntimeException("Should not be used");
}
@@ -88,10 +91,12 @@ public class GroupUserDao implements IDa
.setParameter("groupId",
groupId).setParameter("userId", userId).getResultList().size() > 0;
}
+ @Override
public long count() {
throw new RuntimeException("Should not be used");
}
+ @Override
public long count(String search) {
throw new RuntimeException("Should not be used");
}
@@ -113,6 +118,7 @@ public class GroupUserDao implements IDa
}
}
+ @Override
public GroupUser update(GroupUser entity, Long userId) {
if (entity.getId() == null) {
entity.setInserted(new Date());
@@ -138,6 +144,7 @@ public class GroupUserDao implements IDa
userDao.update(u, userId);
}
+ @Override
public void delete(GroupUser entity, Long userId) {
if (entity.getId() != null) {
updateUser(entity, true, userId);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java?rev=1717669&r1=1717668&r2=1717669&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
Wed Dec 2 18:52:32 2015
@@ -75,13 +75,15 @@ public class PrivateMessageDao implement
return null;
}
+ @Override
public List<PrivateMessage> get(int first, int count) {
return em.createNamedQuery("getPrivateMessages",
PrivateMessage.class)
.setFirstResult(first).setMaxResults(count)
.getResultList();
}
- public PrivateMessage get(long id) {
+ @Override
+ public PrivateMessage get(Long id) {
TypedQuery<PrivateMessage> query =
em.createNamedQuery("getPrivateMessageById", PrivateMessage.class);
query.setParameter("id", id);
PrivateMessage privateMessage = null;
@@ -92,6 +94,7 @@ public class PrivateMessageDao implement
return privateMessage;
}
+ @Override
public PrivateMessage update(PrivateMessage entity, Long userId) {
if (entity.getId() == null) {
entity.setInserted(new Date());
@@ -172,23 +175,26 @@ public class PrivateMessageDao implement
.setParameter("roomId", roomId).getResultList();
}
+ @Override
public List<PrivateMessage> get(String search, int start, int count,
String order) {
// TODO Auto-generated method stub
return null;
}
+ @Override
public long count() {
// TODO Auto-generated method stub
return 0;
}
+ @Override
public long count(String search) {
// TODO Auto-generated method stub
return 0;
}
+ @Override
public void delete(PrivateMessage entity, Long userId) {
// TODO Auto-generated method stub
-
}
}
