[cp-patches] [patch] remove unnecessary try-catch blocks from Window and Canvas

[Thomas Fitzsimmons]

Hi,

I committed this patch.

Tom

2005-05-18  Thomas Fitzsimmons  <address@hidden>

        * java/awt/Window.java (createBufferStrategy): Remove unnecessary
        try-catch blocks.
        * java/awt/Canvas.java (createBufferStrategy): Likewise.

Index: java/awt/Canvas.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Canvas.java,v
retrieving revision 1.13
diff -u -u -r1.13 Canvas.java
--- java/awt/Canvas.java        18 May 2005 15:03:53 -0000      1.13
+++ java/awt/Canvas.java        19 May 2005 00:37:04 -0000
@@ -255,33 +255,22 @@
       throw new IllegalStateException("Canvas.createBufferStrategy: canvas is"
                                      + " not displayable");
 
+    BufferStrategy newStrategy = null;
+
     // try a flipping strategy
     try
       {
-       bufferStrategy = new CanvasFlipBufferStrategy(numBuffers);
-       return;
+       newStrategy = new CanvasFlipBufferStrategy(numBuffers);
       }
     catch (AWTException e)
       {
       }
 
-    // try an accelerated blitting strategy
-    try
-      {
-       bufferStrategy = new CanvasBltBufferStrategy(numBuffers, true);
-      }
-    catch (AWTException e)
-      {
-      }
+    // fall back to an accelerated blitting strategy
+    if (newStrategy == null)
+      newStrategy = new CanvasBltBufferStrategy(numBuffers, true);
 
-    // fall back to an unaccelerated blitting strategy
-    try
-      {
-       bufferStrategy = new CanvasBltBufferStrategy(numBuffers, false);
-      }
-    catch (AWTException e)
-      {
-      }
+    bufferStrategy = newStrategy;
   }
 
   /**
Index: java/awt/Window.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Window.java,v
retrieving revision 1.48
diff -u -u -r1.48 Window.java
--- java/awt/Window.java        18 May 2005 15:03:53 -0000      1.48
+++ java/awt/Window.java        19 May 2005 00:37:07 -0000
@@ -878,33 +878,22 @@
       throw new IllegalStateException("Window.createBufferStrategy: window is"
                                      + " not displayable");
 
+    BufferStrategy newStrategy = null;
+
     // try a flipping strategy
     try
       {
-       bufferStrategy = new WindowFlipBufferStrategy(numBuffers);
-       return;
+       newStrategy = new WindowFlipBufferStrategy(numBuffers);
       }
     catch (AWTException e)
       {
       }
 
-    // try an accelerated blitting strategy
-    try
-      {
-       bufferStrategy = new WindowBltBufferStrategy(numBuffers, true);
-      }
-    catch (AWTException e)
-      {
-      }
+    // fall back to an accelerated blitting strategy
+    if (newStrategy == null)
+      newStrategy = new WindowBltBufferStrategy(numBuffers, true);
 
-    // fall back to an unaccelerated blitting strategy
-    try
-      {
-       bufferStrategy = new WindowBltBufferStrategy(numBuffers, false);
-      }
-    catch (AWTException e)
-      {
-      }
+    bufferStrategy = newStrategy;
   }
 
   /**