harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r452415 [9/12] - in /incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test: java-internal/java/beans/beancontext/ java-internal/org/apache/harmony/beans/ java/org/apache/harmony/beans/tests/ java/org/apache/harmony/beans/tests/ja...
Date Tue, 03 Oct 2006 11:06:03 GMT
Modified: incubator/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/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java Tue Oct  3 04:05:57 2006
@@ -73,7 +73,7 @@
 public class BeanContextSupportTest extends TestCase {
 
     private static class MockBeanContextSupport extends BeanContextSupport {
-        
+
         static final long serialVersionUID = -4165267256277214588L;
 
         public transient MethodInvocationRecords records;
@@ -333,7 +333,7 @@
     private static class BadChild implements BeanContextChild, BeanContextProxy {
 
         public void setBeanContext(BeanContext bc) throws PropertyVetoException {
-        // Auto-generated method stub
+            // Auto-generated method stub
         }
 
         public BeanContext getBeanContext() {
@@ -343,22 +343,22 @@
 
         public void addPropertyChangeListener(String name,
                 PropertyChangeListener pcl) {
-        // Auto-generated method stub
+            // Auto-generated method stub
         }
 
         public void removePropertyChangeListener(String name,
                 PropertyChangeListener pcl) {
-        // Auto-generated method stub
+            // Auto-generated method stub
         }
 
         public void addVetoableChangeListener(String name,
                 VetoableChangeListener vcl) {
-        // Auto-generated method stub
+            // Auto-generated method stub
         }
 
         public void removeVetoableChangeListener(String name,
                 VetoableChangeListener vcl) {
-        // Auto-generated method stub
+            // Auto-generated method stub
         }
 
         public BeanContextChild getBeanContextProxy() {
@@ -785,11 +785,11 @@
     }
 
     public void testChildJustAddedHook() {
-    // covered by testAdd
+        // covered by testAdd
     }
 
     public void testChildJustRemovedHook() {
-    // covered by testRemove
+        // covered by testRemove
     }
 
     public void testClassEquals() {
@@ -893,11 +893,11 @@
     }
 
     public void testCreateBCSChild() {
-    // covered by testAdd
+        // covered by testAdd
     }
 
     public void testDeserialize() {
-    // covered by testBcsPreDeserializationHook()
+        // covered by testBcsPreDeserializationHook()
     }
 
     public void testDontUseGui() {
@@ -914,15 +914,15 @@
     }
 
     public void testFireChildrenAdded() {
-    // covered by testAdd
+        // covered by testAdd
     }
 
     public void testFireChildrenRemoved() {
-    // covered by testRemove
+        // covered by testRemove
     }
 
     public void testGetBeanContextPeer() {
-    // covered by testConstructor
+        // covered by testConstructor
     }
 
     public void testGetChildBeanContextChild_NullParam() {
@@ -937,20 +937,22 @@
                 .publicGetChildBeanContextChild(child);
         assertSame(child, result);
 
-        //Regression for HARMONY-1393
-		class TestBeanException extends BeanContextChildSupport implements BeanContextProxy {
-			private BeanContextChildSupport childSupport = new BeanContextChildSupport();
-			public BeanContextChild getBeanContextProxy() {
-				return childSupport;
-			}
-		}
-		TestBeanException bean = new TestBeanException();
-		try {
-			MockBeanContextSupport.publicGetChildBeanContextChild(bean);
-			fail("IllegalArgumentException expected");
-		} catch (IllegalArgumentException e) {
-			//expected
-		}
+        // Regression for HARMONY-1393
+        class TestBeanException extends BeanContextChildSupport implements
+                BeanContextProxy {
+            private BeanContextChildSupport childSupport = new BeanContextChildSupport();
+
+            public BeanContextChild getBeanContextProxy() {
+                return childSupport;
+            }
+        }
+        TestBeanException bean = new TestBeanException();
+        try {
+            MockBeanContextSupport.publicGetChildBeanContextChild(bean);
+            fail("IllegalArgumentException expected");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
     }
 
     public void testGetChildBeanContextChild_BeanContextProxy() {
@@ -1195,7 +1197,7 @@
     }
 
     public void testInitialize() {
-    // covered by other testcases
+        // covered by other testcases
     }
 
     public void testInstantiateChild_NullParam() throws IOException,
@@ -1270,26 +1272,26 @@
     }
 
     public void testNeedsGui_ComponentChild() {
-    /*
-     * MockBeanContextSupport support = new MockBeanContextSupport();
-     * assertFalse(support.needsGui());
-     * 
-     * Component child = new Component() {/* mock
-     */
-    // };
-    /*
-     * support.add(child); assertTrue(support.needsGui());
-     */
+        /*
+         * MockBeanContextSupport support = new MockBeanContextSupport();
+         * assertFalse(support.needsGui());
+         * 
+         * Component child = new Component() {/* mock
+         */
+        // };
+        /*
+         * support.add(child); assertTrue(support.needsGui());
+         */
     }
 
     public void testNeedsGui_ContainerChild() {
-    // MockBeanContextSupport support = new MockBeanContextSupport();
-    // assertFalse(support.needsGui());
-    //
-    // Container child = new Container() {/* mock */
-    // };
-    // support.add(child);
-    // assertTrue(support.needsGui());
+        // MockBeanContextSupport support = new MockBeanContextSupport();
+        // assertFalse(support.needsGui());
+        //
+        // Container child = new Container() {/* mock */
+        // };
+        // support.add(child);
+        // assertTrue(support.needsGui());
     }
 
     public void testNeedsGui_VisibilityChild() {
@@ -1302,12 +1304,12 @@
     }
 
     public void testNeedsGui_VisiblePeer() {
-    // MockBeanContextSupport peer = new MockBeanContextSupport();
-    // peer.add(new Container() {/* mock */
-    // });
-    // MockBeanContextSupport support = new MockBeanContextSupport(peer);
-    //
-    // assertTrue(support.needsGui());
+        // MockBeanContextSupport peer = new MockBeanContextSupport();
+        // peer.add(new Container() {/* mock */
+        // });
+        // MockBeanContextSupport support = new MockBeanContextSupport(peer);
+        //
+        // assertTrue(support.needsGui());
     }
 
     public void testOkToUseGui() {
@@ -1716,7 +1718,7 @@
     }
 
     public void testSerialize() {
-    // covered by testBcsPreSerializationHook
+        // covered by testBcsPreSerializationHook
     }
 
     public void testSetDesignTime() {
@@ -1796,7 +1798,7 @@
     }
 
     public void testSize() {
-    // covered by other testcases
+        // covered by other testcases
     }
 
     /*
@@ -1814,16 +1816,16 @@
         array = support.toArray();
         assertEquals(3, array.length);
         int count = 0;
-        for (int i = 0; i < array.length; i++) {
-            if (array[i] instanceof Integer) {
-                assertEquals(new Integer(1000), array[i]);
+        for (Object element : array) {
+            if (element instanceof Integer) {
+                assertEquals(new Integer(1000), element);
                 count += 1;
             }
-            if (array[i] instanceof String) {
-                assertEquals("a child", array[i]);
+            if (element instanceof String) {
+                assertEquals("a child", element);
                 count += 2;
             }
-            if (array[i] instanceof MockBeanContextChild) {
+            if (element instanceof MockBeanContextChild) {
                 count += 4;
             }
         }
@@ -1872,8 +1874,8 @@
         assertNotSame(in, out);
         List expected = Arrays.asList(new String[] { "a", "b", "c" });
         assertEquals(expected.size(), out.length);
-        for (int i = 0; i < out.length; i++) {
-            assertTrue(expected.contains(out[i]));
+        for (String element : out) {
+            assertTrue(expected.contains(element));
         }
     }
 
@@ -1890,8 +1892,8 @@
         assertSame(in, out);
         List expected = Arrays.asList(new String[] { "a", "b", "c" });
         assertEquals(expected.size(), out.length);
-        for (int i = 0; i < out.length; i++) {
-            assertTrue(expected.contains(out[i]));
+        for (String element : out) {
+            assertTrue(expected.contains(element));
         }
     }
 
@@ -1915,11 +1917,11 @@
     }
 
     public void testValidatePendingAdd() {
-    // coverd by testAdd
+        // coverd by testAdd
     }
 
     public void testValidatePendingRemove() {
-    // coverd by testRemove
+        // coverd by testRemove
     }
 
     public void testVetoableChange() throws PropertyVetoException {
@@ -1947,7 +1949,7 @@
     }
 
     public void testWriteChildren() {
-    // covered by testReadChildren()
+        // covered by testReadChildren()
     }
 
     public void testSerialization_NoPeer() throws IOException,

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/AType.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/AType.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/AType.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/AType.java Tue Oct  3 04:05:57 2006
@@ -27,7 +27,7 @@
  */
 
 public class AType {
-    
+
     public Object go() {
         return new Object();
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/ChildBeanBeanInfo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/ChildBeanBeanInfo.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/ChildBeanBeanInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/ChildBeanBeanInfo.java Tue Oct  3 04:05:57 2006
@@ -31,17 +31,16 @@
  */
 
 public class ChildBeanBeanInfo extends SimpleBeanInfo {
-    
+
     public ChildBeanBeanInfo() {
         super();
     }
-    
+
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors() {
         try {
-            return new PropertyDescriptor[] {
-                new PropertyDescriptor("childText", ChildBean.class,
-                        "getText", "setText")
-            };
+            return new PropertyDescriptor[] { new PropertyDescriptor(
+                    "childText", ChildBean.class, "getText", "setText") };
         } catch (IntrospectionException ie) {
             System.out.println("in ChildBeanBeanInfo.getPropertyDescriptors: "
                     + ie.getMessage());

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/GrannyBean.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/GrannyBean.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/GrannyBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/GrannyBean.java Tue Oct  3 04:05:57 2006
@@ -27,13 +27,13 @@
  */
 
 public class GrannyBean {
-    
+
     private String text = "GrannyBean";
-    
+
     public String getText() {
         return text;
     }
-    
+
     public void setText(String text) {
         this.text = text;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/GrannyBeanBeanInfo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/GrannyBeanBeanInfo.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/GrannyBeanBeanInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/GrannyBeanBeanInfo.java Tue Oct  3 04:05:57 2006
@@ -31,17 +31,16 @@
  */
 
 public class GrannyBeanBeanInfo extends SimpleBeanInfo {
-    
+
     public GrannyBeanBeanInfo() {
         super();
     }
-    
+
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors() {
         try {
-            return new PropertyDescriptor[] {
-                new PropertyDescriptor("grannyText", GrannyBean.class,
-                        "getText", "setText")
-            };
+            return new PropertyDescriptor[] { new PropertyDescriptor(
+                    "grannyText", GrannyBean.class, "getText", "setText") };
         } catch (IntrospectionException ie) {
             System.out.println("in GrannyBeanBeanInfo.getPropertyDescriptors: "
                     + ie.getMessage());

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintBean.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintBean.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintBean.java Tue Oct  3 04:05:57 2006
@@ -27,7 +27,8 @@
  */
 
 public class MisprintBean {
-    
-    //public void addMiisprintListener(MisprintListenerr ml) {}
-    public void removeMisprintListener(MisprintListenerr ml) {}
+
+    // public void addMiisprintListener(MisprintListenerr ml) {}
+    public void removeMisprintListener(MisprintListenerr ml) {
+    }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintEvent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintEvent.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintEvent.java Tue Oct  3 04:05:57 2006
@@ -29,7 +29,7 @@
  */
 
 public class MisprintEvent extends EventObject {
-    
+
     public MisprintEvent(Object object) {
         super(object);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintListenerr.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintListenerr.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintListenerr.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/MisprintListenerr.java Tue Oct  3 04:05:57 2006
@@ -29,7 +29,7 @@
  */
 
 public interface MisprintListenerr extends EventListener {
-    
+
     public void fireMisprintEvent(MisprintEvent me);
     // public void fireMisprint2Event(MisprintEvent me);
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/NonSerializablePropertyChangeListener.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/NonSerializablePropertyChangeListener.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/NonSerializablePropertyChangeListener.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/NonSerializablePropertyChangeListener.java Tue Oct  3 04:05:57 2006
@@ -29,8 +29,8 @@
  * @version $Revision: 1.2.6.3 $
  */
 
-public class NonSerializablePropertyChangeListener
-        implements PropertyChangeListener {
+public class NonSerializablePropertyChangeListener implements
+        PropertyChangeListener {
 
     public void propertyChange(PropertyChangeEvent event) {
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/OtherBean.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/OtherBean.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/OtherBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/OtherBean.java Tue Oct  3 04:05:57 2006
@@ -27,16 +27,16 @@
  */
 
 public class OtherBean {
-    
+
     public void addSaampleListener(SampleListener listener) {
     }
-    
+
     public void removeSampleListener(SampleListener listener) {
     }
-    
+
     public void setNumber(int a) {
     }
-    
+
     public void set(int a) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/ParentBeanBeanInfo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/ParentBeanBeanInfo.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/ParentBeanBeanInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/ParentBeanBeanInfo.java Tue Oct  3 04:05:57 2006
@@ -31,22 +31,21 @@
  */
 
 public class ParentBeanBeanInfo extends SimpleBeanInfo {
-    
+
     public ParentBeanBeanInfo() {
         super();
     }
-    
+
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors() {
         try {
-            return new PropertyDescriptor[] {
-                new PropertyDescriptor("parentText", ParentBean.class,
-                        "getText", "setText")
-            };
+            return new PropertyDescriptor[] { new PropertyDescriptor(
+                    "parentText", ParentBean.class, "getText", "setText") };
         } catch (IntrospectionException ie) {
             System.out.println("in ParentBeanBeanInfo.getPropertyDescriptors: "
                     + ie.getMessage());
             return null;
         }
-        
+
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleBean.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleBean.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleBean.java Tue Oct  3 04:05:57 2006
@@ -31,140 +31,149 @@
  */
 
 public class SampleBean {
-    
+
     private String text = null;
+
     private String otherText = null;
+
     private SampleBean bean = null;
+
     private int x = 0;
+
     private double[] smth;
+
     private Object[] smthObjs;
+
     private Vector listeners;
-    
+
     public SampleBean() {
         this.text = null;
     }
-    
+
     public SampleBean(String text) {
         this.text = text;
         this.otherText = "Constructor with args";
     }
-    
+
     protected SampleBean(String text, SampleBean bean) {
         this.text = text;
         this.bean = bean;
     }
-    
+
     public String getText() {
         return text;
     }
-    
+
     public void setText(String text) {
         this.text = text;
     }
-    
+
     public SampleBean getObject() {
         return bean;
     }
-    
+
     public void setObject(SampleBean bean) {
         this.bean = bean;
     }
-    
+
     public String getOtherText() {
         return otherText;
     }
-    
+
     public void setOtherText(String value) {
         this.otherText = value;
     }
-    
+
     public int getX() {
         return x;
     }
-    
+
     public void setX(int value) {
         this.x = value;
     }
-    
+
     public double getSmthByIdx(int i) {
         return smth[i];
     }
-    
+
     public void setSmthByIdx(int i, double value) {
         smth[i] = value;
     }
-    
+
     public double[] getSmth() {
         return this.smth;
     }
-    
+
     public void setSmth(double[] value) {
         this.smth = value;
     }
-    
+
     public Object getObjectByIdx(int i) {
         return smthObjs[i];
     }
-    
+
     public void setObjectByIdx(int i, Object value) {
         this.smthObjs[i] = value;
     }
-    
+
     public Object[] getObjects() {
         return smthObjs;
     }
-    
+
     public void setObjects(Object[] value) {
         this.smthObjs = value;
     }
-    
+
+    @Override
     public boolean equals(Object other) {
-        if(other instanceof SampleBean) {
+        if (other instanceof SampleBean) {
             SampleBean sb = (SampleBean) other;
-            if((sb.bean == null) && (bean == null)) {
+            if ((sb.bean == null) && (bean == null)) {
                 return true;
-            } else if((sb.bean != null) && (bean != null)) {
+            } else if ((sb.bean != null) && (bean != null)) {
                 return true;
-            } else return false;
+            } else {
+                return false;
+            }
         }
         return false;
     }
-    
+
     public static SampleBean create(String text, SampleBean bean) {
         return new SampleBean(text, bean);
     }
-    
+
     public void addSampleListener(SampleListener listener)
             throws TooManyListenersException {
-        if(listeners == null) {
+        if (listeners == null) {
             listeners = new Vector();
         }
-        
-        if(listeners.size() >= 100) {
+
+        if (listeners.size() >= 100) {
             throw new TooManyListenersException(
                     "Number of listeners could not exceed 100");
         } else {
             listeners.add(listener);
         }
     }
-    
+
     public void removeSampleListener(SampleListener listener) {
-        if(listeners != null) {
+        if (listeners != null) {
             listeners.remove(listener);
         }
     }
-    
+
     public SampleListener[] getSampleListeners() {
-        if(listeners != null) {
+        if (listeners != null) {
             SampleListener[] result = new SampleListener[listeners.size()];
-            
+
             Iterator i = listeners.iterator();
-            
+
             int idx = 0;
-            while(i.hasNext()) {
+            while (i.hasNext()) {
                 result[idx++] = (SampleListener) i.next();
             }
-            
+
             return result;
         } else {
             return new SampleListener[] {};

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleBeanBeanInfo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleBeanBeanInfo.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleBeanBeanInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleBeanBeanInfo.java Tue Oct  3 04:05:57 2006
@@ -24,20 +24,18 @@
 import java.beans.MethodDescriptor;
 import java.beans.SimpleBeanInfo;
 
-
 /**
  * @author Maxim V. Berkultsev
  * @version $Revision: 1.2.6.3 $
  */
 
 public class SampleBeanBeanInfo extends SimpleBeanInfo {
-    
+
+    @Override
     public MethodDescriptor[] getMethodDescriptors() {
         try {
-            return new MethodDescriptor[] {
-                new MethodDescriptor(
-                        SampleBean.class.getDeclaredMethod("getX", (Class[])null))
-            };
+            return new MethodDescriptor[] { new MethodDescriptor(
+                    SampleBean.class.getDeclaredMethod("getX", (Class[]) null)) };
         } catch (Exception e) {
             return null;
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleEvent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleEvent.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleEvent.java Tue Oct  3 04:05:57 2006
@@ -29,26 +29,27 @@
  */
 
 public class SampleEvent extends EventObject {
-    
+
     private int i = 7;
+
     private static int j = 7;
-    
+
     public SampleEvent(Object object) {
         super(object);
     }
-    
+
     public int getI() {
         return i;
     }
-    
+
     public void setI(int j) {
         j = i;
     }
-    
+
     public static int getJ() {
         return j;
     }
-    
+
     public static void setJ(int i) {
         j = i;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleException.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SampleException.java Tue Oct  3 04:05:57 2006
@@ -27,7 +27,7 @@
  */
 
 public class SampleException extends Exception {
-    
+
     public SampleException(String msg) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializableBean.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializableBean.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializableBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializableBean.java Tue Oct  3 04:05:57 2006
@@ -29,52 +29,56 @@
  */
 
 public class SerializableBean implements Serializable {
-    
+
     private int value;
+
     private String text = null;
+
     private Integer iValue = null;
+
     private int[] intArray;
+
     private String[] strArray;
-    
+
     public SerializableBean() {
     }
-    
+
     public SerializableBean(String text) {
         this.text = text;
     }
-    
+
     public String getText() {
         return this.text;
     }
-    
+
     public Integer getIValue() {
         return iValue;
     }
-    
+
     public void setIValue(Integer iValue) {
         this.iValue = iValue;
     }
-    
+
     public int getValue() {
         return value;
     }
-    
+
     public void setValue(int value) {
         this.value = value;
     }
-    
+
     public int[] getIntArray() {
         return intArray;
     }
-    
+
     public void setIntArray(int[] intArray) {
         this.intArray = intArray;
     }
-    
+
     public String[] getStrArray() {
         return strArray;
     }
-    
+
     public void setStrArray(String[] strArray) {
         this.strArray = strArray;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializablePropertyChangeListener.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializablePropertyChangeListener.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializablePropertyChangeListener.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/SerializablePropertyChangeListener.java Tue Oct  3 04:05:57 2006
@@ -30,8 +30,8 @@
  * @version $Revision: 1.2.6.3 $
  */
 
-public class SerializablePropertyChangeListener
-        implements PropertyChangeListener, Serializable {
+public class SerializablePropertyChangeListener implements
+        PropertyChangeListener, Serializable {
 
     public void propertyChange(PropertyChangeEvent event) {
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StandardBean.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StandardBean.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StandardBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StandardBean.java Tue Oct  3 04:05:57 2006
@@ -27,29 +27,30 @@
  */
 
 public class StandardBean {
-    
+
     private String text = "none";
+
     private StandardBean bean = null;
-    
+
     public StandardBean() {
     }
-    
+
     public StandardBean(String text) {
         this.text = text;
     }
-    
+
     public String getText() {
         return text;
     }
-    
+
     public void setText(String text) {
         this.text = text;
     }
-    
+
     public StandardBean getPeer() {
         return bean;
     }
-    
+
     public void setPeer(StandardBean bean) {
         this.bean = bean;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StandardBean2BeanInfo.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StandardBean2BeanInfo.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StandardBean2BeanInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StandardBean2BeanInfo.java Tue Oct  3 04:05:57 2006
@@ -30,13 +30,12 @@
  */
 
 public class StandardBean2BeanInfo extends SimpleBeanInfo {
-    
+
+    @Override
     public BeanInfo[] getAdditionalBeanInfo() {
         try {
-            return new BeanInfo[] {
-                GrannyBeanBeanInfo.class.newInstance(),
-                GrannyBeanBeanInfo.class.newInstance()
-            };
+            return new BeanInfo[] { GrannyBeanBeanInfo.class.newInstance(),
+                    GrannyBeanBeanInfo.class.newInstance() };
         } catch (Exception e) {
             return null;
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StringEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StringEditor.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StringEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/StringEditor.java Tue Oct  3 04:05:57 2006
@@ -17,7 +17,7 @@
 
 package org.apache.harmony.beans.tests.support;
 
-import java.beans.*;
+import java.beans.PropertyEditorSupport;
 
 public class StringEditor extends PropertyEditorSupport {
 
@@ -29,6 +29,7 @@
         super();
     }
 
+    @Override
     public void setAsText(String text) {
         setValue(text);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/TestEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/TestEventHandler.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/TestEventHandler.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/TestEventHandler.java Tue Oct  3 04:05:57 2006
@@ -21,42 +21,43 @@
  */
 package org.apache.harmony.beans.tests.support;
 
-import java.util.Map;
+import java.io.FileReader;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
 
-import java.io.FileReader;
-
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.XMLReader;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.helpers.XMLReaderFactory;
 
 /**
- * This class is used by XMLEncoderTest for handling SAX parser events. 
+ * This class is used by XMLEncoderTest for handling SAX parser events.
+ * 
  * @author Alexei Zakharov
  */
 public class TestEventHandler extends DefaultHandler {
-   
+
     public Tag root = null;
-    
+
     private Tag currentTag = null;
 
-    
+    @Override
     public void startDocument() {
     }
 
+    @Override
     public void endDocument() {
     }
 
+    @Override
     public void startElement(String uri, String name, String qName,
-            Attributes atts)
-    {
+            Attributes atts) {
         Tag theTag = new Tag(name, currentTag);
 
         theTag.fillAttributes(atts);
@@ -69,18 +70,17 @@
         currentTag = theTag;
     }
 
-
+    @Override
     public void endElement(String uri, String name, String qName)
-            throws SAXException 
-    {
+            throws SAXException {
         if (!name.equals(currentTag.name)) {
             throw new SAXException("unexpected closing tag: " + name);
         }
         currentTag = currentTag.parent;
     }
 
-
-    public void characters (char ch[], int start, int length) {
+    @Override
+    public void characters(char ch[], int start, int length) {
         currentTag.content.append(ch, start, length);
     }
 
@@ -91,7 +91,7 @@
         FileReader reader;
         String saxParserClassName = System.getProperty("org.xml.sax.driver");
 
-        if(saxParserClassName == null) {
+        if (saxParserClassName == null) {
             saxParserClassName = "org.apache.xerces.parsers.SAXParser";
         }
         xmlReader = XMLReaderFactory.createXMLReader(saxParserClassName);
@@ -106,18 +106,21 @@
         System.out.println(handler.root.toString());
     }
 
-    
     static class Tag {
         String name;
-        HashMap<String, String> attributes =
-                new LinkedHashMap<String, String>();
+
+        HashMap<String, String> attributes = new LinkedHashMap<String, String>();
+
         HashSet<Tag> innerTags = new LinkedHashSet<Tag>();
+
         Tag parent = null;
+
         StringBuffer content = new StringBuffer();
+
         boolean ignoreJavaVersion = true;
 
         public Tag(String name, Tag parent) {
-            this.name = name; 
+            this.name = name;
             this.parent = parent;
         }
 
@@ -125,53 +128,50 @@
             for (int i = 0; i < attrs.getLength(); i++) {
                 String name = attrs.getLocalName(i);
                 String value = attrs.getValue(i);
-                
+
                 attributes.put(name, value);
             }
         }
 
+        @Override
         public boolean equals(Object obj) {
             Iterator<Map.Entry<String, String>> it;
             Iterator<Tag> itTag;
             Tag tag;
-            
+
             if (!(obj instanceof Tag)) {
                 return false;
             }
             tag = (Tag) obj;
-            
+
             // name
             if (!name.equals(tag.name)) {
                 return false;
             }
-            
+
             // attributes
-            if (attributes.entrySet().size() !=
-                    tag.attributes.entrySet().size()) {
+            if (attributes.entrySet().size() != tag.attributes.entrySet()
+                    .size()) {
                 return false;
             }
             it = attributes.entrySet().iterator();
-         
+
             while (it.hasNext()) {
                 Map.Entry<String, String> entry = it.next();
-                Iterator<Map.Entry<String, String>> it2 =
-                        tag.attributes.entrySet().iterator();
+                Iterator<Map.Entry<String, String>> it2 = tag.attributes
+                        .entrySet().iterator();
                 boolean found = false;
-                
+
                 while (it2.hasNext()) {
                     Map.Entry<String, String> entry2 = it2.next();
-                    
+
                     if (entry2.getKey().equals(entry.getKey())) {
-                        if (ignoreJavaVersion &&
-                            tag.name.equals("java") &&
-                            entry.getKey().equals("version"))
-                        {
+                        if (ignoreJavaVersion && tag.name.equals("java")
+                                && entry.getKey().equals("version")) {
                             // ignore java version
                             found = true;
                             break;
-                        }
-                        else if (entry2.getValue().equals(entry.getValue()))
-                        {
+                        } else if (entry2.getValue().equals(entry.getValue())) {
                             // values are the same
                             found = true;
                             break;
@@ -182,7 +182,7 @@
                     return false;
                 }
             }
-        
+
             // inner tags
             if (innerTags.size() != tag.innerTags.size()) {
                 return false;
@@ -192,10 +192,10 @@
                 Tag innerTag = itTag.next();
                 Iterator<Tag> itTag2 = tag.innerTags.iterator();
                 boolean found = false;
-                
+
                 while (itTag2.hasNext()) {
                     Tag innerTag2 = itTag2.next();
-                    
+
                     if (innerTag.equals(innerTag2)) {
                         found = true;
                         break;
@@ -208,17 +208,18 @@
             return true;
         }
 
+        @Override
         public String toString() {
             StringBuffer sb = new StringBuffer();
             Iterator<Map.Entry<String, String>> it;
-            
+
             sb.append('<' + name);
             it = attributes.entrySet().iterator();
             while (it.hasNext()) {
                 Map.Entry<String, String> entry = it.next();
-                
-                sb.append(" " + entry.getKey() + "=\"" + entry.getValue() + 
-                        "\"");
+
+                sb.append(" " + entry.getKey() + "=\"" + entry.getValue()
+                        + "\"");
             }
             if (innerTags.isEmpty() && content.length() == 0) {
                 sb.append("/>\n");
@@ -240,5 +241,5 @@
             return sb.toString();
         }
     }
-    
+
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/MethodInvocationRecords.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/MethodInvocationRecords.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/MethodInvocationRecords.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/MethodInvocationRecords.java Tue Oct  3 04:05:57 2006
@@ -26,199 +26,200 @@
  */
 public class MethodInvocationRecords extends Assert {
 
-	public static final Object IGNORE = "IGNORE";
+    public static final Object IGNORE = "IGNORE";
 
-	private ArrayList records = new ArrayList();
+    private ArrayList records = new ArrayList();
 
-	private int assertIndex = 0;
+    private int assertIndex = 0;
 
-	public void clear() {
-		records.clear();
-		assertIndex = 0;
-	}
-
-	public void add(String methodName, Object returnValue) {
-		ArrayList rec = new ArrayList();
-		rec.add(methodName);
-		rec.add(returnValue);
-		records.add(rec);
-	}
-
-	public void add(String methodName, Object arg1, Object returnValue) {
-		ArrayList rec = new ArrayList();
-		rec.add(methodName);
-		rec.add(arg1);
-		rec.add(returnValue);
-		records.add(rec);
-	}
-
-	public void add(String methodName, Object arg1, Object arg2,
-			Object returnValue) {
-		ArrayList rec = new ArrayList();
-		rec.add(methodName);
-		rec.add(arg1);
-		rec.add(arg2);
-		rec.add(returnValue);
-		records.add(rec);
-	}
-
-	public void add(String methodName, Object arg1, Object arg2, Object arg3,
-			Object returnValue) {
-		ArrayList rec = new ArrayList();
-		rec.add(methodName);
-		rec.add(arg1);
-		rec.add(arg2);
-		rec.add(arg3);
-		rec.add(returnValue);
-		records.add(rec);
-	}
-
-	public void add(String methodName, Object arg1, Object arg2, Object arg3,
-			Object arg4, Object returnValue) {
-		ArrayList rec = new ArrayList();
-		rec.add(methodName);
-		rec.add(arg1);
-		rec.add(arg2);
-		rec.add(arg3);
-		rec.add(arg4);
-		rec.add(returnValue);
-		records.add(rec);
-	}
-
-	public void assertRecord(String methodName, Object returnValue) {
-		ArrayList rec = (ArrayList) records.get(assertIndex++);
-		int count = 0;
-		assertEquals(methodName, rec.get(count++));
-		if (returnValue != IGNORE) {
-			assertEquals(returnValue, rec.get(count++));
-		} else {
-			count++;
-		}
-		assertEquals(count, rec.size());
-	}
-
-	public void assertRecord(String methodName, Object arg1, Object returnValue) {
-		ArrayList rec = (ArrayList) records.get(assertIndex++);
-		int count = 0;
-		assertEquals(methodName, rec.get(count++));
-		if (arg1 != IGNORE) {
-			assertEquals(arg1, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (returnValue != IGNORE) {
-			assertEquals(returnValue, rec.get(count++));
-		} else {
-			count++;
-		}
-		assertEquals(count, rec.size());
-	}
-
-	public void assertRecord(String methodName, Object arg1, Object arg2,
-			Object returnValue) {
-		ArrayList rec = (ArrayList) records.get(assertIndex++);
-		int count = 0;
-		assertEquals(methodName, rec.get(count++));
-		if (arg1 != IGNORE) {
-			assertEquals(arg1, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (arg2 != IGNORE) {
-			assertEquals(arg2, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (returnValue != IGNORE) {
-			assertEquals(returnValue, rec.get(count++));
-		} else {
-			count++;
-		}
-		assertEquals(count, rec.size());
-	}
-
-	public void assertRecord(String methodName, Object arg1, Object arg2,
-			Object arg3, Object returnValue) {
-		ArrayList rec = (ArrayList) records.get(assertIndex++);
-		int count = 0;
-		assertEquals(methodName, rec.get(count++));
-		if (arg1 != IGNORE) {
-			assertEquals(arg1, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (arg2 != IGNORE) {
-			assertEquals(arg2, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (arg3 != IGNORE) {
-			assertEquals(arg3, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (returnValue != IGNORE) {
-			assertEquals(returnValue, rec.get(count++));
-		} else {
-			count++;
-		}
-		assertEquals(count, rec.size());
-	}
-
-	public void assertRecord(String methodName, Object arg1, Object arg2,
-			Object arg3, Object arg4, Object returnValue) {
-		ArrayList rec = (ArrayList) records.get(assertIndex++);
-		int count = 0;
-		assertEquals(methodName, rec.get(count++));
-		if (arg1 != IGNORE) {
-			assertEquals(arg1, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (arg2 != IGNORE) {
-			assertEquals(arg2, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (arg3 != IGNORE) {
-			assertEquals(arg3, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (arg4 != IGNORE) {
-			assertEquals(arg4, rec.get(count++));
-		} else {
-			count++;
-		}
-		if (returnValue != IGNORE) {
-			assertEquals(returnValue, rec.get(count++));
-		} else {
-			count++;
-		}
-		assertEquals(count, rec.size());
-	}
-
-	public void assertEndOfRecords() {
-		assertEquals(assertIndex, records.size());
-	}
-
-	public String getMethodName() {
-		ArrayList rec = (ArrayList) records.get(assertIndex);
-		return (String) rec.get(0);
-	}
-
-	public Object getArg(int i) {
-		ArrayList rec = (ArrayList) records.get(assertIndex);
-		return rec.get(i + 1);
-	}
-
-	public Object getReturnValue(int i) {
-		ArrayList rec = (ArrayList) records.get(assertIndex);
-		return rec.get(rec.size() - 1);
-	}
-
-	public String toString() {
-		return records.toString();
-	}
+    public void clear() {
+        records.clear();
+        assertIndex = 0;
+    }
+
+    public void add(String methodName, Object returnValue) {
+        ArrayList rec = new ArrayList();
+        rec.add(methodName);
+        rec.add(returnValue);
+        records.add(rec);
+    }
+
+    public void add(String methodName, Object arg1, Object returnValue) {
+        ArrayList rec = new ArrayList();
+        rec.add(methodName);
+        rec.add(arg1);
+        rec.add(returnValue);
+        records.add(rec);
+    }
+
+    public void add(String methodName, Object arg1, Object arg2,
+            Object returnValue) {
+        ArrayList rec = new ArrayList();
+        rec.add(methodName);
+        rec.add(arg1);
+        rec.add(arg2);
+        rec.add(returnValue);
+        records.add(rec);
+    }
+
+    public void add(String methodName, Object arg1, Object arg2, Object arg3,
+            Object returnValue) {
+        ArrayList rec = new ArrayList();
+        rec.add(methodName);
+        rec.add(arg1);
+        rec.add(arg2);
+        rec.add(arg3);
+        rec.add(returnValue);
+        records.add(rec);
+    }
+
+    public void add(String methodName, Object arg1, Object arg2, Object arg3,
+            Object arg4, Object returnValue) {
+        ArrayList rec = new ArrayList();
+        rec.add(methodName);
+        rec.add(arg1);
+        rec.add(arg2);
+        rec.add(arg3);
+        rec.add(arg4);
+        rec.add(returnValue);
+        records.add(rec);
+    }
+
+    public void assertRecord(String methodName, Object returnValue) {
+        ArrayList rec = (ArrayList) records.get(assertIndex++);
+        int count = 0;
+        assertEquals(methodName, rec.get(count++));
+        if (returnValue != IGNORE) {
+            assertEquals(returnValue, rec.get(count++));
+        } else {
+            count++;
+        }
+        assertEquals(count, rec.size());
+    }
+
+    public void assertRecord(String methodName, Object arg1, Object returnValue) {
+        ArrayList rec = (ArrayList) records.get(assertIndex++);
+        int count = 0;
+        assertEquals(methodName, rec.get(count++));
+        if (arg1 != IGNORE) {
+            assertEquals(arg1, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (returnValue != IGNORE) {
+            assertEquals(returnValue, rec.get(count++));
+        } else {
+            count++;
+        }
+        assertEquals(count, rec.size());
+    }
+
+    public void assertRecord(String methodName, Object arg1, Object arg2,
+            Object returnValue) {
+        ArrayList rec = (ArrayList) records.get(assertIndex++);
+        int count = 0;
+        assertEquals(methodName, rec.get(count++));
+        if (arg1 != IGNORE) {
+            assertEquals(arg1, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (arg2 != IGNORE) {
+            assertEquals(arg2, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (returnValue != IGNORE) {
+            assertEquals(returnValue, rec.get(count++));
+        } else {
+            count++;
+        }
+        assertEquals(count, rec.size());
+    }
+
+    public void assertRecord(String methodName, Object arg1, Object arg2,
+            Object arg3, Object returnValue) {
+        ArrayList rec = (ArrayList) records.get(assertIndex++);
+        int count = 0;
+        assertEquals(methodName, rec.get(count++));
+        if (arg1 != IGNORE) {
+            assertEquals(arg1, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (arg2 != IGNORE) {
+            assertEquals(arg2, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (arg3 != IGNORE) {
+            assertEquals(arg3, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (returnValue != IGNORE) {
+            assertEquals(returnValue, rec.get(count++));
+        } else {
+            count++;
+        }
+        assertEquals(count, rec.size());
+    }
+
+    public void assertRecord(String methodName, Object arg1, Object arg2,
+            Object arg3, Object arg4, Object returnValue) {
+        ArrayList rec = (ArrayList) records.get(assertIndex++);
+        int count = 0;
+        assertEquals(methodName, rec.get(count++));
+        if (arg1 != IGNORE) {
+            assertEquals(arg1, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (arg2 != IGNORE) {
+            assertEquals(arg2, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (arg3 != IGNORE) {
+            assertEquals(arg3, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (arg4 != IGNORE) {
+            assertEquals(arg4, rec.get(count++));
+        } else {
+            count++;
+        }
+        if (returnValue != IGNORE) {
+            assertEquals(returnValue, rec.get(count++));
+        } else {
+            count++;
+        }
+        assertEquals(count, rec.size());
+    }
+
+    public void assertEndOfRecords() {
+        assertEquals(assertIndex, records.size());
+    }
+
+    public String getMethodName() {
+        ArrayList rec = (ArrayList) records.get(assertIndex);
+        return (String) rec.get(0);
+    }
+
+    public Object getArg(int i) {
+        ArrayList rec = (ArrayList) records.get(assertIndex);
+        return rec.get(i + 1);
+    }
+
+    public Object getReturnValue(int i) {
+        ArrayList rec = (ArrayList) records.get(assertIndex);
+        return rec.get(rec.size() - 1);
+    }
+
+    @Override
+    public String toString() {
+        return records.toString();
+    }
 
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/Utils.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/Utils.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/Utils.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/Utils.java Tue Oct  3 04:05:57 2006
@@ -36,4 +36,3 @@
     }
 
 }
-

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContext.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContext.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContext.java Tue Oct  3 04:05:57 2006
@@ -34,319 +34,319 @@
  */
 public class MockBeanContext implements BeanContext {
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.beancontext.BeanContext#instantiateChild(java.lang.String)
-	 */
-	public Object instantiateChild(String beanName) throws IOException,
-			ClassNotFoundException {
-		// Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.beancontext.BeanContext#getResourceAsStream(java.lang.String,
-	 *      java.beans.beancontext.BeanContextChild)
-	 */
-	public InputStream getResourceAsStream(String name, BeanContextChild bcc)
-			throws IllegalArgumentException {
-		// Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.beancontext.BeanContext#getResource(java.lang.String,
-	 *      java.beans.beancontext.BeanContextChild)
-	 */
-	public URL getResource(String name, BeanContextChild bcc)
-			throws IllegalArgumentException {
-		// Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.beancontext.BeanContext#addBeanContextMembershipListener(java.beans.beancontext.BeanContextMembershipListener)
-	 */
-	public void addBeanContextMembershipListener(
-			BeanContextMembershipListener bcml) {
-		// Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.beancontext.BeanContext#removeBeanContextMembershipListener(java.beans.beancontext.BeanContextMembershipListener)
-	 */
-	public void removeBeanContextMembershipListener(
-			BeanContextMembershipListener bcml) {
-		// Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.beancontext.BeanContextChild#setBeanContext(java.beans.beancontext.BeanContext)
-	 */
-	public void setBeanContext(BeanContext bc) throws PropertyVetoException {
-		// Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.beancontext.BeanContextChild#getBeanContext()
-	 */
-	public BeanContext getBeanContext() {
-		// Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (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
-
-	}
-
-	/*
-	 * (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
-
-	}
-
-	/*
-	 * (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
-
-	}
-
-	/*
-	 * (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
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#size()
-	 */
-	public int size() {
-		// Auto-generated method stub
-		return 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#isEmpty()
-	 */
-	public boolean isEmpty() {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#contains(java.lang.Object)
-	 */
-	public boolean contains(Object o) {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#iterator()
-	 */
-	public Iterator iterator() {
-		// Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#toArray()
-	 */
-	public Object[] toArray() {
-		// Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#toArray(java.lang.Object[])
-	 */
-	public Object[] toArray(Object[] a) {
-		// Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#add(java.lang.Object)
-	 */
-	public boolean add(Object o) {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#remove(java.lang.Object)
-	 */
-	public boolean remove(Object o) {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#containsAll(java.util.Collection)
-	 */
-	public boolean containsAll(Collection c) {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#addAll(java.util.Collection)
-	 */
-	public boolean addAll(Collection c) {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#removeAll(java.util.Collection)
-	 */
-	public boolean removeAll(Collection c) {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#retainAll(java.util.Collection)
-	 */
-	public boolean retainAll(Collection c) {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.Collection#clear()
-	 */
-	public void clear() {
-		// Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.DesignMode#setDesignTime(boolean)
-	 */
-	public void setDesignTime(boolean designTime) {
-		// Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.DesignMode#isDesignTime()
-	 */
-	public boolean isDesignTime() {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.Visibility#needsGui()
-	 */
-	public boolean needsGui() {
-		// Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.Visibility#dontUseGui()
-	 */
-	public void dontUseGui() {
-		// Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.Visibility#okToUseGui()
-	 */
-	public void okToUseGui() {
-		// Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.Visibility#avoidingGui()
-	 */
-	public boolean avoidingGui() {
-		// Auto-generated method stub
-		return false;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.beancontext.BeanContext#instantiateChild(java.lang.String)
+     */
+    public Object instantiateChild(String beanName) throws IOException,
+            ClassNotFoundException {
+        // Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.beancontext.BeanContext#getResourceAsStream(java.lang.String,
+     *      java.beans.beancontext.BeanContextChild)
+     */
+    public InputStream getResourceAsStream(String name, BeanContextChild bcc)
+            throws IllegalArgumentException {
+        // Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.beancontext.BeanContext#getResource(java.lang.String,
+     *      java.beans.beancontext.BeanContextChild)
+     */
+    public URL getResource(String name, BeanContextChild bcc)
+            throws IllegalArgumentException {
+        // Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.beancontext.BeanContext#addBeanContextMembershipListener(java.beans.beancontext.BeanContextMembershipListener)
+     */
+    public void addBeanContextMembershipListener(
+            BeanContextMembershipListener bcml) {
+        // Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.beancontext.BeanContext#removeBeanContextMembershipListener(java.beans.beancontext.BeanContextMembershipListener)
+     */
+    public void removeBeanContextMembershipListener(
+            BeanContextMembershipListener bcml) {
+        // Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.beancontext.BeanContextChild#setBeanContext(java.beans.beancontext.BeanContext)
+     */
+    public void setBeanContext(BeanContext bc) throws PropertyVetoException {
+        // Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.beancontext.BeanContextChild#getBeanContext()
+     */
+    public BeanContext getBeanContext() {
+        // Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (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
+
+    }
+
+    /*
+     * (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
+
+    }
+
+    /*
+     * (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
+
+    }
+
+    /*
+     * (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
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#size()
+     */
+    public int size() {
+        // Auto-generated method stub
+        return 0;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#isEmpty()
+     */
+    public boolean isEmpty() {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#contains(java.lang.Object)
+     */
+    public boolean contains(Object o) {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#iterator()
+     */
+    public Iterator iterator() {
+        // Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#toArray()
+     */
+    public Object[] toArray() {
+        // Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#toArray(java.lang.Object[])
+     */
+    public Object[] toArray(Object[] a) {
+        // Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#add(java.lang.Object)
+     */
+    public boolean add(Object o) {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#remove(java.lang.Object)
+     */
+    public boolean remove(Object o) {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#containsAll(java.util.Collection)
+     */
+    public boolean containsAll(Collection c) {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#addAll(java.util.Collection)
+     */
+    public boolean addAll(Collection c) {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#removeAll(java.util.Collection)
+     */
+    public boolean removeAll(Collection c) {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#retainAll(java.util.Collection)
+     */
+    public boolean retainAll(Collection c) {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.util.Collection#clear()
+     */
+    public void clear() {
+        // Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.DesignMode#setDesignTime(boolean)
+     */
+    public void setDesignTime(boolean designTime) {
+        // Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.DesignMode#isDesignTime()
+     */
+    public boolean isDesignTime() {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.Visibility#needsGui()
+     */
+    public boolean needsGui() {
+        // Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.Visibility#dontUseGui()
+     */
+    public void dontUseGui() {
+        // Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.Visibility#okToUseGui()
+     */
+    public void okToUseGui() {
+        // Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.Visibility#avoidingGui()
+     */
+    public boolean avoidingGui() {
+        // Auto-generated method stub
+        return false;
+    }
 
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChild.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChild.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChild.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChild.java Tue Oct  3 04:05:57 2006
@@ -26,74 +26,74 @@
  * Mock of BeanContextChild
  */
 public class MockBeanContextChild implements
-		java.beans.beancontext.BeanContextChild {
+        java.beans.beancontext.BeanContextChild {
 
-	private BeanContext ctx;
+    private BeanContext ctx;
 
-	/*
-	 * (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
-
-	}
-
-	/*
-	 * (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
-
-	}
-
-	/*
-	 * (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
-
-	}
-
-	/*
-	 * (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
+    /*
+     * (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
+
+    }
+
+    /*
+     * (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
+
+    }
+
+    /*
+     * (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
+
+    }
+
+    /*
+     * (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
 
-	}
+    }
 
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildComponentProxy.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildComponentProxy.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildComponentProxy.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildComponentProxy.java Tue Oct  3 04:05:57 2006
@@ -23,16 +23,16 @@
  * Mock of BeanContextChildComponentProxy
  */
 public class MockBeanContextChildComponentProxy implements
-		java.beans.beancontext.BeanContextChildComponentProxy {
+        java.beans.beancontext.BeanContextChildComponentProxy {
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.beancontext.BeanContextChildComponentProxy#getComponent()
-	 */
-	public Component getComponent() {
-		// Auto-generated method stub
-		return null;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.beancontext.BeanContextChildComponentProxy#getComponent()
+     */
+    public Component getComponent() {
+        // Auto-generated method stub
+        return null;
+    }
 
 }

Modified: incubator/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/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildDelegateS.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildDelegateS.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildDelegateS.java Tue Oct  3 04:05:57 2006
@@ -29,64 +29,64 @@
  * Delegate to BeanContextChildSupport
  */
 public class MockBeanContextChildDelegateS implements BeanContextChild,
-		Serializable {
+        Serializable {
 
-	public String id;
+    public String id;
 
-	public BeanContextChildSupport support = new BeanContextChildSupport(this);
+    public BeanContextChildSupport support = new BeanContextChildSupport(this);
 
-	public MockBeanContextChildDelegateS(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * @param name
-	 * @param pcl
-	 */
-	public void addPropertyChangeListener(String name,
-			PropertyChangeListener pcl) {
-		support.addPropertyChangeListener(name, pcl);
-	}
-
-	/**
-	 * @param name
-	 * @param 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) {
-		support.removePropertyChangeListener(name, pcl);
-	}
-
-	/**
-	 * @param name
-	 * @param 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);
-	}
+    public MockBeanContextChildDelegateS(String id) {
+        this.id = id;
+    }
+
+    /**
+     * @param name
+     * @param pcl
+     */
+    public void addPropertyChangeListener(String name,
+            PropertyChangeListener pcl) {
+        support.addPropertyChangeListener(name, pcl);
+    }
+
+    /**
+     * @param name
+     * @param 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) {
+        support.removePropertyChangeListener(name, pcl);
+    }
+
+    /**
+     * @param name
+     * @param 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: incubator/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/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildS.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildS.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextChildS.java Tue Oct  3 04:05:57 2006
@@ -29,89 +29,91 @@
  */
 public class MockBeanContextChildS implements BeanContextChild, Serializable {
 
-	public String id;
+    public String id;
 
-	private BeanContext ctx;
+    private BeanContext ctx;
 
-	public MockBeanContextChildS(String id) {
-		this.id = id;
-	}
-
-	public boolean equals(Object o) {
-		if (o instanceof MockBeanContextChildS) {
-			return id.equals(((MockBeanContextChildS) o).id);
-		}
-		return false;
-	}
-
-	public int hashCode() {
-		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
-
-	}
-
-	/*
-	 * (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
-
-	}
-
-	/*
-	 * (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
-
-	}
-
-	/*
-	 * (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 MockBeanContextChildS(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof MockBeanContextChildS) {
+            return id.equals(((MockBeanContextChildS) o).id);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        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
+
+    }
+
+    /*
+     * (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
+
+    }
+
+    /*
+     * (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
+
+    }
+
+    /*
+     * (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
 
-	}
+    }
 
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextContainerProxy.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextContainerProxy.java?view=diff&rev=452415&r1=452414&r2=452415
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextContainerProxy.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/beancontext/mock/MockBeanContextContainerProxy.java Tue Oct  3 04:05:57 2006
@@ -25,14 +25,14 @@
  */
 public class MockBeanContextContainerProxy implements BeanContextContainerProxy {
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.beancontext.BeanContextContainerProxy#getContainer()
-	 */
-	public Container getContainer() {
-		// Auto-generated method stub
-		return null;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.beans.beancontext.BeanContextContainerProxy#getContainer()
+     */
+    public Container getContainer() {
+        // Auto-generated method stub
+        return null;
+    }
 
 }



Mime
View raw message