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 1c14c66 [OPENMEETINGS-2478] sonar should be more happy
1c14c66 is described below
commit 1c14c6683bcea29c9621c0b9d9204e0b0ec29575
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Oct 14 20:53:24 2020 +0700
[OPENMEETINGS-2478] sonar should be more happy
---
.../apache/openmeetings/core/remote/KStream.java | 36 ++++++++++------------
.../apache/openmeetings/backup/BackupImport.java | 6 ++--
.../apache/openmeetings/web/common/BasePanel.java | 4 +++
.../apache/openmeetings/web/common/MainPanel.java | 2 +-
.../openmeetings/web/common/menu/OmMenuItem.java | 1 +
.../web/common/tree/FileTreePanel.java | 4 +++
.../web/common/tree/OmTreeProvider.java | 4 ++-
.../sidebar/RoomFileUploadResourceReference.java | 2 +-
.../openmeetings/web/user/MessageDialog.java | 2 +-
9 files changed, 35 insertions(+), 26 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 77a5e2d..754ee15 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
@@ -48,6 +48,7 @@ import org.apache.openmeetings.db.util.ws.RoomMessage;
import org.apache.openmeetings.db.util.ws.TextRoomMessage;
import org.kurento.client.Continuation;
import org.kurento.client.IceCandidate;
+import org.kurento.client.MediaFlowState;
import org.kurento.client.MediaProfileSpecType;
import org.kurento.client.MediaType;
import org.kurento.client.RecorderEndpoint;
@@ -122,25 +123,22 @@ public class KStream extends AbstractStream {
outgoingMedia.addMediaSessionTerminatedListener(evt ->
log.warn("Media stream terminated {}", sd));
outgoingMedia.addMediaFlowOutStateChangeListener(evt -> {
log.info("Media Flow STATE :: {}, type {}, evt {}",
evt.getState(), evt.getType(), evt.getMediaType());
- switch (evt.getState()) {
- case NOT_FLOWING:
- log.warn("FlowOut Future is created");
- flowoutFuture = Optional.of(new
CompletableFuture<>().completeAsync(() -> {
- log.warn("KStream will be
dropped {}", sd);
- if (StreamType.SCREEN ==
streamType) {
-
processor.doStopSharing(sid, uid);
- }
- stopBroadcast();
- return null;
- }, delayedExecutor(getFlowoutTimeout(),
TimeUnit.SECONDS)));
- break;
- case FLOWING:
- flowoutFuture.ifPresent(f -> {
- log.warn("FlowOut Future is
canceled");
- f.cancel(true);
- flowoutFuture =
Optional.empty();
- });
- break;
+ if (MediaFlowState.NOT_FLOWING == evt.getState()) {
+ log.warn("FlowOut Future is created");
+ flowoutFuture = Optional.of(new
CompletableFuture<>().completeAsync(() -> {
+ log.warn("KStream will be dropped {}",
sd);
+ if (StreamType.SCREEN == streamType) {
+ processor.doStopSharing(sid,
uid);
+ }
+ stopBroadcast();
+ return null;
+ }, delayedExecutor(getFlowoutTimeout(),
TimeUnit.SECONDS)));
+ } else {
+ flowoutFuture.ifPresent(f -> {
+ log.warn("FlowOut Future is canceled");
+ f.cancel(true);
+ flowoutFuture = Optional.empty();
+ });
}
});
outgoingMedia.addMediaFlowInStateChangeListener(evt ->
log.warn("Media FlowIn :: {}", evt));
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index fced538..66836d0 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -452,17 +452,17 @@ public class BackupImport {
progressHolder.setProgress(97);
if (ver.compareTo(BackupVersion.get("4.0.0")) < 0) {
- for (BaseFileItem bfi : files) {
+ for (FileItem bfi : files) {
if (bfi.isDeleted()) {
continue;
}
if (BaseFileItem.Type.PRESENTATION ==
bfi.getType()) {
- convertOldPresentation((FileItem)bfi);
+ convertOldPresentation(bfi);
fileItemDao.updateBase(bfi);
}
if (BaseFileItem.Type.WML_FILE ==
bfi.getType()) {
try {
- Whiteboard wb =
WbConverter.convert((FileItem)bfi);
+ Whiteboard wb =
WbConverter.convert(bfi);
wb.save(bfi.getFile().toPath());
} catch (Exception e) {
log.error("Unexpected error
while converting WB", e);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
index d492d9a..c6c05fd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
@@ -98,6 +98,10 @@ public abstract class BasePanel extends Panel {
protected void process(IPartialPageRequestHandler handler, JSONObject
o) throws IOException {
}
+ /**
+ * can be overridden by children to provide custom CSS class
+ * @return custom CSS class
+ */
protected String getCssClass() {
return "";
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index edf25a4..87433ec 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -390,7 +390,7 @@ public class MainPanel extends Panel {
private BasePanel getCurrentPanel() {
Component prev = contents.get(CHILD_ID);
- if (prev != null && prev instanceof BasePanel) {
+ if (prev instanceof BasePanel) {
return (BasePanel)prev;
}
return null;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
index 53377ac..d1f05e9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
@@ -134,5 +134,6 @@ public class OmMenuItem implements INavbarComponent {
}
public void onClick(AjaxRequestTarget target) {
+ // no-op by default
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
index 4b5f821..524426d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
@@ -337,6 +337,10 @@ public abstract class FileTreePanel extends Panel {
response.render(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(FileTreePanel.class, "filetree.js")));
}
+ /**
+ * can be overridden by children to provide custom containment
+ * @return custom containment
+ */
protected String getContainment() {
return ".file.item.drop.area";
}
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 48790f6..f24e46d 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
@@ -53,7 +53,9 @@ public class OmTreeProvider implements
ITreeProvider<BaseFileItem> {
public static final String FILES_GROUP = "files-group-%s";
private final Long roomId;
private final List<BaseFileItem> roots = new ArrayList<>();
- private final String lblPublic, lblGroupFile, lblGroupRec;
+ private final String lblPublic;
+ private final String lblGroupFile;
+ private final String lblGroupRec;
@SpringBean
private UserDao userDao;
@SpringBean
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
index 784bfaa..7c9278f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
@@ -72,7 +72,7 @@ public class RoomFileUploadResourceReference extends
ResourceReference {
private static final String PARAM_CLEAN_NAME = "room-upload-clean";
private static final String PARAM_SID_NAME = "room-upload-sid";
private static final String PARAM_LAST_SELECTED_NAME =
"room-upload-last-selected";
- private static enum Status {
+ private enum Status {
SUCCESS
, PROGRESS
, ERROR
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index f7996b9..9aca029 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
@@ -200,7 +200,7 @@ public class MessageDialog extends Modal<PrivateMessage> {
String subj = p.getSubject() ==
null ? "" : p.getSubject();
handler.send(to.getAddress().getEmail(),
Application.getString("1301", to.getLanguageId()) + subj,
- (p.getMessage()
== null ? "" : p.getMessage().replaceAll("\\<.*?>", "")) + aLinkHTML +
invitationLink);
+ (p.getMessage()
== null ? "" : p.getMessage().replaceAll("\\<[^>]*+>", "")) + aLinkHTML +
invitationLink);
}
}
MessageDialog.this.close(target);
