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

fix for Java 8

Browse source
This commit is contained in:
anhefti 2020-03-03 15:51:50 +01:00
parent cccbc48805
commit 697eff4055
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java
View file

@ -20,7 +20,6 @@ import java.util.function.Supplier;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import ch.ethz.seb.sebserver.gbl.util.Cryptor;
import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.RWT;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -36,6 +35,7 @@ import ch.ethz.seb.sebserver.gbl.model.Entity;
import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.Page; import ch.ethz.seb.sebserver.gbl.model.Page;
import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
import ch.ethz.seb.sebserver.gbl.util.Cryptor;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.gui.form.FormBuilder; import ch.ethz.seb.sebserver.gui.form.FormBuilder;
import ch.ethz.seb.sebserver.gui.service.ResourceService; import ch.ethz.seb.sebserver.gui.service.ResourceService;
@ -227,7 +227,7 @@ public class PageServiceImpl implements PageService {
final int dependencies = (int) entities.stream() final int dependencies = (int) entities.stream()
.flatMap(entity -> { .flatMap(entity -> {
final RestCall<Set<EntityKey>>.RestCallBuilder builder = final RestCall<Set<EntityKey>>.RestCallBuilder builder =
restService.getBuilder( restService.<Set<EntityKey>> getBuilder(
entity.entityType(), entity.entityType(),
CallType.GET_DEPENDENCIES); CallType.GET_DEPENDENCIES);
@ -254,7 +254,7 @@ public class PageServiceImpl implements PageService {
public <T extends Entity & Activatable> Function<PageAction, PageAction> activationToggleActionFunction( public <T extends Entity & Activatable> Function<PageAction, PageAction> activationToggleActionFunction(
final EntityTable<T> table, final EntityTable<T> table,
final LocTextKey noSelectionText, final LocTextKey noSelectionText,
Function<PageAction, PageAction> testBeforeActivation) { final Function<PageAction, PageAction> testBeforeActivation) {
return action -> { return action -> {
final Set<T> selectedROWData = table.getSelectedROWData(); final Set<T> selectedROWData = table.getSelectedROWData();
@ -269,7 +269,7 @@ public class PageServiceImpl implements PageService {
for (final T entity : selectedROWData) { for (final T entity : selectedROWData) {
if (!entity.isActive()) { if (!entity.isActive()) {
RestCall<T>.RestCallBuilder restCallBuilder = restService.<T>getBuilder( final RestCall<T>.RestCallBuilder restCallBuilder = restService.<T> getBuilder(
entityType, entityType,
CallType.ACTIVATION_ACTIVATE) CallType.ACTIVATION_ACTIVATE)
.withURIVariable(API.PARAM_MODEL_ID, entity.getModelId()); .withURIVariable(API.PARAM_MODEL_ID, entity.getModelId());
@ -280,7 +280,7 @@ public class PageServiceImpl implements PageService {
restCallBuilder restCallBuilder
.call() .call()
.onError(errors::add); .onError(errors::add);
} catch (Exception e) { } catch (final Exception e) {
errors.add(e); errors.add(e);
} }
} else { } else {
@ -289,7 +289,7 @@ public class PageServiceImpl implements PageService {
.onError(errors::add); .onError(errors::add);
} }
} else { } else {
restService.<T>getBuilder(entityType, CallType.ACTIVATION_DEACTIVATE) restService.<T> getBuilder(entityType, CallType.ACTIVATION_DEACTIVATE)
.withURIVariable(API.PARAM_MODEL_ID, entity.getModelId()) .withURIVariable(API.PARAM_MODEL_ID, entity.getModelId())
.call() .call()
.onError(errors::add); .onError(errors::add);
@ -347,7 +347,7 @@ public class PageServiceImpl implements PageService {
@Override @Override
public FormBuilder formBuilder(final PageContext pageContext, final int rows) { public FormBuilder formBuilder(final PageContext pageContext, final int rows) {
return new FormBuilder(this, pageContext, cryptor, rows); return new FormBuilder(this, pageContext, this.cryptor, rows);
} }
@Override @Override

5
src/main/java/ch/ethz/seb/sebserver/gui/widget/ImageUploadSelection.java
View file

@ -48,7 +48,10 @@ public final class ImageUploadSelection extends Composite {
private static final long serialVersionUID = 368264811155804533L; private static final long serialVersionUID = 368264811155804533L;
private static final Logger log = LoggerFactory.getLogger(ImageUploadSelection.class); private static final Logger log = LoggerFactory.getLogger(ImageUploadSelection.class);
public static final Set<String> SUPPORTED_IMAGE_FILES = Set.of(".png", ".jpg", ".jpeg"); public static final Set<String> SUPPORTED_IMAGE_FILES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
".png",
".jpg",
".jpeg")));
private final ServerPushService serverPushService; private final ServerPushService serverPushService;