[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small DataBuffer fixes

[Kaffe CVS]

PatchSet 5485 
Date: 2004/11/25 05:42:00
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small DataBuffer fixes

2004-11-24  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/awt/image/DataBufferShort.java,
        libraries/javalib/java/awt/image/DataBufferUShort.java:
        Resynced with GNU Classpath.

        2004-11-17  Michael Koch  <konqueror at gmx.de>

        * java/awt/image/DataBufferShort.java: Fixed file header.
        * java/awt/image/DataBufferUShort.java: Likewise.
        (DataBufferUShort): Throw NullPointerException if dataArray is null.

Members: 
	ChangeLog:1.3031->1.3032 
	libraries/javalib/java/awt/image/DataBufferShort.java:1.3->1.4 
	libraries/javalib/java/awt/image/DataBufferUShort.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3031 kaffe/ChangeLog:1.3032
--- kaffe/ChangeLog:1.3031	Thu Nov 25 04:30:10 2004
+++ kaffe/ChangeLog	Thu Nov 25 05:42:00 2004
@@ -1,5 +1,17 @@
 2004-11-24  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/awt/image/DataBufferShort.java,
+	libraries/javalib/java/awt/image/DataBufferUShort.java:
+        Resynced with GNU Classpath.
+
+	2004-11-17  Michael Koch  <konqueror at gmx.de>
+
+        * java/awt/image/DataBufferShort.java: Fixed file header.
+        * java/awt/image/DataBufferUShort.java: Likewise.
+        (DataBufferUShort): Throw NullPointerException if dataArray is null.
+
+2004-11-24  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/net/InetAddress.java:
         Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/awt/image/DataBufferShort.java
diff -u kaffe/libraries/javalib/java/awt/image/DataBufferShort.java:1.3 kaffe/libraries/javalib/java/awt/image/DataBufferShort.java:1.4
--- kaffe/libraries/javalib/java/awt/image/DataBufferShort.java:1.3	Thu Oct 14 23:35:37 2004
+++ kaffe/libraries/javalib/java/awt/image/DataBufferShort.java	Thu Nov 25 05:42:06 2004
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004  Free Software Foundation
+/* DataBufferShort.java --
+   Copyright (C) 2004  Free Software Foundation
 
 This file is part of GNU Classpath.
 
Index: kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java
diff -u kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java:1.4 kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java:1.5
--- kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java:1.4	Thu Oct 14 23:35:37 2004
+++ kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java	Thu Nov 25 05:42:06 2004
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000, 2002  Free Software Foundation
+/* DataBufferUShort.java --
+   Copyright (C) 2000, 2002, 2004  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -87,10 +88,14 @@
    * 
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
+   *
+   * @throws NullPointerException if dataArray is null
    */
   public DataBufferUShort(short[] dataArray, int size)
   {
     super(TYPE_USHORT, size, 1, 0);
+    if (dataArray == null)
+      throw new NullPointerException();
     bankData = new short[1][];
     data = dataArray;
     bankData[0] = data;
@@ -103,10 +108,14 @@
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    * @param offset the offset to the first element in the array.
+   *
+   * @throws NullPointerException if dataArray is null
    */
   public DataBufferUShort(short[] dataArray, int size, int offset)
   {
     super(TYPE_USHORT, size, 1, offset);
+    if (dataArray == null)
+      throw new NullPointerException();
     bankData = new short[1][];
     data = dataArray;
     bankData[0] = data;