From 9532b0d168976d5ba8d405773c7cd6e769227e0d Mon Sep 17 00:00:00 2001
From: green <green@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Jul 2003 02:24:09 +0000
Subject: 2003-07-20  Anthony Green  <green@redhat.com>

	* gnu/awt/j2d/AbstractGraphicsState.java (clone): Handle
	CloneNotSupportedException.
	* gnu/gcj/xlib/WindowAttributes.java (clone): Ditto.
	* gnu/gcj/xlib/WMSizeHints.java (clone): Ditto.
	* gnu/gcj/xlib/GC.java (clone): Ditto.
	* gnu/awt/xlib/XGraphics.java (clone): Ditto.
	* gnu/awt/j2d/Graphics2DImpl.java (clone): Ditto.

	* gnu/awt/xlib/XEventLoop.java (postNextEvent): Remove unreachable
	handler.
	* gnu/gcj/runtime/NameFinder.java (NameFinder): Ditto.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69623 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/gnu/gcj/runtime/NameFinder.java    | 16 ++++------------
 libjava/gnu/gcj/xlib/GC.java               | 26 +++++++++++++++++---------
 libjava/gnu/gcj/xlib/WMSizeHints.java      | 20 ++++++++++++++------
 libjava/gnu/gcj/xlib/WindowAttributes.java | 24 ++++++++++++++++--------
 4 files changed, 51 insertions(+), 35 deletions(-)

(limited to 'libjava/gnu/gcj')

diff --git a/libjava/gnu/gcj/runtime/NameFinder.java b/libjava/gnu/gcj/runtime/NameFinder.java
index 19820c1bd6b..0c358368390 100644
--- a/libjava/gnu/gcj/runtime/NameFinder.java
+++ b/libjava/gnu/gcj/runtime/NameFinder.java
@@ -154,18 +154,10 @@ public class NameFinder
 
 	if (addr2line != null)
 	  {
-	    try
-	      {
-		addr2lineIn = new BufferedReader
-			(new InputStreamReader(addr2line.getInputStream()));
-		addr2lineOut = new BufferedWriter
-			(new OutputStreamWriter(addr2line.getOutputStream()));
-	      }
-	    catch (IOException ioe)
-	      {  
-		addr2line.destroy();
-		addr2line = null;
-	      }
+	    addr2lineIn = new BufferedReader
+	      (new InputStreamReader(addr2line.getInputStream()));
+	    addr2lineOut = new BufferedWriter
+	      (new OutputStreamWriter(addr2line.getOutputStream()));
 	  }
       }
   }
diff --git a/libjava/gnu/gcj/xlib/GC.java b/libjava/gnu/gcj/xlib/GC.java
index 021f53756fb..b7eb0b682f4 100644
--- a/libjava/gnu/gcj/xlib/GC.java
+++ b/libjava/gnu/gcj/xlib/GC.java
@@ -36,15 +36,23 @@ public class GC implements Cloneable
    */
   public Object clone()
   {
-    GC gcClone = target.getGCFromCache ();
-    if (gcClone==null)
-    {
-      gcClone = (GC) super.clone();
-      gcClone.structure = null;
-    }
-    gcClone.initStructure(this);
-    gcClone.updateClip();
-    return gcClone;
+    try
+      {
+	GC gcClone = target.getGCFromCache ();
+	if (gcClone==null)
+	  {
+	    gcClone = (GC) super.clone();
+	    gcClone.structure = null;
+	  }
+	gcClone.initStructure(this);
+	gcClone.updateClip();
+	return gcClone;
+      } 
+    catch (CloneNotSupportedException ex)
+      {
+	// This should never happen.
+	throw new InternalError ();
+      }
   }
 
   private native void initStructure(GC copyFrom);
diff --git a/libjava/gnu/gcj/xlib/WMSizeHints.java b/libjava/gnu/gcj/xlib/WMSizeHints.java
index 29344eee1eb..c0b198c58a7 100644
--- a/libjava/gnu/gcj/xlib/WMSizeHints.java
+++ b/libjava/gnu/gcj/xlib/WMSizeHints.java
@@ -27,12 +27,20 @@ public class WMSizeHints implements Cloneable
   protected native void finalize();
 
   public Object clone() {
-    WMSizeHints hints = (WMSizeHints) super.clone();
-    // In case of an exception before the stucture is copied.
-    hints.structure = null;
-
-    hints.init(this);
-    return hints;
+    try
+      {
+	WMSizeHints hints = (WMSizeHints) super.clone();
+	// In case of an exception before the stucture is copied.
+	hints.structure = null;
+	
+	hints.init(this);
+	return hints;
+      }
+    catch (CloneNotSupportedException ex)
+      {
+	// This should never happen.
+	throw new InternalError ();
+      }
   }
 
   public native void applyNormalHints(Window window);
diff --git a/libjava/gnu/gcj/xlib/WindowAttributes.java b/libjava/gnu/gcj/xlib/WindowAttributes.java
index 6efeaa5d434..23be37d6363 100644
--- a/libjava/gnu/gcj/xlib/WindowAttributes.java
+++ b/libjava/gnu/gcj/xlib/WindowAttributes.java
@@ -43,15 +43,23 @@ public class WindowAttributes
     
   public Object clone()
   {
-    WindowAttributes attributes = (WindowAttributes) super.clone();
-    // In case of an exception before the stucture is copied.
-    attributes.in  = null;
-    attributes.out = null;
-    
-    // FIXME: do anything else?
+    try
+      {
+	WindowAttributes attributes = (WindowAttributes) super.clone();
+	// In case of an exception before the stucture is copied.
+	attributes.in  = null;
+	attributes.out = null;
+	
+	// FIXME: do anything else?
 	
-    attributes.init(this);
-    return attributes;
+	attributes.init(this);
+	return attributes;
+      }
+    catch (CloneNotSupportedException ex)
+      {
+	// This should never happen.
+	throw new InternalError ();
+      }
   }
 
   public native void setBackground(long pixel);
-- 
cgit v1.2.3