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

[VIVO-1245] Cleanup Template Model classes

Browse source
This commit is contained in:
Graham Triggs 2016-05-25 19:47:34 +01:00
parent 0e37b6a69e
commit f3b66a9d42
12 changed files with 66 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
View file

@ -8,6 +8,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividualBuilder;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -100,7 +101,7 @@ public class IndividualListController extends FreemarkerHttpServlet {
List<ListedIndividual> indsTm = new ArrayList<ListedIndividual>();
if (inds != null) {
for ( Individual ind : inds ) {
indsTm.add(new ListedIndividual(ind,vreq));
indsTm.add(ListedIndividualBuilder.build(ind,vreq));
}
}
body.put("individuals", indsTm);

3
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java
View file

@ -9,6 +9,7 @@ import java.util.Map;
import java.util.Properties;
import com.hp.hpl.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONException;
@ -268,7 +269,7 @@ class IndividualResponseBuilder {
private IndividualTemplateModel getIndividualTemplateModel(
Individual individual) {
//individual.sortForDisplay();
return new IndividualTemplateModel(individual, vreq);
return IndividualTemplateModelBuilder.build(individual, vreq);
}
private TemplateModel wrap(Object obj, BeansWrapper wrapper) throws TemplateModelException {

3
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
View file

@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONArray;
@ -72,7 +73,7 @@ public class GetRandomSearchIndividualsByVClass extends GetSearchIndividualsByVC
Map<String, Object> modelMap = new HashMap<String, Object>();
modelMap.put("individual",
new IndividualTemplateModel(individual, vreq));
IndividualTemplateModelBuilder.build(individual, vreq));
modelMap.put("vclass", vclassName);
ShortViewService svs = ShortViewServiceSetup.getService(ctx);

3
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
View file

@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONArray;
@ -80,7 +81,7 @@ public class GetRenderedSearchIndividualsByVClass extends GetSearchIndividualsBy
Map<String, Object> modelMap = new HashMap<String, Object>();
modelMap.put("individual",
new IndividualTemplateModel(individual, vreq));
IndividualTemplateModelBuilder.build(individual, vreq));
modelMap.put("vclass", vclassName);
ShortViewService svs = ShortViewServiceSetup.getService(ctx);

3
api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/BrowseDataGetter.java
View file

@ -11,6 +11,7 @@ import java.util.Map;
import javax.servlet.ServletContext;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividualBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONArray;
@ -174,7 +175,7 @@ public class BrowseDataGetter extends DataGetterBase implements DataGetter {
List<ListedIndividual> tInds = new ArrayList<ListedIndividual>(inds.size());
for( Individual ind : inds){
tInds.add(new ListedIndividual(ind, vreq));
tInds.add(ListedIndividualBuilder.build(ind, vreq));
}
map.put("individualsInClass", tInds);

3
api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SearchIndividualsDataGetter.java
View file

@ -9,6 +9,7 @@ import java.util.Map;
import javax.servlet.ServletContext;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividualBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -183,7 +184,7 @@ public class SearchIndividualsDataGetter extends DataGetterBase implements DataG
List<ListedIndividual> indsTm = new ArrayList<ListedIndividual>();
if (inds != null) {
for ( Individual ind : inds ) {
indsTm.add(new ListedIndividual(ind,vreq));
indsTm.add(ListedIndividualBuilder.build(ind,vreq));
}
}
body.put("individuals", indsTm);

3
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
View file

@ -12,8 +12,7 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
private static final Log log = LogFactory.getLog(IndividualTemplateModel.class);
public IndividualTemplateModel(Individual individual, VitroRequest vreq) {
IndividualTemplateModel(Individual individual, VitroRequest vreq) {
super(individual, vreq);
}
}

25
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModelBuilder.java Normal file
View file

@ -0,0 +1,25 @@
package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual;
public class IndividualTemplateModelBuilder {
static IIndividualTemplateModelBuilder customBuilder = null;
static public IndividualTemplateModel build(Individual individual, VitroRequest vreq) {
if (customBuilder != null) {
return customBuilder.build(individual, vreq);
}
return new IndividualTemplateModel(individual, vreq);
}
static public void setCustomBuilder(IIndividualTemplateModelBuilder builder) {
customBuilder = builder;
}
public interface IIndividualTemplateModelBuilder {
public IndividualTemplateModel build(Individual individual, VitroRequest vreq);
}
}

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/BaseListedIndividual.java
View file

@ -30,7 +30,7 @@ public abstract class BaseListedIndividual extends BaseTemplateModel {
public static List<ListedIndividual> getIndividualTemplateModels(List<Individual> individuals, VitroRequest vreq) {
List<ListedIndividual> models = new ArrayList<ListedIndividual>(individuals.size());
for (Individual individual : individuals) {
models.add(new ListedIndividual(individual, vreq));
models.add(ListedIndividualBuilder.build(individual, vreq));
}
return models;
}

3
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
View file

@ -12,8 +12,7 @@ public class ListedIndividual extends BaseListedIndividual {
private static final Log log = LogFactory.getLog(ListedIndividual.class);
public ListedIndividual(Individual individual, VitroRequest vreq) {
ListedIndividual(Individual individual, VitroRequest vreq) {
super(individual, vreq);
}
}

24
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividualBuilder.java Normal file
View file

@ -0,0 +1,24 @@
package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
public class ListedIndividualBuilder {
static ILIstedIndividualBuilder customBuilder = null;
static public ListedIndividual build(Individual individual, VitroRequest vreq) {
if (customBuilder != null) {
return customBuilder.build(individual, vreq);
}
return new ListedIndividual(individual, vreq);
}
static public void setCustomBuilder(ILIstedIndividualBuilder builder) {
customBuilder = builder;
}
public interface ILIstedIndividualBuilder {
public ListedIndividual build(Individual individual, VitroRequest vreq);
}
}

3
api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java
View file

@ -11,6 +11,7 @@ import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividualBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONArray;
@ -163,7 +164,7 @@ public class BrowseWidget extends Widget {
List<ListedIndividual> tInds = new ArrayList<ListedIndividual>(inds.size());
for( Individual ind : inds){
tInds.add(new ListedIndividual(ind, vreq));
tInds.add(ListedIndividualBuilder.build(ind, vreq));
}
map.put("individualsInClass", tInds);