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

fixed some find bugs issues

Browse source
This commit is contained in:
anhefti 2019-03-07 13:19:30 +01:00
parent bfd25c9885
commit 3cd18d0797
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageContextImpl.java
View file

@ -8,6 +8,7 @@
package ch.ethz.seb.sebserver.gui.service.page.impl; package ch.ethz.seb.sebserver.gui.service.page.impl;
import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
@ -344,9 +345,9 @@ public class PageContextImpl implements PageContext {
+ "]"; + "]";
} }
private final class ConfirmDialogCallback implements DialogCallback { private static final class ConfirmDialogCallback implements DialogCallback {
private static final long serialVersionUID = 1491270214433492441L; private static final long serialVersionUID = 1491270214433492441L;
private transient final Runnable onOK; private final Runnable onOK;
private ConfirmDialogCallback(final Runnable onOK) { private ConfirmDialogCallback(final Runnable onOK) {
this.onOK = onOK; this.onOK = onOK;
@ -366,7 +367,10 @@ public class PageContextImpl implements PageContext {
} }
} }
private static final class ListenerComparator implements Comparator<PageEventListener<?>> { private static final class ListenerComparator implements Comparator<PageEventListener<?>>, Serializable {
private static final long serialVersionUID = 2571739214439340404L;
@Override @Override
public int compare(final PageEventListener<?> o1, final PageEventListener<?> o2) { public int compare(final PageEventListener<?> o1, final PageEventListener<?> o2) {
final int x = o1.priority(); final int x = o1.priority();

7
src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/auth/CurrentUser.java
View file

@ -166,6 +166,10 @@ public class CurrentUser {
} }
} }
private static final ParameterizedTypeReference<Collection<Privilege>> PRIVILEGE_LIST_TYPE_REF =
new ParameterizedTypeReference<>() {
};
private boolean loadPrivileges() { private boolean loadPrivileges() {
if (this.privileges != null) { if (this.privileges != null) {
return true; return true;
@ -183,8 +187,7 @@ public class CurrentUser {
.toUriString(), .toUriString(),
HttpMethod.GET, HttpMethod.GET,
HttpEntity.EMPTY, HttpEntity.EMPTY,
new ParameterizedTypeReference<Collection<Privilege>>() { PRIVILEGE_LIST_TYPE_REF);
});
if (exchange.getStatusCodeValue() == HttpStatus.OK.value()) { if (exchange.getStatusCodeValue() == HttpStatus.OK.value()) {
this.privileges = exchange.getBody().stream() this.privileges = exchange.getBody().stream()