2003-10-11 Michael Koch <konqueror@gmx.de>

	* java/awt/ActiveEvent.java
	* java/awt/datatransfer/ClipboardOwner.java
	* java/awt/datatransfer/FlavorMap.java
	* java/awt/datatransfer/Transferable.java
	* java/awt/dnd/Autoscroll.java
	* java/awt/dnd/peer/DragSourceContextPeer.java
	* java/awt/dnd/peer/DropTargetContextPeer.java
	* java/awt/dnd/peer/DropTargetPeer.java
	* java/awt/font/MultipleMaster.java
	* java/awt/font/OpenType.java
	* java/awt/im/spi/InputMethodDescriptor.java
	* java/awt/image/ImageObserver.java
	* java/awt/image/ImageConsumer.java
	* java/awt/image/ImageProducer.java
	* java/awt/image/RGBImageFilter.java
	* java/awt/image/RasterOp.java
	* java/awt/image/renderable/RenderableImage.java

From-SVN: r72341

17 files changed, 99 insertions, 92 deletions

diff --git a/libjava/java/awt/ActiveEvent.java b/libjava/java/awt/ActiveEvent.java
index 357627d..d43fef1 100644
--- a/libjava/java/awt/ActiveEvent.java
+++ b/libjava/java/awt/ActiveEvent.java
@@ -57,5 +57,5 @@ public interface ActiveEvent
    * Dispatch the event, according to what the event needs done. Invoked
    * automatically if this is placed on the <code>EventDispatchQueue</code>.
    */
-  public void dispatch();
+  void dispatch();
 } // interface ActiveEvent
diff --git a/libjava/java/awt/datatransfer/ClipboardOwner.java b/libjava/java/awt/datatransfer/ClipboardOwner.java
index 3127e02..28e58aa 100644
--- a/libjava/java/awt/datatransfer/ClipboardOwner.java
+++ b/libjava/java/awt/datatransfer/ClipboardOwner.java
@@ -39,22 +39,20 @@ exception statement from your version. */
 package java.awt.datatransfer;
 
 /**
-  * This interface is for classes that will own a clipboard object.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
+ * This interface is for classes that will own a clipboard object.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
 public interface ClipboardOwner
 {
-
-/**
-  * This method is called to notify this object that it no longer
-  * has ownership of the specified <code>Clipboard</code>.
-  *
-  * @param clipboard The clipboard for which ownership was lost.
-  * @param contents The contents of the clipboard which are no longer owned.
-  */
-public abstract void
-lostOwnership(Clipboard clipboard, Transferable contents); 
+  /**
+   * This method is called to notify this object that it no longer
+   * has ownership of the specified <code>Clipboard</code>.
+   *
+   * @param clipboard The clipboard for which ownership was lost.
+   * @param contents The contents of the clipboard which are no longer owned.
+   */
+  void lostOwnership (Clipboard clipboard, Transferable contents); 
 
 } // interface ClipboardOwner
 
diff --git a/libjava/java/awt/datatransfer/FlavorMap.java b/libjava/java/awt/datatransfer/FlavorMap.java
index a392615..ea64fac 100644
--- a/libjava/java/awt/datatransfer/FlavorMap.java
+++ b/libjava/java/awt/datatransfer/FlavorMap.java
@@ -58,7 +58,7 @@ public interface FlavorMap
    *
    * @return A <code>Map</code> of native data types.
    */
-  public abstract Map getNativesForFlavors (DataFlavor[] flavors);
+  Map getNativesForFlavors (DataFlavor[] flavors);
 
   /**
    * Maps the specified native type names to <code>DataFlavor</code>'s.
@@ -71,5 +71,5 @@ public interface FlavorMap
    *
    * @return A <code>Map</code> of data flavors.
    */
-  public abstract Map getFlavorsForNatives (String[] natives);
+  Map getFlavorsForNatives (String[] natives);
 }
