harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r561019 - in /harmony/enhanced/classlib/branches/java6: modules/awt/ modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ modules/awt/src/main/native/fontlib/windows/ modules/awt/src/main/resources/ modules/awt/src/main/resources/cmm...
Date Mon, 30 Jul 2007 15:44:59 GMT
Author: tellison
Date: Mon Jul 30 08:44:58 2007
New Revision: 561019

URL: http://svn.apache.org/viewvc?view=rev&rev=561019
Log:
Merge updates from classlib trunk@561012 since r560058.

Added:
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/resources/
      - copied from r561012, harmony/enhanced/classlib/trunk/modules/awt/src/main/resources/
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/resources/cmm/
      - copied from r561012, harmony/enhanced/classlib/trunk/modules/awt/src/main/resources/cmm/
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/resources/cmm/CIEXYZ.pf
      - copied unchanged from r561012, harmony/enhanced/classlib/trunk/modules/awt/src/main/resources/cmm/CIEXYZ.pf
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/resources/cmm/GRAY.pf
      - copied unchanged from r561012, harmony/enhanced/classlib/trunk/modules/awt/src/main/resources/cmm/GRAY.pf
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/resources/cmm/LINEAR_RGB.pf
      - copied unchanged from r561012, harmony/enhanced/classlib/trunk/modules/awt/src/main/resources/cmm/LINEAR_RGB.pf
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/resources/cmm/sRGB.pf
      - copied unchanged from r561012, harmony/enhanced/classlib/trunk/modules/awt/src/main/resources/cmm/sRGB.pf
    harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/color/ICC_TransformRTest.java
      - copied unchanged from r561012, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/color/ICC_TransformRTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
      - copied unchanged from r561012, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
Modified:
    harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
    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/fontlib/windows/
  (props changed)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java
    harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_HttpServer.java

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/build.xml?view=diff&rev=561019&r1=561018&r2=561019
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/build.xml Mon Jul 30 08:44:58 2007
@@ -71,7 +71,8 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/awt.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />    
+        <delete dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.awt.bin.test}" />
@@ -113,6 +114,11 @@
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
+
+        <mkdir dir="${hy.jdk}/jre/lib/cmm" />
+        <copy todir="${hy.jdk}/jre/lib/cmm">
+            <fileset dir="${hy.awt.src.main.resources}/cmm"/>
+        </copy>	
     </target>
 
     <target name="build-jar" depends="svn-info">

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?view=diff&rev=561019&r1=561018&r2=561019
==============================================================================
--- 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
Mon Jul 30 08:44:58 2007
@@ -664,14 +664,9 @@
         AffineTransform fontTransform = font.getTransform();
         at.concatenate(fontTransform);
 
