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
commit 364b2b2918115888da1f10e313532a38f13fbac6 Author: Maxim Solodovnik <[email protected]> AuthorDate: Thu Nov 26 23:42:27 2020 +0700 [OPENMEETINGS-2478] sonar should be more happy --- .../apache/openmeetings/core/remote/AbstractStream.java | 2 +- .../apache/openmeetings/db/bind/adapter/EntityAdapter.java | 4 ++-- .../java/org/apache/openmeetings/db/dao/room/RoomDao.java | 1 - .../apache/openmeetings/db/entity/file/FileItemTest.java | 14 +++++++------- .../org/apache/openmeetings/backup/TestBackupVersion.java | 2 +- .../calendar/caldav/handler/AbstractCalendarHandler.java | 2 +- .../apache/openmeetings/web/admin/AdminActionsPanel.java | 2 +- .../org/apache/openmeetings/web/admin/AdminBaseForm.java | 2 +- .../org/apache/openmeetings/web/admin/AdminBasePanel.java | 2 +- .../openmeetings/web/admin/AdminUserChoiceProvider.java | 2 +- .../apache/openmeetings/web/admin/SearchableDataView.java | 2 +- .../openmeetings/web/common/AbstractOmDateTimePicker.java | 4 ++-- .../java/org/apache/openmeetings/web/common/BasePanel.java | 4 ++-- .../apache/openmeetings/web/common/FormActionsPanel.java | 2 +- .../org/apache/openmeetings/web/common/ImagePanel.java | 2 +- .../org/apache/openmeetings/web/common/InvitationForm.java | 2 +- .../org/apache/openmeetings/web/common/NameDialog.java | 4 ++-- .../apache/openmeetings/web/common/OmWebSocketPanel.java | 2 +- .../openmeetings/web/common/PagedEntityListPanel.java | 2 +- .../openmeetings/web/common/PagingNavigatorPanel.java | 4 ++-- .../openmeetings/web/common/UploadableImagePanel.java | 2 +- .../org/apache/openmeetings/web/common/UserBasePanel.java | 4 ++-- .../java/org/apache/openmeetings/web/common/UserPanel.java | 4 ++-- .../web/common/confirmation/ConfirmableAjaxBorder.java | 2 +- .../web/common/confirmation/ConfirmationDialog.java | 2 +- .../apache/openmeetings/web/common/tree/FileTreePanel.java | 2 +- .../java/org/apache/openmeetings/web/pages/BasePage.java | 2 +- .../org/apache/openmeetings/web/room/OmTimerBehavior.java | 2 +- .../apache/openmeetings/web/room/wb/AbstractWbPanel.java | 2 +- .../web/user/record/RecordingResourceReference.java | 2 +- .../openmeetings/web/util/FileItemResourceReference.java | 2 +- 31 files changed, 43 insertions(+), 44 deletions(-) diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java index 7891125..cfc18d4 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java @@ -29,7 +29,7 @@ public abstract class AbstractStream { protected final String sid; protected final String uid; - public AbstractStream(final String sid, final String uid) { + protected AbstractStream(final String sid, final String uid) { this.sid = sid; this.uid = uid; } diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/EntityAdapter.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/EntityAdapter.java index 916d257..b9dad29 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/EntityAdapter.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/EntityAdapter.java @@ -31,11 +31,11 @@ public abstract class EntityAdapter<E extends IDataProviderEntity> extends XmlAd private final IDataProviderDao<E> dao; private final Map<Long, Long> idMap; - public EntityAdapter() { + protected EntityAdapter() { this(null, null); } - public EntityAdapter(IDataProviderDao<E> dao, Map<Long, Long> idMap) { + protected EntityAdapter(IDataProviderDao<E> dao, Map<Long, Long> idMap) { this.dao = dao; this.idMap = idMap; } diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java index 7e5bb6d..d90d83b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java @@ -204,7 +204,6 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> { public Room update(Room entity, Long userId) { if (entity.getId() == null) { em.persist(entity); - } else { } if (entity.isSipEnabled() && isSipEnabled()) { String sipNumber = getSipNumber(entity.getId()); diff --git a/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java index 5a27308..cdfb6b9 100644 --- a/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java +++ b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java @@ -51,7 +51,7 @@ class FileItemTest { File f = fileItem.getFile(null); assertTrue(f.getName().endsWith("png")); - assertEquals(f.getName(), "page-0000.png"); + assertEquals("page-0000.png", f.getName()); } @Test @@ -65,7 +65,7 @@ class FileItemTest { File f = fileItem.getOriginal(); assertTrue(f.getName().endsWith("pdf")); - assertEquals(f.getName(), "6594186e-c6bb-49d5-9f66-829e45599aaa.pdf"); + assertEquals("6594186e-c6bb-49d5-9f66-829e45599aaa.pdf", f.getName()); } @Test @@ -79,7 +79,7 @@ class FileItemTest { File f = fileItem.getOriginal(); assertTrue(f.getName().endsWith("pdf")); - assertEquals(f.getName(), "6594186e-c6bb-49d5-9f66-829e45599aaa.pdf"); + assertEquals("6594186e-c6bb-49d5-9f66-829e45599aaa.pdf", f.getName()); } private void wrapper(Runnable r) { @@ -101,7 +101,7 @@ class FileItemTest { File f = fileItem.getOriginal(); assertTrue(f.getName().endsWith("docx")); - assertEquals(f.getName(), "d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx"); + assertEquals("d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx", f.getName()); }); } @@ -116,7 +116,7 @@ class FileItemTest { File f = fileItem.getOriginal(); assertTrue(f.getName().endsWith("docx")); - assertEquals(f.getName(), "d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx"); + assertEquals("d44ab2c5-fd5d-4903-8fa7-292286d72a5f.docx", f.getName()); }); } @@ -131,7 +131,7 @@ class FileItemTest { File f = fileItem.getFile(null); assertTrue(f.getName().endsWith("png")); - assertEquals(f.getName(), "page-0000.png"); + assertEquals("page-0000.png", f.getName()); } @Test @@ -145,7 +145,7 @@ class FileItemTest { File f = fileItem.getFile("pdf"); assertTrue(f.getName().endsWith("pdf")); - assertEquals(f.getName(), "d44ab2c5-fd5d-4903-8fa7-292286d72a5f.pdf"); + assertEquals("d44ab2c5-fd5d-4903-8fa7-292286d72a5f.pdf", f.getName()); } } diff --git a/openmeetings-install/src/test/java/org/apache/openmeetings/backup/TestBackupVersion.java b/openmeetings-install/src/test/java/org/apache/openmeetings/backup/TestBackupVersion.java index eb49a2b..35c81dc 100644 --- a/openmeetings-install/src/test/java/org/apache/openmeetings/backup/TestBackupVersion.java +++ b/openmeetings-install/src/test/java/org/apache/openmeetings/backup/TestBackupVersion.java @@ -34,7 +34,7 @@ class TestBackupVersion { @Test void testEquals() { assertEquals(BackupVersion.get(), BackupVersion.get()); - assertNotEquals(BackupVersion.get(), null); + assertNotEquals(null, BackupVersion.get()); assertNotEquals(BackupVersion.get("3.2.1"), BackupVersion.get("3.2.0")); assertNotEquals(BackupVersion.get("3.1.1"), BackupVersion.get("3.0.0")); assertNotEquals(BackupVersion.get("3.1.1"), BackupVersion.get("2.0.0")); diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/AbstractCalendarHandler.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/AbstractCalendarHandler.java index 65a5b6d..1ddd223 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/AbstractCalendarHandler.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/AbstractCalendarHandler.java @@ -51,7 +51,7 @@ public abstract class AbstractCalendarHandler implements CalendarHandler { protected AppointmentDao appointmentDao; - public AbstractCalendarHandler(String path, OmCalendar calendar, HttpClient client, + protected AbstractCalendarHandler(String path, OmCalendar calendar, HttpClient client, HttpClientContext context, AppointmentDao appointmentDao, IcalUtils utils) { this.path = path; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.java index c565b78..2cb59f2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.java @@ -35,7 +35,7 @@ public abstract class AdminActionsPanel<T> extends FormActionsPanel<T> { private AjaxLink<Void> delBtn; private AjaxLink<Void> restoreBtn; - public AdminActionsPanel(String id, final Form<T> form) { + protected AdminActionsPanel(String id, final Form<T> form) { super(id, form); this.form = form; } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java index 5491c82..dac21ed 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java @@ -39,7 +39,7 @@ public abstract class AdminBaseForm<T> extends Form<T> { protected final AjaxFormValidatingBehavior validationBehavior = new AjaxFormValidatingBehavior("keydown", Duration.ofSeconds(1)); - public AdminBaseForm(String id, IModel<T> object) { + protected AdminBaseForm(String id, IModel<T> object) { super(id, object); savePanel = new AdminActionsPanel<>("buttons", this) { diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java index 7b77e13..b5e59c4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.java @@ -25,7 +25,7 @@ import org.apache.wicket.authroles.authorization.strategies.role.annotations.Aut public abstract class AdminBasePanel extends BasePanel { private static final long serialVersionUID = 1L; - public AdminBasePanel(String id) { + protected AdminBasePanel(String id) { super(id); } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java index 37816b8..6fd2da4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java @@ -35,7 +35,7 @@ public abstract class AdminUserChoiceProvider extends ChoiceProvider<User> { @SpringBean private UserDao userDao; - public AdminUserChoiceProvider() { + protected AdminUserChoiceProvider() { Injector.get().inject(this); } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java index cbb863c..274af3b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java @@ -33,7 +33,7 @@ public abstract class SearchableDataView<T extends IDataProviderEntity> extends private static final long serialVersionUID = 1L; private SearchableDataProvider<T> dp; - public SearchableDataView(String id, SearchableDataProvider<T> dp) { + protected SearchableDataView(String id, SearchableDataProvider<T> dp) { super(id, dp); this.dp = dp; } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AbstractOmDateTimePicker.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AbstractOmDateTimePicker.java index 2c9e2d2..2d0bd5a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AbstractOmDateTimePicker.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AbstractOmDateTimePicker.java @@ -35,11 +35,11 @@ public abstract class AbstractOmDateTimePicker<T> extends AbstractDateTimePicker private static final String DEFAULT_DATE_FORMAT = "yyyy/MM/dd"; private static final String DEFAULT_DATE_TIME_FORMAT = DEFAULT_DATE_FORMAT + " HH:mm:ss"; - public AbstractOmDateTimePicker(String id, IModel<T> model) { + protected AbstractOmDateTimePicker(String id, IModel<T> model) { this(id, model, getDateTimeFormat()); } - public AbstractOmDateTimePicker(String id, IModel<T> model, String format) { + protected AbstractOmDateTimePicker(String id, IModel<T> model, String format) { super(id, model, new DatetimePickerConfig() //.useLocale(WebSession.get().getLocale().toLanguageTag()) .withFormat(patch(format)) 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 c6c05fd..abfe714 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 @@ -35,12 +35,12 @@ public abstract class BasePanel extends Panel { public static final String EVT_CLICK = "click"; protected static final String ROW_CLASS = "clickable"; - public BasePanel(String id) { + protected BasePanel(String id) { super(id); setOutputMarkupId(true); } - public BasePanel(String id, IModel<?> model) { + protected BasePanel(String id, IModel<?> model) { super(id, model); setOutputMarkupId(true); } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.java index 6591b2e..e58dcab 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.java @@ -35,7 +35,7 @@ public abstract class FormActionsPanel<T> extends Panel { private AjaxButton saveBtn; private AjaxLink<Void> purgeBtn; - public FormActionsPanel(String id, Form<T> form) { + protected FormActionsPanel(String id, Form<T> form) { super(id); this.form = form; setOutputMarkupId(true); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java index ba771f0..73dc4d9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java @@ -31,7 +31,7 @@ public abstract class ImagePanel extends Panel { private static final long serialVersionUID = 1L; protected final WebMarkupContainer profile = new TransparentWebMarkupContainer("profile"); - public ImagePanel(String id) { + protected ImagePanel(String id) { super(id); add(profile.setOutputMarkupId(true)); } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java index c088000..237c5f0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java @@ -89,7 +89,7 @@ public abstract class InvitationForm extends Form<Invitation> { , SEND } - public InvitationForm(String id) { + protected InvitationForm(String id) { super(id, new CompoundPropertyModel<>(new Invitation())); setOutputMarkupId(true); } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java index 004ed72..f2f995b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java @@ -40,11 +40,11 @@ public abstract class NameDialog extends Modal<String> { private final String name; private RequiredTextField<String> title; - public NameDialog(String id) { + protected NameDialog(String id) { this(id, null); } - public NameDialog(String id, String name) { + protected NameDialog(String id, String name) { super(id, Model.of(name)); this.name = name; form = new Form<>("form", getModel()); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java index 247b852..9c90531 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java @@ -58,7 +58,7 @@ public abstract class OmWebSocketPanel extends Panel { private KurentoHandler kHandler; private boolean pingable = false; - public OmWebSocketPanel(String id) { + protected OmWebSocketPanel(String id) { super(id); } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java index fe84631..138c22d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java @@ -35,7 +35,7 @@ public abstract class PagedEntityListPanel extends Panel { private static final long serialVersionUID = 1L; private final SearchableDataView<? extends IDataProviderEntity> dataView; - public PagedEntityListPanel(String id, final SearchableDataView<? extends IDataProviderEntity> dataView) { + protected PagedEntityListPanel(String id, final SearchableDataView<? extends IDataProviderEntity> dataView) { super(id); this.dataView = dataView; } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java index f6e32af..5e37061 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java @@ -34,11 +34,11 @@ public abstract class PagingNavigatorPanel extends Panel { private final DataView<?> dataView; private final List<Integer> numbers; - public PagingNavigatorPanel(String id, final DataView<?> dataView) { + protected PagingNavigatorPanel(String id, final DataView<?> dataView) { this(id, dataView, List.of(10, 25, 50, 75, 100, 200), 50); } - public PagingNavigatorPanel(String id, final DataView<?> dataView, List<Integer> numbers, int entitiesPerPage) { + protected PagingNavigatorPanel(String id, final DataView<?> dataView, List<Integer> numbers, int entitiesPerPage) { super(id); setOutputMarkupId(true); this.entitiesPerPage = entitiesPerPage; 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 412878d..26aab2e 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 @@ -51,7 +51,7 @@ public abstract class UploadableImagePanel extends ImagePanel { private final Form<Void> form = new Form<>("form"); private final boolean delayed; - public UploadableImagePanel(String id, boolean delayed) { + protected UploadableImagePanel(String id, boolean delayed) { super(id); this.delayed = delayed; } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserBasePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserBasePanel.java index b2c06f9..2d82a8c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserBasePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserBasePanel.java @@ -25,11 +25,11 @@ import org.apache.wicket.model.IModel; public abstract class UserBasePanel extends BasePanel { private static final long serialVersionUID = 1L; - public UserBasePanel(String id) { + protected UserBasePanel(String id) { super(id); } - public UserBasePanel(String id, IModel<?> model) { + protected UserBasePanel(String id, IModel<?> model) { super(id, model); } } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java index faa2a34..9eef1e4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java @@ -26,11 +26,11 @@ import org.apache.wicket.model.IModel; public abstract class UserPanel extends Panel { private static final long serialVersionUID = 1L; - public UserPanel(String id) { + protected UserPanel(String id) { super(id); } - public UserPanel(String id, IModel<?> model) { + protected UserPanel(String id, IModel<?> model) { super(id, model); } } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.java index 2b651c5..a344fc5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.java @@ -29,7 +29,7 @@ public abstract class ConfirmableAjaxBorder extends Border { private static final long serialVersionUID = 1L; private final ConfirmationDialog dialog; - public ConfirmableAjaxBorder(String id, ConfirmationDialog dialog) { + protected ConfirmableAjaxBorder(String id, ConfirmationDialog dialog) { super(id); this.dialog = dialog; setOutputMarkupId(true); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationDialog.java index 8a125c0..9404517 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationDialog.java @@ -34,7 +34,7 @@ public abstract class ConfirmationDialog extends TextContentModal { private static final long serialVersionUID = 1L; private BootstrapAjaxLink<String> okButton; - public ConfirmationDialog(String id, IModel<String> title, IModel<String> model) { + protected ConfirmationDialog(String id, IModel<String> title, IModel<String> model) { super(id, model); header(title); } 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 fecefce..b472fc8 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 @@ -143,7 +143,7 @@ public abstract class FileTreePanel extends Panel { @SpringBean private FileItemDao fileDao; - public FileTreePanel(String id, Long roomId, NameDialog addFolder) { + protected FileTreePanel(String id, Long roomId, NameDialog addFolder) { super(id); this.roomId = roomId; this.addFolder = addFolder; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java index c26357c..92350d3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java @@ -71,7 +71,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage { } }; - public BasePage() { + protected BasePage() { if (isInitComplete()) { if (!isInstalled() && ! (this instanceof InstallWizardPage)) { throw new RestartResponseException(InstallWizardPage.class); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmTimerBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmTimerBehavior.java index d0a9225..9ca3d5c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmTimerBehavior.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmTimerBehavior.java @@ -29,7 +29,7 @@ public abstract class OmTimerBehavior extends AbstractAjaxTimerBehavior { private final int delay; private final String labelId; - public OmTimerBehavior(int delay, String labelId) { + protected OmTimerBehavior(int delay, String labelId) { super(Duration.ofSeconds(1)); clock = System.currentTimeMillis(); this.delay = delay; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java index 717ff57..67ac7d1 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java @@ -33,7 +33,7 @@ public abstract class AbstractWbPanel extends Panel { protected final RoomPanel rp; protected boolean inited = false; - public AbstractWbPanel(String id, RoomPanel rp) { + protected AbstractWbPanel(String id, RoomPanel rp) { super(id); this.rp = rp; setOutputMarkupId(true); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java index c43b5dc..2584365 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java @@ -55,7 +55,7 @@ public abstract class RecordingResourceReference extends FileItemResourceReferen @SpringBean private UserDao userDao; - public RecordingResourceReference(String name) { + protected RecordingResourceReference(String name) { super(name); Injector.get().inject(this); } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java index 366fd0e..331337c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java @@ -35,7 +35,7 @@ public abstract class FileItemResourceReference<T extends BaseFileItem> extends private static final long serialVersionUID = 1L; protected static final Logger log = LoggerFactory.getLogger(FileItemResourceReference.class); - public FileItemResourceReference(String name) { + protected FileItemResourceReference(String name) { super(name); }
