X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigiApiException.java;h=e766d9ea9e6e56b50fa87ec69c61924da05f4c7a;hb=3167f729417a2c3f8c0d3fbe5091e467bd198509;hp=56d7f9addbdcbee58520a7d5c3dea8e90338fd2a;hpb=5725fc461f2f5d3d767a9d2d445eff96857287a5;p=gigi.git

diff --git a/src/org/cacert/gigi/GigiApiException.java b/src/org/cacert/gigi/GigiApiException.java
index 56d7f9ad..e766d9ea 100644
--- a/src/org/cacert/gigi/GigiApiException.java
+++ b/src/org/cacert/gigi/GigiApiException.java
@@ -2,31 +2,72 @@ package org.cacert.gigi;
 
 import java.io.PrintWriter;
 import java.sql.SQLException;
+import java.util.LinkedList;
+
+import org.cacert.gigi.localisation.Language;
 
 public class GigiApiException extends Exception {
-	SQLException e;
-	String message;
-
-	public GigiApiException(SQLException e) {
-		this.e = e;
-	}
-
-	public GigiApiException(String message) {
-		this.message = message;
-	}
-
-	public boolean isInternalError() {
-		return e != null;
-	}
-
-	public void format(PrintWriter out, Language language) {
-		if (isInternalError()) {
-			e.printStackTrace();
-			out.println(language.getTranslation("An internal error ouccured."));
-		} else {
-			out.println(language.getTranslation(message));
-		}
-
-	}
+
+    private SQLException e;
+
+    private LinkedList<String> messages = new LinkedList<>();
+
+    public GigiApiException(SQLException e) {
+        super(e);
+        this.e = e;
+    }
+
+    public GigiApiException(String message) {
+        super(message);
+        messages.add(message);
+    }
+
+    public GigiApiException() {
+
+    }
+
+    public void mergeInto(GigiApiException e2) {
+        messages.addAll(e2.messages);
+        if (e == null) {
+            e = e2.e;
+        }
+    }
+
+    public boolean isInternalError() {
+        return e != null;
+    }
+
+    public void format(PrintWriter out, Language language) {
+        out.println("<div class='formError'>");
+        if (isInternalError()) {
+            e.printStackTrace();
+            out.print("<div>");
+            out.println(language.getTranslation("An internal error ouccured."));
+            out.println("</div>");
+        }
+        for (String message : messages) {
+            out.print("<div>");
+            out.print(language.getTranslation(message));
+            out.println("</div>");
+        }
+        out.println("</div>");
+
+    }
+
+    public boolean isEmpty() {
+        return e == null && messages.size() == 0;
+    }
+
+    @Override
+    public String getMessage() {
+        if (messages.size() != 0) {
+            StringBuffer res = new StringBuffer();
+            for (String string : messages) {
+                res.append(string + "\n");
+            }
+            return res.toString();
+        }
+        return "";
+    }
 
 }