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 822e99c5b [OPENMEETINGS-2783] sonar should be more happy
822e99c5b is described below
commit 822e99c5b789546c29d3bd898721479768704c8f
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Jul 7 10:04:25 2024 +0700
[OPENMEETINGS-2783] sonar should be more happy
---
.../apache/openmeetings/util/crypt/AbstractCryptTest.java | 2 +-
openmeetings-web/src/main/front/src/chat/chat.js | 2 +-
.../apache/openmeetings/web/room/sidebar/RoomSidebar.html | 10 +++++-----
.../java/org/apache/openmeetings/web/room/wb/WbPanel.html | 6 +++---
.../openmeetings/web/user/calendar/AppointmentDialog.html | 14 +++++++-------
.../java/org/apache/openmeetings/web/user/chat/Chat.html | 4 ++--
.../org/apache/openmeetings/web/user/chat/ChatToolbar.html | 4 ++--
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/AbstractCryptTest.java
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/AbstractCryptTest.java
index c87ec6a73..be813e38a 100644
---
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/AbstractCryptTest.java
+++
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/AbstractCryptTest.java
@@ -55,7 +55,7 @@ abstract class AbstractCryptTest {
RandomStringGenerator generator = new
RandomStringGenerator.Builder()
.withinRange('!', '}')
.usingRandom(rnd::nextInt)
- .build();
+ .get();
for (int i = 0; i < count; ++i) {
l.add(generator.generate(rnd.nextInt(256)));
}
diff --git a/openmeetings-web/src/main/front/src/chat/chat.js
b/openmeetings-web/src/main/front/src/chat/chat.js
index ecebc287c..2c912b22c 100644
--- a/openmeetings-web/src/main/front/src/chat/chat.js
+++ b/openmeetings-web/src/main/front/src/chat/chat.js
@@ -215,7 +215,7 @@ function _addTab(id, label) {
if (!label) {
label = id === "chatTab-all" ? allPrefix : roomPrefix +
id.substr(9);
}
- const link = $('<a class="nav-link" data-bs-toggle="tab" role="tab">')
+ const link = $('<a class="nav-link" data-bs-toggle="tab">')
.attr('aria-controls', id)
.attr('href', '#' + id).text(label)
, li = $('<li class="nav-item">').append(link);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
index f8ddc168a..2640970f7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
@@ -22,15 +22,15 @@
<wicket:panel>
<div id="busy-indicator"><i class="fas fa-spinner fa-spin"></i></div>
<div class="tabs" id="room-sidebar-tabs">
- <ul class="nav nav-tabs" role="tablist">
+ <ul class="nav nav-tabs">
<li class="nav-item">
- <a href="#room-sidebar-tab-users"
class="nav-link active om-icon big tab user" id="room-sidebar-users-tab"
data-bs-toggle="tab" role="tab" aria-controls="room-sidebar-tab-users"
wicket:message="title:398">
+ <a href="#room-sidebar-tab-users"
class="nav-link active om-icon big tab user" id="room-sidebar-users-tab"
data-bs-toggle="tab" aria-controls="room-sidebar-tab-users"
wicket:message="title:398">
<i class="fas fa-users"></i>
<span class="label"><wicket:message
key="398"/> </span><span class="badge bg-info user-count end-0"></span>
</a>
</li>
<li class="nav-item" wicket:enclosure="file-tab">
- <a href="#room-sidebar-tab-files"
class="nav-link om-icon big tab file" id="room-sidebar-files-tab"
data-bs-toggle="tab" role="tab" aria-controls="room-sidebar-tab-files"
wicket:message="title:245" wicket:id="file-tab">
+ <a href="#room-sidebar-tab-files"
class="nav-link om-icon big tab file" id="room-sidebar-files-tab"
data-bs-toggle="tab" aria-controls="room-sidebar-tab-files"
wicket:message="title:245" wicket:id="file-tab">
<i class="fas fa-folder"></i>
<span class="label"><wicket:message
key="245"/></span>
</a>
@@ -41,7 +41,7 @@
</li>
</ul>
<div class="tab-content">
- <div id="room-sidebar-tab-users" class="tab-pane fade
show active" role="tabpanel" aria-labelledby="room-sidebar-users-tab">
+ <div id="room-sidebar-tab-users" class="tab-pane fade
show active" aria-labelledby="room-sidebar-users-tab">
<div class="header">
<span class="om-icon float-start
settings clickable" wicket:message="title:306"></span>
<span class="om-icon float-start
activity cam clickable"
wicket:message="data-on:camera.on,data-off:camera.off"></span>
@@ -52,7 +52,7 @@
</div>
</div>
</div>
- <div id="room-sidebar-tab-files" class="tab-pane fade"
role="tabpanel" aria-labelledby="room-sidebar-files-tab"
wicket:enclosure="tree">
+ <div id="room-sidebar-tab-files" class="tab-pane fade"
aria-labelledby="room-sidebar-files-tab" wicket:enclosure="tree">
<div class="file-list h-100"
wicket:id="tree"></div>
</div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 066cd067d..a795fb925 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -24,7 +24,7 @@
<div class="tabs">
<div class="wb-tabbar">
<div class="scroll-container">
- <ul class="scrollable nav nav-tabs"
role="tablist"></ul>
+ <ul class="scrollable nav nav-tabs"></ul>
</div>
</div>
<div class="wb-tab-content tab-content">
@@ -45,7 +45,7 @@
</div>
<ul>
<li id="wb-area-tab" class="nav-item">
- <a class="nav-link" data-bs-toggle="tab"
role="tab">
+ <a class="nav-link" data-bs-toggle="tab">
<span class="wb-nav-tab-text"></span>
</a>
</li>
@@ -83,7 +83,7 @@
<div wicket:id="clipart" class="clickable
om-icon big clipart" data-image="./public/cliparts/"></div>
</div>
</div>
- <div id="wb-area" class="wb-tab tab-pane" role="tabpanel">
+ <div id="wb-area" class="wb-tab tab-pane">
<div class="wb-with-zoom">
<div class="wb-zoom-block"></div>
<div class="scroll-container">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
index 670df51fd..d794b4dbd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
@@ -24,13 +24,13 @@
<form wicket:id="appForm" class="appointmentPopUp">
<span wicket:id="feedback"></span>
<div class="tabs">
- <ul class="nav nav-tabs" role="tablist">
- <li class="nav-item"><a class="nav-link active"
id="tab1-tab" data-bs-toggle="tab" role="tab" aria-controls="tab1"
href="#tab1"><wicket:message key="lbl.general"/></a></li>
- <li class="nav-item"><a class="nav-link"
id="tab2-tab" data-bs-toggle="tab" role="tab" aria-controls="tab2"
href="#tab2"><wicket:message key="406"/></a></li>
- <li class="nav-item"><a class="nav-link"
id="tab3-tab" data-bs-toggle="tab" role="tab" aria-controls="tab3"
href="#tab3"><wicket:message key="appointment.tab.advanced"/></a></li>
+ <ul class="nav nav-tabs">
+ <li class="nav-item"><a class="nav-link active"
id="tab1-tab" data-bs-toggle="tab" aria-controls="tab1"
href="#tab1"><wicket:message key="lbl.general"/></a></li>
+ <li class="nav-item"><a class="nav-link"
id="tab2-tab" data-bs-toggle="tab" aria-controls="tab2"
href="#tab2"><wicket:message key="406"/></a></li>
+ <li class="nav-item"><a class="nav-link"
id="tab3-tab" data-bs-toggle="tab" aria-controls="tab3"
href="#tab3"><wicket:message key="appointment.tab.advanced"/></a></li>
</ul>
<div class="tab-content">
- <div id="tab1" class="tab-pane fade show active
pt-1" role="tabpanel" aria-labelledby="tab1-tab">
+ <div id="tab1" class="tab-pane fade show active
pt-1" aria-labelledby="tab1-tab">
<div class="row">
<label wicket:for="title"
class="form-label col-3 p-0"><wicket:message key="572" /></label>
<div class="col-8 p-0">
@@ -83,7 +83,7 @@
</div>
</div>
</div>
- <div id="tab2" class="tab-pane fade pt-1"
role="tabpanel" aria-labelledby="tab2-tab">
+ <div id="tab2" class="tab-pane fade pt-1"
aria-labelledby="tab2-tab">
<div wicket:enclosure="createRoom">
<input type="checkbox"
wicket:id="createRoom" class="form-check-input"/>
<label wicket:for="createRoom"
class="form-check-label"><wicket:message key="1509" /></label>
@@ -111,7 +111,7 @@
<span class="col-8"
wicket:id="room.confno"></span>
</div>
</div>
- <div id="tab3" class="tab-pane fade pt-1"
role="tabpanel" aria-labelledby="tab3-tab">
+ <div id="tab3" class="tab-pane fade pt-1"
aria-labelledby="tab3-tab">
<div class="row">
<label wicket:for="reminder"
class="form-label col-3 p-0"><wicket:message key="565" /></label>
<div class="col-8 p-0">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
index c5e6f568a..52f67c3d0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
@@ -21,7 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:panel>
<div id="chatTabs">
- <ul class="nav nav-tabs" role="tablist">
+ <ul class="nav nav-tabs">
</ul>
<div class="tab-content"></div>
</div>
@@ -57,7 +57,7 @@
<i class="fas fa-times"></i>
<span class="sr-only"><wicket:message key="85"/></span>
</button>
- <div id="chat-msg-area-template" class="messageArea bg-white
tab-pane h-100" role="tabpanel"></div>
+ <div id="chat-msg-area-template" class="messageArea bg-white
tab-pane h-100"></div>
</div>
</wicket:panel>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
index a6f278451..e6f3b6476 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
@@ -21,7 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:panel>
- <div wicket:id="toolbar" class="btn-toolbar chat-toolbar navbar
navbar-expand navbar-light bg-light p-0" data-role="editor-toolbar">
+ <nav wicket:id="toolbar" class="btn-toolbar chat-toolbar navbar
navbar-expand navbar-light bg-light p-0" data-role="editor-toolbar">
<button class="navbar-toggler" type="button"
data-bs-toggle="collapse" data-bs-target="#navbarChatContent"
aria-controls="navbarChatContent" aria-expanded="false">
<span class="navbar-toggler-icon"></span>
</button>
@@ -83,7 +83,7 @@
</li>
</ul>
</div>
- </div>
+ </nav>
</wicket:panel>
</html>
