Changeset 6840 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/Outil.java

Timestamp:

Sep 2, 2010, 7:34:07 PM (14 years ago)

Author:

mlg

Message:

Two minor improvements :

• I now get the responses of piwigo's webservices as stream, and not as string any more.
• The information panel now displays which file is being processed.

File:

• extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/Outil.java (modified) (3 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/Outil.java

@@ -1 +1 @@
 package fr.mael.jiwigo.transverse.util;
 
-import java.io.BufferedInputStream;
+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -10 +9 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringReader;
@@ -76 +76 @@
      */
     public static String readInputStreamAsString(InputStream input) throws IOException {
-        DataInputStream dis = new DataInputStream(new BufferedInputStream(input));
-
-        String temp;
-        StringBuffer buffer = new StringBuffer();
-        while ((temp = dis.readLine()) != null) {
-            buffer.append(temp);
-        }
-        return buffer.toString();
+        //      DataInputStream dis = new DataInputStream(new BufferedInputStream(input));
+        //
+        //      String temp;
+        //      StringBuffer buffer = new StringBuffer();
+        //      while ((temp = dis.readLine()) != null) {
+        //          buffer.append(temp);
+        //      }
+        //      return buffer.toString();
+        StringWriter writer = new StringWriter();
+        InputStreamReader streamReader = new InputStreamReader(input);
+        //le buffer permet le readline
+        BufferedReader buffer = new BufferedReader(streamReader);
+        String line = "";
+        while (null != (line = buffer.readLine())) {
+            writer.write(line);
+        }
+        // Sortie finale dans le String
+        return writer.toString();
     }