UPD: Use gigiapiexceptions

diff --git a/src/org/cacert/gigi/User.java b/src/org/cacert/gigi/User.java
index 0e1ee22ca51fc4a85a44dd77373cfe456cdf81cc..1dd150116d973e115ce3a3ad71edcc6b5a5ea323 100644 (file)
--- a/src/org/cacert/gigi/User.java
+++ b/src/org/cacert/gigi/User.java
@@ -291,16 +291,16 @@ public class User {
                }
        }
 
                }
        }
 

-       public void deleteEmail(EmailAddress mail) {
+       public void deleteEmail(EmailAddress mail) throws GigiApiException {

                if (getEmail().equals(mail.getAddress())) {
                if (getEmail().equals(mail.getAddress())) {

-                       throw new IllegalArgumentException("Can't delete user's default e-mail.");
+                       throw new GigiApiException("Can't delete user's default e-mail.");

                }
                try {
                        PreparedStatement ps = DatabaseConnection.getInstance().prepare("DELETE FROM email WHERE id=?");
                        ps.setInt(1, mail.getId());
                        ps.execute();
                } catch (SQLException e) {
                }
                try {
                        PreparedStatement ps = DatabaseConnection.getInstance().prepare("DELETE FROM email WHERE id=?");
                        ps.setInt(1, mail.getId());
                        ps.execute();
                } catch (SQLException e) {

-                       e.printStackTrace();
+                       throw new GigiApiException(e);

                }
        }
 }
                }
        }
 }

diff --git a/src/org/cacert/gigi/pages/account/MailManagementForm.java b/src/org/cacert/gigi/pages/account/MailManagementForm.java
index 9dc6c8daf3392d2ef2a2656a90509b66d37bca52..a36189ea2762999b39eaa9104076a894520ee206 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/MailManagementForm.java
@@ -6,10 +6,12 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.EmailAddress;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.EmailAddress;

+import org.cacert.gigi.GigiApiException;

 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;

+import org.cacert.gigi.pages.Page;

 
 public class MailManagementForm extends Form {
        private static Template t;
 
 public class MailManagementForm extends Form {
        private static Template t;


@@ -32,8 +34,8 @@ public class MailManagementForm extends Form {
                                        return false;
                                }
                                target.updateDefaultEmail(EmailAddress.getById(Integer.parseInt(mailid.trim())));
                                        return false;
                                }
                                target.updateDefaultEmail(EmailAddress.getById(Integer.parseInt(mailid.trim())));

-                       } catch (Exception e) {
-                               out.println("<div class='formError'>Error precessing your request.</div>");
+                       } catch (GigiApiException e) {
+                               e.format(out, Page.getLanguage(req));

                                e.printStackTrace();
                                return false;
                        }
                                e.printStackTrace();
                                return false;
                        }


@@ -47,8 +49,8 @@ public class MailManagementForm extends Form {
                        for (int i = 0; i < toDel.length; i++) {
                                try {
                                        target.deleteEmail(EmailAddress.getById(Integer.parseInt(toDel[i].trim())));
                        for (int i = 0; i < toDel.length; i++) {
                                try {
                                        target.deleteEmail(EmailAddress.getById(Integer.parseInt(toDel[i].trim())));

-                               } catch (Exception e) {
-                                       out.println("<div class='formError'>Error precessing your request.</div>");
+                               } catch (GigiApiException e) {
+                                       e.format(out, Page.getLanguage(req));

                                        e.printStackTrace();
                                        return false;
                                }
                                        e.printStackTrace();
                                        return false;
                                }