From 9f2171c2a3a3e77aec614878d4fd9d90e888016c Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Fri, 27 Sep 2013 16:16:25 -0400
Subject: [PATCH] Changing VClassRetryController to use context dao factory

---
 .../controller/edit/VclassRetryController.java  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
index 2e871b756..3b811f200 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
@@ -31,6 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
@@ -64,10 +65,12 @@ public class VclassRetryController extends BaseEditController {
             action = epo.getAction();
         }
 
-        VClassDao vcwDao = request.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
+        WebappDaoFactory wadf = ModelAccess.on(getServletContext()).getWebappDaoFactory();
+        
+        VClassDao vcwDao = wadf.getVClassDao();
         epo.setDataAccessObject(vcwDao);
-        VClassGroupDao cgDao = request.getUnfilteredWebappDaoFactory().getVClassGroupDao();
-        OntologyDao oDao = request.getUnfilteredWebappDaoFactory().getOntologyDao();
+        VClassGroupDao cgDao = wadf.getVClassGroupDao();
+        OntologyDao oDao = wadf.getOntologyDao();
 
         VClass vclassForEditing = null;
         if (!epo.getUseRecycledBean()){
@@ -82,18 +85,12 @@ public class VclassRetryController extends BaseEditController {
             } else {
                 vclassForEditing = new VClass();
                 if (request.getParameter("GroupId") != null) {
-                    try {
-                        vclassForEditing.setGroupURI(request.getParameter("GroupURI"));
-                    } catch (NumberFormatException e) {
-                        // too bad
-                    }
+                    vclassForEditing.setGroupURI(request.getParameter("GroupURI"));
                 }
             }
             epo.setOriginalBean(vclassForEditing);
         } else {
             vclassForEditing = (VClass) epo.getNewBean();
-            // action = "update";
-            // log.error("using newBean");
         }
 
         //make a simple mask for the class's id