chg: Refactor CountryCode class

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

diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
index 2d57a3c4af642c98a1e51df48b0ba1a4919cb4a4..e54eaecdf8355f17405728cc93d76cbfe7d5ddc6 100644 (file)
--- 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.CountryCode;
 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,15 @@ public class CreateOrgForm extends Form {
         isEdit = true;
         result = t;
         o = t.getName();
+
+        CountryCode orgState = null;
         try {
-            cs = new CountrySelector("C", false, t.getState());
+            orgState = CountryCode.getCountryCode(t.getState());
         } catch (GigiApiException e) {
             throw new Error(e);
         }
+        cs = new CountrySelector("C", false, orgState);
+
         st = t.getProvince();
         l = t.getCity();
         email = t.getContactEmail();