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

[VIVO-1245] Cleanup of NewIndividualFormGenerator, simplify configuration of generators and improve means of configuring in Freemarker

Browse source
This commit is contained in:
Graham Triggs 2016-05-25 17:06:30 +01:00
parent 8ca5955283
commit 40abb0a4e1
6 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
View file

@ -1,6 +1,8 @@
/* $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.edit.n3editing; package edu.cornell.mannlib.vitro.webapp.edit.n3editing;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMapping;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -8,6 +10,9 @@ public class N3TransitionToV2Mapping extends HashMap<String, String>{
public N3TransitionToV2Mapping(){ public N3TransitionToV2Mapping(){
Map<String,String> map = this; Map<String,String> map = this;
map.put("defaultAddMissingIndividualForm.jsp",
edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator.class.getName());
// vivo forms: // vivo forms:
map.put("addAuthorsToInformationResource.jsp", map.put("addAuthorsToInformationResource.jsp",
@ -15,7 +20,7 @@ public class N3TransitionToV2Mapping extends HashMap<String, String>{
map.put("manageWebpagesForIndividual.jsp", map.put("manageWebpagesForIndividual.jsp",
edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator.class.getName()); edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator.class.getName());
map.put("newIndividualForm.jsp", map.put("newIndividualForm.jsp",
edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualFormGenerator.class.getName()); edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVONewIndividualFormGenerator.class.getName());
map.put("organizationHasPositionHistory.jsp", map.put("organizationHasPositionHistory.jsp",
edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationHasPositionHistoryGenerator.class.getName()); edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationHasPositionHistoryGenerator.class.getName());
map.put("personHasEducationalTraining.jsp", map.put("personHasEducationalTraining.jsp",

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java
View file

@ -26,10 +26,6 @@ public class VIVODefaultAddMissingIndividualFormGenerator extends DefaultAddMiss
private Log log = LogFactory.getLog(VIVODefaultAddMissingIndividualFormGenerator.class); private Log log = LogFactory.getLog(VIVODefaultAddMissingIndividualFormGenerator.class);
public static void register() {
DefaultAddMissingIndividualFormGenerator.registerGeneratorClass(VIVOIndividualSearchResult.class);
}
protected Map<String, String> generateNewResources(VitroRequest vreq) { protected Map<String, String> generateNewResources(VitroRequest vreq) {
Map<String, String> newResources = super.generateNewResources(vreq); Map<String, String> newResources = super.generateNewResources(vreq);
newResources.put("newVcardInd", null); newResources.put("newVcardInd", null);

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java → api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java
View file

@ -27,7 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.
* Generates the edit configuration for a default property form. * Generates the edit configuration for a default property form.
* ModelChangePreprocessor creates the rdfs:label statement. * ModelChangePreprocessor creates the rdfs:label statement.
*/ */
public class NewIndividualFormGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator { public class VIVONewIndividualFormGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
@Override @Override
public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) { public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {

7
api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java
View file

@ -1,5 +1,6 @@
package org.vivoweb.webapp.startup; package org.vivoweb.webapp.startup;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMapping;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.VIVOIndividualSearchResult; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.VIVOIndividualSearchResult;
@ -9,7 +10,11 @@ import javax.servlet.ServletContextListener;
public class GeneratorSetup implements ServletContextListener { public class GeneratorSetup implements ServletContextListener {
@Override @Override
public void contextInitialized(ServletContextEvent servletContextEvent) { public void contextInitialized(ServletContextEvent servletContextEvent) {
VIVODefaultAddMissingIndividualFormGenerator.register(); JspToGeneratorMapping.jspsToGenerators.put("defaultAddMissingIndividualForm.jsp",
edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator.class.getName());
JspToGeneratorMapping.jspsToGenerators.put("newIndividualForm.jsp",
edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVONewIndividualFormGenerator.class.getName());
} }
@Override @Override

4
webapp/src/main/webapp/templates/freemarker/lib/lib-generator-classes.ftl Normal file
View file

@ -0,0 +1,4 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#assign ManageLabelsGenerator = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVOManageLabelsGenerator" />
<#assign NewIndividualFormGenerator = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVONewIndividualFormGenerator" />

5
webapp/src/main/webapp/templates/freemarker/lib/lib-properties-classes.ftl
View file

@ -1,5 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#function class_ManageLabelsGenerator>
<#return "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVOManageLabelsGenerator" />
</#function>