diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-06-29 21:00:14 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-06-29 22:03:05 +0200 |
commit | 02bb9c546e16f28c1e38f9667332a1428b94f471 (patch) | |
tree | bbb3a0b9221f0a138462651b10eede784830d4f7 | |
parent | 37e1055f8ca2e28a4ea954feec42d0c60aad3278 (diff) |
fix various (javac 1.7.0) warning: unreachable catch clause
Change-Id: I2b863b43db59e6904f97d9ad22fdb04013e8c76d
7 files changed, 0 insertions, 69 deletions
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index 6285f04a8da9..defc57658d21 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -885,9 +885,6 @@ public class RecoveryTest extends ComplexTestCase { } catch ( com.sun.star.lang.IllegalArgumentException e ){ log.println("Exception occurred while filling text document with content."); failed("Couldn't create test environment"); - } catch (com.sun.star.uno.Exception e) { - log.println("Exception occurred while filling text document with content."); - failed("Couldn't create test environment"); } } @@ -935,9 +932,6 @@ public class RecoveryTest extends ComplexTestCase { } catch (com.sun.star.lang.IllegalArgumentException e) { log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); - } catch (com.sun.star.uno.Exception e) { - log.println("Exception occurred while filling calc document with content."); - failed("Couldn't create test environment"); } } diff --git a/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java index 210cd1da9610..43c163c11dbb 100644 --- a/framework/qa/complex/loadAllDocuments/StreamSimulator.java +++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java @@ -143,8 +143,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } return nRead; @@ -175,8 +173,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } return nRead; } @@ -207,9 +203,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } - } public int available() throws com.sun.star.io.NotConnectedException, @@ -233,8 +226,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } return nAvailable; } @@ -261,9 +252,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } - } /** @@ -296,8 +284,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } } @@ -326,8 +312,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } } //_________________________________ @@ -355,9 +339,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } - } /** @@ -391,9 +372,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } - } public long getPosition() throws com.sun.star.io.IOException @@ -419,8 +397,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } return nPos; } @@ -450,8 +426,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , } catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { - } return nLen; } 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){ diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java index ad68fc8d5289..c84426e53675 100644 --- a/wizards/com/sun/star/wizards/common/JavaTools.java +++ b/wizards/com/sun/star/wizards/common/JavaTools.java @@ -452,10 +452,6 @@ public class JavaTools { e.printStackTrace(System.out); } - catch (IOException e) - { - e.printStackTrace(System.out); - } return sPath; } |