[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: further import cleanups

Kaffe CVS cvs-commits at kaffe.org
Sat Oct 23 15:49:47 PDT 2004


PatchSet 5347 
Date: 2004/10/23 22:45:59
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: further import cleanups

2004-10-23  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/awt/Container.java,
        libraries/javalib/java/awt/Font.java,
        libraries/javalib/java/awt/font/TextLayout.java,
        libraries/javalib/java/util/zip/CheckedInputStream.java,
        libraries/javalib/java/util/zip/InflaterInputStream.java:
        Resynced with GNU Classpath.

        2004-10-21  Michael Koch  <konqueror at gmx.de>

        * java/awt/Container.java,
        java/awt/Font.java,
        java/awt/font/TextLayout.java,
        java/util/zip/CheckedInputStream.java,
        java/util/zip/InflaterInputStream.java:
        Import cleanups.

Members: 
	ChangeLog:1.2899->1.2900 
	libraries/javalib/java/awt/Container.java:1.25->1.26 
	libraries/javalib/java/awt/Font.java:1.20->1.21 
	libraries/javalib/java/awt/font/TextLayout.java:1.6->1.7 
	libraries/javalib/java/util/zip/CheckedInputStream.java:1.4->1.5 
	libraries/javalib/java/util/zip/InflaterInputStream.java:1.12->1.13 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2899 kaffe/ChangeLog:1.2900
--- kaffe/ChangeLog:1.2899	Sat Oct 23 22:09:46 2004
+++ kaffe/ChangeLog	Sat Oct 23 22:45:59 2004
@@ -1,5 +1,23 @@
 2004-10-23  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/awt/Container.java,
+	libraries/javalib/java/awt/Font.java,
+	libraries/javalib/java/awt/font/TextLayout.java,
+	libraries/javalib/java/util/zip/CheckedInputStream.java,
+	libraries/javalib/java/util/zip/InflaterInputStream.java:
+	Resynced with GNU Classpath.
+
+	2004-10-21  Michael Koch  <konqueror at gmx.de>
+
+        * java/awt/Container.java,
+        java/awt/Font.java,
+        java/awt/font/TextLayout.java,
+        java/util/zip/CheckedInputStream.java,
+        java/util/zip/InflaterInputStream.java:
+        Import cleanups.
+
+2004-10-23  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/net/NetworkInterface.java,
 	libraries/javalib/javax/security/auth/x500/X500PrivateCredential.java,
 	libraries/javalib/javax/security/cert/X509CertBridge.java,
Index: kaffe/libraries/javalib/java/awt/Container.java
diff -u kaffe/libraries/javalib/java/awt/Container.java:1.25 kaffe/libraries/javalib/java/awt/Container.java:1.26
--- kaffe/libraries/javalib/java/awt/Container.java:1.25	Sat Oct  9 22:18:53 2004
+++ kaffe/libraries/javalib/java/awt/Container.java	Sat Oct 23 22:46:01 2004
@@ -42,8 +42,6 @@
 import java.awt.event.ContainerListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.awt.event.KeyEvent;
-import java.awt.peer.ComponentPeer;
 import java.awt.peer.ContainerPeer;
 import java.awt.peer.LightweightPeer;
 import java.beans.PropertyChangeListener;
Index: kaffe/libraries/javalib/java/awt/Font.java
diff -u kaffe/libraries/javalib/java/awt/Font.java:1.20 kaffe/libraries/javalib/java/awt/Font.java:1.21
--- kaffe/libraries/javalib/java/awt/Font.java:1.20	Sat Oct  9 22:18:53 2004
+++ kaffe/libraries/javalib/java/awt/Font.java	Sat Oct 23 22:46:01 2004
@@ -44,7 +44,6 @@
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.font.LineMetrics;
-import java.awt.font.TextAttribute;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.awt.peer.FontPeer;
Index: kaffe/libraries/javalib/java/awt/font/TextLayout.java
diff -u kaffe/libraries/javalib/java/awt/font/TextLayout.java:1.6 kaffe/libraries/javalib/java/awt/font/TextLayout.java:1.7
--- kaffe/libraries/javalib/java/awt/font/TextLayout.java:1.6	Sat Oct  9 22:18:53 2004
+++ kaffe/libraries/javalib/java/awt/font/TextLayout.java	Sat Oct 23 22:46:01 2004
@@ -1,4 +1,4 @@
-/* TextLayout.java
+/* TextLayout.java --
    Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,9 @@
 
 package java.awt.font;
 
+import gnu.java.awt.ClasspathToolkit;
+import gnu.java.awt.peer.ClasspathTextLayoutPeer;
+
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Shape;
@@ -46,12 +49,7 @@
 import java.awt.geom.Rectangle2D;
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
-import java.text.CharacterIterator;
 import java.util.Map;
-import java.awt.font.TextAttribute;
-
-import gnu.java.awt.ClasspathToolkit;
-import gnu.java.awt.peer.ClasspathTextLayoutPeer;
 
 /**
  * @author Michael Koch
Index: kaffe/libraries/javalib/java/util/zip/CheckedInputStream.java
diff -u kaffe/libraries/javalib/java/util/zip/CheckedInputStream.java:1.4 kaffe/libraries/javalib/java/util/zip/CheckedInputStream.java:1.5
--- kaffe/libraries/javalib/java/util/zip/CheckedInputStream.java:1.4	Wed Apr 21 14:59:06 2004
+++ kaffe/libraries/javalib/java/util/zip/CheckedInputStream.java	Sat Oct 23 22:46:02 2004
@@ -1,5 +1,5 @@
 /* CheckedInputStream.java - Compute checksum of data being read
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,11 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.util.zip;
 
 import java.io.FilterInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /* Written using on-line Java Platform 1.2 API Specification
  * and JCL book.
Index: kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java
diff -u kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java:1.12 kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java:1.13
--- kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java:1.12	Tue Jun 15 18:42:53 2004
+++ kaffe/libraries/javalib/java/util/zip/InflaterInputStream.java	Sat Oct 23 22:46:02 2004
@@ -36,11 +36,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.util.zip;
 
 import java.io.FilterInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * This filter stream is used to decompress data compressed in the "deflate"




More information about the kaffe mailing list