commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcucchi...@apache.org
Subject svn commit: r1188000 [3/3] - in /commons/proper/ognl/trunk: ./ src/main/java/org/apache/commons/ognl/ src/main/java/org/apache/commons/ognl/enhance/ src/main/java/org/apache/commons/ognl/internal/ src/main/java/org/apache/commons/ognl/internal/entry/ s...
Date Sun, 23 Oct 2011 23:10:27 GMT
Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java Sun
Oct 23 23:10:24 2011
@@ -45,6 +45,7 @@ public interface TypeConverter
      * @return Converted value of type toType or TypeConverter.NoConversionPossible to indicate
that the conversion was
      *         not possible.
      */
-    <T> T convertValue( Map<String, Object> context, Object target, Member member,
String propertyName, Object value, Class<T> toType );
+    <T> T convertValue( Map<String, Object> context, Object target, Member member,
String propertyName, Object value, Class<T> toType )
+        throws OgnlException;
 
 }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Sun Oct 23 23:10:24 2011
@@ -19,17 +19,6 @@ package org.apache.commons.ognl.enhance;
  * under the License.
  */
 
-import static java.lang.String.format;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import javassist.CannotCompileException;
 import javassist.ClassPool;
 import javassist.CtClass;
@@ -39,7 +28,6 @@ import javassist.CtNewConstructor;
 import javassist.CtNewMethod;
 import javassist.LoaderClassPath;
 import javassist.NotFoundException;
-
 import org.apache.commons.ognl.ASTAnd;
 import org.apache.commons.ognl.ASTChain;
 import org.apache.commons.ognl.ASTConst;
@@ -59,6 +47,17 @@ import org.apache.commons.ognl.Node;
 import org.apache.commons.ognl.OgnlContext;
 import org.apache.commons.ognl.OgnlRuntime;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.lang.String.format;
+
 /**
  * Responsible for managing/providing functionality related to compiling generated java source
expressions via bytecode
  * enhancements for a given ognl expression.

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java
Sun Oct 23 23:10:24 2011
@@ -1,6 +1,6 @@
-package org.apache.commons.ognl.internal;
-
 /*
+ * $Id$
+ *
  * 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
@@ -19,21 +19,15 @@ package org.apache.commons.ognl.internal
  * under the License.
  */
 
+package org.apache.commons.ognl.internal;
+
 import org.apache.commons.ognl.ClassCacheInspector;
 
 /**
  * This is a highly specialized map for storing values keyed by Class objects.
  */
-public interface ClassCache
+public interface ClassCache<V>
+    extends Cache<Class<?>, V>
 {
-
     void setClassInspector( ClassCacheInspector inspector );
-
-    void clear();
-
-    int getSize();
-
-    <T> T get( Class<?> key );
-
-    <T> T put( Class<?> key, T value );
 }

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
Sun Oct 23 23:10:24 2011
@@ -1,6 +1,6 @@
-package org.apache.commons.ognl.internal;
-
 /*
+ * $Id$
+ *
  * 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
@@ -19,6 +19,8 @@ package org.apache.commons.ognl.internal
  * under the License.
  */
 
+package org.apache.commons.ognl.internal;
+
 import org.apache.commons.ognl.ClassCacheInspector;
 
 import java.util.Arrays;
@@ -26,8 +28,8 @@ import java.util.Arrays;
 /**
  * Implementation of {@link ClassCache}.
  */
