From c2a2c67c77298d5a03c99331d9828863fb819210 Mon Sep 17 00:00:00 2001 From: bjl23 Date: Mon, 3 Jan 2011 20:38:14 +0000 Subject: [PATCH] NIHVIVO-1334 removing input element for short view on vclass editor plus fixes for bugs affecting ontology editor --- .../controller/edit/VclassEditController.java | 16 +++++++--------- .../controller/edit/VclassRetryController.java | 2 +- .../vitro/webapp/dao/jena/JenaBaseDao.java | 3 ++- .../vitro/webapp/dao/jena/VClassJena.java | 2 +- .../web/templates/edit/specific/vclass_retry.jsp | 9 ++------- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java index 419aefe81..f0ec52ade 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java @@ -33,7 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; public class VclassEditController extends BaseEditController { private static final Log log = LogFactory.getLog(VclassEditController.class.getName()); - private static final int NUM_COLS = 13; + private static final int NUM_COLS = 12; public void doPost (HttpServletRequest req, HttpServletResponse response) { @@ -72,11 +72,10 @@ public class VclassEditController extends BaseEditController { results.add("group"); // 6 results.add("display level"); // 7 results.add("update level"); // 8 - results.add("custom entry form"); // 10 - results.add("custom display view"); // 11 - results.add("custom short view"); // 12 - results.add("custom search view"); // 13 - results.add("URI"); // 14 + results.add("custom entry form"); // 9 + results.add("custom display view"); // 10 + results.add("custom search view"); // 11 + results.add("URI"); // 12 String name = vcl.getLocalNameWithPrefix(); String shortDef = (vcl.getShortDef()==null) ? "" : vcl.getShortDef(); @@ -128,9 +127,8 @@ public class VclassEditController extends BaseEditController { results.add(ProhibitedFromUpdate); // 8 results.add(customEntryForm); // 9 results.add(customDisplayView); // 10 - results.add(customShortView); // 11 - results.add(customSearchView); // 12 - results.add(uri); // 13 + results.add(customSearchView); // 11 + results.add(uri); // 12 request.setAttribute("results", results); request.setAttribute("columncount", NUM_COLS); request.setAttribute("suppressquery", "true"); 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 3a64ae8cc..559235c69 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 @@ -139,7 +139,7 @@ public class VclassRetryController extends BaseEditController { try { Class[] args = new Class[1]; args[0] = String.class; - epo.setGetMethod(vcwDao.getClass().getDeclaredMethod("getVClassByURI",args)); + epo.setGetMethod(VClassDao.class.getDeclaredMethod("getVClassByURI",args)); } catch (NoSuchMethodException e) { log.error(this.getClass().getName()+" could not find the getVClassByURI method"); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java index 1cbe821f2..e9a580058 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java @@ -119,7 +119,7 @@ public class JenaBaseDao extends JenaBaseDaoCon { protected String getPropertyStringValue(OntResource res, Property dataprop) { if (dataprop != null) { try { - ClosableIterator stateIt = getOntModel().listStatements(res,dataprop,(Literal)null); + ClosableIterator stateIt = res.getModel().listStatements(res,dataprop,(Literal)null); try { if (stateIt.hasNext()) return ((Literal)((Statement)stateIt.next()).getObject()).getString(); @@ -142,6 +142,7 @@ public class JenaBaseDao extends JenaBaseDaoCon { protected void addPropertyStringValue(Resource res, Property dataprop, String value, Model model) { if (res != null && dataprop != null && value != null && value.length()>0) { model.add(res, dataprop, value, XSDDatatype.XSDstring); + System.out.println("JenaBaseDao" + value); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java index 120b132a2..6fa3064dc 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java @@ -252,7 +252,7 @@ public class VClassJena extends VClass { } else { cls.getOntModel().enterCriticalSection(Lock.READ); try { - setCustomEntryForm(webappDaoFactory.getJenaBaseDao().getPropertyStringValue(cls, webappDaoFactory.getJenaBaseDao().PROPERTY_CUSTOMDISPLAYVIEWANNOT)); + setCustomDisplayView(webappDaoFactory.getJenaBaseDao().getPropertyStringValue(cls, webappDaoFactory.getJenaBaseDao().PROPERTY_CUSTOMDISPLAYVIEWANNOT)); return this.customDisplayView; } finally { cls.getOntModel().leaveCriticalSection(); diff --git a/webapp/web/templates/edit/specific/vclass_retry.jsp b/webapp/web/templates/edit/specific/vclass_retry.jsp index fb873751e..1eb5c718f 100644 --- a/webapp/web/templates/edit/specific/vclass_retry.jsp +++ b/webapp/web/templates/edit/specific/vclass_retry.jsp @@ -102,14 +102,9 @@ - - Optional: custom short view
- - - - + Optional: custom search view
- +