-        double[] matrix = new double[6];
         if (!at.isIdentity()){
-
-            int atType = at.getType();
-            at.getMatrix(matrix);
-
             // TYPE_TRANSLATION
-            if (atType == AffineTransform.TYPE_TRANSLATION){
+            if (at.getType() == AffineTransform.TYPE_TRANSLATION){
                 jtr.drawString(this, str,
                         (float)(x+fontTransform.getTranslateX()),
                         (float)(y+fontTransform.getTranslateY()));
@@ -681,8 +676,7 @@
             // in Graphics has transforms, we just fill outlines. New textrenderer
             // is to be implemented.
             Shape sh = font.createGlyphVector(this.getFontRenderContext(), str).getOutline(x,
y);
-            this.fill(sh);
-
+            fill(sh);
         } else {
             jtr.drawString(this, str, x, y);
         }

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/windows/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 30 08:44:58 2007
@@ -1,2 +1,3 @@
 *.RES
 *.pdb
+*.obj

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java?view=diff&rev=561019&r1=561018&r2=561019
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
Mon Jul 30 08:44:58 2007
@@ -219,7 +219,8 @@
      * <code>BCSSServiceProvider</code> object. All access to this object
      * should be synchronized on itself.
      */
-    protected transient HashMap<Class, BCSSServiceProvider> services;
+    @SuppressWarnings("unchecked")
+    protected transient HashMap services;
 
     /**
      * The number of serializable service providers currently registered.
@@ -236,10 +237,11 @@
      * A list of registered <code>BeanContextServicesListener</code>s. All
      * access to this object should be synchronized on itself.
      */
-    protected transient ArrayList<BeanContextServicesListener> bcsListeners;
+    @SuppressWarnings("unchecked")
+    protected transient ArrayList bcsListeners;
 
     /**
-     * Constructs a standload <code>BeanContextServicesSupport</code>.
+     * Constructs a standard <code>BeanContextServicesSupport</code>.
      */
     public BeanContextServicesSupport() {
         super();

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?view=diff&rev=561019&r1=561018&r2=561019
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
Mon Jul 30 08:44:58 2007
@@ -103,12 +103,14 @@
      * A list of registered membership listeners.
      * All access to this object should be synchronized on itself.
      */
-    transient protected ArrayList<BeanContextMembershipListener> bcmListeners;
+    @SuppressWarnings("unchecked")
+    transient protected ArrayList bcmListeners;
 
     /**
      * A map of children - key is child instance, value is <code>BCSChild</code>
instance.
      * All access to this object should be synchronized on itself.
      */
+    @SuppressWarnings("unchecked")
     transient protected HashMap children;
 
     transient private boolean serializing;

Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java?view=diff&rev=561019&r1=561018&r2=561019
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java
Mon Jul 30 08:44:58 2007
@@ -21,7 +21,7 @@
 import org.apache.harmony.nio.internal.DirectBuffer;
 
 
-class MappedByteBufferAdapter extends MappedByteBuffer implements DirectBuffer {
+final class MappedByteBufferAdapter extends MappedByteBuffer implements DirectBuffer {
 
     private static final int CHAR_SIZE = 2;
 
@@ -101,10 +101,9 @@
 	}
 
 	public byte get() {
-		if (this.position == this.limit) {
-			throw new BufferUnderflowException();
-		}
-		return this.wrapped.get(this.position++);
+		byte result = this.wrapped.get(); 
+		this.position++;
+		return result;
 	}
 
 	public byte get(int index) {
@@ -112,12 +111,8 @@
 	}
 
 	public char getChar() {
-		int newPosition = this.position + CHAR_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferUnderflowException();
-		}
-		char result = this.wrapped.getChar(this.position);
-		this.position = newPosition;
+		char result = this.wrapped.getChar();
+		this.position += CHAR_SIZE;
 		return result;
 	}
 
@@ -126,12 +121,8 @@
 	}
 
 	public double getDouble() {
-		int newPosition = this.position + DOUBLE_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferUnderflowException();
-		}
-		double result = this.wrapped.getDouble(this.position);
-		this.position = newPosition;
+		double result = this.wrapped.getDouble();
+		this.position += DOUBLE_SIZE;
 		return result;
 	}
 
@@ -144,12 +135,8 @@
 	}
 
 	public float getFloat() {
-		int newPosition = this.position + FLOAT_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferUnderflowException();
-		}
-		float result = this.wrapped.getFloat(this.position);
-		this.position = newPosition;
+		float result = this.wrapped.getFloat();
+		this.position += FLOAT_SIZE;
 		return result;
 	}
 
@@ -158,12 +145,8 @@
 	}
 
 	public int getInt() {
-		int newPosition = this.position + INTEGER_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferUnderflowException();
-		}
-		int result = this.wrapped.getInt(this.position);
-		this.position = newPosition;
+		int result = this.wrapped.getInt();
+		this.position += INTEGER_SIZE;
 		return result;
 	}
 
@@ -172,12 +155,8 @@
 	}
 
 	public long getLong() {
-		int newPosition = this.position + LONG_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferUnderflowException();
-		}
-		long result = this.wrapped.getLong(this.position);
-		this.position = newPosition;
+		long result = this.wrapped.getLong();
+		this.position += LONG_SIZE;
 		return result;
 	}
 
