Merge branch 'release' into stable

sialcasa · Jun 30, 2016 · a1fe740 · a1fe740
2 parents 40e603e + a9a0a24
commit a1fe740
Show file tree

Hide file tree

Showing 22 changed files with 121 additions and 87 deletions.
diff --git a/examples/books-example/pom.xml b/examples/books-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.saxsys.mvvmfx</groupId>
 		<artifactId>examples</artifactId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/contacts-example/pom.xml b/examples/contacts-example/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.saxsys.mvvmfx</groupId>
 		<artifactId>examples</artifactId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>contacts-example</artifactId>
 

diff --git a/examples/mini-examples/fx-root-example/pom.xml b/examples/mini-examples/fx-root-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/mini-examples/helloworld-without-fxml/pom.xml b/examples/mini-examples/helloworld-without-fxml/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/mini-examples/helloworld/pom.xml b/examples/mini-examples/helloworld/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/mini-examples/pom.xml b/examples/mini-examples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>

diff --git a/examples/mini-examples/scopes-example/pom.xml b/examples/mini-examples/scopes-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mini-examples</artifactId>
         <groupId>de.saxsys.mvvmfx</groupId>
-        <version>1.5.1</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/mini-examples/synchronizefx-example/pom.xml b/examples/mini-examples/synchronizefx-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/mini-examples/welcome-example/pom.xml b/examples/mini-examples/welcome-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>mini-examples</artifactId>
 		<groupId>de.saxsys.mvvmfx</groupId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 
 	<groupId>de.saxsys.mvvmfx</groupId>

diff --git a/examples/todomvc-example/pom.xml b/examples/todomvc-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.saxsys.mvvmfx</groupId>
 		<artifactId>examples</artifactId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/mvvmfx-archetype/pom.xml b/mvvmfx-archetype/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 
 

diff --git a/mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml b/mvvmfx-archetype/src/main/resources/archetype-resources/pom.xml
@@ -16,7 +16,7 @@
 			<dependency>
 				<groupId>de.saxsys</groupId>
 				<artifactId>mvvmfx-parent</artifactId>
-				<version>1.5.1</version>
+				<version>1.5.2-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/mvvmfx-cdi/pom.xml b/mvvmfx-cdi/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mvvmfx-cdi</artifactId>

diff --git a/mvvmfx-guice/pom.xml b/mvvmfx-guice/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mvvmfx-guice</artifactId>

diff --git a/mvvmfx-testing-utils/pom.xml b/mvvmfx-testing-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvvmfx-parent</artifactId>
         <groupId>de.saxsys</groupId>
-        <version>1.5.1</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mvvmfx-utils/pom.xml b/mvvmfx-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mvvmfx-parent</artifactId>
         <groupId>de.saxsys</groupId>
-        <version>1.5.1</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mvvmfx/pom.xml b/mvvmfx/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>de.saxsys</groupId>
 		<artifactId>mvvmfx-parent</artifactId>
-		<version>1.5.1</version>
+		<version>1.5.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mvvmfx</artifactId>

diff --git a/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/validation/CompositeValidationStatus.java b/mvvmfx/src/main/java/de/saxsys/mvvmfx/utils/validation/CompositeValidationStatus.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2015 Alexander Casall, Manuel Mauky
- *
+ * <p>
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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,14 +15,8 @@
  ******************************************************************************/
 package de.saxsys.mvvmfx.utils.validation;
 
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-
-import java.util.*;
+import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * This class is used as {@link ValidationStatus} for {@link CompositeValidator}.
@@ -66,32 +60,41 @@ void addMessage(Validator validator, List<? extends ValidationMessage> messages)
 		getMessagesInternal().addAll(
 				messages.stream()
 						// ... we wrap them to keep track of the used validator.
-					.map(message -> new CompositeValidationMessageWrapper(message, validator))
-					.collect(Collectors.toList()));
+						.map(message -> new CompositeValidationMessageWrapper(message, validator))
+						.collect(Collectors.toList()));
 	}
 
 	/*
 	 Remove all given messages for the given validator.
 	 */
-	void removeMessage(Validator validator, List<? extends ValidationMessage> messages) {
-		List<CompositeValidationMessageWrapper> messagesToRemove =
+	void removeMessage(final Validator validator, final List<? extends ValidationMessage> messages) {
+		final List<CompositeValidationMessageWrapper> messagesToRemove =
 				getMessagesInternal().stream()
-					.filter(messages::contains)  // only the given messages
-					.filter(message -> (message instanceof CompositeValidationMessageWrapper))
-					.map(message -> (CompositeValidationMessageWrapper) message)
-					.filter(message -> message.getValidatorCode().equals(System.identityHashCode(validator)))
-					.collect(Collectors.toList());
+						.filter(messages::contains)  // only the given messages
+						.filter(message -> (message instanceof CompositeValidationMessageWrapper))
+						.map(message -> (CompositeValidationMessageWrapper) message)
+						.filter(message -> message.getValidatorCode().equals(System.identityHashCode(validator)))
+						.collect(Collectors.toList());
 
-		getMessagesInternal().removeAll(messagesToRemove);
+		getMessagesInternal().removeIf(validationMessage -> {
+			if (validationMessage instanceof CompositeValidationMessageWrapper) {
+				final CompositeValidationMessageWrapper wrapper = (CompositeValidationMessageWrapper) validationMessage;
+				return messagesToRemove.stream()
+						.filter(m -> m.getValidatorCode().equals(wrapper.getValidatorCode()))
+						.anyMatch(wrapper::equals);
+			}
+
+			return false;
+		});
 	}
 
 	/*
 	 * Remove all messages for this particular validator.
 	 */
-	void removeMessage(Validator validator) {
+	void removeMessage(final Validator validator) {
 		getMessagesInternal().removeIf(validationMessage -> {
-			if(validationMessage instanceof CompositeValidationMessageWrapper) {
-				CompositeValidationMessageWrapper wrapper = (CompositeValidationMessageWrapper) validationMessage;
+			if (validationMessage instanceof CompositeValidationMessageWrapper) {
+				final CompositeValidationMessageWrapper wrapper = (CompositeValidationMessageWrapper) validationMessage;
 
 				return wrapper.getValidatorCode().equals(System.identityHashCode(validator));
 			}

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
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2015 Alexander Casall, Manuel Mauky
- *
+ * <p>
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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.
  * <p>
  * 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<Validator>() {
 			@Override
 			public void onChanged(Change<? extends Validator> c) {
-				while(c.next()) {
+				while (c.next()) {
 
 					// When validators are added...
 					c.getAddedSubList().forEach(validator -> {
@@ -55,7 +54,7 @@ public void onChanged(Change<? extends Validator> c) {
 						status.addMessage(validator, messages);
 
 						final ListChangeListener<ValidationMessage> 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<? extends Validator> c) {
 					c.getRemoved().forEach(validator -> {
 						status.removeMessage(validator);
 
-						if(listenerMap.containsKey(validator)){
+						if (listenerMap.containsKey(validator)) {
 							ListChangeListener<ValidationMessage> changeListener = listenerMap.get(validator);
 
 							validator.getValidationStatus().getMessages().removeListener(changeListener);
@@ -85,21 +84,21 @@ public void onChanged(Change<? extends Validator> 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;