From e67aac14bb49ffe23fbdbdbad136269edef3172a Mon Sep 17 00:00:00 2001
From: cdtank <cdtank@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 22 Feb 2011 19:58:36 +0000
Subject: [PATCH] 1. Refactored to remove a parameter not used by the called
 calss. see http://issues.library.cornell.edu/browse/NIHVIVO-2114

---
 .../PersonGrantCountRequestHandler.java         |  2 --
 .../PersonGrantCountVisCodeGenerator.java       |  9 +++------
 .../personlevel/PersonLevelRequestHandler.java  |  2 --
 .../PersonPublicationCountQueryRunner.java      | 10 ----------
 .../PersonPublicationCountRequestHandler.java   | 17 +++++++----------
 .../PersonPublicationCountVisCodeGenerator.java |  8 ++------
 6 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java
index e1e871ac..c748964f 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java
@@ -110,7 +110,6 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
 	    		new PersonGrantCountVisCodeGenerator(personURI,
 	    									   visMode,
 	    									   visContainer,
-	    									   piGrants,
 	    									   yearToGrantCount,
 	    									   log);
 
@@ -157,7 +156,6 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
     		new PersonGrantCountVisCodeGenerator(personURI,
     									   visMode,
     									   visContainer,
-    									   piGrants,
     									   yearToGrantCount,
     									   log);
     	
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java
index 9736b5a8..3274fd90 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java
@@ -16,7 +16,6 @@ import org.apache.commons.logging.Log;
 import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants;
 import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
 import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Grant;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions;