diff --git a/libjava/java/awt/datatransfer/Transferable.java b/libjava/java/awt/datatransfer/Transferable.java
index ad957ed..2b49931 100644
--- a/libjava/java/awt/datatransfer/Transferable.java
+++ b/libjava/java/awt/datatransfer/Transferable.java
@@ -56,7 +56,7 @@ public interface Transferable
    *
    * @return adA list of data flavors for this data
    */
-  public abstract DataFlavor[] getTransferDataFlavors();
+  DataFlavor[] getTransferDataFlavors();
 
   /**
    * Tests whether or not this data can be delivered in the specified data
@@ -65,7 +65,7 @@ public interface Transferable
    * @param flavor the data flavor to test
    * @return true if the data flavor is supported
    */
-  public abstract boolean isDataFlavorSupported(DataFlavor flavor);
+  boolean isDataFlavorSupported(DataFlavor flavor);
 
   /**
    * Returns the data in the specified <code>DataFlavor</code>.
@@ -76,6 +76,8 @@ public interface Transferable
    * @throws IOException if the data is not available
    * @see DataFlavor#getRepresentationClass
    */
-  public abstract Object getTransferData(DataFlavor flavor)
+  Object getTransferData(DataFlavor flavor)
     throws UnsupportedFlavorException, IOException;
+
 } // interface Transferable
+
diff --git a/libjava/java/awt/dnd/Autoscroll.java b/libjava/java/awt/dnd/Autoscroll.java
index e7d3e28..5c52338 100644
--- a/libjava/java/awt/dnd/Autoscroll.java
+++ b/libjava/java/awt/dnd/Autoscroll.java
@@ -55,7 +55,7 @@ public interface Autoscroll
    * This method returns the Insets describing the autoscrolling region or
    * border relative to the geometry of the implementing Component
    */
-  public Insets getAutoscrollInsets ();
+  Insets getAutoscrollInsets ();
 
   /**
    * Notify the Component to autoscroll
@@ -63,5 +63,7 @@ public interface Autoscroll
    * @param location A Point indicating the location of the cursor that
    * triggered this operation
    */
-  public void autoscroll (Point location);
+  void autoscroll (Point location);
+
 } // interface Autoscroll
+
diff --git a/libjava/java/awt/dnd/peer/DragSourceContextPeer.java b/libjava/java/awt/dnd/peer/DragSourceContextPeer.java
index 971882d..11c3d0c 100644
--- a/libjava/java/awt/dnd/peer/DragSourceContextPeer.java
+++ b/libjava/java/awt/dnd/peer/DragSourceContextPeer.java
@@ -49,9 +49,9 @@ import java.awt.dnd.InvalidDnDOperationException;
  */
 public interface DragSourceContextPeer
 {
-  public void startDrag(DragSourceContext context, Cursor c, Image i, Point p)
+  void startDrag(DragSourceContext context, Cursor c, Image i, Point p)
     throws InvalidDnDOperationException;
-  public Cursor getCursor();
-  public void setCursor(Cursor c) throws InvalidDnDOperationException;
-  public void transferablesFlavorsChanged();
+  Cursor getCursor();
+  void setCursor(Cursor c) throws InvalidDnDOperationException;
+  void transferablesFlavorsChanged();
 } // interface DragSourceContextPeer
diff --git a/libjava/java/awt/dnd/peer/DropTargetContextPeer.java b/libjava/java/awt/dnd/peer/DropTargetContextPeer.java
index 36b303f..239a437 100644
--- a/libjava/java/awt/dnd/peer/DropTargetContextPeer.java
+++ b/libjava/java/awt/dnd/peer/DropTargetContextPeer.java
@@ -53,15 +53,15 @@ import java.awt.dnd.InvalidDnDOperationException;
  */
 public interface DropTargetContextPeer
 {
-  public void setTargetActions(int actions);
-  public int getTargetActions();
-  public DropTarget getDropTarget();
-  public DataFlavor[] getTransferDataFlavors();
-  public Transferable getTransferable() throws InvalidDnDOperationException;
-  public boolean isTransferableJVMLocal();
-  public void acceptDrag(int dragAction);
-  public void rejectDrag();
-  public void acceptDrop(int dropAction);
-  public void rejectDrop();
-  public void dropComplete(boolean success);
+  void setTargetActions(int actions);
+  int getTargetActions();
+  DropTarget getDropTarget();
+  DataFlavor[] getTransferDataFlavors();
+  Transferable getTransferable() throws InvalidDnDOperationException;
+  boolean isTransferableJVMLocal();
+  void acceptDrag(int dragAction);
+  void rejectDrag();
+  void acceptDrop(int dropAction);
+  void rejectDrop();
+  void dropComplete(boolean success);
 }
