From 23d4fa5495f428233e0c881dfb00e89ac975b30b Mon Sep 17 00:00:00 2001 From: Denny Israel Date: Wed, 29 Jun 2016 10:48:33 +0200 Subject: [PATCH] 413: code reformatted --- .../utils/validation/CompositeValidator.java | 31 ++++++------ .../validation/CompositeValidatorTest.java | 50 +++++++++---------- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/validation/CompositeValidator.java b/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/validation/CompositeValidator.java index 8c41c33f4..7cb1fb1d3 100644 --- a/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/validation/CompositeValidator.java +++ b/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/validation/CompositeValidator.java @@ -1,12 +1,12 @@ /******************************************************************************* * Copyright 2015 Alexander Casall, Manuel Mauky - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,21 +15,20 @@ ******************************************************************************/ package de.saxsys.mvvmfx.utils.validation; +import java.util.HashMap; +import java.util.Map; + import javafx.beans.property.ListProperty; import javafx.beans.property.SimpleListProperty; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; -import java.util.HashMap; -import java.util.Map; - /** * This {@link Validator} implementation is used to compose multiple other validators. *

* The {@link ValidationStatus} of this validator will contain all messages of all registered validators. * - * * @author manuel.mauky */ public class CompositeValidator implements Validator { @@ -45,7 +44,7 @@ public CompositeValidator() { validators.addListener(new ListChangeListener() { @Override public void onChanged(Change c) { - while(c.next()) { + while (c.next()) { // When validators are added... c.getAddedSubList().forEach(validator -> { @@ -55,7 +54,7 @@ public void onChanged(Change c) { status.addMessage(validator, messages); final ListChangeListener changeListener = change -> { - while(change.next()) { + while (change.next()) { // add/remove messages for this particular validator status.addMessage(validator, change.getAddedSubList()); status.removeMessage(validator, change.getRemoved()); @@ -73,7 +72,7 @@ public void onChanged(Change c) { c.getRemoved().forEach(validator -> { status.removeMessage(validator); - if(listenerMap.containsKey(validator)){ + if (listenerMap.containsKey(validator)) { ListChangeListener changeListener = listenerMap.get(validator); validator.getValidationStatus().getMessages().removeListener(changeListener); @@ -85,21 +84,21 @@ public void onChanged(Change c) { }); } - + public CompositeValidator(Validator... validators) { this(); // before adding the validators we need to setup the listeners in the default constructor addValidators(validators); } - - + + public void addValidators(Validator... validators) { this.validators.addAll(validators); } - + public void removeValidators(Validator... validators) { this.validators.removeAll(validators); } - + @Override public ValidationStatus getValidationStatus() { return status; diff --git a/mvvmfx/src/test/java/de/saxsys/mvvmfx/utils/validation/CompositeValidatorTest.java b/mvvmfx/src/test/java/de/saxsys/mvvmfx/utils/validation/CompositeValidatorTest.java index d5e23cbad..d35d58495 100644 --- a/mvvmfx/src/test/java/de/saxsys/mvvmfx/utils/validation/CompositeValidatorTest.java +++ b/mvvmfx/src/test/java/de/saxsys/mvvmfx/utils/validation/CompositeValidatorTest.java @@ -1,12 +1,12 @@ /******************************************************************************* * Copyright 2015 Alexander Casall, Manuel Mauky - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,24 +34,24 @@ * @author manuel.mauky */ public class CompositeValidatorTest { - + private ValidationStatus status; - + private BooleanProperty valid1 = new SimpleBooleanProperty(); private BooleanProperty valid2 = new SimpleBooleanProperty(); private CompositeValidator compositeValidator; private ObservableRuleBasedValidator validator1; private ObservableRuleBasedValidator validator2; - + @Before public void setup() { validator1 = new ObservableRuleBasedValidator(); validator1.addRule(valid1, ValidationMessage.error("error1")); - + validator2 = new ObservableRuleBasedValidator(); validator2.addRule(valid2, ValidationMessage.warning("warning2")); - - + + compositeValidator = new CompositeValidator(); status = compositeValidator.getValidationStatus(); } @@ -68,56 +68,56 @@ public void testValidatorConstructor() { assertThat(newValidator.getValidationStatus().isValid()).isFalse(); assertThat(newValidator.getValidationStatus().getMessages()).hasSize(2); } - + @Test public void testValidation() { compositeValidator.addValidators(validator1, validator2); - + valid1.set(true); valid2.set(true); - + assertThat(status.isValid()).isTrue(); - + valid1.setValue(false); - + assertThat(status.isValid()).isFalse(); assertThat(asStrings(status.getErrorMessages())).containsOnly("error1"); assertThat(asStrings(status.getWarningMessages())).isEmpty(); assertThat(asStrings(status.getMessages())).containsOnly("error1"); - + valid2.setValue(false); assertThat(status.isValid()).isFalse(); assertThat(asStrings(status.getErrorMessages())).containsOnly("error1"); assertThat(asStrings(status.getWarningMessages())).containsOnly("warning2"); assertThat(asStrings(status.getMessages())).containsOnly("error1", "warning2"); - + valid1.setValue(true); assertThat(status.isValid()).isFalse(); assertThat(asStrings(status.getErrorMessages())).isEmpty(); assertThat(asStrings(status.getWarningMessages())).containsOnly("warning2"); assertThat(asStrings(status.getMessages())).containsOnly("warning2"); - + valid2.setValue(true); assertThat(status.isValid()).isTrue(); assertThat(asStrings(status.getErrorMessages())).isEmpty(); assertThat(asStrings(status.getWarningMessages())).isEmpty(); assertThat(asStrings(status.getMessages())).isEmpty(); - + } - + @Test public void testLazyRegistration() { valid1.set(false); valid2.set(true); - + assertThat(status.isValid()).isTrue(); // no validator is registered at the moment - + compositeValidator.addValidators(validator2); assertThat(status.isValid()).isTrue(); // validator2 is valid - + compositeValidator.addValidators(validator1); assertThat(status.isValid()).isFalse(); - + compositeValidator.removeValidators(validator1); assertThat(status.isValid()).isTrue(); } @@ -240,7 +240,7 @@ public void validatorsMayNotDeleteEachOthersValidationMessages() { } - private List asStrings(List messages) { + private List asStrings(List messages) { return messages .stream() .map(ValidationMessage::getMessage)