harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r588245 [4/10] - in /harmony/enhanced/classlib/branches/java6: depends/build/ depends/files/ make/ modules/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ modules/archive/ modules/archive/src/main/java/jav...
Date Thu, 25 Oct 2007 14:45:48 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/MouseEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/MouseEventTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/MouseEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/MouseEventTest.java Thu Oct 25 07:44:56 2007
@@ -21,6 +21,7 @@
 package java.awt.event;
 
 import java.awt.Button;
+import java.awt.Component;
 import java.awt.Point;
 
 import junit.framework.TestCase;
@@ -44,19 +45,51 @@
     }
 
     public final void testMouseEventComponentintlongintintintintbooleanint() {
-        Button button = new Button("Button");
-        MouseEvent event = new MouseEvent(button, MouseEvent.MOUSE_PRESSED, 1000000000,
-                InputEvent.BUTTON2_DOWN_MASK, 100, 200,
-                10, true, MouseEvent.BUTTON1);
-
-        assertEquals(event.getSource(), button);
-        assertEquals(event.getID(), MouseEvent.MOUSE_PRESSED);
-        assertEquals(event.getButton(), MouseEvent.BUTTON1);
-        assertEquals(event.getClickCount(), 10);
-        assertEquals(event.getPoint(), new Point(100, 200));
-        assertEquals(event.getX(), 100);
-        assertEquals(event.getY(), 200);
+        final Button button = new Button("Button");
+        MouseEvent event = new MouseEvent(button, MouseEvent.MOUSE_PRESSED,
+                1000000000, InputEvent.BUTTON2_DOWN_MASK, 100, 200, 10, true,
+                MouseEvent.BUTTON1);
+
+        assertEquals(button, event.getSource());
+        assertEquals(MouseEvent.MOUSE_PRESSED, event.getID());
+        assertEquals(MouseEvent.BUTTON1, event.getButton());
+        assertEquals(10, event.getClickCount());
+        assertEquals(new Point(100, 200), event.getPoint());
+        assertEquals(100, event.getX());
+        assertEquals(200, event.getY());
         assertTrue(event.isPopupTrigger());
+        assertEquals(InputEvent.BUTTON1_MASK, event.getModifiers());
+        assertEquals(InputEvent.BUTTON2_DOWN_MASK, event.getModifiersEx());
+
+        event = new MouseEvent(button, MouseEvent.MOUSE_PRESSED, 0,
+                InputEvent.BUTTON1_MASK, 0, 0, 0, true, MouseEvent.NOBUTTON);
+        assertEquals(InputEvent.BUTTON1_MASK, event.getModifiers());
+        assertEquals(InputEvent.BUTTON1_DOWN_MASK, event.getModifiersEx());
+        assertEquals(MouseEvent.BUTTON1, event.getButton());
+
+        event = new MouseEvent(button, MouseEvent.MOUSE_PRESSED, 0, 0, 0, 0, 0,
+                true, MouseEvent.BUTTON1);
+        assertEquals(InputEvent.BUTTON1_MASK, event.getModifiers());
+        assertEquals(MouseEvent.BUTTON1, event.getButton());
+
+        event = new MouseEvent(button, MouseEvent.MOUSE_RELEASED, 1000000000,
+                0, 100, 200, 10, true, MouseEvent.BUTTON1);
+        assertEquals(InputEvent.BUTTON1_MASK, event.getModifiers());
+        assertEquals(0, event.getModifiersEx());
+
+        event = new MouseEvent(button, MouseEvent.MOUSE_CLICKED, 1000000000, 0,
+                100, 200, 10, true, MouseEvent.BUTTON1);
+        assertEquals(InputEvent.BUTTON1_MASK, event.getModifiers());
+        assertEquals(0, event.getModifiersEx());
+
+        event = new MouseEvent(button, MouseEvent.MOUSE_PRESSED, 0,
+                InputEvent.BUTTON1_DOWN_MASK | InputEvent.BUTTON2_DOWN_MASK
+                        | InputEvent.BUTTON3_DOWN_MASK, 0, 0, 0, true,
+                MouseEvent.BUTTON3);
+        assertEquals(InputEvent.BUTTON3_MASK, event.getModifiers());
+        assertEquals(InputEvent.BUTTON1_DOWN_MASK
+                | InputEvent.BUTTON2_DOWN_MASK | InputEvent.BUTTON3_DOWN_MASK,
+                event.getModifiersEx());
     }
 
     public final void testTranslatePoint() {
@@ -97,24 +130,19 @@
     }
 
     public final void testParamString() {
-        // This test case fails on the RI because the method
-        // InputEvent.getModifiers() works incorrectly.
-        // TODO: Reimplement the method InputEvent.getModifiers()
-
-        // Button button = new Button("Button");
-        // MouseEvent event = new MouseEvent(button, MouseEvent.MOUSE_PRESSED,
-        // 1000000000,
-        // InputEvent.BUTTON2_DOWN_MASK, 100, 200,
-        // 10, true, MouseEvent.BUTTON1);
-        //
-        // assertEquals(event.paramString(),
-        // "MOUSE_PRESSED,(100,200),button=1,modifiers=Button1,extModifiers=Button2,clickCount=10");
-        // event = new MouseEvent(button, MouseEvent.MOUSE_PRESSED + 1024,
-        // 1000000000,
-        // InputEvent.BUTTON2_MASK, 100, 200,
-        // 10, true, MouseEvent.BUTTON1);
-        // assertEquals(event.paramString(),
-        // "unknown
-        // type,(100,200),button=1,modifiers=Alt+Button2,extModifiers=Alt+Button2,clickCount=10");
+        Button button = new Button("Button");
+        MouseEvent event = new MouseEvent(button, MouseEvent.MOUSE_PRESSED,
+                1000000000, InputEvent.BUTTON2_DOWN_MASK, 100, 200, 10, true,
+                MouseEvent.BUTTON1);
+
+        assertEquals(
+                event.paramString(),
+                "MOUSE_PRESSED,(100,200),button=1,modifiers=Button1,extModifiers=Button2,clickCount=10");
+        event = new MouseEvent(button, MouseEvent.MOUSE_PRESSED + 1024,
+                1000000000, InputEvent.BUTTON2_MASK, 100, 200, 10, true,
+                MouseEvent.BUTTON1);
+        assertEquals(
+                event.paramString(),
+                "unknown type,(100,200),button=1,modifiers=Alt+Button2,extModifiers=Alt+Button2,clickCount=10");
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/geom/ShapeTestCase.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/geom/ShapeTestCase.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/geom/ShapeTestCase.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/geom/ShapeTestCase.java Thu Oct 25 07:44:56 2007
@@ -524,7 +524,7 @@
           return list;
     }
 