diff --git a/libjava/java/awt/dnd/peer/DropTargetPeer.java b/libjava/java/awt/dnd/peer/DropTargetPeer.java
index 5666bdc..b6fd973 100644
--- a/libjava/java/awt/dnd/peer/DropTargetPeer.java
+++ b/libjava/java/awt/dnd/peer/DropTargetPeer.java
@@ -43,6 +43,6 @@ import java.awt.dnd.DropTarget;
  */
 public interface DropTargetPeer
 {
-  public void addDropTarget (DropTarget target);
-  public void removeDropTarget (DropTarget target);
+  void addDropTarget (DropTarget target);
+  void removeDropTarget (DropTarget target);
 } // interface DropTargetContextPeer
diff --git a/libjava/java/awt/font/MultipleMaster.java b/libjava/java/awt/font/MultipleMaster.java
index 4fe6916..90d65f1 100644
--- a/libjava/java/awt/font/MultipleMaster.java
+++ b/libjava/java/awt/font/MultipleMaster.java
@@ -45,17 +45,17 @@ import java.awt.Font;
  */
 public interface MultipleMaster
 {
-  public Font deriveMMFont (float[] axes);
+  Font deriveMMFont (float[] axes);
   
-  public Font deriveMMFont (float[] glyphWidths, float avgStemWidth,
-                            float typicalCapHeight, float typicalXHeight,
-                            float italicAngle);
+  Font deriveMMFont (float[] glyphWidths, float avgStemWidth,
+                     float typicalCapHeight, float typicalXHeight,
+                     float italicAngle);
   
-  public float[] getDesignAxisDefaults ();
+  float[] getDesignAxisDefaults();
   
-  public String[] getDesignAxisNames ();
+  String[] getDesignAxisNames();
   
-  public float[] getDesignAxisRanges ();
+  float[] getDesignAxisRanges();
   
-  public int getNumDesignAxes ();
+  int getNumDesignAxes();
 }
diff --git a/libjava/java/awt/font/OpenType.java b/libjava/java/awt/font/OpenType.java
index df5ed52..ec604e6 100644
--- a/libjava/java/awt/font/OpenType.java
+++ b/libjava/java/awt/font/OpenType.java
@@ -95,17 +95,17 @@ public interface OpenType
   int TAG_VHEA = 1986553185;
   int TAG_VMTX = 1986884728;
   
-  public byte[] getFontTable (int sfntTag);
+  byte[] getFontTable (int sfntTag);
   
-  public byte[] getFontTable (int sfntTag, int offset, int count);
+  byte[] getFontTable (int sfntTag, int offset, int count);
   
-  public byte[] getFontTable (String strSfntTag);
+  byte[] getFontTable (String strSfntTag);
   
-  public byte[] getFontTable (String strSfntTag, int offset, int count);
+  byte[] getFontTable (String strSfntTag, int offset, int count);
   
-  public int getFontTableSize (int sfntTag);
+  int getFontTableSize (int sfntTag);
   
-  public int getFontTableSize (String strSfntTag);
+  int getFontTableSize (String strSfntTag);
   
-  public int getVersion ();
+  int getVersion ();
 }
diff --git a/libjava/java/awt/im/spi/InputMethodDescriptor.java b/libjava/java/awt/im/spi/InputMethodDescriptor.java
index aeb9128..9ba9774 100644
--- a/libjava/java/awt/im/spi/InputMethodDescriptor.java
+++ b/libjava/java/awt/im/spi/InputMethodDescriptor.java
@@ -88,8 +88,8 @@ public interface InputMethodDescriptor
    * @param displayLanguage the language of the result
    * @return the name of the input method when using the given inputLocale
    */
