mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix various (javac 1.7.0) warning: unreachable catch clause

Browse Source 
Change-Id: I2b863b43db59e6904f97d9ad22fdb04013e8c76d
This commit is contained in:
Michael Stahl
2012-06-29 21:00:14 +02:00
parent 37e1055f8c
commit 02bb9c546e
7 changed files with 0 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/qa/complex/framework/recovery/RecoveryTest.java
View File

@@ -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");
}
}

26
framework/qa/complex/loadAllDocuments/StreamSimulator.java
View File

@@ -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;
}

4
qadevOOo/runner/convwatch/DocumentConverter.java
View File

@@ -248,10 +248,6 @@ public class DocumentConverter extends EnhancedComplexTestCase
{
assure(e.getMessage(), false);
}
catch(ConvWatchException e)
{
assure(e.getMessage(), false);
}
}
if (aGTA.restartOffice())

22
qadevOOo/runner/helper/StreamSimulator.java
View File

@@ -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;

2
qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java
View File

@@ -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);
}
}

5
qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java
View File

@@ -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){

4
wizards/com/sun/star/wizards/common/JavaTools.java
View File

@@ -452,10 +452,6 @@ public class JavaTools
{
e.printStackTrace(System.out);
}
catch (IOException e)
{
e.printStackTrace(System.out);
}
return sPath;
}