harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r572907 [1/5] - in /harmony/enhanced/classlib/branches/java6: depends/files/ modules/awt/src/main/java/common/java/awt/ modules/awt/src/main/java/common/java/awt/geom/ modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ modules/awt/...
Date Wed, 05 Sep 2007 09:14:06 GMT
Author: tellison
Date: Wed Sep  5 02:14:01 2007
New Revision: 572907

URL: http://svn.apache.org/viewvc?rev=572907&view=rev
Log:
Merge updates between classlib trunk@r571136 and r572896

Added:
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/
      - copied from r572896, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/FileURLConnectionTest.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/FileURLConnectionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.doc
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.doc
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.htx
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.htx
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.rtf
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.rtf
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.xml
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/test.xml
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/AttrDefinitionBands.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttrDefinitionBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/BandSet.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BandSet.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/FileBands.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/FileBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/IcBands.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/IcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentConstantPool.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentConstantPool.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentHeader.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentHeader.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CodeAttribute.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CodeAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/Unpack.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/Unpack.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BandSetTest.java
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BandSetTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/
      - copied from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/html
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/html
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/html.html
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/html.html
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/html.rtf
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/html.rtf
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/html.txt
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/html.txt
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/rtf
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/rtf
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/rtf.html
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/rtf.html
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/rtf.rtf
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/rtf.rtf
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/rtf.txt
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/rtf.txt
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/txt
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/txt
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/txt.html
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/txt.html
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/txt.rtf
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/txt.rtf
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/resources/javax/swing/content-type/txt.txt
      - copied unchanged from r572896, harmony/enhanced/classlib/trunk/modules/swing/src/test/resources/javax/swing/content-type/txt.txt
Modified:
    harmony/enhanced/classlib/branches/java6/depends/files/content-types.properties
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/geom/Area.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.h
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/BitmapSurface.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c
    harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/geom/AreaTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectOutputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectStreamClass.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Integer.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URL.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLConnection.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HugeEnumSet.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/IntegerTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/ObjectOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/ObjectStreamClassTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/PrintStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/URLConnectionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/EnumSetTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayout.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayoutMap.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Codec.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/IMatcher.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Segment.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ByteCode.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFieldRef.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutTest.java
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/native/prefs/windows/PreferencesImpl.c
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/nls/messages.properties
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRow.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetReader.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JEditorPane.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java

Modified: harmony/enhanced/classlib/branches/java6/depends/files/content-types.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/files/content-types.properties?rev=572907&r1=572906&r2=572907&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/files/content-types.properties (original)
+++ harmony/enhanced/classlib/branches/java6/depends/files/content-types.properties Wed Sep
 5 02:14:01 2007
@@ -18,7 +18,7 @@
 #
 
 #
-# All these MIME types were taken from the Apache httpd mime.types file
+# All these MIME types were originally taken from the Apache httpd mime.types file
 # which can be found here:
 # http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/conf/mime.types?revision=106443&view=markup
 #
@@ -71,6 +71,7 @@
 ifb=text/calendar
 iges=model/iges
 igs=model/iges
+java=text/plain
 jpe=image/jpeg
 jpeg=image/jpeg
 jpg=image/jpeg
@@ -120,7 +121,7 @@
 rgb=image/x-rgb
 rm=application/vnd.rn-realmedia
 roff=application/x-troff
-rtf=text/rtf
+rtf=application/rtf
 rtx=text/richtext
 sgm=text/sgml
 sgml=text/sgml

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java?rev=572907&r1=572906&r2=572907&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java
Wed Sep  5 02:14:01 2007
@@ -86,7 +86,7 @@
             }
             } catch (Throwable t) {
                 // TODO: Exception handler should be implemented
-                // t.printStackTrace();
+                t.printStackTrace();
             }
         }
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/geom/Area.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/geom/Area.java?rev=572907&r1=572906&r2=572907&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/geom/Area.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/geom/Area.java
Wed Sep  5 02:14:01 2007
@@ -1290,7 +1290,7 @@
     // the internal class implements PathIterator
 	private class AreaPathIterator implements PathIterator {
 
-		AffineTransform t;
+		AffineTransform transform;
 		Area area;
 		int curRuleIndex = 0;
 		int curCoordIndex = 0;
@@ -1301,7 +1301,7 @@
 
 		AreaPathIterator(Area area, AffineTransform t) {
 			this.area = area;
-			this.t = t;
+			this.transform = t;
 		}
 
 		public int getWindingRule() {
@@ -1332,18 +1332,29 @@
 			if (isDone()) {
 				throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
 			}
+			
+			int count = 0;
+			
 			switch (rules[curRuleIndex]) {
 				case PathIterator.SEG_CUBICTO:
 					c[4] = coords[curCoordIndex + 4];
 					c[5] = coords[curCoordIndex + 5];
+					count = 1;
 				case PathIterator.SEG_QUADTO:
 					c[2] = coords[curCoordIndex + 2];
 					c[3] = coords[curCoordIndex + 3];
+					count += 1;
 				case PathIterator.SEG_MOVETO:
 				case PathIterator.SEG_LINETO:
 					c[0] = coords[curCoordIndex];
 					c[1] = coords[curCoordIndex + 1];
+					count += 1;
 			}
+			
+			if(transform != null) {
+	            transform.transform(c, 0, c, 0, count);
+			}
+			
 			return rules[curRuleIndex];
 		}
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java?rev=572907&r1=572906&r2=572907&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
Wed Sep  5 02:14:01 2007
@@ -558,7 +558,7 @@
                 (transform.isIdentity() || transform.getType() == AffineTransform.TYPE_TRANSLATION))
{
             Point p = new Point(x, y);
             transform.transform(p, p);
-            MultiRectArea mra = JavaArcRasterizer.rasterize(x, y, width, height, 0, 360,
clip);
+            MultiRectArea mra = JavaArcRasterizer.rasterize(p.x, p.y, width, height, 0, 360,
clip);
             fillMultiRectArea(mra);
             return;
         }



Mime
View raw message