2007-02-12 Francis Kung <fkung@redhat.com>

	* gnu/java/awt/ClasspathToolkit.java:
	* gnu/java/awt/peer/gtk/AsyncImage.java,
	* gnu/java/awt/peer/gtk/BufferedImageGraphics.java,
	* gnu/java/awt/peer/gtk/CairoGraphics2D.java,
	* gnu/java/awt/peer/gtk/CairoSurface.java,
	* gnu/java/awt/peer/gtk/ComponentGraphics.java,
	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,
	* gnu/java/awt/peer/gtk/GdkFontPeer.java,
	* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
	* gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
	* gnu/java/awt/peer/gtk/GtkChoicePeer.java,
	* gnu/java/awt/peer/gtk/GtkClipboard.java,
	* gnu/java/awt/peer/gtk/GtkClipboardNotifier.java,
	* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
	* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
	* gnu/java/awt/peer/gtk/GtkFramePeer.java,
	* gnu/java/awt/peer/gtk/GtkImage.java,
	* gnu/java/awt/peer/gtk/GtkImageConsumer.java,
	* gnu/java/awt/peer/gtk/GtkLabelPeer.java,
	* gnu/java/awt/peer/gtk/GtkListPeer.java,
	* gnu/java/awt/peer/gtk/GtkMainThread.java,
	* gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
	* gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
	* gnu/java/awt/peer/gtk/GtkMenuPeer.java,
	* gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java,
	* gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
	* gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
	* gnu/java/awt/peer/gtk/GtkSelection.java,
	* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
	* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
	* gnu/java/awt/peer/gtk/GtkToolkit.java,
	* gnu/java/awt/peer/gtk/GtkWindowPeer.java,
	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java,
	* java/awt/RenderingHints.java,
	* java/awt/image/BufferedImage.java: Reformatted and added generics.

1 files changed, 42 insertions, 43 deletions

diff --git a/gnu/java/awt/peer/gtk/GtkClipboardNotifier.java b/gnu/java/awt/peer/gtk/GtkClipboardNotifier.java
index 61df796dc..8e5934557 100644
--- a/gnu/java/awt/peer/gtk/GtkClipboardNotifier.java
+++ b/gnu/java/awt/peer/gtk/GtkClipboardNotifier.java
@@ -74,11 +74,11 @@ class GtkClipboardNotifier extends Thread
   {
     synchronized (notifier)
       {
-	if (clipboard == GtkClipboard.clipboard)
-	  announceClipboardChange = true;
-	else
-	  announcePrimaryChange = true;
-	notifier.notifyAll();
+        if (clipboard == GtkClipboard.clipboard)
+          announceClipboardChange = true;
+        else
+          announcePrimaryChange = true;
+        notifier.notifyAll();
       }
   }
 
@@ -87,44 +87,43 @@ class GtkClipboardNotifier extends Thread
     GtkClipboard clipboard;
     while (true)
       {
-	synchronized (this)
-	  {
-	    while (! announceClipboardChange && ! announcePrimaryChange)
-	      {
-		try
-		  {
-		    this.wait();
-		  }
-		catch (InterruptedException ie)
-		  {
-		    // ignore
-		  }
-	      }
-
-	    if (announceClipboardChange)
-	      {
-		clipboard = GtkClipboard.clipboard;
-		announceClipboardChange = false;
-	      }
-	    else
-	      {
-		clipboard = GtkClipboard.selection;
-		announcePrimaryChange = false;
-	      }
-	  }
-
-	// Do the actual announcement without the lock held.  We will
-	// notice a new change after this notification has finished.
-	try
-	  {
-	    clipboard.setContents(new GtkSelection(clipboard), null);
-	  }
-	catch (Throwable t)
-	  {
-	    // should never happen, but might if we have some faulty
-	    // listener.
-	    t.printStackTrace();
-	  }
+        synchronized (this)
+          {
+            while (! announceClipboardChange && ! announcePrimaryChange)
+              {
+                try
+                  {
+                    this.wait();
+                  }
+                catch (InterruptedException ie)
+                  {
+                    // ignore
+                  }
+              }
+
+            if (announceClipboardChange)
+              {
+                clipboard = GtkClipboard.clipboard;
+                announceClipboardChange = false;
+              }
+            else
+              {
+                clipboard = GtkClipboard.selection;
+                announcePrimaryChange = false;
+              }
+          }
+
+        // Do the actual announcement without the lock held.  We will
+        // notice a new change after this notification has finished.
+        try
+          {
+            clipboard.setContents(new GtkSelection(clipboard), null);
+          }
+        catch (Throwable t)
+          {
+            // should never happen, but might if we have some faulty listener.
+            t.printStackTrace();
+          }
       }
   }
 }