X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FCreateOrgForm.java;h=36bbbe8e511c23ac168891b886f79d6db376349f;hb=2fa72700a18cdc62e80e1762b90e6e8bf20e8b92;hp=2d57a3c4af642c98a1e51df48b0ba1a4919cb4a4;hpb=bead06ac89a5fbe282dab187c5d1babbb7dcdf66;p=gigi.git diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java index 2d57a3c4..36bbbe8e 100644 --- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java +++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java @@ -6,6 +6,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.cacert.gigi.GigiApiException; +import org.cacert.gigi.dbObjects.Country; import org.cacert.gigi.dbObjects.Organisation; import org.cacert.gigi.email.EmailProvider; import org.cacert.gigi.localisation.Language; @@ -39,11 +40,7 @@ public class CreateOrgForm extends Form { public CreateOrgForm(HttpServletRequest hsr) { super(hsr); - try { - cs = new CountrySelector("C", false); - } catch (GigiApiException e) { - throw new Error(e); // should not happen - } + cs = new CountrySelector("C", false); } public CreateOrgForm(HttpServletRequest hsr, Organisation t) { @@ -51,11 +48,9 @@ public class CreateOrgForm extends Form { isEdit = true; result = t; o = t.getName(); - try { - cs = new CountrySelector("C", false, t.getState()); - } catch (GigiApiException e) { - throw new Error(e); - } + + cs = new CountrySelector("C", false, t.getState()); + st = t.getProvince(); l = t.getCity(); email = t.getContactEmail();