From 2da2b209924d93cce26fda7822debd7208bfa806 Mon Sep 17 00:00:00 2001
From: Joerg Hohwiller <hohwille@users.sourceforge.net>
Date: Wed, 6 Jan 2016 10:31:38 +0100
Subject: [PATCH] #166: back to intended type saftety - still working with both
 java compilers

---
 .../net/sf/mmm/util/property/impl/GenericPropertyImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mmm-util-property/src/main/java/net/sf/mmm/util/property/impl/GenericPropertyImpl.java b/mmm-util-property/src/main/java/net/sf/mmm/util/property/impl/GenericPropertyImpl.java
index a46e7c4e3..9aa9ff1bf 100644
--- a/mmm-util-property/src/main/java/net/sf/mmm/util/property/impl/GenericPropertyImpl.java
+++ b/mmm-util-property/src/main/java/net/sf/mmm/util/property/impl/GenericPropertyImpl.java
@@ -365,7 +365,7 @@ public boolean isReadOnly() {
    *         {@link ObjectValidatorBuilder#and() parent-builder} to create a {@link #copy(AbstractValidator)} of this
    *         property with the configured validator.
    */
-  protected <PROPERTY extends GenericPropertyImpl<? extends VALUE>, BUILDER extends ObjectValidatorBuilder<?, PropertyBuilder<PROPERTY>, ?>> BUILDER withValdidator(
+  protected <PROPERTY extends GenericPropertyImpl<? extends VALUE>, BUILDER extends ObjectValidatorBuilder<? extends VALUE, PropertyBuilder<PROPERTY>, ?>> BUILDER withValdidator(
       Function<PropertyBuilder<PROPERTY>, BUILDER> factory) {
 
     PropertyBuilder<PROPERTY> parentBuilder = new PropertyBuilder<>();
@@ -379,7 +379,7 @@ public boolean isReadOnly() {
    *         {@link ObjectValidatorBuilder#and() parent-builder} to create a {@link #copy(AbstractValidator)} of this
    *         property with the configured validator.
    */
-  public ObjectValidatorBuilder<?, ? extends PropertyBuilder<? extends GenericPropertyImpl<? extends VALUE>>, ?> withValdidator() {
+  public ObjectValidatorBuilder<? extends VALUE, ? extends PropertyBuilder<? extends GenericPropertyImpl<? extends VALUE>>, ?> withValdidator() {
 
     Function<PropertyBuilder<GenericPropertyImpl<VALUE>>, ObjectValidatorBuilder<VALUE, PropertyBuilder<GenericPropertyImpl<VALUE>>, ?>> factory = new Function<PropertyBuilder<GenericPropertyImpl<VALUE>>, ObjectValidatorBuilder<VALUE, PropertyBuilder<GenericPropertyImpl<VALUE>>, ?>>() {