-  public String getInputMethodDisplayName(Locale inputLocale,
-                                          Locale displayLanguage);
+  String getInputMethodDisplayName(Locale inputLocale,
+                                   Locale displayLanguage);
 
   /**
    * Returns a 16x16 icon for the input locale. The inputLocale parameter
@@ -99,7 +99,7 @@ public interface InputMethodDescriptor
    * @param inputLocale the locale of the input method, or null
    * @return a 16x16 icon for the input method when using the given inputLocale
    */
-  public Image getInputMethodIcon(Locale inputLocale);
+  Image getInputMethodIcon(Locale inputLocale);
 
   /**
    * Creates a new instance of the input method.
@@ -107,5 +107,7 @@ public interface InputMethodDescriptor
    * @return the newly created input method
    * @throws Exception if anything goes wrong
    */
-  public InputMethod createInputMethod() throws Exception;
+  InputMethod createInputMethod() throws Exception;
+
 } // interface InputMethodDescriptor
+
diff --git a/libjava/java/awt/image/ImageConsumer.java b/libjava/java/awt/image/ImageConsumer.java
index 25073ff..330f21f 100644
--- a/libjava/java/awt/image/ImageConsumer.java
+++ b/libjava/java/awt/image/ImageConsumer.java
@@ -54,21 +54,21 @@ public interface ImageConsumer
      *
      * @see #setHints 
      */
-    public static final int RANDOMPIXELORDER = 1;
+    int RANDOMPIXELORDER = 1;
 
     /**
      * The pixel order is top-down, left-right.
      *
      * @see #setHints
      */
-    public static final int TOPDOWNLEFTRIGHT = 2;
+    int TOPDOWNLEFTRIGHT = 2;
 
     /**
      * The pixel order is in multiples of complete scanlines.
      *
      * @see #setHints
      */
-    public static final int COMPLETESCANLINES = 4;
+    int COMPLETESCANLINES = 4;
 
     /**
      * The pixels will be delivered in a single pass.  There is at
@@ -77,7 +77,7 @@ public interface ImageConsumer
      * @see #setHints
      * @see #setPixels 
      */
-    public static final int SINGLEPASS = 8;
+    int SINGLEPASS = 8;
 
     /**
      * The pixels will be delivered with multiple calls to
@@ -91,35 +91,35 @@ public interface ImageConsumer
      * @see #setHints
      * @see #imageComplete 
      */
-    public static final int SINGLEFRAME = 16;
+    int SINGLEFRAME = 16;
 
     /**
      * Indicates an error occurred while producing an image.
      *
      * @see #imageComplete
      */
-    public static final int IMAGEERROR = 1;
+    int IMAGEERROR = 1;
 
     /**
      * A single frame is complete but more will follow.
      * 
      * @see #imageComplete
      */
-    public static final int SINGLEFRAMEDONE = 2;
+    int SINGLEFRAMEDONE = 2;
 
     /**
      * The image is complete and no more pixels or frames will follow.
      *
      * @see #imageComplete
      */
-    public static final int STATICIMAGEDONE = 3;
+    int STATICIMAGEDONE = 3;
 
     /**
      * Production of the image has been aborted.
      *
      * @see #imageComplete
      */
-    public static final int IMAGEABORTED = 4;
+    int IMAGEABORTED = 4;
 
     /**
      * An <code>ImageProducer</code> indicates the size of the image
@@ -128,7 +128,7 @@ public interface ImageConsumer
      * @param width the width of the image
      * @param height the height of the image 
      */
-    public abstract void setDimensions(int width, int height);
+    void setDimensions(int width, int height);
 
     /**
      * An <code>ImageProducer</code> can set a list of properties
@@ -136,7 +136,7 @@ public interface ImageConsumer
      *
      * @param props the list of properties associated with this image 
      */
-    public abstract void setProperties(Hashtable props);
+    void setProperties(Hashtable props);
 
     /**
      * This <code>ColorModel</code> should indicate the model used by
@@ -147,7 +147,7 @@ public interface ImageConsumer
      * @param model the color model to be used most often by setPixels
      * @see ColorModel 
      */
