upd: narrowing type-safety around Organisation

[gigi.git] / src / org / cacert / gigi / pages / orga / ViewOrgPage.java

diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
index c8259412ae4dca1452d0b33189079ce859203d5b..d5839013222d6a70d543970bc12a77d7c414c141 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
+++ b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
@@ -9,7 +9,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
@@ -23,9 +22,9 @@ import org.cacert.gigi.util.AuthorizationContext;
 
 public class ViewOrgPage extends Page {
 
-    private final Template orgas = new Template(ViewOrgPage.class.getResource("ViewOrgs.templ"));
+    private static final Template orgas = new Template(ViewOrgPage.class.getResource("ViewOrgs.templ"));
 
-    private final Template mainTempl = new Template(ViewOrgPage.class.getResource("EditOrg.templ"));
+    private static final Template mainTempl = new Template(ViewOrgPage.class.getResource("EditOrg.templ"));
 
     public static final String DEFAULT_PATH = "/orga";
 
@@ -40,38 +39,37 @@ public class ViewOrgPage extends Page {
 
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        try {
-            User u = LoginPage.getUser(req);
-            if (req.getParameter("do_affiliate") != null || req.getParameter("del") != null) {
-                AffiliationForm form = Form.getForm(req, AffiliationForm.class);
-                if (form.submit(resp.getWriter(), req)) {
+        User u = LoginPage.getUser(req);
+        if (req.getParameter("do_affiliate") != null || req.getParameter("del") != null) {
+            AffiliationForm form = Form.getForm(req, AffiliationForm.class);
+            if (form.submitProtected(resp.getWriter(), req)) {
+                resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
+            }
+            return;
+        } else {
+            if ( !u.isInGroup(CreateOrgPage.ORG_ASSURER)) {
+                resp.sendError(403, "Access denied");
+                return;
+            }
+
+            if (req.getParameter("addDomain") != null) {
+                OrgDomainAddForm form = Form.getForm(req, OrgDomainAddForm.class);
+                if (form.submitProtected(resp.getWriter(), req)) {
                     resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
                 }
-                return;
-            } else {
-                if ( !u.isInGroup(CreateOrgPage.ORG_ASSURER)) {
-                    resp.sendError(403, "Access denied");
-                    return;
+            } else if (req.getParameter("delete") != null) {
+                DomainManagementForm form = Form.getForm(req, DomainManagementForm.class);
+                if (form.submitProtected(resp.getWriter(), req)) {
+                    resp.sendRedirect(DEFAULT_PATH + "/" + form.getTarget().getId());
                 }
-
-                if (req.getParameter("addDomain") != null) {
-                    OrgDomainAddForm form = Form.getForm(req, OrgDomainAddForm.class);
-                    if (form.submit(resp.getWriter(), req)) {
-                        resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
-                    }
-                } else if (req.getParameter("delete") != null) {
-                    DomainManagementForm form = Form.getForm(req, DomainManagementForm.class);
-                    if (form.submit(resp.getWriter(), req)) {
-                        resp.sendRedirect(DEFAULT_PATH + "/" + form.getTarget().getId());
-                    }
-                } else {
-                    Form.getForm(req, CreateOrgForm.class).submit(resp.getWriter(), req);
+            } else {
+                CreateOrgForm form = Form.getForm(req, CreateOrgForm.class);
+                if (form.submitProtected(resp.getWriter(), req)) {
+                    resp.sendRedirect(DEFAULT_PATH + "/" + form.getResult().getId());
                 }
             }
-
-        } catch (GigiApiException e) {
-            e.format(resp.getWriter(), getLanguage(req));
         }
+
     }
 
     @Override
@@ -81,16 +79,16 @@ public class ViewOrgPage extends Page {
         Language lang = getLanguage(req);
         PrintWriter out = resp.getWriter();
         if (idS.length() < DEFAULT_PATH.length() + 2) {
-            final Organisation[] orgas = Organisation.getOrganisations(0, 30);
+            final Organisation[] orgList = Organisation.getOrganisations(0, 30);
             HashMap<String, Object> map = new HashMap<>();
             final List<Organisation> myOrgs = u.getOrganisations(true);
             final boolean orgAss = u.isInGroup(CreateOrgPage.ORG_ASSURER);
             if (orgAss) {
-                map.put("orgas", makeOrgDataset(orgas));
+                map.put("orgas", makeOrgDataset(orgList));
             } else {
                 map.put("orgas", makeOrgDataset(myOrgs.toArray(new Organisation[myOrgs.size()])));
             }
-            this.orgas.output(out, lang, map);
+            orgas.output(out, lang, map);
             return;
         }
         idS = idS.substring(DEFAULT_PATH.length() + 1);
@@ -134,7 +132,7 @@ public class ViewOrgPage extends Page {
                 Organisation org = orgas[count++];
                 vars.put("id", Integer.toString(org.getId()));
                 vars.put("name", org.getName());
-                vars.put("country", org.getState());
+                vars.put("country", org.getState().getCountryCode());
                 return true;
             }
         };