litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3628 Create a new package for custom list view classes.

Browse source
This commit is contained in:
j2blake 2012-02-22 20:50:47 +00:00
parent 0b18650ac4
commit 6a4228f099
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CustomListViewConfigFile.java → webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java
View file

@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; package edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
@ -71,7 +71,7 @@ public class CustomListViewConfigFile {
// Might be empty but will not be null. // Might be empty but will not be null.
private final String postprocessorName; private final String postprocessorName;
CustomListViewConfigFile(Reader reader) throws InvalidConfigFileException { public CustomListViewConfigFile(Reader reader) throws InvalidConfigFileException {
Document doc = parseDocument(reader); Document doc = parseDocument(reader);
selectQueryElement = parseSelectQuery(doc); selectQueryElement = parseSelectQuery(doc);
constructQueries = parseConstructQueries(doc); constructQueries = parseConstructQueries(doc);

1
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
View file

@ -32,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.CustomListViewConfigFile;
import freemarker.cache.TemplateLoader; import freemarker.cache.TemplateLoader;
import freemarker.template.Configuration; import freemarker.template.Configuration;

5
webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CustomListViewConfigFileTest.java → webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java
View file

@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; package edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -17,7 +17,8 @@ import org.junit.matchers.JUnitMatchers;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.CustomListViewConfigFile.InvalidConfigFileException; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.CustomListViewConfigFile;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.CustomListViewConfigFile.InvalidConfigFileException;
/** /**
* Note: when testing, an "empty" element may be self-closing, or with * Note: when testing, an "empty" element may be self-closing, or with

3
webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
View file

@ -157,6 +157,9 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// The tests // The tests
//
// TODO - remove any tests that are covered by the newer
// CustomListViewConfigFileTest.
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// //