Changeset 9893 for extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/util/Tools.java

Timestamp:

Mar 27, 2011, 1:03:05 PM (13 years ago)

Author:

mlg

Message:

Adds a better Exception management
new Exception : FileAlreadyExistsException.

File:

• extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/util/Tools.java (modified) (6 diffs)

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/util/Tools.java

@@ -17 +17 @@
 import java.net.URLClassLoader;
 import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 
@@ -32 +33 @@
 import org.jdom.output.XMLOutputter;
 
+import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException;
+
 /*
  *  jiwigo-ws-api Piwigo webservice access Api
@@ -123 +126 @@
      * @param filename the path of the file
      * @return the checksum
+     * @throws IOException
+     * @throws NoSuchAlgorithmException
      * @throws Exception
      */
-    public static String getMD5Checksum(String filename) throws Exception {
+    public static String getMD5Checksum(String filename) throws NoSuchAlgorithmException, IOException {
         byte[] b = createChecksum(filename);
         String result = "";
@@ -138 +143 @@
      * @param filename the path of the file
      * @return the checksum as array byte
+     * @throws NoSuchAlgorithmException
+     * @throws IOException
      * @throws Exception
      */
-    private static byte[] createChecksum(String filename) throws Exception {
+    private static byte[] createChecksum(String filename) throws NoSuchAlgorithmException, IOException {
         InputStream fis = new FileInputStream(filename);
 
@@ -185 +192 @@
      * @return true if ok
      */
-    public static boolean checkOk(Document doc) {
+    public static boolean checkOk(Document doc) throws FileAlreadyExistsException {
         if (doc.getRootElement().getAttributeValue("stat").equals("ok")) {
             return true;
@@ -191 +198 @@
             LOG.error("Resultat : " + doc.getRootElement().getAttributeValue("stat") + "\nDocument retourné : \n"
                     + Tools.documentToString(doc));
+            if (doc.getRootElement().getChild("err").getAttributeValue("msg").equals("file already exists")) {
+                throw new FileAlreadyExistsException("The file already exists on the server");
+            }
             return false;
         }