Projects >> qcadoo >>afa1c5d705c137b9ddde6843a8b7d2584f600f22

Chunk
Conflicting content 
<<<<<<< HEAD
    }

    @Override
    public Collection getMissingValidators(final Iterable validators) {
        Set missingValidators = Sets. newHashSet(DEFAULT_SCALE_VALIDATOR,
                DEFAULT_UNSCALED_VALUE_VALIDATOR);
        for (FieldHookDefinition validator : validators) {
            if (validator instanceof UnscaledValueValidator && ((UnscaledValueValidator) validator).hasUppuerBoundDefined()) {
                missingValidators.remove(DEFAULT_UNSCALED_VALUE_VALIDATOR);
            }
            if (validator instanceof ScaleValidator && ((ScaleValidator) validator).hasUppuerBoundDefined()) {
                missingValidators.remove(DEFAULT_SCALE_VALIDATOR);
            }
        }
        return missingValidators;
    }
=======
    public boolean isCopyable() {
        return copyable;
    }

>>>>>>> 968a61a9f4cf2962bf3959ed1518792af9068e11
}
Solution content 
    }

    @Override
    public Collection getMissingValidators(final Iterable validators) {
        Set missingValidators = Sets. newHashSet(DEFAULT_SCALE_VALIDATOR,
                DEFAULT_UNSCALED_VALUE_VALIDATOR);
        for (FieldHookDefinition validator : validators) {
            if (validator instanceof UnscaledValueValidator && ((UnscaledValueValidator) validator).hasUppuerBoundDefined()) {
                missingValidators.remove(DEFAULT_UNSCALED_VALUE_VALIDATOR);
            }
            if (validator instanceof ScaleValidator && ((ScaleValidator) validator).hasUppuerBoundDefined()) {
                missingValidators.remove(DEFAULT_SCALE_VALIDATOR);
            }
        }
        return missingValidators;
    }

    public boolean isCopyable() {
        return copyable;
    }

}
File
DecimalType.java
Developer's decision
Concatenation
Kind of conflict
Method declaration
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
    public Collection getMissingValidators(final Iterable validators) {
        for (FieldHookDefinition validator : validators) {
            if (validator instanceof UnscaledValueValidator) {
                if (((UnscaledValueValidator) validator).hasUppuerBoundDefined()) {
                    return Collections.emptyList();
                }
            }
        }
        return Lists. newArrayList(new UnscaledValueValidator(null, null,
                NumberService.DEFAULT_INTEGER_UNSCALED_VALUE_MAX_LEN));
=======
    public boolean isCopyable() {
        return copyable;
>>>>>>> 968a61a9f4cf2962bf3959ed1518792af9068e11
    }

}
Solution content 
    @Override

    }
    public Collection getMissingValidators(final Iterable validators) {
        for (FieldHookDefinition validator : validators) {
            if (validator instanceof UnscaledValueValidator) {
                if (((UnscaledValueValidator) validator).hasUppuerBoundDefined()) {
                    return Collections.emptyList();
                }
            }
        }
        return Lists. newArrayList(new UnscaledValueValidator(null, null,
                NumberService.DEFAULT_INTEGER_UNSCALED_VALUE_MAX_LEN));
    }

    public boolean isCopyable() {
        return copyable;
    }

}
File
IntegerType.java
Developer's decision
Concatenation
Kind of conflict
Attribute
For statement
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
    public Collection getMissingValidators(final Iterable validators) {
        for (FieldHookDefinition validator : validators) {
            if (validator instanceof LengthValidator) {
                if (((LengthValidator) validator).hasUppuerBoundDefined()) {
                    return Collections.emptyList();
                }
            }
        }
        return Lists. newArrayList(new LengthValidator(null, null, 255));
=======
    public boolean isCopyable() {
        return copyable;
>>>>>>> 968a61a9f4cf2962bf3959ed1518792af9068e11
    }

}
Solution content 
    }

    @Override
    public Collection getMissingValidators(final Iterable validators) {
        for (FieldHookDefinition validator : validators) {
            if (validator instanceof LengthValidator) {
                if (((LengthValidator) validator).hasUppuerBoundDefined()) {
                    return Collections.emptyList();
                }
            }
        }
        return Lists. newArrayList(new LengthValidator(null, null, 255));
    }

    public boolean isCopyable() {
        return copyable;
    }

}
File
StringType.java
Developer's decision
Concatenation
Kind of conflict
Attribute
For statement
Method invocation
Method signature
Return statement