You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/04/05 07:48:40 UTC
svn commit: r1737775 [2/2] - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
branches/3.1.x/o...
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Tue Apr 5 05:48:39 2016
@@ -29,6 +29,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.openmeetings.core.data.conference.RoomManager;
@@ -181,10 +182,15 @@ public class ScopeApplicationAdapter ext
SessionVariablesUtil.setIsScreenClient(conn.getClient());
rcm.setUserId(parentClient.getUserId());
- SessionVariablesUtil.setUserId(conn.getClient(), rcm.getUserId());
+ Long uid = rcm.getUserId();
+ SessionVariablesUtil.setUserId(conn.getClient(), uid);
rcm.setStreamPublishName(parentSid);
- User u = userDao.get(rcm.getUserId() != null && rcm.getUserId() < 0 ? -rcm.getUserId() : rcm.getUserId());
+ User u = null;
+ if (uid != null) {
+ long _uid = uid.longValue();
+ u = userDao.get(_uid < 0 ? -_uid : _uid);
+ }
if (u != null) {
rcm.setUsername(u.getLogin());
rcm.setFirstname(u.getFirstname());
@@ -211,7 +217,7 @@ public class ScopeApplicationAdapter ext
if (client != null) {
boolean changed = false;
- if (Boolean.valueOf("" + map.get("stopStreaming")) && client.isStartStreaming()) {
+ if (Boolean.parseBoolean("" + map.get("stopStreaming")) && client.isStartStreaming()) {
changed = true;
client.setStartStreaming(false);
//Send message to all users
@@ -219,7 +225,7 @@ public class ScopeApplicationAdapter ext
returnMap.put("result", "stopSharingOnly");
}
- if (Boolean.valueOf("" + map.get("stopRecording")) && client.getIsRecording()) {
+ if (Boolean.parseBoolean("" + map.get("stopRecording")) && client.getIsRecording()) {
changed = true;
client.setStartRecording(false);
client.setIsRecording(false);
@@ -230,7 +236,7 @@ public class ScopeApplicationAdapter ext
recordingService.stopRecordAndSave(current.getScope(), client, null);
}
- if (Boolean.valueOf("" + map.get("stopPublishing")) && client.isScreenPublishStarted()) {
+ if (Boolean.parseBoolean("" + map.get("stopPublishing")) && client.isScreenPublishStarted()) {
changed = true;
client.setScreenPublishStarted(false);
returnMap.put("result", "stopPublishingOnly");
@@ -293,9 +299,9 @@ public class ScopeApplicationAdapter ext
Client client = sessionManager.getClientByStreamId(current.getClient().getId(), null);
if (client != null) {
- boolean startRecording = Boolean.valueOf("" + map.get("startRecording"));
- boolean startStreaming = Boolean.valueOf("" + map.get("startStreaming"));
- boolean startPublishing = Boolean.valueOf("" + map.get("startPublishing")) && (0 == sessionManager.getPublishingCount(client.getRoomId()));
+ boolean startRecording = Boolean.parseBoolean("" + map.get("startRecording"));
+ boolean startStreaming = Boolean.parseBoolean("" + map.get("startStreaming"));
+ boolean startPublishing = Boolean.parseBoolean("" + map.get("startPublishing")) && (0 == sessionManager.getPublishingCount(client.getRoomId()));
boolean alreadyStreaming = client.isStartStreaming();
if (startStreaming) {
@@ -365,36 +371,35 @@ public class ScopeApplicationAdapter ext
return null;
}
- public synchronized List<Integer> listRoomBroadcast() {
- HashSet<Integer> broadcastList = new HashSet<Integer>();
- IConnection current = Red5.getConnectionLocal();
- String streamid = current.getClient().getId();
- for (IConnection conn : current.getScope().getClientConnections()) {
- if (conn != null) {
- Client rcl = sessionManager.getClientByStreamId(conn.getClient().getId(), null);
- if (rcl == null) {
- // continue;
- } else if (rcl.isScreenClient()) {
- // continue;
- } else {
- if (!streamid.equals(rcl.getStreamid())) {
- // It is not needed to send back
- // that event to the actuall
- // Moderator
- // as it will be already triggered
- // in the result of this Function
- // in the Client
- int id = (int)rcl.getBroadCastID();
- if (!broadcastList.contains(id)) {
- broadcastList.add(id);
- }
- }
- }
- }
- }
- return new ArrayList<Integer>(broadcastList);
- }
-
+ public List<Long> listRoomBroadcast() {
+ Set<Long> broadcastList = new HashSet<>();
+ IConnection current = Red5.getConnectionLocal();
+ String streamid = current.getClient().getId();
+ for (IConnection conn : current.getScope().getClientConnections()) {
+ if (conn != null) {
+ Client rcl = sessionManager.getClientByStreamId(conn.getClient().getId(), null);
+ if (rcl == null) {
+ // continue;
+ } else if (rcl.isScreenClient()) {
+ // continue;
+ } else {
+ if (!streamid.equals(rcl.getStreamid())) {
+ // It is not needed to send back
+ // that event to the actuall
+ // Moderator
+ // as it will be already triggered
+ // in the result of this Function
+ // in the Client
+ Long id = Long.valueOf(rcl.getBroadCastID());
+ if (!broadcastList.contains(id)) {
+ broadcastList.add(id);
+ }
+ }
+ }
+ }
+ }
+ return new ArrayList<Long>(broadcastList);
+ }
/**
* this function is invoked directly after initial connecting
@@ -686,7 +691,7 @@ public class ScopeApplicationAdapter ext
* @return void
*
*/
- private synchronized void sendClientBroadcastNotifications(IBroadcastStream stream, String clientFunction, Client rc) {
+ private void sendClientBroadcastNotifications(IBroadcastStream stream, String clientFunction, Client rc) {
try {
// Store the local so that we do not send notification to ourself back
IConnection current = Red5.getConnectionLocal();
@@ -764,7 +769,7 @@ public class ScopeApplicationAdapter ext
* @param publicSID
* @return -1
*/
- public synchronized Long addModerator(String publicSID) {
+ public long addModerator(String publicSID) {
try {
log.debug("----------- addModerator: " + publicSID);
@@ -806,7 +811,7 @@ public class ScopeApplicationAdapter ext
}
}
- public Long removeModerator(String publicSID) {
+ public long removeModerator(String publicSID) {
try {
log.debug("----------- removeModerator: " + publicSID);
@@ -830,7 +835,7 @@ public class ScopeApplicationAdapter ext
return -1L;
}
- public Long setBroadCastingFlag(String publicSID, boolean value, boolean canVideo, Integer interviewPodId) {
+ public long setBroadCastingFlag(String publicSID, boolean value, boolean canVideo, Integer interviewPodId) {
try {
log.debug("----------- setBroadCastingFlag: " + publicSID);
@@ -855,7 +860,7 @@ public class ScopeApplicationAdapter ext
return -1L;
}
- public Long giveExclusiveAudio(String publicSID) {
+ public long giveExclusiveAudio(String publicSID) {
try {
log.debug("----------- giveExclusiveAudio: " + publicSID);
@@ -895,7 +900,7 @@ public class ScopeApplicationAdapter ext
return -1L;
}
- public Long switchMicMuted(String publicSID, boolean mute) {
+ public long switchMicMuted(String publicSID, boolean mute) {
try {
log.debug("----------- switchMicMuted: " + publicSID);
@@ -941,7 +946,7 @@ public class ScopeApplicationAdapter ext
* @return Long 1 => means get Moderation, 2 => ask Moderator for
* Moderation, 3 => wait for Moderator
*/
- public synchronized Long applyForModeration(String publicSID) {
+ public long applyForModeration(String publicSID) {
try {
Client currentClient = sessionManager.getClientByPublicSID(publicSID, null);
if (currentClient == null) {
@@ -1044,7 +1049,7 @@ public class ScopeApplicationAdapter ext
/*
* checks if the user is allowed to apply for Moderation
*/
- public Boolean checkRoomValues(Long roomId) {
+ public boolean checkRoomValues(Long roomId) {
try {
// appointed meeting or moderated Room?
@@ -1106,7 +1111,7 @@ public class ScopeApplicationAdapter ext
* @param colorObj - some color
* @return RoomStatus object
*/
- public synchronized RoomStatus setRoomValues(Long roomId, Boolean becomeModerator, Boolean isSuperModerator, String colorObj) {
+ public RoomStatus setRoomValues(Long roomId, boolean becomeModerator, boolean isSuperModerator, String colorObj) {
try {
log.debug("----------- setRoomValues");
IConnection current = Red5.getConnectionLocal();
@@ -1133,10 +1138,10 @@ public class ScopeApplicationAdapter ext
sessionManager.updateClientByStreamId(streamid, currentClient, true, null);
- Room room = roomDao.get(roomId);
- if (room.getShowMicrophoneStatus()) {
- currentClient.setCanGiveAudio(true);
- }
+ Room room = roomDao.get(roomId);
+ if (room.getShowMicrophoneStatus()) {
+ currentClient.setCanGiveAudio(true);
+ }
// Log the User
conferenceLogDao.add(ConferenceLog.Type.roomEnter,
@@ -1785,7 +1790,7 @@ public class ScopeApplicationAdapter ext
* @param clientId
* @return 1 in case of success, -1 otherwise
*/
- public synchronized int sendMessageById(Object newMessage, String clientId, IScope scope) {
+ public int sendMessageById(Object newMessage, String clientId, IScope scope) {
try {
log.debug("### sendMessageById ###" + clientId);
@@ -1816,7 +1821,7 @@ public class ScopeApplicationAdapter ext
* @param clientId
* @return 1 in case of no exceptions, -1 otherwise
*/
- public synchronized int sendMessageWithClientById(Object newMessage, String clientId) {
+ public int sendMessageWithClientById(Object newMessage, String clientId) {
try {
IConnection current = Red5.getConnectionLocal();
Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null);
@@ -1838,7 +1843,7 @@ public class ScopeApplicationAdapter ext
return 1;
}
- public synchronized void sendMessageWithClientByPublicSID(Object message, String publicSID) {
+ public void sendMessageWithClientByPublicSID(Object message, String publicSID) {
try {
// ApplicationContext appCtx = getContext().getApplicationContext();
IScope globalScope = getContext().getGlobalScope();
@@ -1999,7 +2004,7 @@ public class ScopeApplicationAdapter ext
*
* @return true if interview was found
*/
- public Boolean stopInterviewRecording() {
+ public boolean stopInterviewRecording() {
IConnection current = Red5.getConnectionLocal();
Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null);
return _stopInterviewRecording(currentClient, current.getScope());
@@ -2047,7 +2052,7 @@ public class ScopeApplicationAdapter ext
*
* @return all ClientList Objects of that room
*/
- public synchronized List<Client> getClientListScope() {
+ public List<Client> getClientListScope() {
try {
IConnection current = Red5.getConnectionLocal();
Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null);
@@ -2114,10 +2119,10 @@ public class ScopeApplicationAdapter ext
}
private String getSipTransportLastname(Long roomId) {
- return getSipTransportLastname(roomId, roomManager.getSipConferenceMembersNumber(roomId));
+ return getSipTransportLastname(roomManager.getSipConferenceMembersNumber(roomId));
}
- private static String getSipTransportLastname(Long roomId, Integer c) {
+ private static String getSipTransportLastname(Integer c) {
return (c != null && c > 0) ? "(" + (c - 1) + ")" : "";
}
@@ -2128,7 +2133,7 @@ public class ScopeApplicationAdapter ext
Client client = sessionManager.getClientByStreamId(streamid, null);
Long roomId = client.getRoomId();
Integer count = roomManager.getSipConferenceMembersNumber(roomId);
- String newNumber = getSipTransportLastname(roomId, count);
+ String newNumber = getSipTransportLastname(count);
log.debug("getSipConferenceMembersNumber: " + newNumber);
if (!newNumber.equals(client.getLastname())) {
client.setLastname(newNumber);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java Tue Apr 5 05:48:39 2016
@@ -39,6 +39,8 @@ public interface IDataProviderDao<T exte
*/
T get(Long id);
+ T get(long id);
+
/**
* Get a list of instances of {@link T}
*
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java Tue Apr 5 05:48:39 2016
@@ -26,6 +26,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.util.OpenmeetingsVariables.whiteboardDrawStatus;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.APPLICATION_NAME;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
@@ -71,12 +72,6 @@ public class ConfigurationDao implements
private UserDao userDao;
/**
- * @deprecated Dao's are not the place to store session variables
- */
- @Deprecated
- private String appName = null;
-
- /**
* Retrieves Configuration regardless of its deleted status
*
* @param confKey
@@ -178,10 +173,10 @@ public class ConfigurationDao implements
}
public String getAppName() {
- if (appName == null) {
- appName = getConfValue(CONFIG_APPLICATION_NAME, String.class, DEFAULT_APP_NAME);
+ if (APPLICATION_NAME == null) {
+ APPLICATION_NAME = getConfValue(CONFIG_APPLICATION_NAME, String.class, DEFAULT_APP_NAME);
}
- return appName;
+ return APPLICATION_NAME;
}
public String getBaseUrl() {
@@ -193,8 +188,13 @@ public class ConfigurationDao implements
}
@Override
+ public Configuration get(long id) {
+ return get(Long.valueOf(id));
+ }
+
+ @Override
public Configuration get(Long id) {
- if (id <= 0) {
+ if (id == null) {
return null;
}
return em.createNamedQuery("getConfigurationById", Configuration.class)
@@ -234,7 +234,7 @@ public class ConfigurationDao implements
public Configuration update(Configuration entity, Long userId, boolean deleted) {
String key = entity.getKey();
String value = entity.getValue();
- if (entity.getId() == null || entity.getId() <= 0) {
+ if (entity.getId() == null || entity.getId().longValue() <= 0) {
entity.setInserted(new Date());
entity.setDeleted(deleted);
em.persist(entity);
@@ -249,9 +249,9 @@ public class ConfigurationDao implements
if (CONFIG_CRYPT_KEY.equals(key)) {
configKeyCryptClassName = value;
} else if ("show.whiteboard.draw.status".equals(key)) {
- whiteboardDrawStatus = "1".equals(value);
+ whiteboardDrawStatus = Boolean.valueOf("1".equals(value));
} else if (CONFIG_APPLICATION_NAME.equals(key)) {
- appName = value;
+ APPLICATION_NAME = value;
}
//TODO ensure entity returned is updated
return entity;
@@ -292,8 +292,8 @@ public class ConfigurationDao implements
public boolean getWhiteboardDrawStatus() {
if (whiteboardDrawStatus == null) {
String drawStatus = getConfValue("show.whiteboard.draw.status", String.class, "0");
- whiteboardDrawStatus = "1".equals(drawStatus);
+ whiteboardDrawStatus = Boolean.valueOf("1".equals(drawStatus));
}
- return whiteboardDrawStatus;
+ return whiteboardDrawStatus.booleanValue();
}
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java Tue Apr 5 05:48:39 2016
@@ -37,6 +37,11 @@ public class MailMessageDao implements
private EntityManager em;
@Override
+ public MailMessage get(long id) {
+ return get(Long.valueOf(id));
+ }
+
+ @Override
public MailMessage get(Long id) {
return em.createNamedQuery("getMailMessageById", MailMessage.class).setParameter("id", id).getSingleResult();
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java Tue Apr 5 05:48:39 2016
@@ -266,7 +266,7 @@ public class LabelDao implements IDataPr
}
private static List<StringLabel> getLabels(Locale l, final String search) {
- if (labelCache.get(l) == null) {
+ if (!labelCache.containsKey(l)) {
labelCache.put(l, getLabels(l));
}
List<StringLabel> result = new ArrayList<StringLabel>(labelCache.get(l));
@@ -282,6 +282,11 @@ public class LabelDao implements IDataPr
}
@Override
+ public StringLabel get(long id) {
+ return null;
+ }
+
+ @Override
public StringLabel get(Long id) {
return null;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java Tue Apr 5 05:48:39 2016
@@ -94,8 +94,8 @@ public class RecordingMetaDataDao {
return null;
}
- public Long add(Long recordingId, String freeTextUserName, Date recordStart, Boolean isAudioOnly,
- Boolean isVideoOnly, Boolean isScreenData, String streamName, Integer interiewPodId) {
+ public Long add(Long recordingId, String freeTextUserName, Date recordStart, boolean isAudioOnly,
+ boolean isVideoOnly, boolean isScreenData, String streamName, Integer interiewPodId) {
try {
RecordingMetaData metaData = new RecordingMetaData();
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java Tue Apr 5 05:48:39 2016
@@ -61,9 +61,14 @@ public class RoomDao implements IDataPro
private TimezoneUtil timezoneUtil;
@Override
+ public Room get(long id) {
+ return get(Long.valueOf(id));
+ }
+
+ @Override
public Room get(Long id) {
Room r = null;
- if (id != null && id > 0) {
+ if (id != null && id.longValue() > 0) {
OpenJPAEntityManager oem = OpenJPAPersistence.cast(em);
boolean qrce = oem.getFetchPlan().getQueryResultCacheEnabled();
try {
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java Tue Apr 5 05:48:39 2016
@@ -58,6 +58,11 @@ public class LdapConfigDao implements ID
private UserDao userDao;
@Override
+ public LdapConfig get(long id) {
+ return get(Long.valueOf(id));
+ }
+
+ @Override
public LdapConfig get(Long id) {
try {
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java Tue Apr 5 05:48:39 2016
@@ -43,6 +43,11 @@ public class OAuth2Dao implements IDataP
}
@Override
+ public OAuthServer get(long id) {
+ return get(Long.valueOf(id));
+ }
+
+ @Override
public OAuthServer get(Long id) {
TypedQuery<OAuthServer> query = em.createNamedQuery("getOAuthServerById", OAuthServer.class);
query.setParameter("id", id);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java Tue Apr 5 05:48:39 2016
@@ -121,6 +121,11 @@ public class ServerDao implements IDataP
return q.getSingleResult();
}
+ @Override
+ public Server get(long id) {
+ return get(Long.valueOf(id));
+ }
+
/*
* (non-Javadoc)
*
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java Tue Apr 5 05:48:39 2016
@@ -39,6 +39,11 @@ public class GroupDao implements IDataPr
private EntityManager em;
@Override
+ public Group get(long id) {
+ return get(Long.valueOf(id));
+ }
+
+ @Override
public Group get(Long id) {
TypedQuery<Group> query = em.createNamedQuery("getGroupById", Group.class);
query.setParameter("id", id);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java Tue Apr 5 05:48:39 2016
@@ -41,6 +41,11 @@ public class GroupUserDao implements IDa
public final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.address.email"};
@Override
+ public GroupUser get(long id) {
+ return get(Long.valueOf(id));
+ }
+
+ @Override
public GroupUser get(Long id) {
TypedQuery<GroupUser> q = em.createNamedQuery("getGroupUsersById", GroupUser.class);
q.setParameter("id", id);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java Tue Apr 5 05:48:39 2016
@@ -83,6 +83,11 @@ public class PrivateMessageDao implement
}
@Override
+ public PrivateMessage get(long id) {
+ return get(Long.valueOf(id));
+ }
+
+ @Override
public PrivateMessage get(Long id) {
TypedQuery<PrivateMessage> query = em.createNamedQuery("getPrivateMessageById", PrivateMessage.class);
query.setParameter("id", id);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java Tue Apr 5 05:48:39 2016
@@ -67,6 +67,11 @@ public class PrivateMessageFolderDao imp
}
@Override
+ public PrivateMessageFolder get(long id) {
+ return get(Long.valueOf(id));
+ }
+
+ @Override
public PrivateMessageFolder get(Long id) {
String hql = "select c from PrivateMessageFolder c where c.id = :id ";
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Tue Apr 5 05:48:39 2016
@@ -249,6 +249,11 @@ public class UserDao implements IDataPro
return get(id, false);
}
+ @Override
+ public User get(long id) {
+ return get(Long.valueOf(id), false);
+ }
+
private User get(Long id, boolean force) {
User u = null;
if (id != null && id.longValue() > 0) {
@@ -443,11 +448,11 @@ public class UserDao implements IDataPro
TypedQuery<Long> query = em.createNamedQuery("checkPassword", Long.class);
query.setParameter("userId", userId);
query.setParameter("password", ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(password));
- return query.getResultList().get(0) == 1;
+ return Long.valueOf(1).equals(query.getResultList().get(0));
}
- public User getContact(String email, long ownerId) {
+ public User getContact(String email, Long ownerId) {
return getContact(email, "", "", ownerId);
}
@@ -478,7 +483,7 @@ public class UserDao implements IDataPro
to.setLogin(login.length() < getMinLoginLength(cfgDao) ? UUID.randomUUID().toString() : login);
to.setFirstname(firstName);
to.setLastname(lastName);
- to.setLanguageId(null == langId ? owner.getLanguageId() : langId);
+ to.setLanguageId(null == langId ? owner.getLanguageId() : langId.longValue());
to.setOwnerId(owner.getId());
to.setAddress(new Address());
to.getAddress().setEmail(email);
@@ -563,7 +568,7 @@ public class UserDao implements IDataPro
@Override
public List<User> get(String search, int start, int count, String order) {
- return get(search, start, count, order, false, -1L);
+ return get(search, start, count, order, false, Long.valueOf(-1));
}
public Set<Right> getRights(Long id) {
@@ -573,7 +578,7 @@ public class UserDao implements IDataPro
return rights;
}
// For direct access of linked users
- if (id < 0) {
+ if (id.longValue() < 0) {
rights.add(Right.Room);
return rights;
}
@@ -668,7 +673,7 @@ public class UserDao implements IDataPro
u.setShowContactDataToContacts(showContactDataToContacts);
// this is needed cause the language is not a needed data at registering
- u.setLanguageId(languageId != 0 ? languageId : null);
+ u.setLanguageId(languageId != 0 ? languageId : 1);
if (!Strings.isEmpty(userpass)) {
u.updatePassword(cfgDao, userpass);
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObject.java Tue Apr 5 05:48:39 2016
@@ -25,7 +25,7 @@ import java.util.Map;
public class WhiteboardObject {
- private Long whiteBoardId;
+ private long whiteBoardId;
private Integer x = 0;
private Integer y = 0;
private Integer zoom = 100;
@@ -36,11 +36,11 @@ public class WhiteboardObject {
public WhiteboardObject() {}
- public Long getWhiteBoardId() {
+ public long getWhiteBoardId() {
return whiteBoardId;
}
- public void setWhiteBoardId(Long whiteBoardId) {
+ public void setWhiteBoardId(long whiteBoardId) {
this.whiteBoardId = whiteBoardId;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java Tue Apr 5 05:48:39 2016
@@ -276,32 +276,29 @@ public class Server implements IDataProv
final int prime = 31;
int result = 1;
result = prime * result + ((address == null) ? 0 : address.hashCode());
- result = prime * result + (int) (id ^ (id >>> 32));
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
- if (this == obj) {
+ if (this == obj)
return true;
- }
- if (obj == null) {
+ if (obj == null)
return false;
- }
- if (getClass() != obj.getClass()) {
+ if (getClass() != obj.getClass())
return false;
- }
Server other = (Server) obj;
if (address == null) {
- if (other.address != null) {
+ if (other.address != null)
return false;
- }
- } else if (!address.equals(other.address)) {
+ } else if (!address.equals(other.address))
return false;
- }
- if (id != other.id) {
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
return false;
- }
return true;
}
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java Tue Apr 5 05:48:39 2016
@@ -172,5 +172,4 @@ public class GroupUser implements IDataP
public String toString() {
return "GroupUser [id=" + id + ", group=" + group + ", user=" + user + ", deleted=" + deleted + "]";
}
-
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java Tue Apr 5 05:48:39 2016
@@ -227,18 +227,6 @@ public class PrivateMessage implements I
this.parentMessage = parentMessage;
}
- @Deprecated
- public boolean getIsTrash() {
- return TRASH_FOLDER_ID == folderId;
- }
-
- @Deprecated
- public void setIsTrash(boolean isTrash) {
- if (isTrash) {
- folderId = TRASH_FOLDER_ID;
- }
- }
-
public Long getFolderId() {
return folderId;
}
Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java Tue Apr 5 05:48:39 2016
@@ -643,11 +643,13 @@ public class CoreScreenShare implements
@Override
public void resultReceived(IPendingServiceCall call) {
try {
-
log.trace("service call result: " + call);
+ if (call == null) {
+ return;
+ }
- String method = call == null ? null : call.getServiceMethodName();
- Object o = call == null ? null : call.getResult();
+ String method = call.getServiceMethodName();
+ Object o = call.getResult();
log.trace("call ### get Method Name " + method);
if ("connect".equals(method)) {
if (o instanceof Map) {
Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java (original)
+++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java Tue Apr 5 05:48:39 2016
@@ -57,4 +57,5 @@ public class OpenmeetingsVariables {
public static final int USER_PASSWORD_MINIMUM_LENGTH = 4;
public static Boolean whiteboardDrawStatus = null;
public static String wicketApplicationName = null;
+ public static String APPLICATION_NAME = null;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Tue Apr 5 05:48:39 2016
@@ -321,7 +321,7 @@ public class WebSession extends Abstract
public String getValidatedSid() {
SessiondataDao sessionDao = getBean(SessiondataDao.class);
Long _userId = sessionDao.checkSession(SID);
- if (_userId == null || userId != _userId) {
+ if (_userId == null || !_userId.equals(userId)) {
Sessiondata sessionData = sessionDao.getSessionByHash(SID);
if (sessionData == null) {
sessionData = sessionDao.startsession();
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java Tue Apr 5 05:48:39 2016
@@ -57,21 +57,21 @@ import com.googlecode.wicket.kendo.ui.pa
public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> {
private static final long serialVersionUID = 1L;
private final static List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); //TODO max vote should be added
- private final long roomId;
+ private final Long roomId;
private final PollAnswerForm form;
private final DialogButton vote = new DialogButton("vote", Application.getString(32));
private final DialogButton cancel = new DialogButton("cancel", Application.getString(25));
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final IModel<String> user = Model.of((String)null);
- public VoteDialog(String id, long roomId) {
+ public VoteDialog(String id, Long roomId) {
super(id, Application.getString(18));
this.roomId = roomId;
add(form = new PollAnswerForm("form", new CompoundPropertyModel<RoomPollAnswer>(new RoomPollAnswer())));
}
static String getName(User u) {
- return u == null ? "" : getUserId() == u.getId() ? Application.getString(1411) : u.getFirstname() + " " + u.getLastname();
+ return u == null ? "" : (getUserId().equals(u.getId()) ? Application.getString(1411) : u.getFirstname() + " " + u.getLastname());
}
public void updateModel(IPartialPageRequestHandler target) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Tue Apr 5 05:48:39 2016
@@ -224,7 +224,7 @@ public class AppointmentDialog extends A
}
public static boolean isOwner(Appointment object) {
- return object.getOwner() != null && getUserId() == object.getOwner().getId();
+ return object.getOwner() != null && getUserId().equals(object.getOwner().getId());
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Tue Apr 5 05:48:39 2016
@@ -86,7 +86,7 @@ import com.googlecode.wicket.jquery.ui.p
public class MessagesContactsPanel extends UserPanel {
private static final long serialVersionUID = 1L;
- private final static long MOVE_CHOOSE = -1;
+ private final static Long MOVE_CHOOSE = Long.valueOf(-1);
private final static int SELECT_CHOOSE = 1252;
private final static int SELECT_ALL = 1239;
private final static int SELECT_NONE = 1240;
@@ -169,9 +169,10 @@ public class MessagesContactsPanel exten
private void updateControls(AjaxRequestTarget target) {
deleteBtn.setEnabled(!selectedMessages.isEmpty());
- readBtn.setEnabled(TRASH_FOLDER_ID != selectedFolderModel.getObject() && !selectedMessages.isEmpty());
- unreadBtn.setEnabled(TRASH_FOLDER_ID != selectedFolderModel.getObject() && !selectedMessages.isEmpty());
- toInboxBtn.setVisible(INBOX_FOLDER_ID != selectedFolderModel.getObject() && SENT_FOLDER_ID != selectedFolderModel.getObject() && !selectedMessages.isEmpty());
+ Long selFldr = selectedFolderModel.getObject();
+ readBtn.setEnabled(!TRASH_FOLDER_ID.equals(selFldr) && !selectedMessages.isEmpty());
+ unreadBtn.setEnabled(!TRASH_FOLDER_ID.equals(selFldr) && !selectedMessages.isEmpty());
+ toInboxBtn.setVisible(!INBOX_FOLDER_ID.equals(selFldr) && !SENT_FOLDER_ID.equals(selFldr) && !selectedMessages.isEmpty());
target.add(buttons);
}
@@ -209,7 +210,7 @@ public class MessagesContactsPanel exten
}
}
- private void selectFolder(WebMarkupContainer folder, long id, AjaxRequestTarget target) {
+ private void selectFolder(WebMarkupContainer folder, Long id, AjaxRequestTarget target) {
selectedFolder = folder;
selectedFolderModel.setObject(id);
setDefaultFolderClass();
@@ -217,7 +218,7 @@ public class MessagesContactsPanel exten
emptySelection(target);
selectDropDown.setModelObject(SELECT_CHOOSE);
moveDropDown.setModelObject(NOT_MOVE_FOLDER);
- deleteBtn.add(AttributeModifier.replace("value", Application.getString(TRASH_FOLDER_ID == id ? 1256 : 1245)));
+ deleteBtn.add(AttributeModifier.replace("value", Application.getString(TRASH_FOLDER_ID.equals(id) ? 1256 : 1245)));
readBtn.setEnabled(false);
unreadBtn.setEnabled(false);
if (target != null) {
@@ -377,7 +378,7 @@ public class MessagesContactsPanel exten
@Override
protected void populateItem(Item<PrivateMessage> item) {
PrivateMessage m = item.getModelObject();
- final long id = m.getId();
+ final Long id = m.getId();
allMessages.add(id);
if (m.getIsRead()) {
readMessages.add(id);
@@ -404,7 +405,7 @@ public class MessagesContactsPanel exten
target.add(container);
}
});
- StringBuilder cssClass = new StringBuilder(Boolean.FALSE.equals(m.getIsRead()) ? "unread" : "");
+ StringBuilder cssClass = new StringBuilder(m.getIsRead() ? "unread" : "");
if (selectedMessages.contains(id)) {
if (cssClass.length() > 0) {
cssClass.append(" ");
@@ -448,7 +449,7 @@ public class MessagesContactsPanel exten
@Override
protected void onEvent(AjaxRequestTarget target) {
- if (TRASH_FOLDER_ID == selectedFolderModel.getObject()) {
+ if (TRASH_FOLDER_ID.equals(selectedFolderModel.getObject())) {
getBean(PrivateMessageDao.class).delete(selectedMessages);
} else {
getBean(PrivateMessageDao.class).moveMailsToFolder(selectedMessages, TRASH_FOLDER_ID);
@@ -509,8 +510,8 @@ public class MessagesContactsPanel exten
@Override
protected void onUpdate(AjaxRequestTarget target) {
- long folderId = moveDropDown.getModelObject().getId();
- if (folderId != MOVE_CHOOSE) {
+ Long folderId = moveDropDown.getModelObject().getId();
+ if (!MOVE_CHOOSE.equals(folderId)) {
getBean(PrivateMessageDao.class).moveMailsToFolder(selectedMessages, folderId);
}
selectFolder(selectedFolder, selectedFolderModel.getObject(), target);
@@ -554,8 +555,8 @@ public class MessagesContactsPanel exten
@Override
protected void populateItem(Item<UserContact> item) {
UserContact uc = item.getModelObject();
- final long contactId = uc.getId();
- final long userId = uc.getOwner().getId();
+ final Long contactId = uc.getId();
+ final Long userId = uc.getOwner().getId();
if (uc.isPending()) {
item.add(AttributeModifier.append("class", "unread"));
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Tue Apr 5 05:48:39 2016
@@ -51,7 +51,7 @@ public class UserProfilePanel extends Us
add(new Label("regdate"));
add(new TextArea<String>("userOffers").setEnabled(false));
add(new TextArea<String>("userSearchs").setEnabled(false));
- if (getUserId() == model.getObject().getId() || model.getObject().isShowContactData()
+ if (getUserId().equals(model.getObject().getId()) || model.getObject().isShowContactData()
|| (model.getObject().isShowContactDataToContacts() && getBean(UserContactDao.class).isContact(model.getObject().getId(), getUserId())))
{
addressDenied.setVisible(false);
@@ -64,7 +64,7 @@ public class UserProfilePanel extends Us
address.add(new Label("address.comment"));
} else {
address.setVisible(false);
- addressDenied.setDefaultModelObject(Application.getString(Boolean.TRUE.equals(model.getObject().isShowContactDataToContacts()) ? 1269 : 1268));
+ addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts() ? 1269 : 1268));
}
add(address.setDefaultModel(model));
add(addressDenied);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Tue Apr 5 05:48:39 2016
@@ -113,7 +113,7 @@ public class VideoInfo extends Panel {
}
boolean reConvEnabled = false;
- if (r.getOwnerId() != null && getUserId() == r.getOwnerId() && r.getStatus() != Status.RECORDING && r.getStatus() != Status.CONVERTING) {
+ if (r.getOwnerId() != null && r.getOwnerId().equals(getUserId()) && r.getStatus() != Status.RECORDING && r.getStatus() != Status.CONVERTING) {
List<RecordingMetaData> metas = getBean(RecordingMetaDataDao.class).getByRecording(r.getId());
reconvLabel:
if (!metas.isEmpty()) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1737775&r1=1737774&r2=1737775&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java Tue Apr 5 05:48:39 2016
@@ -90,7 +90,7 @@ public abstract class RecordingResourceR
if (r == null) {
return r;
}
- if (r.getOwnerId() == null || getUserId() == r.getOwnerId()) {
+ if (r.getOwnerId() == null || getUserId().equals(r.getOwnerId())) {
return r;
}
if (r.getGroupId() == null || getBean(GroupUserDao.class).isUserInGroup(r.getGroupId(), getUserId())) {