/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you 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
 *
 * 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.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package org.apache.commons.ognl;

import static java.lang.String.format;

import java.lang.reflect.Member;
import java.util.Map;

/**
 * Default type conversion. Converts among numeric types and also strings.
 * 
 * @author Luke Blanshard (blanshlu@netscape.net)
 * @author Drew Davidson (drew@ognl.org)
 */
public class DefaultTypeConverter
    implements TypeConverter
{

    public <T> T convertValue( Map context, Object value, Class<T> toType )
    {
        Object ret = OgnlOps.convertValue( value, toType );

        if ( ret == null )
        {
            return null;
        }

        if ( !toType.isAssignableFrom( ret.getClass() ) )
        {
            throw new ClassCastException( format( "value '%s' can not be coverted to class '%s'",
                                                  ( value != null ? value : "null" ), toType.getName() ) );
        }

        return toType.cast( ret );
    }

    /**
     * {@inheritDoc}
     */
    public <T> T convertValue( Map context, Object target, Member member, String propertyName, Object value,
                                Class<T> toType )
    {
        return convertValue( context, value, toType );
    }

}

@@ -839,48 +839,8 @@
 l;%0A%0A
-import static java.lang.String.format;%0A%0A
 impo
@@ -868,16 +868,16 @@
 Member;%0A
+
 import j
@@ -1229,20 +1229,70 @@
     
-Object ret =
+@SuppressWarnings( %22unchecked%22 ) // type checking performed in
  Ogn
@@ -1325,18 +1325,16 @@
 toType )
-;%0A
 %0A       
@@ -1338,391 +1338,77 @@
     
-if (
+T
  ret =
-= null )%0A        %7B%0A            return null;%0A        %7D%0A%0A        if ( !toType.isAssignableFrom( ret.getClass() ) )%0A        %7B%0A            throw new ClassCastException( format( %22value '%25s' can not be coverted to class '%25s'%22,%0A                                                  ( value != null ? value : %22null%22 ), toType.getName() ) );%0A        %7D%0A%0A        return toType.cast(
+ (T) OgnlOps.convertValue( value, toType );%0A        return
  ret
- )
 ;%0A  

fix for broken build # 51