summaryrefslogtreecommitdiff
path: root/java/awt
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2005-04-03 00:09:08 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2005-04-03 00:09:08 +0000
commit8d6cd83a7f7a707aebe9e8f0b98d1bb9a6c0f390 (patch)
treefe4b0be51ab9a34ed4a322c0150c1d65f368eb12 /java/awt
parentb4b5c4667bad3f4add76b8a63bfb8f1d2e156803 (diff)
downloadclasspath-8d6cd83a7f7a707aebe9e8f0b98d1bb9a6c0f390.tar.gz
2005-04-03 Andrew John Hughes <gnu_andrew@member.fsf.org>
Merge from HEAD --> generics-branch for 28th of March to 2nd of April. Changelog: 2005-04-01 Tom Tromey <tromey@redhat.com> * java/lang/AssertionError.java: Typo fix. 2005-04-01 Michael Koch <konqueror@gmx.de> * java/io/PipedInputStream.java (read): Make sure a positive byte value is returned. Revised javadoc. Thanks to Olafur Bragason for reporting these bugs. 2005-04-01 Guilhem Lavaux <guilhem@kaffe.org> * java/awt/image/IndexColorModel.java (getRGB): Check if pixel is negative. 2005-03-31 Thomas Fitzsimmons <fitzsim@redhat.com> * javax/swing/text/JTextComponent.java (viewToModel): New method. 2005-03-31 Audrius Meskauskas <audriusa@bluewin.ch> * org/omg/CORBA/ORBPackage/InconsistentTypeCode.java, org/omg/CORBA/ORBPackage/InvalidName.java, org/omg/CORBA/ORBPackage/package.html: New files. 2005-03-31 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkGraphics.java (getClipBounds): Handle clip being null. (setClip): Likewise. * java/beans/beancontext/BeanContextSupport.java (add): Implemented. (addAll): Likewise. (clear): Likewise. (removeAll): Likewise. (retainAll): Likewise. 2005-03-30 Sven de Marothy <sven@physto.se> * gnu/java/awt/peer/gtk/GdkGraphics.java: (drawImage): Don't notify the image observer for offscreen images. * gnu/java/awt/peer/gtk/GtkImagePainter.java: (setPixels): Don't notify the image observer. 2005-03-30 Michael Koch <konqueror@gmx.de> * java/beans/beancontext/BeanContextServicesSupport.java (BeanContextServicesSupport): Reimplemented. (addBeanContextServicesListener): Implemented. (initialize): Likewise. (removeBeanContextServicesListener): Likewise. * java/beans/beancontext/BeanContextSupport.java (add): Likewise. (addBeanContextMembershipListener): Likewise. (getLocale): Likewise. (initialize): Likewise. (iterator): Likewise. (remove): Likewise. (toArray): Likewise. 2005-03-30 Michael Koch <konqueror@gmx.de> * java/awt/image/ConvolveOp.java: Removed comment added by eclipse. 2005-03-30 Michael Koch <konqueror@gmx.de> * gnu/xml/aelfred2/XmlParser.java: Revert my typo fix. 2005-03-30 Michael Koch <konqueror@gmx.de> * java/awt/geom/CubicCurve2D.java, java/awt/geom/QuadCurve2D.java: Fixed typo in name of Brian Cough. 2005-03-29 Guilhem Lavaux <guilhem@kaffe.org> * native/jni/java-nio/gnu_java_nio_VMSelector.c (Java_gnu_java_nio_VMSelector_select): Use GetStaticMethodID for Thread.interrupted(). 2005-03-29 Jeroen Frijters <jeroen@frijters.net> * gnu/classpath/SystemProperties.java (static): Converted encoding aliases to lower case and removed redudant aliases. * gnu/java/io/EncodingManager.java (findEncoderConstructor, findDecoderConstructor): Call new method resolveAlias(). (resolveAlias): New method. * java/lang/System.java (getProperties): Removed uppercase aliases from comments. 2005-03-28 Tom Tromey <tromey@redhat.com> * java/net/URL.java (DEFAULT_SEARCH_PATH): Added org.metastatic.jessie. 2005-03-28 Tom Tromey <tromey@redhat.com> * java/lang/ClassLoader.java (loadClass): Resolve class even if it was already found.
Diffstat (limited to 'java/awt')
-rw-r--r--java/awt/geom/CubicCurve2D.java2
-rw-r--r--java/awt/geom/QuadCurve2D.java2
-rw-r--r--java/awt/image/ConvolveOp.java10
-rw-r--r--java/awt/image/IndexColorModel.java2
4 files changed, 6 insertions, 10 deletions
diff --git a/java/awt/geom/CubicCurve2D.java b/java/awt/geom/CubicCurve2D.java
index 1c500b00b..a3d9182f4 100644
--- a/java/awt/geom/CubicCurve2D.java
+++ b/java/awt/geom/CubicCurve2D.java
@@ -689,7 +689,7 @@ public abstract class CubicCurve2D implements Shape, Cloneable
* result of -1 indicates that the equation is constant (i.e.,
* always or never zero).
*
- * @author Brain Gouph (bjg@network-theory.com)
+ * @author Brian Gough (bjg@network-theory.com)
* (original C implementation in the <a href=
* "http://www.gnu.org/software/gsl/">GNU Scientific Library</a>)
*
diff --git a/java/awt/geom/QuadCurve2D.java b/java/awt/geom/QuadCurve2D.java
index db7c2abf2..9ec22e4f1 100644
--- a/java/awt/geom/QuadCurve2D.java
+++ b/java/awt/geom/QuadCurve2D.java
@@ -562,7 +562,7 @@ public abstract class QuadCurve2D implements Shape, Cloneable
* result of -1 indicates that the equation is constant (i.e.,
* always or never zero).
*
- * @author Brain Gouph (bjg@network-theory.com)
+ * @author Brian Gouph (bjg@network-theory.com)
* (original C implementation in the <a href=
* "http://www.gnu.org/software/gsl/">GNU Scientific Library</a>)
*
diff --git a/java/awt/image/ConvolveOp.java b/java/awt/image/ConvolveOp.java
index c793eee14..92a629beb 100644
--- a/java/awt/image/ConvolveOp.java
+++ b/java/awt/image/ConvolveOp.java
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 Free Software Foundation -- ConvolveOp
+/* ConvolveOp.java --
+ Copyright (C) 2004 Free Software Foundation -- ConvolveOp
This file is part of GNU Classpath.
@@ -34,12 +35,7 @@ this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
-/*
- * Created on Nov 1, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+
package java.awt.image;
import java.awt.Graphics2D;
diff --git a/java/awt/image/IndexColorModel.java b/java/awt/image/IndexColorModel.java
index e4ccc5429..2a8a7887e 100644
--- a/java/awt/image/IndexColorModel.java
+++ b/java/awt/image/IndexColorModel.java
@@ -432,7 +432,7 @@ public class IndexColorModel extends ColorModel
*/
public final int getRGB (int pixel)
{
- if (pixel < map_size)
+ if (pixel >= 0 && pixel < map_size)
return rgb[pixel];
return 0;