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/05/13 04:17:27 UTC
[openmeetings] 01/02: [OPENMEETINGS-2703] couple more Sonar issues
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 d7b916b0c835cbe083823c0ff693d5e079df3dbd
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri May 13 11:14:55 2022 +0700
[OPENMEETINGS-2703] couple more Sonar issues
---
.../web/pages/install/InstallWizard$InstallStep.html | 2 +-
.../web/room/GroupCustomCssResourceReference.java | 20 +++++++++++++-------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
index 6494806f5..12b43c89b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
@@ -23,7 +23,7 @@
<wicket:panel>
<p wicket:id="desc"></p>
<div wicket:id="container" class="m-3">
- <div wicket:id="progress"><!-- div><span wicket:id="value"></span>%</div--></div>
+ <div wicket:id="progress"></div>
<div wicket:id="status"></div>
</div>
</wicket:panel>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/GroupCustomCssResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/GroupCustomCssResourceReference.java
index ddde86d1f..bca95d732 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/GroupCustomCssResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/GroupCustomCssResourceReference.java
@@ -23,6 +23,8 @@ import static org.apache.openmeetings.util.OmFileHelper.getGroupCss;
import java.io.File;
import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.resource.FileSystemResource;
@@ -48,14 +50,16 @@ public class GroupCustomCssResourceReference extends FileSystemResourceReference
public IResource getResource() {
return new FileSystemResource() {
private static final long serialVersionUID = 1L;
+ private static final String MIME = "text/css";
@Override
protected String getMimeType() throws IOException {
- return "text/css";
+ return MIME;
}
@Override
protected ResourceResponse newResourceResponse(Attributes attr) {
+ ResourceResponse rr;
PageParameters params = attr.getParameters();
StringValue idStr = params.get("id");
Long id = null;
@@ -65,14 +69,16 @@ public class GroupCustomCssResourceReference extends FileSystemResourceReference
//no-op expected
}
File file = getGroupCss(id, true);
- if (file != null) {
- ResourceResponse rr = createResourceResponse(attr, file.toPath());
- rr.setFileName(file.getName());
- return rr;
- } else {
+ if (file == null) {
log.debug("Custom CSS was not found");
- return null;
+ rr = new ResourceResponse()
+ .setContentType(MIME)
+ .setStatusCode(HttpServletResponse.SC_NO_CONTENT);
+ } else {
+ rr = createResourceResponse(attr, file.toPath());
+ rr.setFileName(file.getName());
}
+ return rr;
}
};
}