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 2022/12/20 03:18:35 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2753] Redo for clear-all should work; some Sonar issues are addressed
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 f8b0ffe61 [OPENMEETINGS-2753] Redo for clear-all should work; some Sonar issues are addressed
f8b0ffe61 is described below
commit f8b0ffe61c530fd1705ede65e424fc0ceb89b0e9
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Dec 20 10:18:09 2022 +0700
[OPENMEETINGS-2753] Redo for clear-all should work; some Sonar issues are addressed
---
.../openmeetings/db/entity/basic/StreamDesc.java | 4 ++--
.../openmeetings/db/entity/basic/WebcamStreamDesc.java | 2 +-
.../openmeetings/web/common/UploadableImagePanel.java | 7 ++++---
.../web/common/datetime/AbstractOmDateTimePicker.java | 2 +-
.../apache/openmeetings/web/common/tree/filetree.js | 4 ++--
.../apache/openmeetings/web/common/upload/upload.js | 2 +-
.../org/apache/openmeetings/web/room/raw-nettest.js | 2 +-
.../org/apache/openmeetings/web/room/wb/WbPanel.java | 18 +++++++++++-------
8 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/StreamDesc.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/StreamDesc.java
index eebc62058..931ce1aa5 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/StreamDesc.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/StreamDesc.java
@@ -22,8 +22,8 @@ import static java.util.UUID.randomUUID;
import java.io.Serializable;
import java.util.List;
-import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap.KeySetView;
import org.apache.openmeetings.db.entity.basic.Client.Activity;
import org.apache.openmeetings.db.entity.basic.Client.StreamType;
@@ -33,7 +33,7 @@ import com.github.openjson.JSONObject;
public abstract class StreamDesc implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
- protected final Set<Activity> activities = ConcurrentHashMap.newKeySet();
+ protected final /*serializable*/ KeySetView<Activity, Boolean> activities = ConcurrentHashMap.newKeySet();
private final Client client;
private final String uid;
private final StreamType type;
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WebcamStreamDesc.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WebcamStreamDesc.java
index 18288b5b9..6f54598ff 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WebcamStreamDesc.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WebcamStreamDesc.java
@@ -96,7 +96,7 @@ public class WebcamStreamDesc extends StreamDesc {
camEnabled = !camEnabled;
break;
default:
- };
+ }
}
public boolean isBroadcasting() {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
index caff47b9f..959f212a6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
@@ -49,6 +49,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5I
public abstract class UploadableImagePanel extends ImagePanel {
private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(UploadableImagePanel.class);
+ private static final String ERROR = "Error";
private final FileUploadField fileUploadField = new FileUploadField("image", new ListModel<>());
private final Form<Void> form = new Form<>("form");
private final boolean delayed;
@@ -83,7 +84,7 @@ public abstract class UploadableImagePanel extends ImagePanel {
try {
deleteImage();
} catch (Exception e) {
- log.error("Error", e);
+ log.error(ERROR, e);
}
update(Optional.of(target));
}
@@ -143,7 +144,7 @@ public abstract class UploadableImagePanel extends ImagePanel {
try {
deleteImage();
} catch (Exception e) {
- log.error("Error", e);
+ log.error(ERROR, e);
}
} else {
FileUpload fu = fileUploadField.getFileUpload();
@@ -156,7 +157,7 @@ public abstract class UploadableImagePanel extends ImagePanel {
processImage(sf, temp);
}
} catch (Exception e) {
- log.error("Error", e);
+ log.error(ERROR, e);
} finally {
if (temp != null && temp.exists()) {
log.debug("Temp file was deleted ? {}", temp.delete());
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
index dc521e527..8659b455d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
@@ -117,7 +117,7 @@ public abstract class AbstractOmDateTimePicker<T extends Serializable> extends F
public static String patch(String format) {
// in Java free text is escaped with single-quotes
// moment.js uses []
- return format.replaceAll("[']([^']*)[']", "\\[$1\\]");
+ return format.replaceAll("'([^']*)'", "\\[$1\\]");
}
public static String getDateTimeFormat() {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
index dbb426dae..880559019 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
@@ -1,5 +1,5 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
-var OmFileTree = (function() {
+const OmFileTree = (function() {
return {
dragHelper: function() {
let s = $(this);
@@ -24,5 +24,5 @@ var OmFileTree = (function() {
});
$('.trash-toolbar').confirmation('show');
}
- }
+ };
})();
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/upload.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/upload.js
index 07cc280e7..bad18e34a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/upload.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/upload.js
@@ -1,5 +1,5 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
-var Upload = (function() {
+const Upload = (function() {
let progress, progressBar, progressTitle, curUid, onCompleteFunc;
function _setProgress(prg) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
index 26bab6e14..d136dbcf2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
@@ -1,5 +1,5 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
-var NetTest = (function() {
+const NetTest = (function() {
const self = {}, PINGS = 10, LIMIT = 2000, URL = './services/networktest/'
, DELAY = 3000, KB = 1024, MB = KB * KB;
let output, lbls, tests, testName, testLabel, testNext, bulk = true;
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 de937790e..e466b28d7 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
@@ -198,20 +198,24 @@ public class WbPanel extends AbstractWbPanel {
}
private void doAction(Client c, WbAction a, JSONObject obj, boolean redo, IPartialPageRequestHandler handler) throws IOException {
- if (processActionGeneral(c, a, obj, handler)) {
+ if (doActionGeneral(c, a, obj, handler)) {
return;
}
+ doActionInternal(c, a, obj, redo, handler);
+ }
+
+ private void doActionInternal(Client c, WbAction a, JSONObject obj, boolean redo, IPartialPageRequestHandler handler) throws IOException {
//presenter-right
if (c.hasRight(Right.PRESENTER)) {
- processActionPresenter(c, a, obj, redo);
+ doActionPresenter(c, a, obj, redo);
}
//wb-right
if (c.hasRight(Right.PRESENTER) || c.hasRight(Right.WHITEBOARD)) {
- processActionWhiteboard(c, a, obj, false, handler);
+ doActionWhiteboard(c, a, obj, false, handler);
}
}
- private boolean processActionGeneral(Client c, WbAction a, JSONObject obj, IPartialPageRequestHandler handler) {
+ private boolean doActionGeneral(Client c, WbAction a, JSONObject obj, IPartialPageRequestHandler handler) {
switch (a) {
case CREATE_OBJ, MODIFY_OBJ:
{
@@ -240,7 +244,7 @@ public class WbPanel extends AbstractWbPanel {
return false;
}
- private void processActionPresenter(Client c, WbAction a, JSONObject obj, boolean redo) {
+ private void doActionPresenter(Client c, WbAction a, JSONObject obj, boolean redo) {
switch (a) {
case CREATE_WB:
{
@@ -307,7 +311,7 @@ public class WbPanel extends AbstractWbPanel {
}
}
- private void processActionWhiteboard(Client c, WbAction a, JSONObject obj, boolean redo, IPartialPageRequestHandler handler) throws IOException {
+ private void doActionWhiteboard(Client c, WbAction a, JSONObject obj, boolean redo, IPartialPageRequestHandler handler) throws IOException {
switch (a) {
case CREATE_OBJ:
{
@@ -433,7 +437,7 @@ public class WbPanel extends AbstractWbPanel {
Long wbId = obj.getLong("wbId");
UndoObject uo = getRedo(wbId);
if (uo != null) {
- processActionWhiteboard(c, uo.getAction(), uo.getOrigObject(), true, handler);
+ doActionInternal(c, uo.getAction(), uo.getOrigObject(), true, handler);
}
}
break;