split OA target configuration from general OA configuration

1 files changed, 2 insertions, 27 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index 5db77a515..5fe9625ba 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -22,14 +22,12 @@
  */
 package at.gv.egovernment.moa.id.configuration.struts.action;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
@@ -67,7 +65,7 @@ public class BasicOAAction extends BasicAction {
     	
 	}
     
-	protected OnlineApplication populateOnlineApplicationFromRequest(LinkedHashMap<String, IOnlineApplicationData> requestedFormList) throws BasicOAActionException{
+	protected OnlineApplication populateOnlineApplicationFromRequest() throws BasicOAActionException{
         if (!ValidationHelper.validateOAID(oaidobj)) {
         	throw new BasicOAActionException(
         			LanguageHelper.getErrorString("errors.edit.oa.oaid", request), 
@@ -107,34 +105,11 @@ public class BasicOAAction extends BasicAction {
                 		Constants.STRUTS_ERROR);
             }
         }
-        
-        List<String> errors = new ArrayList<String>();
-		for (IOnlineApplicationData form : requestedFormList.values()) {
-			List<String> error = form.parse(onlineapplication, authUser, request);
-			if (error != null)
-				errors.addAll(error);
-		}
-        if (errors.size() > 0) {
-            for (String el : errors)
-                addActionError(el);
-        }
-
-        ConfigurationDBUtils.closeSession();
-        session.setAttribute(Constants.SESSION_OAID, oaid);
-
-        formID = Random.nextRandom();
-        session.setAttribute(Constants.SESSION_FORMID, formID);
-
-        newOA = false;
-    	
+            	
         return onlineapplication;
 		
 	}
 	
-    protected OnlineApplication populateOnlineApplicationFromRequest() throws BasicOAActionException{
-    	return populateOnlineApplicationFromRequest(formList);
-    }
-	
     protected void populateBasicNewOnlineApplicationInformation() {
         session.setAttribute(Constants.SESSION_OAID, null);