UPD: Move some template classes to there reightful place.

[gigi.git] / src / org / cacert / gigi / pages / account / MyListingForm.java

diff --git a/src/org/cacert/gigi/pages/account/MyListingForm.java b/src/org/cacert/gigi/pages/account/MyListingForm.java
index e9fa960292c2766c56d36d2c02a2148afc0a9c27..b3e831827c870f3077886684437aca03154983f6 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyListingForm.java
+++ b/src/org/cacert/gigi/pages/account/MyListingForm.java
@@ -1,25 +1,21 @@
 package org.cacert.gigi.pages.account;
 
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.sql.SQLException;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
-import org.cacert.gigi.pages.Page;
 
 public class MyListingForm extends Form {
 
     private static Template template;
-    
-    static{
-        template = new Template(new InputStreamReader(MyListingForm.class.getResourceAsStream("MyListingForm.templ")));
+
+    static {
+        template = new Template(MyListingForm.class.getResource("MyListingForm.templ"));
     }
 
     private User target;
@@ -32,33 +28,23 @@ public class MyListingForm extends Form {
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) {
         if (req.getParameter("listme") != null && req.getParameter("contactinfo") != null) {
-            try {
-                target.setDirectoryListing( !req.getParameter("listme").equals("0"));
-                target.setContactInformation(req.getParameter("contactinfo"));
-                return true;
-            } catch (SQLException e) {
-                new GigiApiException(e).format(out, Page.getLanguage(req));
-                e.printStackTrace();
-                return false;
-            }
+            target.setDirectoryListing( !req.getParameter("listme").equals("0"));
+            target.setContactInformation(req.getParameter("contactinfo"));
+            return true;
         }
         return false;
     }
 
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
-        try {
-            if (target.wantsDirectoryListing()) {
-                vars.put("selected", "selected");
-                vars.put("notSelected", "");
-                vars.put("activeInfo", target.getContactInformation());
-            } else {
-                vars.put("selected", "");
-                vars.put("notSelected", "selected");
-                vars.put("activeInfo", "");
-            }
-        } catch (SQLException e) {
-            new GigiApiException(e).format(out, l);
+        if (target.wantsDirectoryListing()) {
+            vars.put("selected", "selected");
+            vars.put("notSelected", "");
+            vars.put("activeInfo", target.getContactInformation());
+        } else {
+            vars.put("selected", "");
+            vars.put("notSelected", "selected");
+            vars.put("activeInfo", "");
         }
         template.output(out, l, vars);
     }