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 2017/12/04 03:54:13 UTC
openmeetings git commit: [OPENMEETINGS-1721] some sonar issues are
fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 2c12651ab -> 2581b203b
[OPENMEETINGS-1721] some sonar issues are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2581b203
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2581b203
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2581b203
Branch: refs/heads/4.0.x
Commit: 2581b203bb2932d30ef62dce21e473d2408f2160
Parents: 2c12651
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Dec 4 10:54:05 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Dec 4 10:54:05 2017 +0700
----------------------------------------------------------------------
.../apache/openmeetings/web/common/tree/OmTreeProvider.java | 1 +
.../apache/openmeetings/web/room/activities/activities.js | 4 ++--
.../java/org/apache/openmeetings/web/user/chat/Chat.java | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2581b203/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
index 7dbcc8e..c33de3e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
@@ -185,5 +185,6 @@ public class OmTreeProvider implements ITreeProvider<BaseFileItem> {
@Override
public void detach() {
+ //no-op
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2581b203/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
index 733fb87..fcd30cc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
@@ -15,7 +15,7 @@ var Activities = function() {
a.prop('checked', clean);
if (clean) {
activities.find('.auto-clean').each(function() {
- setTimeout(_remove.bind(null, $(this).data().id), timeout);
+ setTimeout(_clearItem.bind(null, $(this).data().id), timeout);
});
}
}
@@ -135,7 +135,7 @@ var Activities = function() {
a.find('.activity-text').text(obj.text);
_hightlight();
if (aclean.prop('checked')) {
- setTimeout(_remove.bind(null, obj.id), timeout);
+ setTimeout(_clearItem.bind(null, obj.id), timeout);
}
}
, remove: _remove
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2581b203/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index 7f3dca5..b962940 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -97,6 +97,10 @@ public class Chat extends Panel {
log.error("Unexpected exception while accepting chat message", e);
}
}
+
+ private String getUid() {
+ return getClient().getUid();
+ }
};
public Chat(String id) {
@@ -112,10 +116,6 @@ public class Chat extends Panel {
return findParent(MainPanel.class).getClient();
}
- private String getUid() {
- return getClient().getUid();
- }
-
public JSONObject getMessage(List<ChatMessage> list) {
final Client c = getClient();
final User curUser = c == null ? getBean(UserDao.class).get(getUserId()) : c.getUser();