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 9ddf649 [OPENMEETINGS-1856] sonar should be more happy
9ddf649 is described below
commit 9ddf649a60adc0b7e333f3f83069569a0ebd01e9
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon Mar 4 19:18:35 2019 +0700
[OPENMEETINGS-1856] sonar should be more happy
---
.../org/apache/openmeetings/core/remote/KStream.java | 8 ++------
.../apache/openmeetings/db/dto/room/Whiteboard.java | 3 +++
.../org/apache/openmeetings/web/room/wb/WbPanel.java | 19 +++++++++++--------
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 54a19d9..ed18d9e 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -111,9 +111,7 @@ public class KStream extends AbstractStream {
break;
}
outgoingMedia = createEndpoint(processor, sd.getSid(),
sd.getUid());
- outgoingMedia.addMediaSessionTerminatedListener(evt -> {
- log.warn("Media stream terminated");
- });
+ outgoingMedia.addMediaSessionTerminatedListener(evt ->
log.warn("Media stream terminated"));
outgoingMedia.addMediaFlowOutStateChangeListener(evt -> {
if (MediaFlowState.NOT_FLOWING == evt.getState()) {
log.warn("Media FlowOut :: {}", evt.getState());
@@ -123,9 +121,7 @@ public class KStream extends AbstractStream {
stopBroadcast(processor);
}
});
- outgoingMedia.addMediaFlowInStateChangeListener(evt -> {
- log.warn("Media FlowIn :: {}", evt);
- });
+ outgoingMedia.addMediaFlowInStateChangeListener(evt ->
log.warn("Media FlowIn :: {}", evt));
processor.addStream(this);
addListener(processor, sd.getSid(), sd.getUid(), sdpOffer);
if (room.isRecording()) {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
index 1dc9186..ee79f09 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
@@ -50,6 +50,9 @@ public class Whiteboard implements Serializable {
public static final String ATTR_FILE_ID = "fileId";
public static final String ATTR_FILE_TYPE = "fileType";
public static final String ATTR_SLIDE = "slide";
+ public static final String ATTR_WIDTH = "width";
+ public static final String ATTR_HEIGHT = "height";
+ public static final String ATTR_ZOOM = "zoom";
public enum ZoomMode {
fullFit
, pageWidth
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index dd71e88..cbf15e4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -21,8 +21,11 @@ package org.apache.openmeetings.web.room.wb;
import static java.util.UUID.randomUUID;
import static org.apache.openmeetings.db.dto.room.Whiteboard.ATTR_FILE_ID;
import static org.apache.openmeetings.db.dto.room.Whiteboard.ATTR_FILE_TYPE;
+import static org.apache.openmeetings.db.dto.room.Whiteboard.ATTR_HEIGHT;
import static org.apache.openmeetings.db.dto.room.Whiteboard.ATTR_SLIDE;
import static org.apache.openmeetings.db.dto.room.Whiteboard.ATTR_TYPE;
+import static org.apache.openmeetings.db.dto.room.Whiteboard.ATTR_WIDTH;
+import static org.apache.openmeetings.db.dto.room.Whiteboard.ATTR_ZOOM;
import static org.apache.openmeetings.db.dto.room.Whiteboard.ITEMS_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.PARAM_STATUS;
@@ -336,9 +339,9 @@ public class WbPanel extends AbstractWbPanel {
case setSize:
{
Whiteboard wb =
wbm.get(roomId).get(obj.getLong("wbId"));
- wb.setWidth(obj.getInt("width"));
- wb.setHeight(obj.getInt("height"));
- wb.setZoom(obj.getDouble("zoom"));
+ wb.setWidth(obj.getInt(ATTR_WIDTH));
+ wb.setHeight(obj.getInt(ATTR_HEIGHT));
+ wb.setZoom(obj.getDouble(ATTR_ZOOM));
wb.setZoomMode(ZoomMode.valueOf(obj.getString("zoomMode")));
wbm.update(roomId, wb);
sendWbOthers(WbAction.setSize,
getAddWbJson(wb));
@@ -480,9 +483,9 @@ public class WbPanel extends AbstractWbPanel {
private static JSONObject getAddWbJson(final Whiteboard wb) {
return new JSONObject().put("wbId", wb.getId())
.put("name", wb.getName())
- .put("width", wb.getWidth())
- .put("height", wb.getHeight())
- .put("zoom", wb.getZoom())
+ .put(ATTR_WIDTH, wb.getWidth())
+ .put(ATTR_HEIGHT, wb.getHeight())
+ .put(ATTR_ZOOM, wb.getZoom())
.put("zoomMode", wb.getZoomMode().name());
}
@@ -601,8 +604,8 @@ public class WbPanel extends AbstractWbPanel {
.put(ATTR_TYPE, "image")
.put("left",
UPLOAD_WB_LEFT)
.put("top",
UPLOAD_WB_TOP)
- .put("width",
fi.getWidth() == null ? DEFAULT_WIDTH : fi.getWidth())
- .put("height",
fi.getHeight() == null ? DEFAULT_HEIGHT : fi.getHeight())
+ .put(ATTR_WIDTH,
fi.getWidth() == null ? DEFAULT_WIDTH : fi.getWidth())
+ .put(ATTR_HEIGHT,
fi.getHeight() == null ? DEFAULT_HEIGHT : fi.getHeight())
.put("uid", wuid)
.put(ATTR_SLIDE,
wb.getSlide())
;
