[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: import cleanups
Kaffe CVS
cvs-commits at kaffe.org
Wed Jan 5 12:11:24 PST 2005
PatchSet 5768
Date: 2005/01/05 20:06:41
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: import cleanups
Members:
ChangeLog:1.3312->1.3313
libraries/javalib/java/awt/Button.java:1.7->1.8
libraries/javalib/java/lang/System.java:1.44->1.45
libraries/javalib/java/security/cert/X509CRLSelector.java:1.4->1.5
libraries/javalib/java/security/cert/X509CertSelector.java:1.3->1.4
libraries/javalib/java/util/ResourceBundle.java:1.23->1.24
libraries/javalib/java/util/jar/JarFile.java:1.8->1.9
libraries/javalib/javax/swing/JApplet.java:1.4->1.5
libraries/javalib/javax/swing/JFormattedTextField.java:1.6->1.7
libraries/javalib/javax/swing/JTree.java:1.10->1.11
libraries/javalib/javax/swing/JWindow.java:1.5->1.6
libraries/javalib/javax/swing/TransferHandler.java:1.4->1.5
libraries/javalib/javax/swing/plaf/basic/BasicEditorPaneUI.java:1.1->1.2
libraries/javalib/javax/swing/plaf/basic/BasicTextPaneUI.java:1.2->1.3
libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3312 kaffe/ChangeLog:1.3313
--- kaffe/ChangeLog:1.3312 Wed Jan 5 19:45:25 2005
+++ kaffe/ChangeLog Wed Jan 5 20:06:41 2005
@@ -2,6 +2,29 @@
Resynced with GNU Classpath.
+ 2004-12-29 Michael Koch <konqueror at gmx.de>
+
+ * java/awt/Button.java,
+ java/lang/Runtime.java,
+ java/lang/System.java,
+ java/security/cert/X509CRLSelector.java,
+ java/security/cert/X509CertSelector.java,
+ java/util/ResourceBundle.java,
+ java/util/jar/JarFile.java,
+ javax/swing/JApplet.java,
+ javax/swing/JFormattedTextField.java,
+ javax/swing/JTree.java,
+ javax/swing/JWindow.java,
+ javax/swing/TransferHandler.java,
+ javax/swing/plaf/basic/BasicEditorPaneUI.java,
+ javax/swing/plaf/basic/BasicTextPaneUI.java
+ javax/swing/plaf/basic/BasicTreeUI.java:
+ Imports reworked.
+
+2005-01-05 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
2004-12-27 Jeroen Frijters <jeroen at frijters.net>
* java/nio/ByteBufferImpl.java,
Index: kaffe/libraries/javalib/java/awt/Button.java
diff -u kaffe/libraries/javalib/java/awt/Button.java:1.7 kaffe/libraries/javalib/java/awt/Button.java:1.8
--- kaffe/libraries/javalib/java/awt/Button.java:1.7 Fri Dec 3 01:56:21 2004
+++ kaffe/libraries/javalib/java/awt/Button.java Wed Jan 5 20:06:43 2005
@@ -47,7 +47,6 @@
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleAction;
import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRelation;
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleValue;
Index: kaffe/libraries/javalib/java/lang/System.java
diff -u kaffe/libraries/javalib/java/lang/System.java:1.44 kaffe/libraries/javalib/java/lang/System.java:1.45
--- kaffe/libraries/javalib/java/lang/System.java:1.44 Mon Jan 3 06:44:22 2005
+++ kaffe/libraries/javalib/java/lang/System.java Wed Jan 5 20:06:43 2005
@@ -10,7 +10,6 @@
package java.lang;
-import gnu.classpath.Configuration;
import gnu.classpath.SystemProperties;
import java.io.BufferedInputStream;
Index: kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java
diff -u kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java:1.4 kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java:1.5
--- kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java:1.4 Wed Dec 8 07:22:35 2004
+++ kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java Wed Jan 5 20:06:44 2005
@@ -45,7 +45,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.math.BigInteger;
-import java.security.AccessController;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Index: kaffe/libraries/javalib/java/security/cert/X509CertSelector.java
diff -u kaffe/libraries/javalib/java/security/cert/X509CertSelector.java:1.3 kaffe/libraries/javalib/java/security/cert/X509CertSelector.java:1.4
--- kaffe/libraries/javalib/java/security/cert/X509CertSelector.java:1.3 Wed Dec 8 07:22:35 2004
+++ kaffe/libraries/javalib/java/security/cert/X509CertSelector.java Wed Jan 5 20:06:44 2005
@@ -43,7 +43,6 @@
import java.io.IOException;
import java.math.BigInteger;
-import java.security.AccessController;
import java.security.KeyFactory;
import java.security.PublicKey;
import java.security.spec.X509EncodedKeySpec;
Index: kaffe/libraries/javalib/java/util/ResourceBundle.java
diff -u kaffe/libraries/javalib/java/util/ResourceBundle.java:1.23 kaffe/libraries/javalib/java/util/ResourceBundle.java:1.24
--- kaffe/libraries/javalib/java/util/ResourceBundle.java:1.23 Sat Nov 27 20:21:45 2004
+++ kaffe/libraries/javalib/java/util/ResourceBundle.java Wed Jan 5 20:06:45 2005
@@ -41,8 +41,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
import java.security.AccessController;
import java.security.PrivilegedAction;
Index: kaffe/libraries/javalib/java/util/jar/JarFile.java
diff -u kaffe/libraries/javalib/java/util/jar/JarFile.java:1.8 kaffe/libraries/javalib/java/util/jar/JarFile.java:1.9
--- kaffe/libraries/javalib/java/util/jar/JarFile.java:1.8 Sat Nov 13 00:56:25 2004
+++ kaffe/libraries/javalib/java/util/jar/JarFile.java Wed Jan 5 20:06:46 2005
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.util.jar;
import gnu.java.io.Base64InputStream;
@@ -48,7 +49,6 @@
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
-
import java.security.InvalidKeyException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -58,17 +58,15 @@
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
-
import java.util.Arrays;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.Enumeration;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
Index: kaffe/libraries/javalib/javax/swing/JApplet.java
diff -u kaffe/libraries/javalib/javax/swing/JApplet.java:1.4 kaffe/libraries/javalib/javax/swing/JApplet.java:1.5
--- kaffe/libraries/javalib/javax/swing/JApplet.java:1.4 Thu Dec 23 00:40:21 2004
+++ kaffe/libraries/javalib/javax/swing/JApplet.java Wed Jan 5 20:06:46 2005
@@ -46,7 +46,6 @@
import java.awt.Graphics;
import java.awt.LayoutManager;
import java.awt.event.KeyEvent;
-import java.awt.event.WindowEvent;
import javax.accessibility.AccessibleContext;
Index: kaffe/libraries/javalib/javax/swing/JFormattedTextField.java
diff -u kaffe/libraries/javalib/javax/swing/JFormattedTextField.java:1.6 kaffe/libraries/javalib/javax/swing/JFormattedTextField.java:1.7
--- kaffe/libraries/javalib/javax/swing/JFormattedTextField.java:1.6 Wed Jan 5 17:27:37 2005
+++ kaffe/libraries/javalib/javax/swing/JFormattedTextField.java Wed Jan 5 20:06:46 2005
@@ -43,8 +43,6 @@
import java.text.Format;
import java.text.ParseException;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
import javax.swing.text.Document;
import javax.swing.text.DocumentFilter;
import javax.swing.text.NavigationFilter;
Index: kaffe/libraries/javalib/javax/swing/JTree.java
diff -u kaffe/libraries/javalib/javax/swing/JTree.java:1.10 kaffe/libraries/javalib/javax/swing/JTree.java:1.11
--- kaffe/libraries/javalib/javax/swing/JTree.java:1.10 Tue Dec 14 07:36:47 2004
+++ kaffe/libraries/javalib/javax/swing/JTree.java Wed Jan 5 20:06:46 2005
@@ -53,10 +53,10 @@
import javax.swing.event.TreeSelectionListener;
import javax.swing.event.TreeWillExpandListener;
import javax.swing.plaf.TreeUI;
-import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.TreeCellEditor;
import javax.swing.tree.TreeCellRenderer;
import javax.swing.tree.TreeModel;
Index: kaffe/libraries/javalib/javax/swing/JWindow.java
diff -u kaffe/libraries/javalib/javax/swing/JWindow.java:1.5 kaffe/libraries/javalib/javax/swing/JWindow.java:1.6
--- kaffe/libraries/javalib/javax/swing/JWindow.java:1.5 Wed Jan 5 17:27:37 2005
+++ kaffe/libraries/javalib/javax/swing/JWindow.java Wed Jan 5 20:06:46 2005
@@ -48,7 +48,6 @@
import java.awt.LayoutManager;
import java.awt.Window;
import java.awt.event.KeyEvent;
-import java.awt.event.WindowEvent;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
Index: kaffe/libraries/javalib/javax/swing/TransferHandler.java
diff -u kaffe/libraries/javalib/javax/swing/TransferHandler.java:1.4 kaffe/libraries/javalib/javax/swing/TransferHandler.java:1.5
--- kaffe/libraries/javalib/javax/swing/TransferHandler.java:1.4 Fri Dec 17 07:56:51 2004
+++ kaffe/libraries/javalib/javax/swing/TransferHandler.java Wed Jan 5 20:06:46 2005
@@ -38,11 +38,11 @@
package javax.swing;
-import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
import java.io.Serializable;
public class TransferHandler implements Serializable
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicEditorPaneUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicEditorPaneUI.java:1.1 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicEditorPaneUI.java:1.2
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicEditorPaneUI.java:1.1 Thu Dec 23 01:46:30 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicEditorPaneUI.java Wed Jan 5 20:06:47 2005
@@ -38,8 +38,6 @@
package javax.swing.plaf.basic;
-import java.beans.PropertyChangeEvent;
-
import javax.swing.JComponent;
import javax.swing.plaf.ComponentUI;
import javax.swing.text.Element;
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTextPaneUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTextPaneUI.java:1.2 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTextPaneUI.java:1.3
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTextPaneUI.java:1.2 Wed Jan 5 17:27:38 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTextPaneUI.java Wed Jan 5 20:06:47 2005
@@ -38,8 +38,6 @@
package javax.swing.plaf.basic;
-import java.beans.PropertyChangeEvent;
-
import javax.swing.JComponent;
import javax.swing.plaf.ComponentUI;
import javax.swing.text.Element;
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.3 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.4
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.3 Sat Nov 13 02:17:46 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java Wed Jan 5 20:06:47 2005
@@ -45,14 +45,13 @@
import java.awt.Rectangle;
import javax.swing.JComponent;
+import javax.swing.JTree;
import javax.swing.UIDefaults;
import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI;
-import javax.swing.JTree;
import javax.swing.plaf.TreeUI;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.TreePath;
import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
/**
* A delegate providing the user interface for <code>JTree</code>
More information about the kaffe
mailing list