Projects >> xp >>30a8b10b271ba93b9fc75fa0558d0a929e92eda0

Chunk
Conflicting content 
        return (T) INSTANCE.doConvert( source, toType );
    }

<<<<<<< HEAD
    @SuppressWarnings("unchecked")
    public static  T convertOrDefault( final S source, final Class toType, T defaultValue )
    {
        Object converted = convert( source, toType );
        return converted == null ? defaultValue : (T) converted;
=======
    public static  T convertOrNull( final S source, final Class toType )
    {
        try
        {
            return convert( source, toType );
        }
        catch ( final ConvertException e )
        {
            return null;
        }
    }

    public static  T convertOrDefault( final S source, final Class toType, final T defValue )
    {
        final T value = convertOrNull( source, toType );
        return value != null ? value : defValue;
>>>>>>> 5277b4f8f0475a138224127d647bd477b7a4b73b
    }

    private Object doConvert( final Object source, final Class type )
Solution content 
        return (T) INSTANCE.doConvert( source, toType );
    }

    public static  T convertOrNull( final S source, final Class toType )
    {
        try
        {
            return convert( source, toType );
        }
        catch ( final ConvertException e )
        {
            return null;
        }
    }

    public static  T convertOrDefault( final S source, final Class toType, final T defValue )
    {
        final T value = convertOrNull( source, toType );
        return value != null ? value : defValue;
    }

    private Object doConvert( final Object source, final Class type )
File
Converters.java
Developer's decision
Version 2
Kind of conflict
Annotation
Cast expression
Method declaration
Method invocation
Method signature
Return statement
Variable