harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r481147 - in /harmony/enhanced/classlib/trunk/modules/beans/src/test: java-internal/java/beans/beancontext/ java/org/apache/harmony/beans/tests/java/beans/ java/org/apache/harmony/beans/tests/java/beans/beancontext/ support/java/org/apache/...
Date Fri, 01 Dec 2006 04:35:41 GMT
Author: ndbeyer
Date: Thu Nov 30 20:35:37 2006
New Revision: 481147

URL: http://svn.apache.org/viewvc?view=rev&rev=481147
Log:
Cleanup compiler warnings for 'beans' module tests

Modified:
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextServicesSupportTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextSupportTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeanDescriptorTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/CustomizedPersistenceDelegateTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventHandlerTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PersistenceDelegateTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintEvent.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleEvent.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleException.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializableBean.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializablePropertyChangeListener.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildDelegateS.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildS.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextDelegateS.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextMembershipListenerS.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextProxyS.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServiceProviderS.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServicesListenerS.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockPropertyChangeListenerS.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockVetoableChangeListenerS.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockButton.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooButton.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooChild.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooLabel.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooStop.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSub.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSubSub.java
    harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/SerializedVCListener.java

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextServicesSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextServicesSupportTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextServicesSupportTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextServicesSupportTest.java Thu Nov 30 20:35:37 2006
@@ -173,7 +173,7 @@
     public void testHasServiceClass() {
         // Instantiate services and add service
         BeanContextServicesSupport sup = new BeanContextServicesSupport();
-        Class cl = new Object().getClass();
+        Class<?> cl = new Object().getClass();
         sup.addService(cl, getProvider(), true);
 
         assertTrue("Service not found", sup.hasService(cl));
@@ -277,10 +277,11 @@
     /**
      * Fake implementation of provider
      */
+    @SuppressWarnings("unchecked")
     private BeanContextServiceProvider getProvider() {
 
         return new BeanContextServiceProvider() {
-
+            
             public java.util.Iterator getCurrentServiceSelectors(
                     BeanContextServices bcs, Class serviceClass) {
 

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextSupportTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextSupportTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextSupportTest.java Thu Nov 30 20:35:37 2006
@@ -136,6 +136,7 @@
      * Test method bcsChildren() with no parameters.
      * <p>
      */
+    @SuppressWarnings("unchecked")
     public void testBcsChildren() {
         BeanContextSupport sup = new BeanContextSupport();
         sup.add(new BeanContextChildSupport());

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeanDescriptorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeanDescriptorTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeanDescriptorTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeanDescriptorTest.java Thu Nov 30 20:35:37 2006
@@ -135,6 +135,8 @@
 
     class MyCustomizer extends Component implements Customizer {
 
+        private static final long serialVersionUID = 76060185562822787L;
+
         HashSet<PropertyChangeListener> listeners;
 
         Object bean;

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/CustomizedPersistenceDelegateTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/CustomizedPersistenceDelegateTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/CustomizedPersistenceDelegateTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/CustomizedPersistenceDelegateTest.java Thu Nov 30 20:35:37 2006
@@ -237,10 +237,10 @@
             } else if (method.getName().equals("getProp")) {
                 return new Integer(i);
             } else if (method.getName().equals("hashCode")) {
-                return this.hashCode() + 113;
+                return Integer.valueOf(this.hashCode() + 113);
             } else if (method.getName().equals("equals") && args.length == 1) {
-                return proxy.getClass().getName().equals(
-                        args[0].getClass().getName());
+                return Boolean.valueOf(proxy.getClass().getName().equals(
+                        args[0].getClass().getName()));
             }
             return null;
         }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java Thu Nov 30 20:35:37 2006
@@ -475,7 +475,6 @@
         MockPersistenceDelegate pd = new MockPersistenceDelegate();
         MockFoo oldBean;
         MockFoo newBean;
-        MockFooLabel complexLabel;
 
         enc = new CollectingEncoder();
         oldBean = new MockFoo();
@@ -718,6 +717,8 @@
      * Mock bean with no getter.
      */
     public static class MockNoGetterBean extends MockFoo {
+        private static final long serialVersionUID = 5528972237047564849L;
+
         public void setII(Integer i) {
         }
     }
@@ -794,6 +795,8 @@
      * Mock bean with a transient property.
      */
     public static class MockTransientBean extends MockFoo {
+
+        private static final long serialVersionUID = 6924332068595493238L;
     }
 
     /*

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventHandlerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventHandlerTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventHandlerTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventHandlerTest.java Thu Nov 30 20:35:37 2006
@@ -48,16 +48,10 @@
 
     private final String text = "something";
 
-    /**
-     * 
-     */
     public EventHandlerTest() {
         super();
     }
 
-    /**
-     * 
-     */
     public EventHandlerTest(String name) {
         super(name);
     }
@@ -991,7 +985,7 @@
                 PropertyChangeListener.class, bean, "goodProp3", "source.prop2");
         try { 
             ((PropertyChangeListener) proxy).propertyChange( 
-                    new PropertyChangeEvent(bean, "goodProp3", true, false)); 
+                    new PropertyChangeEvent(bean, "goodProp3", Boolean.TRUE, Boolean.FALSE)); 
             fail(); 
         } catch (Exception e) { 
             // expected 

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java Thu Nov 30 20:35:37 2006
@@ -143,7 +143,7 @@
         for (EventSetDescriptor descriptor : descriptors) {
             Method m = descriptor.getAddListenerMethod();
             if (m != null) {
-                Class[] exceptionTypes = m.getExceptionTypes();
+                Class<?>[] exceptionTypes = m.getExceptionTypes();
                 boolean found = false;
 
                 for (Class<?> et : exceptionTypes) {

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PersistenceDelegateTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PersistenceDelegateTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PersistenceDelegateTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PersistenceDelegateTest.java Thu Nov 30 20:35:37 2006
@@ -36,11 +36,6 @@
  */
 public class PersistenceDelegateTest extends TestCase {
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
     /*
      * Test the constructor.
      */
@@ -321,7 +316,7 @@
         public MockPersistenceDelegate2() {}
         
         public MockPersistenceDelegate2(boolean mutatesToFlag) {
-            this.mutatesToFlag = mutatesToFlag;
+            this.mutatesToFlag = Boolean.valueOf(mutatesToFlag);
         }
 
         @Override
@@ -342,7 +337,7 @@
             methods.push("mutatesTo");
 
             if (mutatesToFlag != null) {
-                return mutatesToFlag;
+                return mutatesToFlag.booleanValue();
             }
             return super.mutatesTo(oldInstance, newInstance);
         }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java Thu Nov 30 20:35:37 2006
@@ -1291,6 +1291,8 @@
     static class MockPropertyChangeListener implements PropertyChangeListener,
             Serializable {
 
+        private static final long serialVersionUID = 161877638385579731L;
+
         private transient Object expSrc;
 
         private String expPropName;
@@ -1386,6 +1388,7 @@
     /**
      * Regression test for concurrent modification of listener set
      */
+    @SuppressWarnings("unused")
     public void testConcurrentModification() {
         PropertyChangeSupport changeSupport = new PropertyChangeSupport("bogus");
         MockPropertyChangeListener3 changeListener = new MockPropertyChangeListener3(

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java Thu Nov 30 20:35:37 2006
@@ -83,17 +83,14 @@
         
         image = info.loadImage("/gif/harmony-logo.gif");
         assertNotNull(image);
-        assertTrue(image instanceof Image);
     
         image = info.loadImage("/gif/test.gif");
         assertNotNull(image);
-        assertTrue(image instanceof Image);
 
         // regression for HARMONY-2241
         info = new SimpleBeanInfo() {};
         image = info.loadImage("testB.jpg");
         assertNotNull(image);
-        assertTrue(image instanceof Image);
     }
 
 }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java Thu Nov 30 20:35:37 2006
@@ -186,34 +186,32 @@
         public char getChar(int idx) throws IllegalAccessException {
             if (text == null) {
                 throw new IllegalAccessException("Text property is null.");
-            } else {
-                return text.charAt(idx);
             }
+            return text.charAt(idx);
         }
 
         public void setChar(int idx, char value) throws IllegalAccessException {
             if (text == null) {
                 throw new IllegalAccessException("Text property is null.");
-            } else {
-                // IndexOutOfBounds exception is thrown if indexed bounds
-                // are violated
-                StringBuffer sb = new StringBuffer(text.length());
-
-                if (idx < 0 || idx >= text.length()) {
-                    throw new IndexOutOfBoundsException();
-                }
-
-                if (idx > 0) {
-                    sb.append(text.substring(0, idx));
-                }
-                sb.append(value);
-
-                if (idx < (text.length() - 1)) {
-                    sb.append(text.substring(idx + 1));
-                }
+            }
+            // IndexOutOfBounds exception is thrown if indexed bounds
+            // are violated
+            StringBuffer sb = new StringBuffer(text.length());
+
+            if (idx < 0 || idx >= text.length()) {
+                throw new IndexOutOfBoundsException();
+            }
 
-                text = sb.toString();
+            if (idx > 0) {
+                sb.append(text.substring(0, idx));
             }
+            sb.append(value);
+
+            if (idx < (text.length() - 1)) {
+                sb.append(text.substring(idx + 1));
+            }
+
+            text = sb.toString();
         }
     }
 
@@ -952,6 +950,7 @@
             throw new NullPointerException();
         }
 
+        @SuppressWarnings("unchecked")
         public MockObject(Object o, Vector v, Class c) {
             reset();
             calledMethod = "new5";
@@ -1029,7 +1028,7 @@
         // receivedArguments.add(o2);
         // }
 
-        public static Class forName(String o) {
+        public static Class<?> forName(String o) {
             reset();
             calledMethod = "forName";
             receivedArguments.add(o);

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java Thu Nov 30 20:35:37 2006
@@ -1565,8 +1565,8 @@
         } catch (PropertyVetoException ok) {
         }
 
-        assertEquals(1, vlistener.event.getOldValue());
-        assertEquals(0, vlistener.event.getNewValue());
+        assertEquals(Integer.valueOf(1), vlistener.event.getOldValue());
+        assertEquals(Integer.valueOf(0), vlistener.event.getNewValue());
     }
 
     /*
@@ -1669,6 +1669,8 @@
     }
 
     public static class MockSource implements Serializable {
+
+        private static final long serialVersionUID = 2592367737991345105L;
 
         private String name;
 

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java Thu Nov 30 20:35:37 2006
@@ -112,6 +112,7 @@
             return result;
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public PersistenceDelegate getPersistenceDelegate(Class type) {
             PersistenceDelegate result = super.getPersistenceDelegate(type);
@@ -305,10 +306,9 @@
             public void close() throws IOException {
                 if (closeCalled) {
                     throw new IOException("close already called!");
-                } else {
-                    closeCalled = true;
-                    super.close();
                 }
+                closeCalled = true;
+                super.close();
             }
         };
         XMLEncoder enc = new XMLEncoder(out);
@@ -725,6 +725,7 @@
             final Object object = new Object();
             e.setPersistenceDelegate(AType.class,
                     new DefaultPersistenceDelegate() {
+                        @SuppressWarnings("unchecked")
                         @Override
                         protected void initialize(Class type,
                                 Object oldInstance, Object newInstance,

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java Thu Nov 30 20:35:37 2006
@@ -952,6 +952,7 @@
         // Regression for HARMONY-1393
         class TestBeanException extends BeanContextChildSupport implements
                 BeanContextProxy {
+            private static final long serialVersionUID = -8544245159647566063L;
             private final BeanContextChildSupport childSupport = new BeanContextChildSupport();
 
             public BeanContextChild getBeanContextProxy() {

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintEvent.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintEvent.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintEvent.java Thu Nov 30 20:35:37 2006
@@ -15,20 +15,13 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.2.6.3 $
- */
 package org.apache.harmony.beans.tests.support;
 
 import java.util.EventObject;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.2.6.3 $
- */
-
 public class MisprintEvent extends EventObject {
+
+    private static final long serialVersionUID = 6237503200476618235L;
 
     public MisprintEvent(Object object) {
         super(object);

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleEvent.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleEvent.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleEvent.java Thu Nov 30 20:35:37 2006
@@ -15,20 +15,13 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.3.6.3 $
- */
 package org.apache.harmony.beans.tests.support;
 
 import java.util.EventObject;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.3.6.3 $
- */
-
 public class SampleEvent extends EventObject {
+
+    private static final long serialVersionUID = 5298423873363309034L;
 
     private final int i = 7;
 

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleException.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleException.java Thu Nov 30 20:35:37 2006
@@ -15,18 +15,11 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.2.6.3 $
- */
 package org.apache.harmony.beans.tests.support;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.2.6.3 $
- */
-
 public class SampleException extends Exception {
+
+    private static final long serialVersionUID = 8001501122369182728L;
 
     public SampleException(String msg) {
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializableBean.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializableBean.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializableBean.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializableBean.java Thu Nov 30 20:35:37 2006
@@ -15,20 +15,13 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.3.6.3 $
- */
 package org.apache.harmony.beans.tests.support;
 
 import java.io.Serializable;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.3.6.3 $
- */
-
 public class SerializableBean implements Serializable {
+
+    private static final long serialVersionUID = -753653007843975743L;
 
     private int value;
 

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializablePropertyChangeListener.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializablePropertyChangeListener.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializablePropertyChangeListener.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializablePropertyChangeListener.java Thu Nov 30 20:35:37 2006
@@ -15,23 +15,15 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.2.6.3 $
- */
 package org.apache.harmony.beans.tests.support;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.Serializable;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.2.6.3 $
- */
+public class SerializablePropertyChangeListener implements PropertyChangeListener, Serializable {
 
-public class SerializablePropertyChangeListener implements
-        PropertyChangeListener, Serializable {
+    private static final long serialVersionUID = -4159288131626418260L;
 
     public void propertyChange(PropertyChangeEvent event) {
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildDelegateS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildDelegateS.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildDelegateS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildDelegateS.java Thu Nov 30 20:35:37 2006
@@ -28,8 +28,9 @@
 /**
  * Delegate to BeanContextChildSupport
  */
-public class MockBeanContextChildDelegateS implements BeanContextChild,
-        Serializable {
+public class MockBeanContextChildDelegateS implements BeanContextChild, Serializable {
+
+    private static final long serialVersionUID = -8741207393863151473L;
 
     public String id;
 
@@ -39,53 +40,26 @@
         this.id = id;
     }
 
-    /**
-     * @param name
-     * @param pcl
-     */
-    public void addPropertyChangeListener(String name,
-            PropertyChangeListener pcl) {
+    public void addPropertyChangeListener(String name, PropertyChangeListener pcl) {
         support.addPropertyChangeListener(name, pcl);
     }
 
-    /**
-     * @param name
-     * @param vcl
-     */
-    public void addVetoableChangeListener(String name,
-            VetoableChangeListener vcl) {
+    public void addVetoableChangeListener(String name, VetoableChangeListener vcl) {
         support.addVetoableChangeListener(name, vcl);
     }
 
-    /**
-     * @return
-     */
     public BeanContext getBeanContext() {
         return support.getBeanContext();
     }
 
-    /**
-     * @param name
-     * @param pcl
-     */
-    public void removePropertyChangeListener(String name,
-            PropertyChangeListener pcl) {
+    public void removePropertyChangeListener(String name, PropertyChangeListener pcl) {
         support.removePropertyChangeListener(name, pcl);
     }
 
-    /**
-     * @param name
-     * @param vcl
-     */
-    public void removeVetoableChangeListener(String name,
-            VetoableChangeListener vcl) {
+    public void removeVetoableChangeListener(String name, VetoableChangeListener vcl) {
         support.removeVetoableChangeListener(name, vcl);
     }
 
-    /**
-     * @param bc
-     * @throws java.beans.PropertyVetoException
-     */
     public void setBeanContext(BeanContext bc) throws PropertyVetoException {
         support.setBeanContext(bc);
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildS.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildS.java Thu Nov 30 20:35:37 2006
@@ -29,6 +29,8 @@
  */
 public class MockBeanContextChildS implements BeanContextChild, Serializable {
 
+    private static final long serialVersionUID = 8671685325002756158L;
+
     public String id;
 
     private BeanContext ctx;
@@ -50,70 +52,27 @@
         return id.hashCode();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextChild#setBeanContext(java.beans.beancontext.BeanContext)
-     */
     public void setBeanContext(BeanContext bc) throws PropertyVetoException {
         ctx = bc;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextChild#getBeanContext()
-     */
     public BeanContext getBeanContext() {
         return ctx;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextChild#addPropertyChangeListener(java.lang.String,
-     *      java.beans.PropertyChangeListener)
-     */
-    public void addPropertyChangeListener(String name,
-            PropertyChangeListener pcl) {
-        // Auto-generated method stub
+    public void addPropertyChangeListener(String name, PropertyChangeListener pcl) {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextChild#removePropertyChangeListener(java.lang.String,
-     *      java.beans.PropertyChangeListener)
-     */
-    public void removePropertyChangeListener(String name,
-            PropertyChangeListener pcl) {
-        // Auto-generated method stub
+    public void removePropertyChangeListener(String name, PropertyChangeListener pcl) {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextChild#addVetoableChangeListener(java.lang.String,
-     *      java.beans.VetoableChangeListener)
-     */
-    public void addVetoableChangeListener(String name,
-            VetoableChangeListener vcl) {
-        // Auto-generated method stub
+    public void addVetoableChangeListener(String name, VetoableChangeListener vcl) {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextChild#removeVetoableChangeListener(java.lang.String,
-     *      java.beans.VetoableChangeListener)
-     */
-    public void removeVetoableChangeListener(String name,
-            VetoableChangeListener vcl) {
-        // Auto-generated method stub
-
+    public void removeVetoableChangeListener(String name, VetoableChangeListener vcl) {
     }
 
 }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextDelegateS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextDelegateS.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextDelegateS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextDelegateS.java Thu Nov 30 20:35:37 2006
@@ -43,6 +43,8 @@
 @SuppressWarnings("unchecked")
 public class MockBeanContextDelegateS implements BeanContext, Serializable {
 
+    private static final long serialVersionUID = 3636087892485726792L;
+
     public BeanContextSupport support = new BeanContextSupport(this, Locale.US);
 
     public String id;
@@ -51,370 +53,188 @@
         this.id = id;
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public boolean add(Object arg0) {
         return support.add(arg0);
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public boolean addAll(Collection arg0) {
         return support.addAll(arg0);
     }
 
-    /**
-     * @param arg0
-     */
-    public void addBeanContextMembershipListener(
-            BeanContextMembershipListener arg0) {
+    public void addBeanContextMembershipListener(BeanContextMembershipListener arg0) {
         support.addBeanContextMembershipListener(arg0);
     }
 
-    /**
-     * @param arg0
-     * @param arg1
-     */
-    public void addPropertyChangeListener(String arg0,
-            PropertyChangeListener arg1) {
+    public void addPropertyChangeListener(String arg0, PropertyChangeListener arg1) {
         support.addPropertyChangeListener(arg0, arg1);
     }
 
-    /**
-     * @param arg0
-     * @param arg1
-     */
-    public void addVetoableChangeListener(String arg0,
-            VetoableChangeListener arg1) {
+    public void addVetoableChangeListener(String arg0, VetoableChangeListener arg1) {
         support.addVetoableChangeListener(arg0, arg1);
     }
 
-    /**
-     * @return
-     */
     public boolean avoidingGui() {
         return support.avoidingGui();
     }
 
-    /**
-     * 
-     */
     public void clear() {
         support.clear();
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public boolean contains(Object arg0) {
         return support.contains(arg0);
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public boolean containsAll(Collection arg0) {
         return support.containsAll(arg0);
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public boolean containsKey(Object arg0) {
         return support.containsKey(arg0);
     }
 
-    /**
-     * 
-     */
     public void dontUseGui() {
         support.dontUseGui();
     }
 
-    /**
-     * @param arg0
-     * @param arg1
-     * @param arg2
-     */
     public void firePropertyChange(String arg0, Object arg1, Object arg2) {
         support.firePropertyChange(arg0, arg1, arg2);
     }
 
-    /**
-     * @param arg0
-     * @param arg1
-     * @param arg2
-     * @throws java.beans.PropertyVetoException
-     */
     public void fireVetoableChange(String arg0, Object arg1, Object arg2)
             throws PropertyVetoException {
         support.fireVetoableChange(arg0, arg1, arg2);
     }
 
-    /**
-     * @return
-     */
     public BeanContext getBeanContext() {
         return support.getBeanContext();
     }
 
-    /**
-     * @return
-     */
     public BeanContextChild getBeanContextChildPeer() {
         return support.getBeanContextChildPeer();
     }
 
-    /**
-     * @return
-     */
     public BeanContext getBeanContextPeer() {
         return support.getBeanContextPeer();
     }
 
-    /**
-     * @return
-     */
     public Locale getLocale() {
         return support.getLocale();
     }
 
-    /**
-     * @param arg0
-     * @param arg1
-     * @return
-     * @throws java.lang.IllegalArgumentException
-     */
-    public URL getResource(String arg0, BeanContextChild arg1)
-            throws IllegalArgumentException {
+    public URL getResource(String arg0, BeanContextChild arg1) throws IllegalArgumentException {
         return support.getResource(arg0, arg1);
     }
 
-    /**
-     * @param arg0
-     * @param arg1
-     * @return
-     * @throws java.lang.IllegalArgumentException
-     */
     public InputStream getResourceAsStream(String arg0, BeanContextChild arg1)
             throws IllegalArgumentException {
         return support.getResourceAsStream(arg0, arg1);
     }
 
-    /**
-     * @param arg0
-     * @return
-     * @throws java.io.IOException
-     * @throws java.lang.ClassNotFoundException
-     */
-    public Object instantiateChild(String arg0) throws IOException,
-            ClassNotFoundException {
+    public Object instantiateChild(String arg0) throws IOException, ClassNotFoundException {
         return support.instantiateChild(arg0);
     }
 
-    /**
-     * @return
-     */
     public boolean isDelegated() {
         return support.isDelegated();
     }
 
-    /**
-     * @return
-     */
     public boolean isDesignTime() {
         return support.isDesignTime();
     }
 
-    /**
-     * @return
-     */
     public boolean isEmpty() {
         return support.isEmpty();
     }
 
-    /**
-     * @return
-     */
     public boolean isSerializing() {
         return support.isSerializing();
     }
 
-    /**
-     * @return
-     */
     public Iterator iterator() {
         return support.iterator();
     }
 
-    /**
-     * @return
-     */
     public boolean needsGui() {
         return support.needsGui();
     }
 
-    /**
-     * 
-     */
     public void okToUseGui() {
         support.okToUseGui();
     }
 
-    /**
-     * @param arg0
-     */
     public void propertyChange(PropertyChangeEvent arg0) {
         support.propertyChange(arg0);
     }
 
-    /**
-     * @param arg0
-     * @throws java.io.IOException
-     * @throws java.lang.ClassNotFoundException
-     */
-    public void readChildren(ObjectInputStream arg0) throws IOException,
-            ClassNotFoundException {
+    public void readChildren(ObjectInputStream arg0) throws IOException, ClassNotFoundException {
         support.readChildren(arg0);
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public boolean remove(Object arg0) {
         return support.remove(arg0);
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public boolean removeAll(Collection arg0) {
         return support.removeAll(arg0);
     }
 
-    /**
-     * @param arg0
-     */
-    public void removeBeanContextMembershipListener(
-            BeanContextMembershipListener arg0) {
+    public void removeBeanContextMembershipListener(BeanContextMembershipListener arg0) {
         support.removeBeanContextMembershipListener(arg0);
     }
 
-    /**
-     * @param arg0
-     * @param arg1
-     */
-    public void removePropertyChangeListener(String arg0,
-            PropertyChangeListener arg1) {
+    public void removePropertyChangeListener(String arg0, PropertyChangeListener arg1) {
         support.removePropertyChangeListener(arg0, arg1);
     }
 
-    /**
-     * @param arg0
-     * @param arg1
-     */
-    public void removeVetoableChangeListener(String arg0,
-            VetoableChangeListener arg1) {
+    public void removeVetoableChangeListener(String arg0, VetoableChangeListener arg1) {
         support.removeVetoableChangeListener(arg0, arg1);
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public boolean retainAll(Collection arg0) {
         return support.retainAll(arg0);
     }
 
-    /**
-     * @param arg0
-     */
     public void serviceAvailable(BeanContextServiceAvailableEvent arg0) {
         support.serviceAvailable(arg0);
     }
 
-    /**
-     * @param arg0
-     */
     public void serviceRevoked(BeanContextServiceRevokedEvent arg0) {
         support.serviceRevoked(arg0);
     }
 
-    /**
-     * @param arg0
-     * @throws java.beans.PropertyVetoException
-     */
     public void setBeanContext(BeanContext arg0) throws PropertyVetoException {
         support.setBeanContext(arg0);
     }
 
-    /**
-     * @param arg0
-     */
     public void setDesignTime(boolean arg0) {
         support.setDesignTime(arg0);
     }
 
-    /**
-     * @param arg0
-     * @throws java.beans.PropertyVetoException
-     */
     public void setLocale(Locale arg0) throws PropertyVetoException {
         support.setLocale(arg0);
     }
 
-    /**
-     * @return
-     */
     public int size() {
         return support.size();
     }
 
-    /**
-     * @return
-     */
     public Object[] toArray() {
         return support.toArray();
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public Object[] toArray(Object[] arg0) {
         return support.toArray(arg0);
     }
 
-    /**
-     * @param arg0
-     * @return
-     */
     public boolean validatePendingSetBeanContext(BeanContext arg0) {
         return support.validatePendingSetBeanContext(arg0);
     }
 
-    /**
-     * @param arg0
-     * @throws java.beans.PropertyVetoException
-     */
-    public void vetoableChange(PropertyChangeEvent arg0)
-            throws PropertyVetoException {
+    public void vetoableChange(PropertyChangeEvent arg0) throws PropertyVetoException {
         support.vetoableChange(arg0);
     }
 
-    /**
-     * @param arg0
-     * @throws java.io.IOException
-     */
     public void writeChildren(ObjectOutputStream arg0) throws IOException {
         support.writeChildren(arg0);
     }
@@ -424,8 +244,7 @@
         support.writeChildren(oos);
     }
 
-    private void readObject(ObjectInputStream ois) throws IOException,
-            ClassNotFoundException {
+    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
         ois.defaultReadObject();
         support.readChildren(ois);
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextMembershipListenerS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextMembershipListenerS.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextMembershipListenerS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextMembershipListenerS.java Thu Nov 30 20:35:37 2006
@@ -24,8 +24,10 @@
 /**
  * Mock of BeanContextMembershipListener
  */
-public class MockBeanContextMembershipListenerS implements
-        BeanContextMembershipListener, Serializable {
+public class MockBeanContextMembershipListenerS implements BeanContextMembershipListener,
+        Serializable {
+
+    private static final long serialVersionUID = -7929429772961643840L;
 
     public String id;
 
@@ -45,21 +47,11 @@
         lastEvent = null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextMembershipListener#childrenAdded(java.beans.beancontext.BeanContextMembershipEvent)
-     */
     public void childrenAdded(BeanContextMembershipEvent bcme) {
         lastEventAdd = true;
         lastEvent = bcme;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextMembershipListener#childrenRemoved(java.beans.beancontext.BeanContextMembershipEvent)
-     */
     public void childrenRemoved(BeanContextMembershipEvent bcme) {
         lastEventRemove = true;
         lastEvent = bcme;

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextProxyS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextProxyS.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextProxyS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextProxyS.java Thu Nov 30 20:35:37 2006
@@ -26,6 +26,8 @@
  */
 public class MockBeanContextProxyS implements BeanContextProxy, Serializable {
 
+    private static final long serialVersionUID = 1003496111741970301L;
+
     private String id;
 
     private BeanContextChild bcc;
@@ -49,11 +51,6 @@
         return id.hashCode() + bcc.hashCode();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextProxy#getBeanContextProxy()
-     */
     public BeanContextChild getBeanContextProxy() {
         return bcc;
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServiceProviderS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServiceProviderS.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServiceProviderS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServiceProviderS.java Thu Nov 30 20:35:37 2006
@@ -26,8 +26,10 @@
  * Mock of BeanContextServiceProvider
  */
 @SuppressWarnings("unchecked")
-public class MockBeanContextServiceProviderS implements
-        BeanContextServiceProvider, Serializable {
+public class MockBeanContextServiceProviderS implements BeanContextServiceProvider,
+        Serializable {
+
+    private static final long serialVersionUID = -4704593364692129549L;
 
     public String id;
 
@@ -35,34 +37,15 @@
         this.id = id;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextServiceProvider#getService(java.beans.beancontext.BeanContextServices,
-     *      java.lang.Object, java.lang.Class, java.lang.Object)
-     */
-    public Object getService(BeanContextServices bcs, Object requestor,
-            Class serviceClass, Object serviceSelector) {
+    public Object getService(BeanContextServices bcs, Object requestor, Class serviceClass,
+            Object serviceSelector) {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextServiceProvider#releaseService(java.beans.beancontext.BeanContextServices,
-     *      java.lang.Object, java.lang.Object)
-     */
-    public void releaseService(BeanContextServices bcs, Object requestor,
-            Object service) {
+    public void releaseService(BeanContextServices bcs, Object requestor, Object service) {
         // nothing
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextServiceProvider#getCurrentServiceSelectors(java.beans.beancontext.BeanContextServices,
-     *      java.lang.Class)
-     */
     public Iterator<Object> getCurrentServiceSelectors(BeanContextServices bcs,
             Class serviceClass) {
         return null;

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServicesListenerS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServicesListenerS.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServicesListenerS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextServicesListenerS.java Thu Nov 30 20:35:37 2006
@@ -25,8 +25,10 @@
 /**
  * Mock of BeanContextServicesListener
  */
-public class MockBeanContextServicesListenerS implements
-        BeanContextServicesListener, Serializable {
+public class MockBeanContextServicesListenerS implements BeanContextServicesListener,
+        Serializable {
+
+    private static final long serialVersionUID = -2513090204796560433L;
 
     public String id;
 
@@ -34,22 +36,12 @@
         this.id = id;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextServicesListener#serviceAvailable(java.beans.beancontext.BeanContextServiceAvailableEvent)
-     */
     public void serviceAvailable(BeanContextServiceAvailableEvent bcsae) {
-        // nothing
+
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.beancontext.BeanContextServiceRevokedListener#serviceRevoked(java.beans.beancontext.BeanContextServiceRevokedEvent)
-     */
     public void serviceRevoked(BeanContextServiceRevokedEvent bcsre) {
-        // nothing
+
     }
 
 }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockPropertyChangeListenerS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockPropertyChangeListenerS.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockPropertyChangeListenerS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockPropertyChangeListenerS.java Thu Nov 30 20:35:37 2006
@@ -24,8 +24,9 @@
 /**
  * Mock of PropertyChangeListener
  */
-public class MockPropertyChangeListenerS implements PropertyChangeListener,
-        Serializable {
+public class MockPropertyChangeListenerS implements PropertyChangeListener, Serializable {
+
+    private static final long serialVersionUID = 2047816547264017403L;
 
     public PropertyChangeEvent lastEvent;
 
@@ -39,11 +40,6 @@
         lastEvent = null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
-     */
     public void propertyChange(PropertyChangeEvent evt) {
         lastEvent = evt;
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockVetoableChangeListenerS.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockVetoableChangeListenerS.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockVetoableChangeListenerS.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockVetoableChangeListenerS.java Thu Nov 30 20:35:37 2006
@@ -25,8 +25,9 @@
 /**
  * Mock of VetoableChangeListener
  */
-public class MockVetoableChangeListenerS implements VetoableChangeListener,
-        Serializable {
+public class MockVetoableChangeListenerS implements VetoableChangeListener, Serializable {
+
+    private static final long serialVersionUID = -455571860616755790L;
 
     public PropertyChangeEvent lastEvent;
 
@@ -40,13 +41,7 @@
         lastEvent = null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.VetoableChangeListener#vetoableChange(java.beans.PropertyChangeEvent)
-     */
-    public void vetoableChange(PropertyChangeEvent evt)
-            throws PropertyVetoException {
+    public void vetoableChange(PropertyChangeEvent evt) throws PropertyVetoException {
         lastEvent = evt;
     }
 

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean.java Thu Nov 30 20:35:37 2006
@@ -23,6 +23,8 @@
  * test java.beans.Beans
  */
 public class MockAppletBean extends Applet {
+    private static final long serialVersionUID = -1501701773486783824L;
+
     private String propertyOne;
 
     private boolean initBeenCalled;
@@ -41,17 +43,10 @@
         this.initBeenCalled = value;
     }
 
-    /**
-     * @return Returns the propertyOne.
-     */
     public String getPropertyOne() {
         return propertyOne;
     }
 
-    /**
-     * @param propertyOne
-     *            The propertyOne to set.
-     */
     public void setPropertyOne(String propertyOne) {
         this.propertyOne = propertyOne;
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockButton.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockButton.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockButton.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockButton.java Thu Nov 30 20:35:37 2006
@@ -25,6 +25,8 @@
  * This is a mock bean for EventHandler test.
  */
 public class MockButton implements Serializable {
+    private static final long serialVersionUID = 9216444906795513297L;
+
     String name;
 
     String label;
@@ -43,33 +45,19 @@
         this.support.addPropertyChangeListener(listener);
     }
 
-    /**
-     * @return Returns the label.
-     */
     public String getLabel() {
         return label;
     }
 
-    /**
-     * @param label
-     *            The label to set.
-     */
     public void setLabel(String label) {
         this.support.firePropertyChange("label", this.label, label);
         this.label = label;
     }
 
-    /**
-     * @return Returns the name.
-     */
     public String getName() {
         return name;
     }
 
-    /**
-     * @param name
-     *            The name to set.
-     */
     public void setName(String name) {
         this.name = name;
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooButton.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooButton.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooButton.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooButton.java Thu Nov 30 20:35:37 2006
@@ -23,19 +23,14 @@
  * Test the default bean info search path.
  */
 public class MockFooButton implements Serializable {
+    private static final long serialVersionUID = -2605949066932919527L;
+
     private String text;
 
-    /**
-     * @return Returns the text.
-     */
     public String getText() {
         return text;
     }
 
-    /**
-     * @param text
-     *            The text to set.
-     */
     public void setText(String text) {
         this.text = text;
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooChild.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooChild.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooChild.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooChild.java Thu Nov 30 20:35:37 2006
@@ -21,30 +21,23 @@
  * test Introspector
  */
 public class MockFooChild extends MockFoo {
+    private static final long serialVersionUID = -5817959822261385626L;
+
     private String childName;
 
-    /**
-     * @return Returns the childName.
-     */
     public String getChildName() {
         return childName;
     }
 
-    /**
-     * @param childName
-     *            The childName to set.
-     */
     public void setChildName(String childName) {
         this.childName = childName;
     }
 
-    public void addMockPropertyChangeListener(
-            MockPropertyChangeListener listener) {
+    public void addMockPropertyChangeListener(MockPropertyChangeListener listener) {
 
     }
 
-    public void removeMockPropertyChangeListener(
-            MockPropertyChangeListener listener) {
+    public void removeMockPropertyChangeListener(MockPropertyChangeListener listener) {
 
     }
 }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooLabel.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooLabel.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooLabel.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooLabel.java Thu Nov 30 20:35:37 2006
@@ -23,29 +23,26 @@
  * Test the default bean info search path.
  */
 public class MockFooLabel implements Serializable {
+    private static final long serialVersionUID = -1305056517480261922L;
+
     private String text;
 
-    public MockFooLabel() {}
-    
+    public MockFooLabel() {
+    }
+
     public MockFooLabel(String text) {
-        this.text = text; 
+        this.text = text;
     }
-    
-    /**
-     * @return Returns the text.
-     */
+
     public String getText() {
         return text;
     }
 
-    /**
-     * @param text
-     *            The text to set.
-     */
     public void setText(String text) {
         this.text = text;
     }
-    
+
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof MockFooLabel) {
             return false;

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooStop.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooStop.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooStop.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooStop.java Thu Nov 30 20:35:37 2006
@@ -23,19 +23,14 @@
  * test Introspector
  */
 public class MockFooStop implements Serializable {
+    private static final long serialVersionUID = -3007105946173048551L;
+
     private String label;
 
-    /**
-     * @return Returns the label.
-     */
     public String getLabel() {
         return label;
     }
 
-    /**
-     * @param label
-     *            The label to set.
-     */
     public void setLabel(String label) {
         this.label = label;
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSub.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSub.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSub.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSub.java Thu Nov 30 20:35:37 2006
@@ -22,32 +22,25 @@
  */
 public class MockFooSub extends MockFooChild {
 
+    private static final long serialVersionUID = -6190124759553440748L;
+
     private String text;
 
-    /**
-     * @return Returns the text.
-     */
     public String getText() {
         return text;
     }
 
-    /**
-     * @param text
-     *            The text to set.
-     */
     public void setText(String text) {
         this.text = text;
     }
 
     @Override
-    public void addMockPropertyChangeListener(
-            MockPropertyChangeListener listener) {
+    public void addMockPropertyChangeListener(MockPropertyChangeListener listener) {
 
     }
 
     @Override
-    public void removeMockPropertyChangeListener(
-            MockPropertyChangeListener listener) {
+    public void removeMockPropertyChangeListener(MockPropertyChangeListener listener) {
 
     }
 }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSubSub.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSubSub.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSubSub.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockFooSubSub.java Thu Nov 30 20:35:37 2006
@@ -22,19 +22,14 @@
  */
 public class MockFooSubSub extends MockFooSub {
 
+    private static final long serialVersionUID = 2473405304400125998L;
+
     private int flags;
 
-    /**
-     * @return Returns the flags.
-     */
     public int getFlags() {
         return flags;
     }
 
-    /**
-     * @param flags
-     *            The flags to set.
-     */
     public void setFlags(int flags) {
         this.flags = flags;
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/SerializedVCListener.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/SerializedVCListener.java?view=diff&rev=481147&r1=481146&r2=481147
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/SerializedVCListener.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/SerializedVCListener.java Thu Nov 30 20:35:37 2006
@@ -25,8 +25,9 @@
 /**
  * test VetoableChangeSupport
  */
-public class SerializedVCListener implements Serializable,
-        VetoableChangeListener {
+public class SerializedVCListener implements Serializable, VetoableChangeListener {
+
+    private static final long serialVersionUID = -3110366593959548316L;
 
     String propertyName;
 
@@ -43,19 +44,11 @@
         }
 
         SerializedVCListener other = (SerializedVCListener) o;
-        return ((this.name == null ? other.name == null : this.name
-                .equals(other.name)) && (this.propertyName == null ? other.propertyName == null
+        return ((this.name == null ? other.name == null : this.name.equals(other.name)) && (this.propertyName == null ? other.propertyName == null
                 : this.propertyName.equals(other.propertyName)));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.beans.VetoableChangeListener#vetoableChange(java.beans.PropertyChangeEvent)
-     */
-    public void vetoableChange(PropertyChangeEvent event)
-            throws PropertyVetoException {
-        // TODO Auto-generated method stub
+    public void vetoableChange(PropertyChangeEvent event) throws PropertyVetoException {
 
     }
 



Mime
View raw message