@@ -45,8 +44,7 @@ public class PersonGrantCountVisCodeGenerator {
 	private String individualURI;
 	
 	public PersonGrantCountVisCodeGenerator(String individualURIParam,
-			String visMode, String visContainer, Set<Grant> piGrants,
-			Map<String, Integer> yearToGrantCount,
+			String visMode, String visContainer, Map<String, Integer> yearToGrantCount,
 			Log log) {
 
 		this.individualURI = individualURIParam;
@@ -55,7 +53,7 @@ public class PersonGrantCountVisCodeGenerator {
 		
 		this.log = log;
 		
-		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer, piGrants);
+		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
 
 	}
 	
@@ -68,8 +66,7 @@ public class PersonGrantCountVisCodeGenerator {
 	 * @return 
 	 */
 	private SparklineData setupSparklineParameters(String visMode,
-			  							  String providedVisContainerID,
-										   Set<Grant> piGrants) {
+			  							  String providedVisContainerID) {
 		
 		SparklineData sparklineData = new SparklineData();
 		sparklineData.setYearToActivityCount(yearToGrantCount);
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java
index d8773fe8..a7972c05 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java
@@ -113,7 +113,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
 	    			egoURI,
 	    			VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE,
 	    			EGO_GRANT_SPARKLINE_VIS_CONTAINER_ID,
-	    			piGrants,
 	    			yearToGrantCount,
 	    			log);
 	    	
@@ -174,7 +173,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
 	    			egoURI,
 	    			VisualizationFrameworkConstants.FULL_SPARKLINE_VIS_MODE,
 	    			EGO_PUB_SPARKLINE_VIS_CONTAINER_ID,
-	    			authorDocuments,
 	    			yearToPublicationCount,
 	    			log);	  
 	    	
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java
index 0bc56c2b..2f050e4f 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java
@@ -55,13 +55,11 @@ public class PersonPublicationCountQueryRunner implements QueryRunner<Set<BiboDo
 			+ "SELECT (str(?authorLabel) as ?" + QueryFieldLabels.AUTHOR_LABEL + ") \n" 
 			+ "		(str(?document) as ?" + QueryFieldLabels.DOCUMENT_URL + ") \n" 			 			 			 
 			+ "		(str(?publicationDate) as ?" + QueryFieldLabels.DOCUMENT_PUBLICATION_DATE + ") \n";
-		//	+ "		(str(?publicationYearUsing_1_1_property) as ?" + QueryFieldLabels.DOCUMENT_PUBLICATION_YEAR_USING_1_1_PROPERTY + ") \n";			
 
 	private static final String SPARQL_QUERY_COMMON_WHERE_CLAUSE = "" 
 			+ "?document rdfs:label ?documentLabel .\n" 
 			+ "OPTIONAL {  ?document core:dateTimeValue ?dateTimeValue . \n" 
 			+ "				?dateTimeValue core:dateTime ?publicationDate } .\n" ;
-			//+ "OPTIONAL {  ?document core:year ?publicationYearUsing_1_1_property } ." ;
 	
 	public PersonPublicationCountQueryRunner(String personURI,
 			Dataset Dataset, Log log) {
@@ -87,14 +85,6 @@ public class PersonPublicationCountQueryRunner implements QueryRunner<Set<BiboDo
 				biboDocument.setPublicationDate(publicationDateNode.toString());
 			}
 
-			/*
-			 * This is being used so that date in the data from pre-1.2 ontology can be captured. 
-			 * */
-//			RDFNode publicationYearUsing_1_1_PropertyNode = solution.get(QueryFieldLabels.DOCUMENT_PUBLICATION_YEAR_USING_1_1_PROPERTY);
-//			if (publicationYearUsing_1_1_PropertyNode != null) {
-//				biboDocument.setPublicationYear(publicationYearUsing_1_1_PropertyNode.toString());
-//			}
-			
 			/*
 			 * Since we are getting publication count for just one author at a time we need
 			 * to create only one "Individual" instance. We test against the null for "author" to
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java
index 680b3433..98ef6604 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java
@@ -6,8 +6,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -25,16 +25,16 @@ import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants;
 import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants;
 import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.BiboDocument;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData;
-import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions;
-import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.PDFDocument;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner;
+import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions;
+import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler;
 
 /**
  * 
@@ -94,12 +94,10 @@ VisualizationRequestHandler {
 						personURI, 
 						visMode, 
 						visContainer, 
-						authorDocuments,
-						yearToPublicationCount, 
+						yearToPublicationCount,
 						log);
 
-		SparklineData sparklineData = visualizationCodeGenerator
-		.getValueObjectContainer();
+		SparklineData sparklineData = visualizationCodeGenerator.getValueObjectContainer();
 
 		return prepareDynamicResponse(vitroRequest, sparklineData,
 				shouldVIVOrenderVis);
@@ -172,8 +170,7 @@ VisualizationRequestHandler {
 						personURI, 
 						visMode, 
 						visContainer, 
-						authorDocuments,
-						yearToPublicationCount, 
+						yearToPublicationCount,
 						log);
 
 		SparklineData sparklineData = 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java
index f8019d34..9ba5c2f9 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java
@@ -16,7 +16,6 @@ import org.apache.commons.logging.Log;
 import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants;
 import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants;
 import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.BiboDocument;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions;
@@ -47,7 +46,6 @@ public class PersonPublicationCountVisCodeGenerator {
 	public PersonPublicationCountVisCodeGenerator(String individualURIParam, 
 									  String visMode, 
 									  String visContainer, 
-									  Set<BiboDocument> authorDocuments, 
 									  Map<String, Integer> yearToPublicationCount, 
 									  Log log) {
 		
@@ -57,7 +55,7 @@ public class PersonPublicationCountVisCodeGenerator {
 
 		this.log = log;
 		
-		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer, authorDocuments);
+		this.sparklineParameterVO = setupSparklineParameters(visMode, visContainer);
 		
 	}
 	
@@ -66,12 +64,10 @@ public class PersonPublicationCountVisCodeGenerator {
 	 * will be used in the template to construct the actual html/javascript code.
 	 * @param visMode
 	 * @param visContainer
-	 * @param authorDocuments
 	 * @return 
 	 */
 	private SparklineData setupSparklineParameters(String visMode,
-			  							  String providedVisContainerID,
-										  Set<BiboDocument> authorDocuments) {
+			  							  String providedVisContainerID) {
 		
 		SparklineData sparklineData = new SparklineData();
 		sparklineData.setYearToActivityCount(yearToPublicationCount);