Hello all,
writing the CL took more time than the patch itself. Built with ecj and
jikes.
Ok for head?
Andreas
2006-07-18 Andreas Tobler <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/BufferedImageGraphics.java: Remove unneeded
imports.
* gnu/java/awt/peer/gtk/CairoSurface.java: Likewise.
* gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java: Likewise.
* gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java: Likewise.
* gnu/java/awt/peer/gtk/GdkFontPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Likewise.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkClipboardNotifier.java: Likewise.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkContainerPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkDialogPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkFramePeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkImage.java: Likewise.
* gnu/java/awt/peer/gtk/GtkImageConsumer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkMenuBarPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkPanelPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkScrollbarPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkWindowPeer.java: Likewise.
* gnu/java/awt/peer/gtk/VolatileImageGraphics.java: Likewise.
Index: gnu/java/awt/peer/gtk/BufferedImageGraphics.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java,v
retrieving revision 1.7
diff -u -r1.7 BufferedImageGraphics.java
--- gnu/java/awt/peer/gtk/BufferedImageGraphics.java 2 Jun 2006 22:57:31
-0000 1.7
+++ gnu/java/awt/peer/gtk/BufferedImageGraphics.java 17 Jul 2006 22:13:42
-0000
@@ -40,10 +40,8 @@
import java.awt.Color;
import java.awt.Graphics;
-import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.Image;
-import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.font.GlyphVector;
Index: gnu/java/awt/peer/gtk/CairoSurface.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurface.java,v
retrieving revision 1.12
diff -u -r1.12 CairoSurface.java
--- gnu/java/awt/peer/gtk/CairoSurface.java 13 Jul 2006 21:44:12 -0000
1.12
+++ gnu/java/awt/peer/gtk/CairoSurface.java 17 Jul 2006 22:13:43 -0000
@@ -38,27 +38,16 @@
package gnu.java.awt.peer.gtk;
-import java.awt.Graphics;
-import java.awt.Color;
-import java.awt.Image;
import java.awt.Point;
import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
import java.awt.image.DataBuffer;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.DirectColorModel;
-import java.io.File;
-import java.io.IOException;
import java.nio.ByteOrder;
import java.util.Hashtable;
-import java.util.Vector;
-import java.io.ByteArrayOutputStream;
-import java.io.BufferedInputStream;
-import java.net.URL;
-import gnu.classpath.Pointer;
/**
* CairoSurface - wraps a Cairo surface.
Index: gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java,v
retrieving revision 1.6
diff -u -r1.6 CairoSurfaceGraphics.java
--- gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java 12 Jun 2006 21:10:11
-0000 1.6
+++ gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java 17 Jul 2006 22:13:43
-0000
@@ -39,14 +39,9 @@
package gnu.java.awt.peer.gtk;
import java.awt.Graphics;
-import java.awt.Color;
import java.awt.GraphicsEnvironment;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.geom.Rectangle2D;
-import java.awt.image.*;
/**
* Implementation of Graphics2D on a Cairo surface.
Index: gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java,v
retrieving revision 1.2
diff -u -r1.2 ComponentGraphicsCopy.java
--- gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java 4 Jun 2006 19:44:39
-0000 1.2
+++ gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java 17 Jul 2006 22:13:43
-0000
@@ -39,17 +39,11 @@
package gnu.java.awt.peer.gtk;
import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
import java.awt.Image;
-import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.font.GlyphVector;
import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBuffer;
import java.awt.image.RenderedImage;
import java.awt.image.ImageObserver;
Index: gnu/java/awt/peer/gtk/GdkFontPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,v
retrieving revision 1.18
diff -u -r1.18 GdkFontPeer.java
--- gnu/java/awt/peer/gtk/GdkFontPeer.java 11 Jun 2006 08:29:57 -0000
1.18
+++ gnu/java/awt/peer/gtk/GdkFontPeer.java 17 Jul 2006 22:13:43 -0000
@@ -38,7 +38,6 @@
package gnu.java.awt.peer.gtk;
-import gnu.classpath.Configuration;
import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.java.awt.font.opentype.NameDecoder;
@@ -50,9 +49,7 @@
import java.awt.font.GlyphMetrics;
import java.awt.font.LineMetrics;
import java.awt.geom.Rectangle2D;
-import java.awt.geom.Point2D;
import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
Index: gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,v
retrieving revision 1.24
diff -u -r1.24 GdkPixbufDecoder.java
--- gnu/java/awt/peer/gtk/GdkPixbufDecoder.java 12 Jun 2006 08:51:15 -0000
1.24
+++ gnu/java/awt/peer/gtk/GdkPixbufDecoder.java 17 Jul 2006 22:13:43 -0000
@@ -38,13 +38,10 @@
package gnu.java.awt.peer.gtk;
-import gnu.classpath.Configuration;
-
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.DirectColorModel;
import java.awt.image.ImageConsumer;
-import java.awt.image.ImageProducer;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
import java.io.DataInput;
Index: gnu/java/awt/peer/gtk/GtkButtonPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkButtonPeer.java,v
retrieving revision 1.40
diff -u -r1.40 GtkButtonPeer.java
--- gnu/java/awt/peer/gtk/GtkButtonPeer.java 13 Feb 2006 18:57:03 -0000
1.40
+++ gnu/java/awt/peer/gtk/GtkButtonPeer.java 17 Jul 2006 22:13:43 -0000
@@ -38,13 +38,8 @@
package gnu.java.awt.peer.gtk;
-import java.awt.AWTEvent;
import java.awt.Button;
-import java.awt.Component;
-import java.awt.Point;
import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
import java.awt.peer.ButtonPeer;
// A composite widget. GtkButtons have transparent backgrounds. An
Index: gnu/java/awt/peer/gtk/GtkClipboardNotifier.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkClipboardNotifier.java,v
retrieving revision 1.2
diff -u -r1.2 GtkClipboardNotifier.java
--- gnu/java/awt/peer/gtk/GtkClipboardNotifier.java 9 Mar 2006 21:29:58
-0000 1.2
+++ gnu/java/awt/peer/gtk/GtkClipboardNotifier.java 17 Jul 2006 22:13:43
-0000
@@ -1,5 +1,5 @@
/* GtkClipboardNotifier.java -- Helper for announcing GtkSelection changes.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,8 +38,6 @@
package gnu.java.awt.peer.gtk;
-import java.awt.datatransfer.*;
-import java.util.*;
class GtkClipboardNotifier extends Thread
{
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.116
diff -u -r1.116 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 15 Jun 2006 18:29:33 -0000
1.116
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 17 Jul 2006 22:13:44 -0000
@@ -68,7 +68,6 @@
import java.awt.event.MouseWheelEvent;
import java.awt.event.PaintEvent;
import java.awt.event.TextEvent;
-import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.ImageObserver;
import java.awt.image.ImageProducer;
Index: gnu/java/awt/peer/gtk/GtkContainerPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkContainerPeer.java,v
retrieving revision 1.35
diff -u -r1.35 GtkContainerPeer.java
--- gnu/java/awt/peer/gtk/GtkContainerPeer.java 16 Mar 2006 03:24:18 -0000
1.35
+++ gnu/java/awt/peer/gtk/GtkContainerPeer.java 17 Jul 2006 22:13:44 -0000
@@ -42,10 +42,7 @@
import java.awt.Component;
import java.awt.Container;
import java.awt.Font;
-import java.awt.Graphics;
import java.awt.Insets;
-import java.awt.Window;
-import java.awt.peer.ComponentPeer;
import java.awt.peer.ContainerPeer;
public class GtkContainerPeer extends GtkComponentPeer
Index: gnu/java/awt/peer/gtk/GtkDialogPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkDialogPeer.java,v
retrieving revision 1.33
diff -u -r1.33 GtkDialogPeer.java
--- gnu/java/awt/peer/gtk/GtkDialogPeer.java 16 Mar 2006 03:24:18 -0000
1.33
+++ gnu/java/awt/peer/gtk/GtkDialogPeer.java 17 Jul 2006 22:13:44 -0000
@@ -1,5 +1,5 @@
/* GtkDialogPeer.java -- Implements DialogPeer with GTK
- Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,9 +39,6 @@
package gnu.java.awt.peer.gtk;
import java.awt.Dialog;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-import java.awt.event.PaintEvent;
import java.awt.peer.DialogPeer;
public class GtkDialogPeer extends GtkWindowPeer
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.47
diff -u -r1.47 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java 15 Jul 2006 08:02:23 -0000
1.47
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java 17 Jul 2006 22:13:44 -0000
@@ -39,11 +39,9 @@
package gnu.java.awt.peer.gtk;
import java.awt.Frame;
-import java.awt.Graphics;
import java.awt.Image;
import java.awt.MenuBar;
import java.awt.Rectangle;
-import java.awt.event.PaintEvent;
import java.awt.peer.FramePeer;
import java.awt.peer.MenuBarPeer;
Index: gnu/java/awt/peer/gtk/GtkImage.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkImage.java,v
retrieving revision 1.34
diff -u -r1.34 GtkImage.java
--- gnu/java/awt/peer/gtk/GtkImage.java 5 Jun 2006 13:47:04 -0000 1.34
+++ gnu/java/awt/peer/gtk/GtkImage.java 17 Jul 2006 22:13:44 -0000
@@ -39,12 +39,10 @@
package gnu.java.awt.peer.gtk;
import java.awt.Graphics;
-import java.awt.Color;
import java.awt.Image;
import java.awt.image.ColorModel;
import java.awt.image.DirectColorModel;
import java.awt.image.MemoryImageSource;
-import java.awt.image.ImageConsumer;
import java.awt.image.ImageObserver;
import java.awt.image.ImageProducer;
import java.io.File;
Index: gnu/java/awt/peer/gtk/GtkImageConsumer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkImageConsumer.java,v
retrieving revision 1.4
diff -u -r1.4 GtkImageConsumer.java
--- gnu/java/awt/peer/gtk/GtkImageConsumer.java 26 Jul 2005 01:53:25 -0000
1.4
+++ gnu/java/awt/peer/gtk/GtkImageConsumer.java 17 Jul 2006 22:13:44 -0000
@@ -1,5 +1,5 @@
/* GtkImageConsumer.java
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,16 +38,11 @@
package gnu.java.awt.peer.gtk;
-import java.awt.Graphics;
-import java.awt.Image;
import java.awt.image.ColorModel;
-import java.awt.image.DirectColorModel;
import java.awt.image.ImageConsumer;
-import java.awt.image.ImageObserver;
import java.awt.image.ImageProducer;
import java.awt.image.MemoryImageSource;
import java.util.Hashtable;
-import java.util.Vector;
/**
* Helper class to GtkImage. Sits and gathers pixels for a GtkImage and then
Index: gnu/java/awt/peer/gtk/GtkMenuBarPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,v
retrieving revision 1.13
diff -u -r1.13 GtkMenuBarPeer.java
--- gnu/java/awt/peer/gtk/GtkMenuBarPeer.java 20 Feb 2006 09:15:02 -0000
1.13
+++ gnu/java/awt/peer/gtk/GtkMenuBarPeer.java 17 Jul 2006 22:13:45 -0000
@@ -38,12 +38,9 @@
package gnu.java.awt.peer.gtk;
-import java.awt.Font;
import java.awt.Menu;
import java.awt.MenuBar;
-import java.awt.MenuComponent;
import java.awt.peer.MenuBarPeer;
-import java.awt.peer.MenuPeer;
public class GtkMenuBarPeer extends GtkMenuComponentPeer
implements MenuBarPeer
Index: gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,v
retrieving revision 1.18
diff -u -r1.18 GtkMenuItemPeer.java
--- gnu/java/awt/peer/gtk/GtkMenuItemPeer.java 20 Feb 2006 09:15:02 -0000
1.18
+++ gnu/java/awt/peer/gtk/GtkMenuItemPeer.java 17 Jul 2006 22:13:45 -0000
@@ -38,13 +38,8 @@
package gnu.java.awt.peer.gtk;
-import java.awt.Font;
-import java.awt.Menu;
-import java.awt.MenuBar;
-import java.awt.MenuComponent;
import java.awt.MenuItem;
import java.awt.peer.MenuItemPeer;
-import java.awt.peer.MenuPeer;
public class GtkMenuItemPeer extends GtkMenuComponentPeer
implements MenuItemPeer
Index: gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java,v
retrieving revision 1.1
diff -u -r1.1 GtkMouseInfoPeer.java
--- gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java 15 Jul 2006 08:02:23 -0000
1.1
+++ gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java 17 Jul 2006 22:13:45 -0000
@@ -40,7 +40,6 @@
import java.awt.Point;
import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
import java.awt.Window;
import java.awt.peer.MouseInfoPeer;
Index: gnu/java/awt/peer/gtk/GtkPanelPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkPanelPeer.java,v
retrieving revision 1.24
diff -u -r1.24 GtkPanelPeer.java
--- gnu/java/awt/peer/gtk/GtkPanelPeer.java 29 Mar 2006 23:23:36 -0000
1.24
+++ gnu/java/awt/peer/gtk/GtkPanelPeer.java 17 Jul 2006 22:13:45 -0000
@@ -1,5 +1,5 @@
/* GtkPanelPeer.java -- Implements PanelPeer with GTK
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -41,7 +41,6 @@
import java.awt.AWTEvent;
import java.awt.Panel;
import java.awt.event.MouseEvent;
-import java.awt.event.PaintEvent;
import java.awt.peer.PanelPeer;
public class GtkPanelPeer extends GtkContainerPeer
Index: gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,v
retrieving revision 1.10
diff -u -r1.10 GtkPopupMenuPeer.java
--- gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java 20 Feb 2006 09:15:02 -0000
1.10
+++ gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java 17 Jul 2006 22:13:45 -0000
@@ -40,7 +40,6 @@
import java.awt.Component;
import java.awt.Event;
-import java.awt.MenuItem;
import java.awt.Point;
import java.awt.PopupMenu;
import java.awt.peer.PopupMenuPeer;
Index: gnu/java/awt/peer/gtk/GtkScrollbarPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,v
retrieving revision 1.20
diff -u -r1.20 GtkScrollbarPeer.java
--- gnu/java/awt/peer/gtk/GtkScrollbarPeer.java 21 Feb 2006 16:37:31 -0000
1.20
+++ gnu/java/awt/peer/gtk/GtkScrollbarPeer.java 17 Jul 2006 22:13:45 -0000
@@ -38,8 +38,6 @@
package gnu.java.awt.peer.gtk;
-import java.awt.Adjustable;
-import java.awt.EventQueue;
import java.awt.Scrollbar;
import java.awt.event.AdjustmentEvent;
import java.awt.peer.ScrollbarPeer;
Index: gnu/java/awt/peer/gtk/GtkWindowPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java,v
retrieving revision 1.49
diff -u -r1.49 GtkWindowPeer.java
--- gnu/java/awt/peer/gtk/GtkWindowPeer.java 15 Jul 2006 08:02:23 -0000
1.49
+++ gnu/java/awt/peer/gtk/GtkWindowPeer.java 17 Jul 2006 22:13:45 -0000
@@ -38,7 +38,6 @@
package gnu.java.awt.peer.gtk;
-import java.awt.AWTEvent;
import java.awt.Component;
import java.awt.Frame;
import java.awt.Graphics;
Index: gnu/java/awt/peer/gtk/VolatileImageGraphics.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java,v
retrieving revision 1.6
diff -u -r1.6 VolatileImageGraphics.java
--- gnu/java/awt/peer/gtk/VolatileImageGraphics.java 15 Jun 2006 18:29:34
-0000 1.6
+++ gnu/java/awt/peer/gtk/VolatileImageGraphics.java 17 Jul 2006 22:13:45
-0000
@@ -38,25 +38,11 @@
package gnu.java.awt.peer.gtk;
-import java.awt.Color;
import java.awt.Graphics;
-import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.Image;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferInt;
-import java.awt.image.ColorModel;
-import java.awt.image.DirectColorModel;
-import java.awt.image.RenderedImage;
import java.awt.image.ImageObserver;
-import java.util.WeakHashMap;
public class VolatileImageGraphics extends ComponentGraphics
{