@@ -186,12 +165,8 @@
 	}
 
 	public short getShort() {
-		int newPosition = this.position + SHORT_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferUnderflowException();
-		}
-		short result = this.wrapped.getShort(this.position);
-		this.position = newPosition;
+		short result = this.wrapped.getShort();
+		this.position += SHORT_SIZE;
 		return result;
 	}
 
@@ -213,10 +188,8 @@
 	}
 
 	public ByteBuffer put(byte b) {
-		if (this.position == this.limit) {
-			throw new BufferOverflowException();
-		}
-		this.wrapped.put(this.position++, b);
+		this.wrapped.put(b);
+		this.position++;
 		return this;
 	}
 
@@ -233,12 +206,8 @@
 	}
 
 	public ByteBuffer putChar(char value) {
-		int newPosition = this.position + CHAR_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferOverflowException();
-		}
-		this.wrapped.putChar(this.position, value);
-		this.position = newPosition;
+		this.wrapped.putChar(value);
+		this.position += CHAR_SIZE;
 		return this;
 	}
 
@@ -248,12 +217,8 @@
 	}
 
 	public ByteBuffer putDouble(double value) {
-		int newPosition = this.position + DOUBLE_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferOverflowException();
-		}
-		this.wrapped.putDouble(this.position, value);
-		this.position = newPosition;
+		this.wrapped.putDouble(value);
+		this.position += DOUBLE_SIZE;
 		return this;
 	}
 
@@ -263,12 +228,8 @@
 	}
 
 	public ByteBuffer putFloat(float value) {
-		int newPosition = this.position + FLOAT_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferOverflowException();
-		}
-		this.wrapped.putFloat(this.position, value);
-		this.position = newPosition;
+		this.wrapped.putFloat(value);
+		this.position += FLOAT_SIZE;
 		return this;
 	}
 
@@ -283,12 +244,8 @@
 	}
 
 	public ByteBuffer putInt(int value) {
-		int newPosition = this.position + INTEGER_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferOverflowException();
-		}
-		this.wrapped.putInt(this.position, value);
-		this.position = newPosition;
+		this.wrapped.putInt(value);
+		this.position += INTEGER_SIZE;
 		return this;
 	}
 
@@ -298,12 +255,8 @@
 	}
 
 	public ByteBuffer putLong(long value) {
-		int newPosition = this.position + LONG_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferOverflowException();
-		}
-		this.wrapped.putLong(this.position, value);
-		this.position = newPosition;
+		this.wrapped.putLong(value);
+		this.position += LONG_SIZE;
 		return this;
 	}
 
@@ -313,12 +266,8 @@
 	}
 
 	public ByteBuffer putShort(short value) {
-		int newPosition = this.position + SHORT_SIZE;
-		if (newPosition > this.limit) {
-			throw new BufferOverflowException();
-		}
-		this.wrapped.putShort(this.position, value);
-		this.position = newPosition;
+		this.wrapped.putShort(value);
+		this.position += SHORT_SIZE;
 		return this;
 	}
 
@@ -359,7 +308,7 @@
 		this.wrapped.free();
 	}
         
-        public int getByteCapacity() {
-            return wrapped.getByteCapacity();
-        }
+    public int getByteCapacity() {
+        return wrapped.getByteCapacity();
+    }
 }

Modified: harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_HttpServer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_HttpServer.java?view=diff&rev=561019&r1=561018&r2=561019
==============================================================================
--- harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_HttpServer.java
(original)
+++ harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_HttpServer.java
Mon Jul 30 08:44:58 2007
@@ -394,7 +394,6 @@
 				OutputStream os = socket.getOutputStream();
 				if (!proxy) {
 					print(os, "HTTP/1.1 " + 305 + " Use Proxy\r\n");
-					// print(os, "Location: http://intl2000.ott.oti.com\r\n");
 					print(os, "Location: http://localhost:" + (port + 1)
 							+ "/otherTest.html\r\n");
 					print(os, "Content-Length: 9\r\n");



Mime
View raw message