-public class ClassCacheImpl
-    implements ClassCache
+public class ClassCacheImpl<V>
+    implements ClassCache<V>
 {
 
     /* this MUST be a power of 2 */
@@ -36,17 +38,12 @@ public class ClassCacheImpl
     /* ...and now you see why. The table size is used as a mask for generating hashes */
     private static final int TABLE_SIZE_MASK = TABLE_SIZE - 1;
 
-    private Entry<?>[] _table;
+    private Entry<Class<?>,V>[] _table = new Entry[TABLE_SIZE];
 
     private ClassCacheInspector _classInspector;
 
     private int _size = 0;
 
-    public ClassCacheImpl()
-    {
-        _table = new Entry[TABLE_SIZE];
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -79,55 +76,51 @@ public class ClassCacheImpl
     /**
      * {@inheritDoc}
      */
-    public final <T> T get( Class<?> key )
+    public final V get( Class<?> key )
+        throws CacheException
     {
         int i = key.hashCode() & TABLE_SIZE_MASK;
 
-        Entry<?> entry = _table[i];
+        Entry<Class<?>,V> entry = _table[i];
 
         while ( entry != null )
         {
             if ( key == entry.getKey() )
             {
-                @SuppressWarnings( "unchecked" ) // guaranteed by key == entry.getKey()
-                T result = (T) entry.getValue();
-                return result;
+                return entry.getValue();
             }
 
             entry = entry.getNext();
         }
-
         return null;
     }
 
     /**
      * {@inheritDoc}
      */
-    public final <T> T put( Class<?> key, T value )
+    public final V put( Class<?> key, V value )
     {
         if ( _classInspector != null && !_classInspector.shouldCache( key ) )
         {
             return value;
         }
 
-        T result = null;
+        V result = null;
         int i = key.hashCode() & TABLE_SIZE_MASK;
 
-        Entry<?> entry = _table[i];
+        Entry<Class<?>,V> entry = _table[i];
 
         if ( entry == null )
         {
-            _table[i] = new Entry<T>( key, value );
+            _table[i] = new Entry<Class<?>,V>( key, value );
             _size++;
         }
         else
         {
             if ( key == entry.getKey() )
             {
-                @SuppressWarnings( "unchecked" ) // guaranteed by key == entry.getKey()
-                Entry<T> current = (Entry<T>) entry;
-                result = current.getValue();
-                current.setValue( value );
+                result = entry.getValue( );
+                entry.setValue( value );
             }
             else
             {
@@ -136,17 +129,15 @@ public class ClassCacheImpl
                     if ( key == entry.getKey() )
                     {
                         /* replace value */
-                        @SuppressWarnings( "unchecked" ) // guaranteed by key == entry.getKey()
-                        Entry<T> current = (Entry<T>) entry;
-                        result = current.getValue();
-                        current.setValue( value );
+                        result = entry.getValue( );
+                        entry.setValue( value );
                         break;
                     }
 
                     if ( entry.getNext() == null )
                     {
                         /* add value */
-                        entry.setNext( new Entry<T>( key, value ) );
+                        entry.setNext( new Entry<Class<?>,V>( key, value ) );
                         break;
                     }
 

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java Sun
Oct 23 23:10:24 2011
@@ -1,6 +1,6 @@
-package org.apache.commons.ognl.internal;
-
 /*
+ * $Id$
+ *
  * 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
@@ -19,45 +19,47 @@ package org.apache.commons.ognl.internal
  * under the License.
  */
 
+package org.apache.commons.ognl.internal;
+
 /**
  * Used by {@link ClassCacheImpl} to store entries in the cache.
  */
-final class Entry<T>
+class Entry<K,V>
 {
 
-    private Entry<?> next;
+    private Entry<K,V> next;
 
-    private final Class<?> key;
+    private final K key;
 
-    private T value;
+    private V value;
 
-    public Entry( Class<?> key, T value )
+    public Entry( K key, V value )
     {
         this.key = key;
         this.value = value;
     }
 
-    public Class<?> getKey()
+    public K getKey()
     {
         return key;
     }
 
-    public T getValue()
+    public V getValue()
     {
         return value;
     }
 
-    public void setValue( T value )
+    public void setValue( V value )
     {
         this.value = value;
     }
 
-    public Entry<?> getNext()
+    public Entry<K,V> getNext()
     {
         return next;
     }
 
-    public void setNext( Entry<?> next )
+    public void setNext( Entry<K,V> next )
     {
         this.next = next;
     }

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java (original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java Sun
Oct 23 23:10:24 2011
@@ -19,11 +19,31 @@
  */
 package org.apache.commons.ognl;
 
-import org.apache.commons.ognl.test.objects.*;
+import org.apache.commons.ognl.internal.CacheException;
+import org.apache.commons.ognl.test.objects.BaseGeneric;
+import org.apache.commons.ognl.test.objects.Bean1;
+import org.apache.commons.ognl.test.objects.Bean2;
+import org.apache.commons.ognl.test.objects.FormImpl;
+import org.apache.commons.ognl.test.objects.GameGeneric;
+import org.apache.commons.ognl.test.objects.GameGenericObject;
+import org.apache.commons.ognl.test.objects.GenericCracker;
+import org.apache.commons.ognl.test.objects.GenericService;
+import org.apache.commons.ognl.test.objects.GenericServiceImpl;
+import org.apache.commons.ognl.test.objects.GetterMethods;
+import org.apache.commons.ognl.test.objects.IComponent;
+import org.apache.commons.ognl.test.objects.IForm;
+import org.apache.commons.ognl.test.objects.ListSource;
+import org.apache.commons.ognl.test.objects.ListSourceImpl;
+import org.apache.commons.ognl.test.objects.OtherObjectIndexed;
+import org.apache.commons.ognl.test.objects.Root;
+import org.apache.commons.ognl.test.objects.SetterReturns;
+import org.apache.commons.ognl.test.objects.SubclassSyntheticObject;
 import org.junit.Test;
 
+import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
@@ -37,12 +57,12 @@ public class TestOgnlRuntime
 {
 
     @Test
-    public void test_Get_Super_Or_Interface_Class()
+    public void test_Get_Super_Or_Interface_Class( )
         throws Exception
     {
-        ListSource list = new ListSourceImpl();
+        ListSource list = new ListSourceImpl( );
 
-        Method m = OgnlRuntime.getReadMethod( list.getClass(), "total" );
+        Method m = OgnlRuntime.getReadMethod( list.getClass( ), "total" );
         assertNotNull( m );
 
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
@@ -50,12 +70,12 @@ public class TestOgnlRuntime
     }
 
     @Test
-    public void test_Get_Private_Class()
+    public void test_Get_Private_Class( )
         throws Exception
     {
         List list = Arrays.asList( "hello", "world" );
 
-        Method m = OgnlRuntime.getReadMethod( list.getClass(), "iterator" );
+        Method m = OgnlRuntime.getReadMethod( list.getClass( ), "iterator" );
         assertNotNull( m );
 
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
@@ -63,12 +83,12 @@ public class TestOgnlRuntime
     }
 
     @Test
-    public void test_Complicated_Inheritance()
+    public void test_Complicated_Inheritance( )
         throws Exception
     {
-        IForm form = new FormImpl();
+        IForm form = new FormImpl( );
 
-        Method m = OgnlRuntime.getWriteMethod( form.getClass(), "clientId" );
+        Method m = OgnlRuntime.getWriteMethod( form.getClass( ), "clientId" );
         assertNotNull( m );
 
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
@@ -76,87 +96,87 @@ public class TestOgnlRuntime
     }
 
     @Test
-    public void test_Get_Read_Method()
+    public void test_Get_Read_Method( )
         throws Exception
     {
         Method m = OgnlRuntime.getReadMethod( Bean2.class, "pageBreakAfter" );
         assertNotNull( m );
 
-        assertEquals( "isPageBreakAfter", m.getName() );
+        assertEquals( "isPageBreakAfter", m.getName( ) );
     }
 
     class TestGetters
     {
-        public boolean isEditorDisabled()
+        public boolean isEditorDisabled( )
         {
             return false;
         }
 
-        public boolean isDisabled()
+        public boolean isDisabled( )
         {
             return true;
         }
 
-        public boolean isNotAvailable()
+        public boolean isNotAvailable( )
         {
             return false;
         }
 
-        public boolean isAvailable()
+        public boolean isAvailable( )
         {
             return true;
         }
     }
 
     @Test
-    public void test_Get_Read_Method_Multiple()
+    public void test_Get_Read_Method_Multiple( )
         throws Exception
     {
         Method m = OgnlRuntime.getReadMethod( TestGetters.class, "disabled" );
         assertNotNull( m );
 
-        assertEquals( "isDisabled", m.getName() );
+        assertEquals( "isDisabled", m.getName( ) );
     }
 
     @Test
-    public void test_Get_Read_Method_Multiple_Boolean_Getters()
+    public void test_Get_Read_Method_Multiple_Boolean_Getters( )
         throws Exception
     {
         Method m = OgnlRuntime.getReadMethod( TestGetters.class, "available" );
         assertNotNull( m );
 
-        assertEquals( "isAvailable", m.getName() );
+        assertEquals( "isAvailable", m.getName( ) );
 
         m = OgnlRuntime.getReadMethod( TestGetters.class, "notAvailable" );
         assertNotNull( m );
 
-        assertEquals( "isNotAvailable", m.getName() );
+        assertEquals( "isNotAvailable", m.getName( ) );
     }
 
     @Test
-    public void test_Find_Method_Mixed_Boolean_Getters()
+    public void test_Find_Method_Mixed_Boolean_Getters( )
         throws Exception
     {
         Method m = OgnlRuntime.getReadMethod( GetterMethods.class, "allowDisplay" );
         assertNotNull( m );
 
-        assertEquals( "getAllowDisplay", m.getName() );
+        assertEquals( "getAllowDisplay", m.getName( ) );
     }
 
     @Test
-    public void test_Get_Appropriate_Method()
+    public void test_Get_Appropriate_Method( )
         throws Exception
     {
-        ListSource list = new ListSourceImpl();
+        ListSource list = new ListSourceImpl( );
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
 
-        Object ret = OgnlRuntime.callMethod( context, list, "addValue", new String[] { null
} );
+        Object ret = OgnlRuntime.callMethod( context, list, "addValue", new String[]{ null
} );
 
         assert ret != null;
     }
 
     @Test
-    public void test_Call_Static_Method_Invalid_Class()
+    public void test_Call_Static_Method_Invalid_Class( )
     {
 
         try
@@ -171,18 +191,18 @@ public class TestOgnlRuntime
         {
 
             assertTrue( MethodFailedException.class.isInstance( et ) );
-            assertTrue( et.getMessage().contains( "made.up.Name" ) );
+            assertTrue( et.getMessage( ).contains( "made.up.Name" ) );
         }
     }
 
     @Test
-    public void test_Setter_Returns()
+    public void test_Setter_Returns( )
         throws Exception
     {
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
-        SetterReturns root = new SetterReturns();
+        SetterReturns root = new SetterReturns( );
 
-        Method m = OgnlRuntime.getWriteMethod( root.getClass(), "value" );
+        Method m = OgnlRuntime.getWriteMethod( root.getClass( ), "value" );
         assertTrue( m != null );
 
         Ognl.setValue( "value", context, root, "12__" );
@@ -190,47 +210,47 @@ public class TestOgnlRuntime
     }
 
     @Test
-    public void test_Call_Method_VarArgs()
+    public void test_Call_Method_VarArgs( )
         throws Exception
     {
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
-        GenericService service = new GenericServiceImpl();
+        GenericService service = new GenericServiceImpl( );
 
-        GameGenericObject argument = new GameGenericObject();
+        GameGenericObject argument = new GameGenericObject( );
 
-        Object[] args = OgnlRuntime.getObjectArrayPool().create( 2 );
+        Object[] args = OgnlRuntime.getObjectArrayPool( ).create( 2 );
         args[0] = argument;
 
         assertEquals( "Halo 3", OgnlRuntime.callMethod( context, service, "getFullMessageFor",
args ) );
     }
 
     @Test
-    public void test_Class_Cache_Inspector()
+    public void test_Class_Cache_Inspector( )
         throws Exception
     {
-        OgnlRuntime.clearCache();
-        assertEquals( 0, OgnlRuntime._propertyDescriptorCache.getSize() );
+        OgnlRuntime.clearCache( );
+        assertEquals( 0, OgnlRuntime._propertyDescriptorCache.getSize( ) );
 
-        Root root = new Root();
+        Root root = new Root( );
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
         Node expr = Ognl.compileExpression( context, root, "property.bean3.value != null"
);
 
-        assertTrue( (Boolean) expr.getAccessor().get( context, root ) );
+        assertTrue( (Boolean) expr.getAccessor( ).get( context, root ) );
 
-        int size = OgnlRuntime._propertyDescriptorCache.getSize();
+        int size = OgnlRuntime._propertyDescriptorCache.getSize( );
         assertTrue( size > 0 );
 
-        OgnlRuntime.clearCache();
-        assertEquals( 0, OgnlRuntime._propertyDescriptorCache.getSize() );
+        OgnlRuntime.clearCache( );
+        assertEquals( 0, OgnlRuntime._propertyDescriptorCache.getSize( ) );
 
         // now register class cache prevention
 
-        OgnlRuntime.setClassCacheInspector( new TestCacheInspector() );
+        OgnlRuntime.setClassCacheInspector( new TestCacheInspector( ) );
 
         expr = Ognl.compileExpression( context, root, "property.bean3.value != null" );
-        assertTrue( (Boolean) expr.getAccessor().get( context, root ) );
+        assertTrue( (Boolean) expr.getAccessor( ).get( context, root ) );
 
-        assertEquals( ( size - 1 ), OgnlRuntime._propertyDescriptorCache.getSize() );
+        assertEquals( ( size - 1 ), OgnlRuntime._propertyDescriptorCache.getSize( ) );
     }
 
     class TestCacheInspector
@@ -244,7 +264,7 @@ public class TestOgnlRuntime
     }
 
     @Test
-    public void test_Set_Generic_Parameter_Types()
+    public void test_Set_Generic_Parameter_Types( )
         throws Exception
     {
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
@@ -252,13 +272,13 @@ public class TestOgnlRuntime
         Method m = OgnlRuntime.getSetMethod( context, GenericCracker.class, "param" );
         assertNotNull( m );
 
-        Class[] types = m.getParameterTypes();
+        Class[] types = m.getParameterTypes( );
         assertEquals( 1, types.length );
         assertEquals( Integer.class, types[0] );
     }
 
     @Test
-    public void test_Get_Generic_Parameter_Types()
+    public void test_Get_Generic_Parameter_Types( )
         throws Exception
     {
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
@@ -266,11 +286,11 @@ public class TestOgnlRuntime
         Method m = OgnlRuntime.getGetMethod( context, GenericCracker.class, "param" );
         assertNotNull( m );
 
-        assertEquals( Integer.class, m.getReturnType() );
+        assertEquals( Integer.class, m.getReturnType( ) );
     }
 
     @Test
-    public void test_Find_Parameter_Types()
+    public void test_Find_Parameter_Types( )
         throws Exception
     {
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
@@ -284,7 +304,7 @@ public class TestOgnlRuntime
     }
 
     @Test
-    public void test_Find_Parameter_Types_Superclass()
+    public void test_Find_Parameter_Types_Superclass( )
         throws Exception
     {
         OgnlContext context = (OgnlContext) Ognl.createDefaultContext( null );
@@ -298,7 +318,7 @@ public class TestOgnlRuntime
     }
 
     @Test
-    public void test_Get_Declared_Methods_With_Synthetic_Methods()
+    public void test_Get_Declared_Methods_With_Synthetic_Methods( )
         throws Exception
     {
         List result = OgnlRuntime.getDeclaredMethods( SubclassSyntheticObject.class, "list",
false );
@@ -307,17 +327,17 @@ public class TestOgnlRuntime
         // "public volatile java.util.List org.ognl.test.objects.SubclassSyntheticObject.getList()",
         // causing method return size to be 3
 
-        assertEquals( 2, result.size() );
+        assertEquals( 2, result.size( ) );
     }
 
     @Test
-    public void test_Get_Property_Descriptors_With_Synthetic_Methods()
+    public void test_Get_Property_Descriptors_With_Synthetic_Methods( )
         throws Exception
     {
         PropertyDescriptor pd = OgnlRuntime.getPropertyDescriptor( SubclassSyntheticObject.class,
"list" );
 
         assert pd != null;
-        assert OgnlRuntime.isMethodCallable( pd.getReadMethod() );
+        assert OgnlRuntime.isMethodCallable( pd.getReadMethod( ) );
     }
 
     private static class GenericParent<T>
@@ -344,8 +364,8 @@ public class TestOgnlRuntime
      * Tests OGNL parameter discovery.
      */
     @Test
-    public void testOGNLParameterDiscovery()
-        throws NoSuchMethodException
+    public void testOGNLParameterDiscovery( )
+        throws NoSuchMethodException, CacheException
     {
         Method saveMethod = GenericParent.class.getMethod( "save", Object.class );
         System.out.println( saveMethod );
@@ -359,4 +379,21 @@ public class TestOgnlRuntime
         assertSame( stringClass[0], String.class );
     }
 
+    @Test
+    public void testGetField( )
+        throws OgnlException
+    {
+        Field field = OgnlRuntime.getField( OtherObjectIndexed.class, "attributes" );
+        assertNotNull( "Field is null", field );
+    }
+
+    @Test
+    public void testGetSetMethod( )
+        throws IntrospectionException, OgnlException
+    {
+        Method setter = OgnlRuntime.getSetMethod( null, Bean1.class, "bean2" );
+        Method getter = OgnlRuntime.getGetMethod( null, Bean1.class, "bean2" );
+        assertNotNull( getter );
+        assertNull( setter );
+    }
 }

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
Sun Oct 23 23:10:24 2011
@@ -19,16 +19,16 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
 import org.apache.commons.ognl.test.objects.Root;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class ArrayElementsTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java
Sun Oct 23 23:10:24 2011
@@ -19,14 +19,14 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.apache.commons.ognl.test.objects.Simple;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class ContextVariableTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java
Sun Oct 23 23:10:24 2011
@@ -19,9 +19,6 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.apache.commons.ognl.MethodFailedException;
 import org.apache.commons.ognl.NoSuchPropertyException;
 import org.apache.commons.ognl.test.objects.IndexedSetObject;
@@ -30,6 +27,9 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class IndexAccessTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
Sun Oct 23 23:10:24 2011
@@ -19,10 +19,6 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 import org.apache.commons.ognl.OgnlRuntime;
 import org.apache.commons.ognl.test.objects.Bean1;
 import org.apache.commons.ognl.test.objects.BeanProvider;
@@ -36,6 +32,10 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 @RunWith(value = Parameterized.class)
 public class InterfaceInheritanceTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
Sun Oct 23 23:10:24 2011
@@ -19,16 +19,16 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class LambdaExpressionTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
Sun Oct 23 23:10:24 2011
@@ -19,15 +19,15 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.apache.commons.ognl.test.objects.Simple;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class MethodWithConversionTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
Sun Oct 23 23:10:24 2011
@@ -19,15 +19,15 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.apache.commons.ognl.test.objects.Component;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class NestedMethodTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
Sun Oct 23 23:10:24 2011
@@ -19,9 +19,6 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.apache.commons.ognl.OgnlRuntime;
 import org.apache.commons.ognl.test.objects.CorrectedObject;
 import org.junit.Before;
@@ -30,6 +27,9 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class NullHandlerTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OgnlTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OgnlTestCase.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OgnlTestCase.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OgnlTestCase.java
Sun Oct 23 23:10:24 2011
@@ -199,7 +199,7 @@ public abstract class OgnlTestCase
         } catch (Exception ex) {
             if (RuntimeException.class.isInstance(ex) && ex.getCause() != null
                     && Exception.class.isAssignableFrom( ex.getCause().getClass()))
{
-            	ex = (Exception) ((RuntimeException) ex).getCause();
+            	ex = (Exception) ex.getCause( );
             }
 
             if (testedResult instanceof Class) {

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
Sun Oct 23 23:10:24 2011
@@ -19,13 +19,13 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class OperatorTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java
Sun Oct 23 23:10:24 2011
@@ -25,7 +25,6 @@ import org.apache.commons.ognl.OgnlExcep
 import org.apache.commons.ognl.SimpleNode;
 import org.apache.commons.ognl.test.objects.Bean1;
 
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
Sun Oct 23 23:10:24 2011
@@ -19,9 +19,6 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.apache.commons.ognl.DefaultMemberAccess;
 import org.apache.commons.ognl.test.objects.Root;
 import org.junit.Before;
@@ -30,6 +27,9 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class PrivateAccessorTest
     extends OgnlTestCase
@@ -39,7 +39,7 @@ public class PrivateAccessorTest
 
     private static Object[][] TESTS = {
         // Using private get/set methods
-    	{ ROOT, "getPrivateAccessorIntValue()", new Integer( 67 ) },
+        { ROOT, "getPrivateAccessorIntValue()", new Integer( 67 ) },
         { ROOT, "privateAccessorIntValue", new Integer( 67 ) },
         { ROOT, "privateAccessorIntValue", new Integer( 67 ), new Integer( 100 ) },
         { ROOT, "privateAccessorIntValue2", new Integer( 67 ) },

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java
Sun Oct 23 23:10:24 2011
@@ -19,11 +19,6 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
 import org.apache.commons.ognl.test.objects.BaseBean;
 import org.apache.commons.ognl.test.objects.Bean2;
 import org.apache.commons.ognl.test.objects.FirstBean;
@@ -33,6 +28,11 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class PropertyTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java
Sun Oct 23 23:10:24 2011
@@ -19,14 +19,14 @@
  */
 package org.apache.commons.ognl.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 @RunWith(value = Parameterized.class)
 public class QuotingTest
     extends OgnlTestCase

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
Sun Oct 23 23:10:24 2011
@@ -158,7 +158,7 @@ public class TestExpressionCompiler
         throws Throwable
     {
         Root root = new Root();
-        Node expr = (Node) Ognl.compileExpression( _context, root, "{index + 1}" );
+        Node expr = Ognl.compileExpression( _context, root, "{index + 1}" );
 
         Object ret = expr.getAccessor().get( _context, root );
 
@@ -172,7 +172,7 @@ public class TestExpressionCompiler
         Inherited obj1 = new TestInherited1();
         Inherited obj2 = new TestInherited2();
 
-        Node expr = (Node) Ognl.compileExpression( _context, obj1, "myString" );
+        Node expr = Ognl.compileExpression( _context, obj1, "myString" );
 
         assertEquals( expr.getAccessor().get( _context, obj1 ), "inherited1" );
         assertEquals( expr.getAccessor().get( _context, obj2 ), "inherited2" );
@@ -182,7 +182,7 @@ public class TestExpressionCompiler
     public void test_Create_Empty_Collection()
         throws Throwable
     {
-        Node expr = (Node) Ognl.compileExpression( _context, null, "{}" );
+        Node expr = Ognl.compileExpression( _context, null, "{}" );
 
         Object ret = expr.getAccessor().get( _context, null );
 
@@ -244,10 +244,10 @@ public class TestExpressionCompiler
         Node node = Ognl.compileExpression( _context, root, "cracker.param" );
         assertEquals( null, node.getAccessor().get( _context, root ) );
 
-        node.getAccessor().set( _context, root, new Integer( 0 ) );
-        assertEquals( new Integer( 0 ), node.getAccessor().get( _context, root ) );
+        node.getAccessor().set( _context, root, 0 );
+        assertEquals( 0, node.getAccessor().get( _context, root ) );
 
-        node.getAccessor().set( _context, root, new Integer( 12 ) );
-        assertEquals( new Integer( 12 ), node.getAccessor().get( _context, root ) );
+        node.getAccessor().set( _context, root, 12 );
+        assertEquals( 12, node.getAccessor().get( _context, root ) );
     }
 }

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean1.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean1.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean1.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean1.java
Sun Oct 23 23:10:24 2011
@@ -20,7 +20,6 @@
 package org.apache.commons.ognl.test.objects;
 
 public class Bean1
-    extends Object
 {
     private Bean2 bean2 = new Bean2();
 

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean2.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean2.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean2.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean2.java
Sun Oct 23 23:10:24 2011
@@ -20,7 +20,6 @@
 package org.apache.commons.ognl.test.objects;
 
 public class Bean2
-    extends Object
 {
     private Bean3 bean3 = new Bean3();
 

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean3.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean3.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean3.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Bean3.java
Sun Oct 23 23:10:24 2011
@@ -23,7 +23,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class Bean3
-    extends Object
 {
     private int value = 100;
 

Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java?rev=1188000&r1=1187999&r2=1188000&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java
(original)
+++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/Root.java
Sun Oct 23 23:10:24 2011
@@ -30,7 +30,6 @@ import java.util.Locale;
 import java.util.Map;
 
 public class Root
-    extends Object
 {
     public static final String SIZE_STRING = "size";
 



Mime
View raw message