[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: cleanups
Kaffe CVS
cvs-commits at kaffe.org
Fri Feb 18 03:31:20 PST 2005
PatchSet 5558
Date: 2005/02/18 11:26:31
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: cleanups
2005-02-18 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath.
2005-02-16 Michael Koch <konqueror at gmx.de>
* java/awt/EventQueue.java: Reworked import statements.
* java/lang/StringBuilder.java
(DEFAULT_CAPACITY): Reordered modifiers.
* java/text/SimpleDateFormat.java: Reworked import statements.
Fixed one littel formatting issue.
(formatData): Removed a useless comment.
* javax/imageio/ImageIO.java: Reworked import statements.
* javax/swing/text/StringContent.java: Likewise.
* javax/swing/JTextField.java: Likewise.
(notifyAction): Added javadoc.
Members:
ChangeLog:1.3601->1.3602
libraries/javalib/java/awt/EventQueue.java:1.15->1.16
libraries/javalib/java/lang/StringBuilder.java:1.1->1.2
libraries/javalib/java/text/SimpleDateFormat.java:1.45->1.46
libraries/javalib/javax/imageio/ImageIO.java:1.4->1.5
libraries/javalib/javax/swing/JTextField.java:1.8->1.9
libraries/javalib/javax/swing/text/StringContent.java:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3601 kaffe/ChangeLog:1.3602
--- kaffe/ChangeLog:1.3601 Wed Feb 16 13:35:15 2005
+++ kaffe/ChangeLog Fri Feb 18 11:26:31 2005
@@ -1,3 +1,20 @@
+2005-02-18 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
+ 2005-02-16 Michael Koch <konqueror at gmx.de>
+
+ * java/awt/EventQueue.java: Reworked import statements.
+ * java/lang/StringBuilder.java
+ (DEFAULT_CAPACITY): Reordered modifiers.
+ * java/text/SimpleDateFormat.java: Reworked import statements.
+ Fixed one littel formatting issue.
+ (formatData): Removed a useless comment.
+ * javax/imageio/ImageIO.java: Reworked import statements.
+ * javax/swing/text/StringContent.java: Likewise.
+ * javax/swing/JTextField.java: Likewise.
+ (notifyAction): Added javadoc.
+
2005-02-16 Dalibor Topic <robilad at kaffe.org>
* kaffe/kaffevm/classMethod.h: (METHOD_CODE_START)
Index: kaffe/libraries/javalib/java/awt/EventQueue.java
diff -u kaffe/libraries/javalib/java/awt/EventQueue.java:1.15 kaffe/libraries/javalib/java/awt/EventQueue.java:1.16
--- kaffe/libraries/javalib/java/awt/EventQueue.java:1.15 Tue Jan 18 15:44:37 2005
+++ kaffe/libraries/javalib/java/awt/EventQueue.java Fri Feb 18 11:26:33 2005
@@ -1,4 +1,5 @@
-/* Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation
+/* EventQueue.java --
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation
This file is part of GNU Classpath.
@@ -37,14 +38,14 @@
package java.awt;
+import gnu.java.awt.ClasspathToolkit;
+
import java.awt.event.ActionEvent;
import java.awt.event.InputEvent;
import java.awt.event.InvocationEvent;
import java.awt.event.WindowEvent;
import java.lang.reflect.InvocationTargetException;
import java.util.EmptyStackException;
-
-import gnu.java.awt.ClasspathToolkit;
/* Written using on-line Java 2 Platform Standard Edition v1.3 API
* Specification, as well as "The Java Class Libraries", 2nd edition
Index: kaffe/libraries/javalib/java/lang/StringBuilder.java
diff -u kaffe/libraries/javalib/java/lang/StringBuilder.java:1.1 kaffe/libraries/javalib/java/lang/StringBuilder.java:1.2
--- kaffe/libraries/javalib/java/lang/StringBuilder.java:1.1 Sat Jan 22 18:41:39 2005
+++ kaffe/libraries/javalib/java/lang/StringBuilder.java Fri Feb 18 11:26:33 2005
@@ -1,5 +1,5 @@
/* StringBuilder.java -- Unsynchronized growable strings
- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -68,7 +68,7 @@
* @author Paul Fisher
* @author John Keiser
* @author Tom Tromey
- * @author Eric Blake <ebb9 at email.byu.edu>
+ * @author Eric Blake (ebb9 at email.byu.edu)
* @see String
* @see StringBuffer
*
@@ -106,7 +106,7 @@
/**
* The default capacity of a buffer.
*/
- private final static int DEFAULT_CAPACITY = 16;
+ private static final int DEFAULT_CAPACITY = 16;
/**
* Create a new StringBuilder with default capacity 16.
Index: kaffe/libraries/javalib/java/text/SimpleDateFormat.java
diff -u kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.45 kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.46
--- kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.45 Mon Feb 14 20:49:39 2005
+++ kaffe/libraries/javalib/java/text/SimpleDateFormat.java Fri Feb 18 11:26:34 2005
@@ -1,6 +1,6 @@
/* SimpleDateFormat.java -- A class for parsing/formating simple
date constructs
- Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004
+ Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -45,8 +45,8 @@
import gnu.java.text.FormatCharacterIterator;
import gnu.java.text.StringFormatBuffer;
-import java.io.InvalidObjectException;
import java.io.IOException;
+import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.util.ArrayList;
import java.util.Calendar;
@@ -96,7 +96,8 @@
* @param s the size of the field.
* @param c the character used.
*/
- public CompiledField(int f, int s, char c) {
+ public CompiledField(int f, int s, char c)
+ {
field = f;
size = s;
character = c;
@@ -168,7 +169,7 @@
* @see DateFormatSymbols
* @serial The localisation data. May not be null.
*/
- private DateFormatSymbols formatData; // formatData
+ private DateFormatSymbols formatData;
/**
* The date representing the start of the century
Index: kaffe/libraries/javalib/javax/imageio/ImageIO.java
diff -u kaffe/libraries/javalib/javax/imageio/ImageIO.java:1.4 kaffe/libraries/javalib/javax/imageio/ImageIO.java:1.5
--- kaffe/libraries/javalib/javax/imageio/ImageIO.java:1.4 Thu Jan 13 08:56:34 2005
+++ kaffe/libraries/javalib/javax/imageio/ImageIO.java Fri Feb 18 11:26:36 2005
@@ -1,5 +1,5 @@
/* ImageIO.java --
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,15 +38,15 @@
package javax.imageio;
-import java.awt.image.RenderedImage;
import java.awt.image.BufferedImage;
-import java.net.URL;
+import java.awt.image.RenderedImage;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -55,8 +55,8 @@
import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.spi.ImageWriterSpi;
import javax.imageio.spi.ServiceRegistry;
-import javax.imageio.stream.ImageOutputStream;
import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
import javax.imageio.stream.MemoryCacheImageInputStream;
import javax.imageio.stream.MemoryCacheImageOutputStream;
Index: kaffe/libraries/javalib/javax/swing/JTextField.java
diff -u kaffe/libraries/javalib/javax/swing/JTextField.java:1.8 kaffe/libraries/javalib/javax/swing/JTextField.java:1.9
--- kaffe/libraries/javalib/javax/swing/JTextField.java:1.8 Thu Jan 27 13:58:34 2005
+++ kaffe/libraries/javalib/javax/swing/JTextField.java Fri Feb 18 11:26:36 2005
@@ -47,7 +47,6 @@
import java.beans.PropertyChangeListener;
import javax.accessibility.AccessibleStateSet;
-import javax.swing.Action;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import javax.swing.text.PlainDocument;
@@ -84,6 +83,10 @@
private static final Action[] actions;
+ /**
+ * Name of the action that gets sent when the content of the text field
+ * gets accepted.
+ */
public static final String notifyAction = "notify-field-accept";
static
Index: kaffe/libraries/javalib/javax/swing/text/StringContent.java
diff -u kaffe/libraries/javalib/javax/swing/text/StringContent.java:1.1 kaffe/libraries/javalib/javax/swing/text/StringContent.java:1.2
--- kaffe/libraries/javalib/javax/swing/text/StringContent.java:1.1 Sat Jan 15 18:11:36 2005
+++ kaffe/libraries/javalib/javax/swing/text/StringContent.java Fri Feb 18 11:26:36 2005
@@ -39,13 +39,13 @@
package javax.swing.text;
import java.io.Serializable;
-import java.util.Vector;
import java.util.Iterator;
+import java.util.Vector;
-import javax.swing.undo.UndoableEdit;
import javax.swing.undo.AbstractUndoableEdit;
-import javax.swing.undo.CannotUndoException;
import javax.swing.undo.CannotRedoException;
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.UndoableEdit;
/**
* An implementation of the <code>AbstractDocument.Content</code>
More information about the kaffe
mailing list