Merge "Fix typo and spelling"

[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 e54eaecdf8355f17405728cc93d76cbfe7d5ddc6..36bbbe8e511c23ac168891b886f79d6db376349f 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
+++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
@@ -6,7 +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.Country;
 import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
@@ -49,13 +49,7 @@ public class CreateOrgForm extends Form {
         result = t;
         o = t.getName();
 
-        CountryCode orgState = null;
-        try {
-            orgState = CountryCode.getCountryCode(t.getState());
-        } catch (GigiApiException e) {
-            throw new Error(e);
-        }
-        cs = new CountrySelector("C", false, orgState);
+        cs = new CountrySelector("C", false, t.getState());
 
         st = t.getProvince();
         l = t.getCity();