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

Complete default individual list view in FreeMarker

Browse source
This commit is contained in:
rjy7 2010-06-02 17:06:55 +00:00
parent b3ddf9e822
commit 037ff45736
9 changed files with 78 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
View file

@ -32,7 +32,7 @@ public class UrlBuilder {
SEARCH("/search"),
TERMS_OF_USE("/termsOfUse"),
// put under /admin
// RY put these under /admin/
LOGIN("/siteAdmin"),
LOGOUT("/login_process.jsp"),
SITE_ADMIN("/siteAdmin");

50
webapp/src/edu/cornell/mannlib/vitro/webapp/view/IndividualView.java
View file

@ -2,10 +2,14 @@
package edu.cornell.mannlib.vitro.webapp.view;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.Link;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
import edu.cornell.mannlib.vitro.webapp.utils.StringUtils;
import edu.cornell.mannlib.vitro.webapp.view.ViewFinder.ClassView;
@ -44,23 +48,45 @@ public class IndividualView extends ViewObject {
public String getProfileUrl() {
return getUrl("/individual/" + individual.getLocalName());
}
public String getSearchView() {
ViewFinder vf = new ViewFinder(ClassView.SEARCH);
return vf.findView(individual, context);
public String getSearchView() {
return getView(ClassView.SEARCH);
}
public String getCustomView() {
// see code currently in entityList.ftl
String customView = null;
return customView;
public String getShortView() {
return getView(ClassView.SHORT);
}
public Object getProperty(String propertyName) {
return new Object();
public String getDisplayView() {
return getView(ClassView.DISPLAY);
}
private String getView(ClassView view) {
ViewFinder vf = new ViewFinder(view);
return vf.findClassView(individual, context);
}
public Link getPrimaryLink() {
Link primaryLink = null;
String anchor = individual.getAnchor();
String url = individual.getUrl();
if (anchor != null && url != null) {
primaryLink = new Link();
primaryLink.setAnchor(individual.getAnchor());
primaryLink.setUrl(individual.getUrl());
}
return primaryLink;
}
public List<Link> getLinks() {
List<Link> additionalLinks = individual.getLinksList();
List<Link> links = new ArrayList<Link>(additionalLinks.size()+1);
Link primaryLink = getPrimaryLink();
if (primaryLink != null) {
links.add(primaryLink);
}
links.addAll(additionalLinks);
return links;
}
}

8
webapp/src/edu/cornell/mannlib/vitro/webapp/view/ViewFinder.java
View file

@ -27,7 +27,8 @@ public class ViewFinder {
public enum ClassView {
DISPLAY("getCustomDisplayView", "/view/display"),
FORM("getCustomEntryForm", "/form"),
// NB this is not the value currently used for custom forms - we use the value on the object property
FORM("getCustomEntryForm", "/form"),
SEARCH("getCustomSearchView", "/view/search"),
SHORT("getCustomShortView", "/view/short");
@ -64,9 +65,8 @@ public class ViewFinder {
this.view = view;
}
public String findView(Individual individual, ServletContext context) {
String viewName = "default.ftl";
// For now, all custom views are attached to classes.
public String findClassView(Individual individual, ServletContext context) {
String viewName = "default.ftl";
List<VClass> vclasses = individual.getVClasses();
Method method = view.getMethod();
/* RY The logic here is incorrect. The vclasses are