From 02bb9c546e16f28c1e38f9667332a1428b94f471 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 29 Jun 2012 21:00:14 +0200 Subject: fix various (javac 1.7.0) warning: unreachable catch clause Change-Id: I2b863b43db59e6904f97d9ad22fdb04013e8c76d --- qadevOOo/runner/convwatch/DocumentConverter.java | 4 ---- qadevOOo/runner/helper/StreamSimulator.java | 22 ---------------------- .../ifc/configuration/backend/_XUpdateHandler.java | 2 -- .../tests/java/mod/_dbaccess/ODatabaseSource.java | 5 ----- 4 files changed, 33 deletions(-) (limited to 'qadevOOo') diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/runner/convwatch/DocumentConverter.java index 32cbbca8f8ee..bc774d7eac7f 100644 --- a/qadevOOo/runner/convwatch/DocumentConverter.java +++ b/qadevOOo/runner/convwatch/DocumentConverter.java @@ -248,10 +248,6 @@ public class DocumentConverter extends EnhancedComplexTestCase { assure(e.getMessage(), false); } - catch(ConvWatchException e) - { - assure(e.getMessage(), false); - } } if (aGTA.restartOffice()) diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index fe4a19deda09..da5f422e722e 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -158,8 +158,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\treads "+nRead+" bytes\n\tOK\n}\n"); @@ -198,8 +196,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\treads "+nRead+" bytes\n\tOK\n}\n"); @@ -236,8 +232,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\tOK\n}\n"); } @@ -267,8 +261,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\treturns "+nAvailable+" bytes\n\tOK\n}\n"); return nAvailable; @@ -298,8 +290,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\tOK\n}\n"); } @@ -336,8 +326,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\tOK\n}\n"); } @@ -369,8 +357,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\tOK\n}\n"); } @@ -401,8 +387,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\tOK\n}\n"); } @@ -443,8 +427,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n" ); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\tOK\n}\n"); } @@ -478,8 +460,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\treturns pos="+nPos+"\n\tOK\n}\n"); return nPos; @@ -514,8 +494,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { //m_aProtocol.log("\tgot RuntimeException\n\tfailed\n}\n"); throw exRuntime; } - catch (com.sun.star.uno.Exception exUno ) { //m_aProtocol.log("\tgot Exception\n\tfailed\n}\n" ); - } //m_aProtocol.log("\treturns len="+nLen+"\n\tOK\n}\n"); return nLen; diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java index 18e072838461..6848ab48ca38 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java @@ -115,8 +115,6 @@ public class _XUpdateHandler extends MultiMethodTest { log.println("Unexpected Exception " + e); } catch (com.sun.star.lang.WrappedTargetException e) { log.println("Unexpected Exception " + e); - } catch (com.sun.star.uno.Exception e) { - log.println("Unexpected Exception " + e); } } diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java index aa4232abffce..e2647e38ebdb 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java @@ -194,13 +194,8 @@ public class ODatabaseSource extends TestCase { log.println("Could not store datasource 'aFile'" ); e.printStackTrace (); throw new StatusException("Could not save ", e) ; - } catch (Exception e){ - log.println("Could not store datasource 'aFile'" ); - e.printStackTrace (); - throw new StatusException("Could not save ", e) ; } - try{ xDBContextNameServ.registerObject(databaseName, oObj) ; } catch (Exception e){ -- cgit