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 2019-02-08 22:04:35 +01:00
parent 04bbadf2e0
commit c0ba128bc7
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/ch/ethz/seb/sebserver/gui/service/page/form/Form.java
View file

@ -35,7 +35,7 @@ public final class Form implements FormBinding {
private final JSONMapper jsonMapper; private final JSONMapper jsonMapper;
private final ObjectNode objectRoot; private final ObjectNode objectRoot;
private final Map<String, FormFieldAccessor<?>> formFields = new LinkedHashMap<>(); private final Map<String, FormFieldAccessor> formFields = new LinkedHashMap<>();
private final Map<String, Form> subForms = new LinkedHashMap<>(); private final Map<String, Form> subForms = new LinkedHashMap<>();
private final Map<String, List<Form>> subLists = new LinkedHashMap<>(); private final Map<String, List<Form>> subLists = new LinkedHashMap<>();
private final Map<String, Set<String>> groups = new LinkedHashMap<>(); private final Map<String, Set<String>> groups = new LinkedHashMap<>();
@ -56,7 +56,7 @@ public final class Form implements FormBinding {
} }
public String getValue(final String name) { public String getValue(final String name) {
final FormFieldAccessor<?> formFieldAccessor = this.formFields.get(name); final FormFieldAccessor formFieldAccessor = this.formFields.get(name);
if (formFieldAccessor != null) { if (formFieldAccessor != null) {
return formFieldAccessor.getValue(); return formFieldAccessor.getValue();
} }
@ -132,7 +132,7 @@ public final class Form implements FormBinding {
public void process( public void process(
final Predicate<String> nameFilter, final Predicate<String> nameFilter,
final Consumer<FormFieldAccessor<?>> processor) { final Consumer<FormFieldAccessor> processor) {
this.formFields.entrySet() this.formFields.entrySet()
.stream() .stream()
@ -142,8 +142,8 @@ public final class Form implements FormBinding {
} }
public void flush() { public void flush() {
for (final Map.Entry<String, FormFieldAccessor<?>> entry : this.formFields.entrySet()) { for (final Map.Entry<String, FormFieldAccessor> entry : this.formFields.entrySet()) {
final FormFieldAccessor<?> accessor = entry.getValue(); final FormFieldAccessor accessor = entry.getValue();
if (accessor.control.isVisible()) { if (accessor.control.isVisible()) {
this.objectRoot.put(entry.getKey(), accessor.getValue()); this.objectRoot.put(entry.getKey(), accessor.getValue());
} }
@ -169,38 +169,36 @@ public final class Form implements FormBinding {
} }
//@formatter:off //@formatter:off
private FormFieldAccessor<?> createAccessor(final Label label, final Label field) { private FormFieldAccessor createAccessor(final Label label, final Label field) {
final FormFieldAccessor<?> result = new FormFieldAccessor<>(label, field) { return new FormFieldAccessor(label, field) {
@Override public String getValue() { return field.getText(); } @Override public String getValue() { return field.getText(); }
@Override public void setValue(final String value) { field.setText(value); } @Override public void setValue(final String value) { field.setText(value); }
}; };
return result;
} }
private FormFieldAccessor<Text> createAccessor(final Label label, final Text text) { private FormFieldAccessor createAccessor(final Label label, final Text text) {
return new FormFieldAccessor<>(label, text) { return new FormFieldAccessor(label, text) {
@Override public String getValue() { return text.getText(); } @Override public String getValue() { return text.getText(); }
@Override public void setValue(final String value) { text.setText(value); } @Override public void setValue(final String value) { text.setText(value); }
}; };
} }
private FormFieldAccessor<SingleSelection> createAccessor( private FormFieldAccessor createAccessor(
final Label label, final Label label,
final SingleSelection singleSelection) { final SingleSelection singleSelection) {
return new FormFieldAccessor<>(label, singleSelection) { return new FormFieldAccessor(label, singleSelection) {
@Override public String getValue() { return singleSelection.getSelectionValue(); } @Override public String getValue() { return singleSelection.getSelectionValue(); }
@Override public void setValue(final String value) { singleSelection.select(value); } @Override public void setValue(final String value) { singleSelection.select(value); }
}; };
} }
//@formatter:on //@formatter:on
public static abstract class FormFieldAccessor<T extends Control> { public static abstract class FormFieldAccessor {
public final Label label; public final Label label;
public final T control; public final Control control;
private boolean hasError; private boolean hasError;
public FormFieldAccessor(final Label label, final T control) { public FormFieldAccessor(final Label label, final Control control) {
this.label = label; this.label = label;
this.control = control; this.control = control;
} }

2
src/main/java/ch/ethz/seb/sebserver/gui/service/page/form/FormHandle.java
View file

@ -75,7 +75,7 @@ public class FormHandle<T> {
} }
private final void showValidationError( private final void showValidationError(
final FormFieldAccessor<?> fieldAccessor, final FormFieldAccessor fieldAccessor,
final FieldValidationError valError) { final FieldValidationError valError) {
fieldAccessor.setError(this.i18nSupport.getText(new LocTextKey( fieldAccessor.setError(this.i18nSupport.getText(new LocTextKey(