aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/awt/image
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-06-05 19:58:40 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-06-05 19:58:40 +0000
commitfe7f8a4ebd088b7ba5c4793ffa138f283d9bff33 (patch)
tree2e233a371732648b36e8620303bba800d934d6f5 /libjava/java/awt/image
parent7d445f153d2937b96ccdde7c6acde3f0996564ed (diff)
downloadgcc-fe7f8a4ebd088b7ba5c4793ffa138f283d9bff33.zip
gcc-fe7f8a4ebd088b7ba5c4793ffa138f283d9bff33.tar.gz
gcc-fe7f8a4ebd088b7ba5c4793ffa138f283d9bff33.tar.bz2
Button.java, [...]: New versions from Classpath.
2003-06-05 Michael Koch <konqueror@gmx.de> * java/awt/Button.java, java/awt/Checkbox.java, java/awt/CheckboxMenuItem.java, java/awt/Choice.java, java/awt/Container.java, java/awt/Dialog.java, java/awt/EventQueue.java, java/awt/FileDialog.java, java/awt/Frame.java, java/awt/Label.java, java/awt/List.java, java/awt/Menu.java, java/awt/MenuItem.java, java/awt/Panel.java, java/awt/PopupMenu.java, java/awt/Rectangle.java, java/awt/ScrollPane.java, java/awt/Scrollbar.java, java/awt/TextArea.java, java/awt/TextField.java, java/awt/Window.java, java/awt/datatransfer/DataFlavor.java, java/awt/dnd/DragSource.java, java/awt/dnd/DragSourceContext.java, java/awt/event/HierarchyEvent.java, java/awt/event/MouseWheelEvent.java, java/awt/im/InputContext.java, java/awt/image/BufferedImage.java, java/awt/image/ComponentColorModel.java, java/awt/image/Raster.java, java/awt/image/WritableRaster.java, java/awt/peer/ComponentPeer.java, java/awt/print/PageFormat.java, java/awt/print/PrinterJob.java: New versions from Classpath. From-SVN: r67506
Diffstat (limited to 'libjava/java/awt/image')
-rw-r--r--libjava/java/awt/image/BufferedImage.java13
-rw-r--r--libjava/java/awt/image/ComponentColorModel.java3
-rw-r--r--libjava/java/awt/image/Raster.java4
-rw-r--r--libjava/java/awt/image/WritableRaster.java8
4 files changed, 19 insertions, 9 deletions
diff --git a/libjava/java/awt/image/BufferedImage.java b/libjava/java/awt/image/BufferedImage.java
index 5d72288..1fd7b9b 100644
--- a/libjava/java/awt/image/BufferedImage.java
+++ b/libjava/java/awt/image/BufferedImage.java
@@ -37,10 +37,15 @@ exception statement from your version. */
package java.awt.image;
-import java.awt.*;
-import java.awt.color.*;
-import java.util.*;
-
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Transparency;
+import java.awt.color.ColorSpace;
+import java.util.Hashtable;
+import java.util.Vector;
import gnu.java.awt.ComponentDataBlitOp;
/**
diff --git a/libjava/java/awt/image/ComponentColorModel.java b/libjava/java/awt/image/ComponentColorModel.java
index 090f49d..cc96ab1 100644
--- a/libjava/java/awt/image/ComponentColorModel.java
+++ b/libjava/java/awt/image/ComponentColorModel.java
@@ -34,10 +34,11 @@ 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. */
+
package java.awt.image;
-import java.awt.color.*;
import java.awt.Point;
+import java.awt.color.ColorSpace;
import gnu.java.awt.Buffers;
public class ComponentColorModel extends ColorModel
diff --git a/libjava/java/awt/image/Raster.java b/libjava/java/awt/image/Raster.java
index 52fff59..1b3d2f0 100644
--- a/libjava/java/awt/image/Raster.java
+++ b/libjava/java/awt/image/Raster.java
@@ -34,9 +34,11 @@ 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. */
+
package java.awt.image;
-import java.awt.*;
+import java.awt.Point;
+import java.awt.Rectangle;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
diff --git a/libjava/java/awt/image/WritableRaster.java b/libjava/java/awt/image/WritableRaster.java
index 887ee8f..a886440 100644
--- a/libjava/java/awt/image/WritableRaster.java
+++ b/libjava/java/awt/image/WritableRaster.java
@@ -34,9 +34,11 @@ 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. */
+
package java.awt.image;
-import java.awt.*;
+import java.awt.Point;
+import java.awt.Rectangle;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
@@ -138,10 +140,10 @@ public class WritableRaster extends Raster
public void setRect(Raster srcRaster)
{
- setRect(srcRaster, 0, 0);
+ setRect(0, 0, srcRaster);
}
- public void setRect(Raster srcRaster, int dx, int dy)
+ public void setRect(int dx, int dy, Raster srcRaster)
{
Rectangle targetUnclipped = new Rectangle(srcRaster.getMinX()+dx,
srcRaster.getMinY()+dy,