-    public abstract void setColorModel(ColorModel model);
+    void setColorModel(ColorModel model);
 
     /**
      * The <code>ImageProducer</code> should call this method with a
@@ -157,14 +157,14 @@ public interface ImageConsumer
      * 
      * @param flags a bit mask of hints
      */
-    public abstract void setHints(int flags);
+    void setHints(int flags);
 
     /**
      * This function delivers a rectangle of pixels where any
      * pixel(m,n) is stored in the array as a <code>byte</code> at
      * index (n * scansize + m + offset).  
      */
-    public abstract void setPixels(int x, int y, int w, int h, 
+    void setPixels(int x, int y, int w, int h, 
 	   ColorModel model, byte[] pixels, int offset, int scansize);
 
     /**
@@ -172,7 +172,7 @@ public interface ImageConsumer
      * pixel(m,n) is stored in the array as an <code>int</code> at
      * index (n * scansize + m + offset).  
      */
-    public abstract void setPixels(int x, int y, int w, int h, 
+    void setPixels(int x, int y, int w, int h, 
            ColorModel model, int[] pixels, int offset, int scansize);
 
     /**
@@ -181,6 +181,6 @@ public interface ImageConsumer
      * also used to indicate an error in loading or producing the
      * image.  
      */
-    public abstract void imageComplete(int status);
+    void imageComplete(int status);
 }
 
diff --git a/libjava/java/awt/image/ImageObserver.java b/libjava/java/awt/image/ImageObserver.java
index 6c4673e..738e08a 100644
--- a/libjava/java/awt/image/ImageObserver.java
+++ b/libjava/java/awt/image/ImageObserver.java
@@ -56,7 +56,7 @@ public interface ImageObserver
      *
      * @see #imageUpdate 
      */
-    public static final int WIDTH = 1;
+    int WIDTH = 1;
 
     /**
      * The height of the image has been provided as the
@@ -64,7 +64,7 @@ public interface ImageObserver
      *
      * @see #imageUpdate 
      */
-    public static final int HEIGHT = 2;
+    int HEIGHT = 2;
 
     /**
      * The properties of the image have been provided.
@@ -72,7 +72,7 @@ public interface ImageObserver
      * @see #imageUpdate
      * @see java.awt.Image#getProperty (java.lang.String, java.awt.image.ImageObserver)
      */
-    public static final int PROPERTIES = 4;
+    int PROPERTIES = 4;
 
     /**
      * More pixels are now available for drawing a scaled variation of
@@ -80,7 +80,7 @@ public interface ImageObserver
      *
      * @see #imageUpdate 
      */
-    public static final int SOMEBITS = 8;
+    int SOMEBITS = 8;
 
     /**
      * All the pixels needed to draw a complete frame of a multi-frame
@@ -88,28 +88,28 @@ public interface ImageObserver
      *
      * @see #imageUpdate 
      */
-    public static final int FRAMEBITS = 16;
+    int FRAMEBITS = 16;
 
     /**
      * An image with a single frame, a static image, is complete.
      *
      * @see #imageUpdate
      */
-    public static final int ALLBITS = 32;
+    int ALLBITS = 32;
 
     /**
      * An error was encountered while producing the image.
      *
      * @see #imageUpdate
      */
-    public static final int ERROR = 64;
+    int ERROR = 64;
 
     /**
      * Production of the image was aborted.
      *
      * @see #imageUpdate
      */
-    public static final int ABORT = 128;
+    int ABORT = 128;
 
     /**
      * This is a callback method for an asynchronous image producer to
@@ -124,6 +124,6 @@ public interface ImageObserver
      * 
      * @see java.awt.Image 
      */
-    public abstract boolean imageUpdate(Image image, int flags, int x, 
+    boolean imageUpdate(Image image, int flags, int x, 
 					int y, int width, int height);
 }
diff --git a/libjava/java/awt/image/ImageProducer.java b/libjava/java/awt/image/ImageProducer.java
index 1bc1736..47530f1 100644
--- a/libjava/java/awt/image/ImageProducer.java
+++ b/libjava/java/awt/image/ImageProducer.java
@@ -53,19 +53,19 @@ public interface ImageProducer
      * Used to register an <code>ImageConsumer</code> with this
      * <code>ImageProducer</code>.  
      */
-    public abstract void addConsumer(ImageConsumer ic);
+    void addConsumer(ImageConsumer ic);
 
     /**
      * Used to determine if the given <code>ImageConsumer</code> is
      * already registered with this <code>ImageProducer</code>.  
      */
-    public abstract boolean isConsumer(ImageConsumer ic);
+    boolean isConsumer(ImageConsumer ic);
 
     /**
      * Used to remove an <code>ImageConsumer</code> from the list of
      * registered consumers for this <code>ImageProducer</code>.  
      */
-    public abstract void removeConsumer(ImageConsumer ic);
+    void removeConsumer(ImageConsumer ic);
 
     /**
      * Used to register an <code>ImageConsumer</code> with this
@@ -73,13 +73,13 @@ public interface ImageProducer
      * reconstruction of the image data to be delivered to all
      * registered consumers.  
      */
-    public abstract void startProduction(ImageConsumer ic);
+    void startProduction(ImageConsumer ic);
 
     /**
      * Used to register an <code>ImageConsumer</code> with this
      * <code>ImageProducer</code> and then request that this producer
      * resend the image data in the order top-down, left-right.  
      */
-    public abstract void requestTopDownLeftRightResend(ImageConsumer ic);
+    void requestTopDownLeftRightResend(ImageConsumer ic);
 }
 
