zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix findbugs

Browse source
This commit is contained in:
anhefti 2019-11-25 11:49:30 +01:00
parent 2fd7ce47b8
commit 31f8dc295b
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
findbugs-excludes.xml
View file

@ -24,7 +24,7 @@
<Bug pattern="REC_CATCH_EXCEPTION" /> <Bug pattern="REC_CATCH_EXCEPTION" />
</Match> </Match>
<Match> <Match>
<Package name="ch.ethz.seb.sebserver.gui.*" /> <Package name="~ch\.ethz\.seb\.sebserver\.gui\..*" />
<Bug pattern="SE_BAD_FIELD" /> <Bug pattern="SE_BAD_FIELD" />
</Match> </Match>
<Match> <Match>
@ -32,7 +32,7 @@
<Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" /> <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" />
</Match> </Match>
<Match> <Match>
<Package name="ch.ethz.seb.sebserver.gui.service.page.FieldValidationError" /> <Package name="ch.ethz.seb.sebserver.gui.service.page" />
<Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" /> <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" />
</Match> </Match>

2
src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java
View file

@ -38,7 +38,7 @@ public final class Indicator implements Entity {
; ;
public final String name; public final String name;
public boolean integerValue; public final boolean integerValue;
private IndicatorType(final String name, final boolean integerValue) { private IndicatorType(final String name, final boolean integerValue) {
this.name = name; this.name = name;

3
src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java
View file

@ -85,6 +85,9 @@ final class InstitutionalAuthenticationEntryPoint implements AuthenticationEntry
_defaultLogo = FileCopyUtils.copyToString(reader); _defaultLogo = FileCopyUtils.copyToString(reader);
} catch (final IOException e) {
log.warn("Failed to load default logo image from filesystem: {}", defaultLogoFileName);
_defaultLogo = null;
} catch (final Exception e) { } catch (final Exception e) {
log.warn("Failed to load default logo image from filesystem: {}", defaultLogoFileName); log.warn("Failed to load default logo image from filesystem: {}", defaultLogoFileName);
_defaultLogo = null; _defaultLogo = null;

7
src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
View file

@ -315,7 +315,12 @@ public class ActivitiesPane implements TemplateComposer {
.create()); .create());
} }
monitoring.setExpanded(this.currentUser.get().hasAnyRole(UserRole.EXAM_SUPPORTER)); if (monitoring != null) {
monitoring.setExpanded(
this.currentUser
.get()
.hasAnyRole(UserRole.EXAM_SUPPORTER));
}
} }
// ---- MONITORING --------------------------------------------------------------------- // ---- MONITORING ---------------------------------------------------------------------