[Libreoffice-commits] core.git: javaunohelper/com

[Noel Grandin]

 javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java   |   62 +++++-----
 javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java |   22 ++-
 2 files changed, 53 insertions(+), 31 deletions(-)

New commits:
commit 255e30026b668f0effed62fbed36f0463539f93c
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Sep 29 11:47:53 2014 +0200

    fix more Java1.5 incompatibility
    
    Change-Id: I9c4d62e4d3703e4e1015efe2b2917d54f82bc83f

diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
index 8352a0b..432cfdc 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
@@ -55,7 +55,9 @@ public final class XInputStreamToInputStreamAdapter extends InputStream {
         try {
             bytesAvail = xin.available();
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
 
         return(bytesAvail);
@@ -66,7 +68,9 @@ public final class XInputStreamToInputStreamAdapter extends InputStream {
         try {
             xin.closeInput();
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
     }
 
@@ -79,15 +83,17 @@ public final class XInputStreamToInputStreamAdapter extends InputStream {
             if (bytesRead <= 0) {
                return (-1);
             } else {
-        int tmpInt = tmp[0][0];
-        if (tmpInt< 0 ){
-            tmpInt = 256 +tmpInt;
-        }
+                int tmpInt = tmp[0][0];
+                if (tmpInt< 0 ){
+                    tmpInt = 256 +tmpInt;
+                }
                 return(tmpInt);
             }
 
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
     }
 
@@ -107,7 +113,9 @@ public final class XInputStreamToInputStreamAdapter extends InputStream {
                 System.arraycopy(tmp[0], 0, b, 0, b.length);
             }
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
 
         return (bytesRead);
@@ -117,31 +125,31 @@ public final class XInputStreamToInputStreamAdapter extends InputStream {
     public int read(byte[] b, int off, int len) throws IOException {
         byte [][] tmp = new byte [1][b.length];
         try {
-        long bytesRead;
+            long bytesRead;
             int av = xin.available();
-        if ( av != 0 && len > av) {
-          bytesRead = xin.readBytes(tmp, av);
-        }
-        else{
-        bytesRead = xin.readBytes(tmp,len);
-        }
+            if ( av != 0 && len > av) {
+                bytesRead = xin.readBytes(tmp, av);
+            }
+            else{
+                bytesRead = xin.readBytes(tmp,len);
+            }
             // Casting bytesRead to an int is okay, since the user can
             // only pass in an integer length to read, so the bytesRead
             // must <= len.
 
             if (bytesRead <= 0) {
                 return(-1);
-        } else if (bytesRead < len) {
-        System.arraycopy(tmp[0], 0, b, off, (int)bytesRead);
-        } else {
+            } else if (bytesRead < len) {
+                System.arraycopy(tmp[0], 0, b, off, (int)bytesRead);
+            } else {
                 System.arraycopy(tmp[0], 0, b, off, len);
-        }
-
-        return ((int)bytesRead);
-
+            }
 
+            return ((int)bytesRead);
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
     }
 
@@ -155,7 +163,9 @@ public final class XInputStreamToInputStreamAdapter extends InputStream {
         try {
             avail = xin.available();
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
 
         do {
@@ -170,7 +180,9 @@ public final class XInputStreamToInputStreamAdapter extends InputStream {
             try {
                 xin.skipBytes(tmpIntVal);
             } catch (Exception e) {
-                throw new IOException(e);
+                IOException newEx = new IOException(e.getMessage());
+                newEx.initCause(e);
+                throw newEx;
             }
         } while (tmpLongVal > 0);
 
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
index 7608521..8104cf4 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
@@ -53,7 +53,9 @@ public final class XOutputStreamToOutputStreamAdapter extends OutputStream {
         try {
             xout.closeOutput();
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
     }
 
@@ -62,17 +64,21 @@ public final class XOutputStreamToOutputStreamAdapter extends OutputStream {
         try {
             xout.flush();
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
     }
 
     @Override
     public void write(byte[] b) throws IOException {
 
-    try {
+        try {
             xout.writeBytes(b);
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
     }
 
@@ -88,7 +94,9 @@ public final class XOutputStreamToOutputStreamAdapter extends OutputStream {
         try {
             xout.writeBytes(tmp);
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
     }
 
@@ -101,7 +109,9 @@ public final class XOutputStreamToOutputStreamAdapter extends OutputStream {
         try {
             xout.writeBytes(oneByte);
         } catch (Exception e) {
-            throw new IOException(e);
+            IOException newEx = new IOException(e.getMessage());
+            newEx.initCause(e);
+            throw newEx;
         }
     }
 }