-    void interator(String name, FilenameFilter filter, Runner runner) {
+    void iterator(String name, FilenameFilter filter, Runner runner) {
         if (filter == null) {
             return; // skip test
         }
@@ -540,28 +540,28 @@
     }
 
     public void testGetPathIterator() {
-        interator(
+        iterator(
                 "getPathIterator()",
                 filterShape,
                 new Runner.PathIterator());
     }
 
     public void testContainsPoint() {
-        interator(
+        iterator(
                 "contains(double,double)",
                 filterImage,
                 new Runner.Point());
     }
 
     public void testContainsRect() {
-        interator(
+        iterator(
                 "contains(double,double,double,double)",
                 filterImage,
                 new Runner.Rectangle.Contains());
     }
 
     public void testIntersectsRect() {
-        interator(
+        iterator(
                 "intersects(double,double,double,double)",
                 filterImage,
                 new Runner.Rectangle.Intersects());

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/org/apache/harmony/awt/tests/java/awt/image/LookupOpTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/org/apache/harmony/awt/tests/java/awt/image/LookupOpTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/org/apache/harmony/awt/tests/java/awt/image/LookupOpTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/org/apache/harmony/awt/tests/java/awt/image/LookupOpTest.java Thu Oct 25 07:44:56 2007
@@ -47,7 +47,7 @@
      * Test method for 'java.awt.image.LookupOp.filter()' when src and dst have
      * different heights or widths.
      */
-    public final void test_LookupOp_filter_DifferentDimentionsTest() {
+    public final void test_LookupOp_filter_DifferentDimensionsTest() {
         // regression test for Harmony-1632
         byte[] array0 = new byte[96];
         ByteLookupTable localByteLookupTable = new ByteLookupTable(1, array0);

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/AwtDimensionPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/AwtDimensionPersistenceDelegate.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/AwtDimensionPersistenceDelegate.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/AwtDimensionPersistenceDelegate.java Thu Oct 25 07:44:56 2007
@@ -24,9 +24,9 @@
     @Override
 	@SuppressWarnings("boxing")
     protected Expression instantiate(Object oldInstance, Encoder enc) {
-		Dimension dimesion = (Dimension) oldInstance;
+		Dimension dimension = (Dimension) oldInstance;
 
-        return new Expression(dimesion, dimesion.getClass(), Statement.CONSTRUCTOR_NAME,
-                new Object[] { dimesion.width, dimesion.height });
+        return new Expression(dimension, dimension.getClass(), Statement.CONSTRUCTOR_NAME,
+                new Object[] { dimension.width, dimension.height });
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java Thu Oct 25 07:44:56 2007
@@ -373,7 +373,7 @@
         try {
             return sourceClass.getMethod(methodName);
         } catch (Exception e) {
-            // RI keeps silence here and just retunrs null
+            // RI keeps silence here and just returns null
             return null;
         }
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java Thu Oct 25 07:44:56 2007
@@ -507,10 +507,10 @@
         ArrayList<MethodDescriptor> methodList = new ArrayList<MethodDescriptor>(
                 basicMethods.length);
 
-        // Loop over the methods found, looking for public methods
+        // Loop over the methods found, looking for public non-static methods
         for (int i = 0; i < basicMethods.length; i++) {
             int modifiers = basicMethods[i].getModifiers();
-            if (Modifier.isPublic(modifiers)) {
+            if (Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers)) {
                 // Allocate a MethodDescriptor for this method
                 MethodDescriptor theDescriptor = new MethodDescriptor(
                         basicMethods[i]);

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventSetDescriptorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventSetDescriptorTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventSetDescriptorTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventSetDescriptorTest.java Thu Oct 25 07:44:56 2007
@@ -724,7 +724,7 @@
 
         // RI reports true in the following assertion, so it returns exactly
         // the same array as it was specified in the EventSetDescriptor
-        // construtor. 
+        // constructor. 
         assertEquals(listenerMethods, esd.getListenerMethods());
 
         assertEquals(2, esd.getListenerMethodDescriptors().length);

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java Thu Oct 25 07:44:56 2007
@@ -2302,4 +2302,33 @@
         }
 
     }
+
+    /*
+     * Regression test for HARMONY-4892
+     */
+    public static class MyBean {
+
+        public static String invisble;
+
+        public static String getInvisible() {
+            return invisble;
+        }
+
+        public String visible;
+
+        public String getVisible() {
+            return visible;
+        }
+
+        public void setVisible(String a) {
+            this.visible = a;
+        }
+    }
+
+    public void testPropertyDescriptors() throws IntrospectionException {
+        BeanInfo info = Introspector.getBeanInfo(MyBean.class);
+        for (PropertyDescriptor pd : info.getPropertyDescriptors()) {
+            assertFalse(pd.getName().equals("invisible"));
+        }
+    }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java Thu Oct 25 07:44:56 2007
@@ -55,37 +55,37 @@
 
     @Override
     public int getHeight(int i) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     @Override
     public int getWidth(int i) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     @Override
     public int getNumImages(boolean b) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     @Override
     public Iterator<ImageTypeSpecifier> getImageTypes(int i) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     @Override
     public IIOMetadata getStreamMetadata() throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     @Override
     public IIOMetadata getImageMetadata(int i) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageReader.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageReader.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageReader.java Thu Oct 25 07:44:56 2007
@@ -41,34 +41,34 @@
     }
 
     public int getNumImages(boolean allowSearch) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     public int getWidth(int imageIndex) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     public int getHeight(int imageIndex) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     @Override
     public IIOMetadata getStreamMetadata() throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 
     @Override
     public IIOMetadata getImageMetadata(int imageIndex) throws IOException {
-        //-- TODO imlement
+        //-- TODO implement
         throw new UnsupportedOperationException("not implemented yet");
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageWriter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageWriter.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageWriter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageWriter.java Thu Oct 25 07:44:56 2007
@@ -183,9 +183,9 @@
             colorType = PNG_COLOR_TYPE_RGBA;
         }
 
-        int dbufferLenght = bytePixelSize * imageHeight * imageWidth;
+        int dbufferLength = bytePixelSize * imageHeight * imageWidth;
 
-        dbuffer = new DataBufferByte(dbufferLenght);
+        dbuffer = new DataBufferByte(dbufferLength);
 
         WritableRaster scanRaster = Raster.createInterleavedRaster(dbuffer, imageWidth, imageHeight, bpb * numBands
                 * imageWidth, bpb * numBands, BAND_OFFSETS[numBands], null);
@@ -198,7 +198,7 @@
         }
 
         try {
-            encode(dbuffer.getData(), dbufferLenght, bytePixelSize, (ImageOutputStream) getOutput(), imageWidth,
+            encode(dbuffer.getData(), dbufferLength, bytePixelSize, (ImageOutputStream) getOutput(), imageWidth,
                     imageHeight, bitDepth, colorType, palette, palette == null ? 0 : palette.length, isInterlace);
 
         }

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile Thu Oct 25 07:44:56 2007
@@ -25,7 +25,7 @@
   libjpeg.a
 
 ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
 MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile Thu Oct 25 07:44:56 2007
@@ -25,7 +25,7 @@
   libpng.a
 
 ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
 endif
 
 MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ControlFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ControlFactoryTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ControlFactoryTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/ControlFactoryTest.java Thu Oct 25 07:44:56 2007
@@ -29,7 +29,7 @@
 
 /**
  * <p>This Test class is testing the class ControlFactory in the javax.naming.ldap package.</p>
- * <p>Here in the next tables we are gonna find all methods to be tested:</p>
+ * <p>Here in the next tables we are going to find all methods to be tested:</p>
  * <table>
  	<tbody><th>Method Summary:</th>
 	<tr><TD>Return</TD><TD>Method</TD></tr>

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/RdnTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/RdnTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/RdnTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/RdnTest.java Thu Oct 25 07:44:56 2007
@@ -665,10 +665,10 @@
      * </p>
      * <p>
      * This is a test for the constructor of the class Rdn. Here we are testing
-     * with a non-empty String and diferents objects.
+     * with a non-empty String and different objects.
      * </p>
      * <p>
-     * The expected result is an instance of the class with the diferents
+     * The expected result is an instance of the class with the different
      * arguments because the arguments are not parsed.
      * </p>
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/StartTlsRequestTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/StartTlsRequestTest.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/StartTlsRequestTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/StartTlsRequestTest.java Thu Oct 25 07:44:56 2007
@@ -29,7 +29,7 @@
 import org.apache.harmony.jndi.tests.javax.naming.spi.mock.ldap.MockStartTlsResponse;
 /**
  * <p>This Test class is testing the class StartTlsRequest in the javax.naming.ldap package.</p>
- * <p>Here in the next tables we are gonna find all methods to be tested:</p>
+ * <p>Here in the next tables we are going to find all methods to be tested:</p>
  *  <table class="t" cellspacing="0">
 	<tbody><th>Constructors:</th>
 		<tr>

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestPagedResultsControls.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestPagedResultsControls.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestPagedResultsControls.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestPagedResultsControls.java Thu Oct 25 07:44:56 2007
@@ -29,7 +29,7 @@
 
 /**        
  * <p>This Test class is testing the PagedResultsControls class.</p>
- * <p>In the next tables we are gonna see the methods that we test in this class:</p>
+ * <p>In the next tables we are going to see the methods that we test in this class:</p>
  * <table class="t" cellspacing="0">
 	<tbody><th>Constructors:</th>
 		<tr>

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestPagedResultsResponseControl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestPagedResultsResponseControl.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestPagedResultsResponseControl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestPagedResultsResponseControl.java Thu Oct 25 07:44:56 2007
@@ -32,7 +32,7 @@
 
 /**        
  * <p>This Test class is testing the PagedResultsControls class.</p>
- * <p>In the next tables we are gonna see the methods that we test in this class:</p>
+ * <p>In the next tables we are going to see the methods that we test in this class:</p>
  * <table class="t" cellspacing="0">
 	<tbody><th>Constructors:</th>
 		<tr>

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/extras/TestRdnParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/extras/TestRdnParser.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/extras/TestRdnParser.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/extras/TestRdnParser.java Thu Oct 25 07:44:56 2007
@@ -27,7 +27,7 @@
 import junit.framework.TestCase;
 
 /**
- * <p>Test case to test the class Rdn when it recives an UTF-8 string that happens when is escaped with the 
+ * <p>Test case to test the class Rdn when it receives an UTF-8 string that happens when is escaped with the 
  * blackslash ('\' ASCII 92).</p>
  *
  */
@@ -293,7 +293,7 @@
 	}
 
 	/**
-	 * <p>Here we are testing if the constructor can create an instance of the rdn with diferents combiantions of utf8 not printables.</p>
+	 * <p>Here we are testing if the constructor can create an instance of the rdn with different combinations of utf8 not printables.</p>
 	 *
 	 */
 	public void testRdnString001() {
@@ -310,7 +310,7 @@
 	}
 
 	/**
-	 * <p>Here we are testing if the constructor can create an instance of the rdn with diferents combiantions of utf8 printables.</p>
+	 * <p>Here we are testing if the constructor can create an instance of the rdn with different combinations of utf8 printables.</p>
 	 *
 	 */
 	public void testRdnString002() {
@@ -329,7 +329,7 @@
 	}
 
 	/**
-	 * <p>Here we are testing if the constructor can create an instance of the rdn with diferents combiantions of utf8 not printables and 
+	 * <p>Here we are testing if the constructor can create an instance of the rdn with different combinations of utf8 not printables and 
 	 * printables. 1 to 1</p>
 	 *
 	 */
@@ -352,7 +352,7 @@
 	}
 
 	/**
-	 * <p>Here we are testing if the constructor can create an instance of the rdn with diferents combiantions of utf8 not printables and 
+	 * <p>Here we are testing if the constructor can create an instance of the rdn with different combinations of utf8 not printables and 
 	 * printables. 1 to 1</p>
 	 *
 	 */	
@@ -375,7 +375,7 @@
 	}
 
 	/**
-	 * <p>Here we are testing if the constructor can create an instance of the rdn with diferents combiantions of utf8 not printables and 
+	 * <p>Here we are testing if the constructor can create an instance of the rdn with different combinations of utf8 not printables and 
 	 * printables. 1 utf8 to 1 ascii to 1 utf8 and 1 ascii to 1 utf8 to 1 ascii.</p>
 	 *
 	 */	
@@ -517,7 +517,7 @@
 	}
 	
 	/**
-	 * <p>Here we are testing if the constructor recives in the value an utf8 value.</p>
+	 * <p>Here we are testing if the constructor receives in the value an utf8 value.</p>
 	 *
 	 */
 	public void testRdnString010(){
@@ -535,7 +535,7 @@
 	}
 	
 	/**
-	 * <p>Here we are testing if the constructor recives in the value utf8 values.</p>
+	 * <p>Here we are testing if the constructor receives in the value utf8 values.</p>
 	 *
 	 */
 	public void testRdnString011(){
@@ -564,7 +564,7 @@
 	}
 	
 	/**
-	 * <p>Here we are testing if the constructor recives in the value an ascii value.</p>
+	 * <p>Here we are testing if the constructor receives in the value an ascii value.</p>
 	 *
 	 */
 	public void testRdnString012(){
@@ -582,7 +582,7 @@
 	}
 	
 	/**
-	 * <p>Here we are testing if the constructor recives in the value ascii values.</p>
+	 * <p>Here we are testing if the constructor receives in the value ascii values.</p>
 	 *
 	 */
 	public void testRdnString013(){
@@ -612,7 +612,7 @@
 	
 	
 	/**
-	 * <p>Here we are testing if the constructor recives an especial character in the type.</p>
+	 * <p>Here we are testing if the constructor receives an especial character in the type.</p>
 	 *
 	 */
 	public void testRdnString014() {
@@ -631,7 +631,7 @@
 	}
 	
 	/**
-	 * <p>Here we are testing if the constructor recives an especial character in the value.</p>
+	 * <p>Here we are testing if the constructor receives an especial character in the value.</p>
 	 *
 	 */
 	public void testRdnString015() {
@@ -652,7 +652,7 @@
 	}
 	
 	/**
-	 * <p>Here we are testing if the constructor can recive an utf8 up to 7e</p>
+	 * <p>Here we are testing if the constructor can receive an utf8 up to 7e</p>
 	 *
 	 */
 	public void testRdnString016(){
@@ -669,7 +669,7 @@
 	}
 	
 	/**
-	 * <p>Here we are testing if the constructor can recive a multivalue.</p> 
+	 * <p>Here we are testing if the constructor can receive a multivalue.</p> 
 	 *
 	 */
 	public void testRdnString017(){
@@ -730,7 +730,7 @@
 	
 	
 	/**
-	 * <p>Here we are testing if the constructor can recive a multivalue between '"'.</p> 
+	 * <p>Here we are testing if the constructor can receive a multivalue between '"'.</p> 
 	 *
 	 */
 	public void testRdnString018(){
@@ -763,7 +763,7 @@
 	}
 	
 	/**
-	 * <p>Here we are testing if the constructor can recive a multivalue between '"'.</p> 
+	 * <p>Here we are testing if the constructor can receive a multivalue between '"'.</p> 
 	 *
 	 */
 	public void testRdnString019(){
@@ -853,7 +853,7 @@
 	}
 	
 	/**
-	 * <p>Here we are testing if the constructor recives combinations of bytes arrays.</p>
+	 * <p>Here we are testing if the constructor receives combinations of bytes arrays.</p>
 	 *
 	 */
 	public void testBytes(){

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestControlFactoryWhiteBoxDevelopment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestControlFactoryWhiteBoxDevelopment.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestControlFactoryWhiteBoxDevelopment.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestControlFactoryWhiteBoxDevelopment.java Thu Oct 25 07:44:56 2007
@@ -32,8 +32,8 @@
 
 /**
  * <p>This class test is made to test all cases of package where the coverage was not 100%.</p>
- * <p>We are gonna find here a lot cases from diferent classes, notice here that the conventional structure
- * followed in the rest of the proyect is applied  here.</p>
+ * <p>We are going to find here a lot cases from different classes, notice here that the conventional structure
+ * followed in the rest of the project is applied  here.</p>
  * 
  */
 public class TestControlFactoryWhiteBoxDevelopment extends TestCase {
@@ -55,7 +55,7 @@
 
 	/**
 	 * <p>Test method for 'javax.naming.ldap.ControlFactory.getControlInstance(Control)'</p>
-	 * <p>Here we are gonna test if we can get an instance with the controls sended.</p>
+	 * <p>Here we are going to test if we can get an instance with the controls sended.</p>
 	 */
 	public void testGetControlInstanceControl() {
 

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestInitialLdapContextWhiteBoxDevelopment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestInitialLdapContextWhiteBoxDevelopment.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestInitialLdapContextWhiteBoxDevelopment.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestInitialLdapContextWhiteBoxDevelopment.java Thu Oct 25 07:44:56 2007
@@ -30,8 +30,8 @@
 
 /**
  * <p>This class test is made to test all cases of package where the coverage was not 100%.</p>
- * <p>We are gonna find here a lot cases from diferent classes, notice here that the conventional structure
- * followed in the rest of the proyect is applied  here.</p>
+ * <p>We are going to find here a lot cases from different classes, notice here that the conventional structure
+ * followed in the rest of the project is applied  here.</p>
  * 
  */
 public class TestInitialLdapContextWhiteBoxDevelopment extends TestCase {

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestLdapNameWhiteBoxDevelopment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestLdapNameWhiteBoxDevelopment.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestLdapNameWhiteBoxDevelopment.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestLdapNameWhiteBoxDevelopment.java Thu Oct 25 07:44:56 2007
@@ -37,8 +37,8 @@
 
 /**
  * <p>This class test is made to test all cases of package where the coverage was not 100%.</p>
- * <p>We are gonna find here a lot cases from diferent classes, notice here that the conventional structure
- * followed in the rest of the proyect is applied  here.</p>
+ * <p>We are going to find here a lot cases from different classes, notice here that the conventional structure
+ * followed in the rest of the project is applied  here.</p>
  * 
  */
 public class TestLdapNameWhiteBoxDevelopment extends TestCase {

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestLdapReferralException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestLdapReferralException.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestLdapReferralException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestLdapReferralException.java Thu Oct 25 07:44:56 2007
@@ -28,8 +28,8 @@
 
 /**
  * <p>This class test is made to test all cases of package where the coverage was not 100%.</p>
- * <p>We are gonna find here a lot cases from diferent classes, notice here that the conventional structure
- * followed in the rest of the proyect is applied  here.</p>
+ * <p>We are going to find here a lot cases from different classes, notice here that the conventional structure
+ * followed in the rest of the project is applied  here.</p>
  * 
  */
 public class TestLdapReferralException extends TestCase {
@@ -50,7 +50,7 @@
 	}
 
 	/**
-	 * Here we are testing if this method recives a string a creates a not null object.
+	 * Here we are testing if this method receives a string a creates a not null object.
 	 *
 	 */
 	public void testLdapReferralExceptionString(){

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestRdnWhiteBoxDevelopment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestRdnWhiteBoxDevelopment.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestRdnWhiteBoxDevelopment.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/whitebox/TestRdnWhiteBoxDevelopment.java Thu Oct 25 07:44:56 2007
@@ -36,8 +36,8 @@
  * not 100%.
  * </p>
  * <p>
- * We are gonna find here a lot cases from diferent classes, notice here that
- * the conventional structure followed in the rest of the proyect is applied
+ * We are going to find here a lot cases from different classes, notice here that
+ * the conventional structure followed in the rest of the project is applied
  * here.
  * </p>
  * 
@@ -53,7 +53,7 @@
      * Test method for 'javax.naming.ldap.Rdn.Rdn(String)'
      * </p>
      * <p>
-     * Here we are testing if the constructor can recive several multivalued
+     * Here we are testing if the constructor can receive several multivalued
      * types.
      * </p>
      * <p>
@@ -80,7 +80,7 @@
      * Test method for 'javax.naming.ldap.Rdn.Rdn(String)'
      * </p>
      * <p>
-     * Here we are testing if the constructor can recive the special character
+     * Here we are testing if the constructor can receive the special character
      * "\".
      * </p>
      * <p>
@@ -100,7 +100,7 @@
      * Test method for 'javax.naming.ldap.Rdn.Rdn(String)'
      * </p>
      * <p>
-     * Here we are testing if the constructor can recive the special character
+     * Here we are testing if the constructor can receive the special character
      * "+".
      * </p>
      * <p>
@@ -118,7 +118,7 @@
      * Test method for 'javax.naming.ldap.Rdn.Rdn(String)'
      * </p>
      * <p>
-     * Here we are testing if the constructor can recive the special character
+     * Here we are testing if the constructor can receive the special character
      * "#".
      * </p>
      * <p>
@@ -134,7 +134,7 @@
      * Test method for 'javax.naming.ldap.Rdn.equals(Rdn)'
      * </p>
      * <p>
-     * Here we are testing if the method can recive a Rdn.
+     * Here we are testing if the method can receive a Rdn.
      * </p>
      * <p>
      * The expected result is that two rdns must be the same.
@@ -151,7 +151,7 @@
      * Test method for 'javax.naming.ldap.Rdn.equals(Rdn)'
      * </p>
      * <p>
-     * Here we are testing if the method can recive a Rdn.
+     * Here we are testing if the method can receive a Rdn.
      * </p>
      * <p>
      * The expected result is that two rdns must be the same.
@@ -168,7 +168,7 @@
      * Test method for 'javax.naming.ldap.Rdn.equals(Rdn)'
      * </p>
      * <p>
-     * Here we are testing if the method can recive a Rdn.
+     * Here we are testing if the method can receive a Rdn.
      * </p>
      * <p>
      * The expected result is that two rdns must be the same.
@@ -186,7 +186,7 @@
      * Test method for 'javax.naming.ldap.Rdn.equals(Rdn)'
      * </p>
      * <p>
-     * Here we are testing if the method can recive a Rdn.
+     * Here we are testing if the method can receive a Rdn.
      * </p>
      * <p>
      * The expected result is that two rdns must be the same.
@@ -228,7 +228,7 @@
      * Test method for 'javax.naming.ldap.Rdn.equals(Rdn)'
      * </p>
      * <p>
-     * Here we are testing if the method can recive a Rdn with a different
+     * Here we are testing if the method can receive a Rdn with a different
      * array.
      * </p>
      * <p>
@@ -485,7 +485,7 @@
 
     /**
      * <p>
-     * Test methdo to test if the constructor can recive the correct lenght to a
+     * Test method to test if the constructor can receive the correct length to a
      * byte array.
      * </p>
      * 

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/mock/ldap/MockInitialLdapContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/mock/ldap/MockInitialLdapContext.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/mock/ldap/MockInitialLdapContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/mock/ldap/MockInitialLdapContext.java Thu Oct 25 07:44:56 2007
@@ -64,7 +64,7 @@
 	Control[] last=null;
 	
 	/**
-	 * <p>This method retrives the properties.</p>
+	 * <p>This method retrieves the properties.</p>
 	 */
 	public Hashtable getProps(){
 		return env;
@@ -126,7 +126,7 @@
 	}
 	
 	/**
-	 * <p>This methdo retrives the connection controls.</p>
+	 * <p>This method retrieves the connection controls.</p>
 	 * @return The connection controls.
 	 */
 	public Control[] getConnectControls() throws NamingException {

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/mock/ldap/MockUnsolicitedNotification.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/mock/ldap/MockUnsolicitedNotification.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/mock/ldap/MockUnsolicitedNotification.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/spi/mock/ldap/MockUnsolicitedNotification.java Thu Oct 25 07:44:56 2007
@@ -31,7 +31,7 @@
 
 /**
  * <p>Implementation of the interfaces UnsolicitedNotificationListener and UnsolicitedNotification. This class has the intention of
- * give us a notifiction or a listener to test another classes.</p> 
+ * give us a notification or a listener to test another classes.</p> 
  *
  */
 public class MockUnsolicitedNotification implements
@@ -41,7 +41,7 @@
 	 */
 	private static final long serialVersionUID = 1L;
 	/**
-	 * <p>This flag has the intention of give us a way to know if a notification was recived.</p>
+	 * <p>This flag has the intention of give us a way to know if a notification was received.</p>
 	 */
 	private boolean flag;
 
@@ -51,11 +51,11 @@
 	 */
 	public MockUnsolicitedNotification() {
 		super();
-		flag=false;//Flag to know if a the notification was recived.
+		flag=false;//Flag to know if a the notification was received.
 		
 	}
 	/**
-	 * <p>Here we recived the notification, so we set the flag true.</p>
+	 * <p>Here we received the notification, so we set the flag true.</p>
 	 */
 	public void notificationReceived(UnsolicitedNotificationEvent arg0) {
 		flag=true;
@@ -63,7 +63,7 @@
 	}
 
 	/**
-	 * <p>Method to see if the notitfication was recived.</p>
+	 * <p>Method to see if the notification was received.</p>
 	 * @return The flag of the notification.
 	 */
 	public boolean getFlag(){

Modified: harmony/enhanced/classlib/branches/java6/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java Thu Oct 25 07:44:56 2007
@@ -664,7 +664,7 @@
      * 
      * @param methodName
      * @return an instance of <code>InvokeType</code> corresponding to the
-     *         nature of the operation that the caller is attemting to make on
+     *         nature of the operation that the caller is attempting to make on
      *         the target object.
      */
     private InvokeType getInvokeType(String methodName) {

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/XMLFormatter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/XMLFormatter.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/XMLFormatter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/XMLFormatter.java Thu Oct 25 07:44:56 2007
@@ -165,7 +165,7 @@
 
     /**
      * Return the header string for XML, use given handler's encoding if has,
-     * other wise use default platform encoding
+     * otherwise use default platform encoding
      * 
      * @param h
      *            the given handler

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/build.xml?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/build.xml Thu Oct 25 07:44:56 2007
@@ -53,10 +53,6 @@
                 <include name="hyvmls.h" />
                 <include name="hysocket.h" />
                 <include name="gp.h" />
-                <include name="iohelp.h" />
-                <include name="exceptions.h" />
-                <include name="libglob.h" />
-                <include name="strhelp.h" />
                 <include name="fdlibm.h" />
                 <include name="hymagic.h" />
                 <include name="jsig.h" />
@@ -216,9 +212,6 @@
                 <include name="jclprots.h" />
                 <include name="hysocket.h" />
                 <include name="gp.h" />
-                <include name="iohelp.h" />
-                <include name="exceptions.h" />
-                <include name="libglob.h" />
                 <include name="fdlibm.h" />
                 <include name="hymagic.h" />
                 <include name="jsig.h" />

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java Thu Oct 25 07:44:56 2007
@@ -742,7 +742,7 @@
      * @see #getPath
      */
     public boolean isAbsolute() {
-        return isAbsoluteImpl(Util.getBytes(path));
+        return isAbsoluteImpl(Util.getUTF8Bytes(path));
     }
 
     private native boolean isAbsoluteImpl(byte[] filePath);
@@ -1333,7 +1333,7 @@
         if (properPath != null) {
             return properPath;
         }
-        byte[] pathBytes = Util.getUTF8Bytes(path);
+        byte[] pathBytes = Util.getUTF8Bytes(path);       
         if (isAbsoluteImpl(pathBytes)) {
             return properPath = pathBytes;
         }
@@ -1374,7 +1374,7 @@
 
         }
         result += path;
-        return properPath = Util.getUTF8Bytes(result);        
+        return properPath = Util.getUTF8Bytes(result);               
     }
 
     private static native byte[] properPathImpl(byte[] path);

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/CharSequence.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/CharSequence.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/CharSequence.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/CharSequence.java Thu Oct 25 07:44:56 2007
@@ -27,7 +27,7 @@
 	/**
 	 * Answers the number of characters in the sequence.
 	 * 
-	 * @return the number of charcters in the sequence
+	 * @return the number of characters in the sequence
 	 */
 	public int length();
 

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetSocketAddress.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetSocketAddress.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetSocketAddress.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetSocketAddress.java Thu Oct 25 07:44:56 2007
@@ -52,7 +52,7 @@
     }
 
     /*
-     * Internal contructor for InetSocketAddress(String, int) and
+     * Internal constructor for InetSocketAddress(String, int) and
      * createUnresolved(String, int);
      */
     InetSocketAddress(String host, int port, boolean needResolved) {

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/JarURLConnection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/JarURLConnection.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/JarURLConnection.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/JarURLConnection.java Thu Oct 25 07:44:56 2007
@@ -42,7 +42,7 @@
     private String file;
 
     /**
-     * Contructs an instance of <code>JarURLConnection</code>.
+     * Constructs an instance of <code>JarURLConnection</code>.
      * 
      * @param url
      *            java.net.URL the URL that contains the location to connect to

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SecureCacheResponse.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SecureCacheResponse.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SecureCacheResponse.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SecureCacheResponse.java Thu Oct 25 07:44:56 2007
@@ -22,7 +22,7 @@
 import javax.net.ssl.SSLPeerUnverifiedException;
 
 /**
- * A secure cache response, which is orignally retrieved through secure ways.
+ * A secure cache response, which is originally retrieved through secure ways.
  */
 public abstract class SecureCacheResponse extends CacheResponse {
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URI.java?rev=588245&r1=588244&r2=588245&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URI.java Thu Oct 25 07:44:56 2007
@@ -613,7 +613,7 @@
                     // case for a closed bracket at end of IP [x:x:x:...x]
                     case ']':
                         if (i != length - 1) {
-                            return false; // must be last charcter
+                            return false; // must be last character
                         }
                         if (ipAddress.charAt(0) != '[') {
                             return false; // must have a open [



Mime
View raw message