diff --git a/libjava/java/awt/image/RGBImageFilter.java b/libjava/java/awt/image/RGBImageFilter.java
index f682cd8..b15fe25 100644
--- a/libjava/java/awt/image/RGBImageFilter.java
+++ b/libjava/java/awt/image/RGBImageFilter.java
@@ -149,7 +149,7 @@ public abstract class RGBImageFilter extends ImageFilter
 				int off,
 				int scansize)
     {
-	int xp, yp, i;
+	int xp, yp;
 
 	for( xp = x; xp < ( x + w); xp++ )
 	    for( yp = y; yp < (y + h); yp++ )
@@ -212,7 +212,7 @@ public abstract class RGBImageFilter extends ImageFilter
     private void convertColorModelToDefault( int x, int y, int w, int h, 
 	    ColorModel model, int pixels[], int offset, int scansize)
 	{
-	int xp, yp, i;
+	int xp, yp;
 
 	for( xp = x; xp < ( x + w); xp++ )
 	    for( yp = y; yp < (y + h); yp++ )
diff --git a/libjava/java/awt/image/RasterOp.java b/libjava/java/awt/image/RasterOp.java
index 32d9f9e..5796180 100644
--- a/libjava/java/awt/image/RasterOp.java
+++ b/libjava/java/awt/image/RasterOp.java
@@ -50,6 +50,6 @@ public interface RasterOp {
 
   Point2D getPoint2D(Point2D srcPoint, Point2D destPoint);
 
-  public RenderingHints getRenderingHints();
+  RenderingHints getRenderingHints();
 }
 
diff --git a/libjava/java/awt/image/renderable/RenderableImage.java b/libjava/java/awt/image/renderable/RenderableImage.java
index f79442e..c953914 100644
--- a/libjava/java/awt/image/renderable/RenderableImage.java
+++ b/libjava/java/awt/image/renderable/RenderableImage.java
@@ -44,7 +44,8 @@ import java.util.Vector;
 
 public interface RenderableImage
 {
-  static final String HINTS_OBSERVED = "HINTS_OBSERVED";
+  String HINTS_OBSERVED = "HINTS_OBSERVED";
+  
   Vector getSources();
   Object getProperty(String name);
   String[] getPropertyNames();
@@ -56,4 +57,6 @@ public interface RenderableImage
   RenderedImage createScaledRendering(int w, int h, RenderingHints hints);
   RenderedImage createDefaultRendering();
   RenderedImage createRendering(RenderContext context);
+
 } // interface RenderableImage
+