1 files changed, 12 insertions, 50 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 4830ffb71..cc2cf3bf0 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -68,10 +68,8 @@ public class EditOAAction extends BasicAction {
     private String formID;
 
     private boolean onlyBusinessService = false;
-    private boolean onlyStorkService = false;
     private boolean subTargetSet = false;
     private boolean deaktivededBusinessService = false;
-    private boolean deactivatedStorkService = false;
     private boolean isMetaDataRefreshRequired = false;
 
     private String nextPage;
@@ -736,18 +734,7 @@ public class EditOAAction extends BasicAction {
 
         dboa.setPublicURLPrefix(generalOA.getIdentifier());
 
-        if (generalOA.isStorkService() || onlyStorkService) {
-            dboa.setType(Constants.MOA_CONFIG_STORKSERVICE);
-            dboa.setStorkSPTargetCountry(generalOA.getStorkSPTargetCountry());
-
-
-            IdentificationNumber idnumber = new IdentificationNumber();
-            idnumber.setValue(Constants.PREFIX_STORK + "AT+" + generalOA.getStorkSPTargetCountry());
-            idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType()));
-
-            authoa.setIdentificationNumber(idnumber);
-
-        } else if (generalOA.isBusinessService() || onlyBusinessService) {
+        if (generalOA.isBusinessService() || onlyBusinessService) {
 
             dboa.setType(Constants.MOA_CONFIG_BUSINESSSERVICE);
 
@@ -767,8 +754,15 @@ public class EditOAAction extends BasicAction {
                 num = num.substring(Constants.IDENIFICATIONTYPE_ERSB.length());
 
             IdentificationNumber idnumber = new IdentificationNumber();
-            idnumber.setValue(Constants.PREFIX_WPBK + generalOA.getIdentificationType() + "+" + num);
-            idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType()));
+
+            if (generalOA.getIdentificationType().equals(Constants.IDENIFICATIONTYPE_STORK)) {
+                idnumber.setValue(Constants.PREFIX_STORK + "AT" + "+" + num);
+                idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType()));
+            } else {
+                idnumber.setValue(Constants.PREFIX_WPBK + generalOA.getIdentificationType() + "+" + num);
+                idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType()));
+            }
+
 
             authoa.setIdentificationNumber(idnumber);
 
@@ -1075,16 +1069,13 @@ public class EditOAAction extends BasicAction {
 
         if (userdb.isIsMandateUser() != null && userdb.isIsMandateUser()) {
             String bpk = userdb.getBpk();
-            if (bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_FN) || bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_ZVR)) {
+            if (bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_FN) || bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_ZVR) || bpk.startsWith(Constants.IDENIFICATIONTYPE_STORK)) {
                 onlyBusinessService = true;
                 generalOA.setBusinessService(true);
-            } else if (bpk.startsWith(Constants.IDENIFICATIONTYPE_STORK)) {
-                onlyStorkService = true;
-                generalOA.setStorkService(true);
             }
 
             deaktivededBusinessService = true;
-            deactivatedStorkService = true;
+
             String[] split = bpk.split("\\+");
             generalOA.setIdentificationType(split[1].substring(1));
 
@@ -1212,20 +1203,6 @@ public class EditOAAction extends BasicAction {
     }
 
     /**
-     * @param onlyStorkService the onlyStorkService to set
-     */
-    public void setOnlyStorkService(boolean onlyStorkService) {
-        this.onlyStorkService = onlyStorkService;
-    }
-
-    /**
-     * @return the onlyStorkService
-     */
-    public boolean isOnlyStorkService() {
-        return onlyStorkService;
-    }
-
-    /**
      * @param onlyBusinessService the onlyBusinessService to set
      */
     public void setOnlyBusinessService(boolean onlyBusinessService) {
@@ -1254,21 +1231,6 @@ public class EditOAAction extends BasicAction {
         return deaktivededBusinessService;
     }
 
-    /**
-     * @return the deactivatedStorkService
-     */
-    public boolean isDeactivatedStorkService() {
-        return deactivatedStorkService;
-    }
-
-    /**
-     * @param deactivatedStorkService the deactivatedStorkService to set
-     */
-
-    public void setDeactivatedStorkService(boolean deactivatedStorkService) {
-
-        this.deactivatedStorkService = deactivatedStorkService;
-    }
 
     /**
      * @param deaktivededBusinessService the deaktivededBusinessService to set