This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 87d968d [OPENMEETINGS-1856] sonar should be more happy
87d968d is described below
commit 87d968ddffe2e1852ba3f795945e7ebe456bd6b5
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon Mar 4 17:15:13 2019 +0700
[OPENMEETINGS-1856] sonar should be more happy
---
.../openmeetings/core/remote/StreamProcessor.java | 5 ++---
.../core/remote/TestStreamProcessor.java | 21 ++++++++++++---------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index 9ef4b05..abb4bef 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -206,7 +206,6 @@ public class StreamProcessor implements IStreamProcessor {
checkStreams(c.getRoomId());
}
WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), c, RoomMessage.Type.rightUpdated, c.getUid()));
- //FIXME TODO update interview buttons
} else if (!wasBroadcasting) {
//join
StreamDesc sd = c.addStream(StreamType.WEBCAM);
@@ -216,7 +215,6 @@ public class StreamProcessor implements IStreamProcessor {
.put("id", "broadcast")
.put("stream", sd.toJson())
.put(PARAM_ICE,
kHandler.getTurnServers(false)));
- //FIXME TODO update interview buttons
} else {
//constraints were changed
c.getStreams().stream()
@@ -265,7 +263,8 @@ public class StreamProcessor implements IStreamProcessor {
Room r = c.getRoom();
return r != null && Room.Type.interview != r.getType()
&& !r.isHidden(RoomElement.ScreenSharing)
- && r.isAllowRecording() &&
c.hasRight(Right.share);
+ && r.isAllowRecording()
+ && c.hasRight(Right.share);
}
public boolean screenShareAllowed(Client c) {
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/TestStreamProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/TestStreamProcessor.java
index 38a3b20..e3a171d 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/TestStreamProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/TestStreamProcessor.java
@@ -47,11 +47,11 @@ public class TestStreamProcessor implements
IStreamProcessor {
@Autowired
private KurentoHandler kHandler;
- void onMessage(IWsClient _c, final String cmdId, JSONObject msg) {
- KTestStream user = getByUid(_c.getUid());
+ void onMessage(IWsClient c, final String cmdId, JSONObject msg) {
+ KTestStream user = getByUid(c.getUid());
switch (cmdId) {
case "wannaRecord":
- WebSocketHelper.sendClient(_c,
newTestKurentoMsg()
+ WebSocketHelper.sendClient(c,
newTestKurentoMsg()
.put("id", "canRecord")
.put(PARAM_ICE,
kHandler.getTurnServers(true))
);
@@ -60,8 +60,8 @@ public class TestStreamProcessor implements IStreamProcessor {
if (user != null) {
user.release(this);
}
- user = new KTestStream(_c, msg,
createTestPipeline());
- streamByUid.put(_c.getUid(), user);
+ user = new KTestStream(c, msg,
createTestPipeline());
+ streamByUid.put(c.getUid(), user);
break;
case "iceCandidate":
JSONObject candidate =
msg.getJSONObject(PARAM_CANDIDATE);
@@ -72,16 +72,19 @@ public class TestStreamProcessor implements
IStreamProcessor {
}
break;
case "wannaPlay":
- WebSocketHelper.sendClient(_c,
newTestKurentoMsg()
+ WebSocketHelper.sendClient(c,
newTestKurentoMsg()
.put("id", "canPlay")
.put(PARAM_ICE,
kHandler.getTurnServers(true))
);
break;
case "play":
if (user != null) {
- user.play(_c, msg,
createTestPipeline());
+ user.play(c, msg, createTestPipeline());
}
break;
+ default:
+ //no-op
+ break;
}
}
@@ -103,8 +106,8 @@ public class TestStreamProcessor implements
IStreamProcessor {
return KurentoHandler.newKurentoMsg().put(TAG_MODE, MODE_TEST);
}
- void remove(IWsClient _c) {
- AbstractStream s = getByUid(_c.getUid());
+ void remove(IWsClient c) {
+ AbstractStream s = getByUid(c.getUid());
if (s != null) {
s.release(this);
}
