#166: back to intended type saftety - still working with both java co…

…mpilers
m-m-m · Jan 6, 2016 · 2da2b20 · 2da2b20
1 parent 5a78b3d
commit 2da2b20
Showing 1 changed file with 2 additions and 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
@@ -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>>, ?>>() {