Author: solomax
Date: Sun Oct 12 17:16:29 2014
New Revision: 1631223
URL: http://svn.apache.org/r1631223
Log:
Code clean-up
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1631223&r1=1631222&r2=1631223&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Sun Oct 12 17:16:29 2014
@@ -155,7 +155,7 @@ public class ScopeApplicationAdapter ext
}
log.debug("### Client connected to OpenMeetings,
register Client StreamId: " + streamId + " scope "
- + conn.getScope().getName() + "
isAVClient " + isAVClient + " params " + params);
+ + conn.getScope().getName() + "
isAVClient " + isAVClient);
// Set StreamId in Client
service.invoke("setId", new Object[] { streamId },
this);
@@ -403,9 +403,9 @@ public class ScopeApplicationAdapter ext
// as it will be already triggered
// in the result of this Function
// in the Client
- Long id = Long.valueOf(rcl.getBroadCastID());
- if (id != null && !broadcastList.contains(id)) {
- broadcastList.add(id.intValue());
+ int id = (int)rcl.getBroadCastID();
+ if (!broadcastList.contains(id)) {
+ broadcastList.add(id);
}
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java?rev=1631223&r1=1631222&r2=1631223&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
Sun Oct 12 17:16:29 2014
@@ -58,7 +58,7 @@ public class FileItemTree<T extends File
@Override
protected boolean isSelected() {
- return getModelObject().getId() ==
treePanel.selectedFile.getObject().getId();
+ return
getModelObject().getId().equals(treePanel.selectedFile.getObject().getId());
}
@Override
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1631223&r1=1631222&r2=1631223&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Sun Oct 12 17:16:29 2014
@@ -266,7 +266,7 @@ public class RoomPanel extends BasePanel
User u =
getBean(UserDao.class).get(getUserId());
for (RoomOrganisation ro :
r.getRoomOrganisations()) {
for (OrganisationUser ou :
u.getOrganisationUsers()) {
- if
(ro.getOrganisation().getId() == ou.getOrganisation().getId()) {
+ if
(ro.getOrganisation().getId().equals(ou.getOrganisation().getId())) {
allowed = true;
break;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1631223&r1=1631222&r2=1631223&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Sun Oct 12 17:16:29 2014
@@ -154,7 +154,7 @@ public class MessagesContactsPanel exten
private void setFolderClass(ListItem<PrivateMessageFolder> folder) {
folder.add(AttributeAppender.replace("class", "email folder
clickable"));
- if (folder.getModelObject().getId() ==
selectedFolderModel.getObject()) {
+ if
(folder.getModelObject().getId().equals(selectedFolderModel.getObject())) {
selectFolder(folder);
}
}
