From 380d7bca962c847506befd526d3f5c475ddc5cfb Mon Sep 17 00:00:00 2001 From: cdtank Date: Wed, 11 May 2011 21:35:43 +0000 Subject: [PATCH] 1. Refactored the package naming, removed the "freemarker" from the package structure for visualziations, since now only freemarkerised visualizations exist. --- .../visualizations-beans-injection-fm.xml | 20 +++++------ .../AjaxVisualizationController.java | 4 +-- .../DataVisualizationController.java | 4 +-- .../ShortURLVisualizationController.java | 4 +-- .../StandardVisualizationController.java | 4 +-- .../freemarker/VisualizationInjector.java | 2 +- .../VisualizationsDependencyInjector.java | 2 +- .../CoAuthorshipGraphMLWriter.java | 12 +++---- .../coauthorship/CoAuthorshipQueryRunner.java | 18 +++++----- .../CoAuthorshipRequestHandler.java | 12 +++---- .../CoAuthorshipVisCodeGenerator.java | 10 +++--- .../collaborationutils/CoAuthorshipData.java | 6 ++-- .../CoInvestigationData.java | 6 ++-- .../CollaborationComparator.java | 4 +-- .../collaborationutils/CollaborationData.java | 6 ++-- .../CollaboratorComparator.java | 4 +-- .../CoPIGrantCountConstructQueryRunner.java | 4 +-- .../CoPIGrantCountQueryRunner.java | 18 +++++----- .../CoPIGrantCountRequestHandler.java | 14 ++++---- .../CoPIGraphMLWriter.java | 12 +++---- .../CoPIVisCodeGenerator.java | 10 +++--- ...yPublicationCountConstructQueryRunner.java | 4 +-- .../EntityPublicationCountQueryRunner.java | 10 +++--- .../EntityPublicationCountRequestHandler.java | 16 ++++----- ...OrganizationTypesConstructQueryRunner.java | 4 +-- ...EntitySubOrganizationTypesQueryRunner.java | 4 +-- .../OrganizationUtilityFunctions.java | 12 +++---- ...poralGrantVisualizationRequestHandler.java | 20 +++++------ ...ublicationVisualizationRequestHandler.java | 20 +++++------ .../EntityGrantCountConstructQueryRunner.java | 4 +-- .../EntityGrantCountQueryRunner.java | 10 +++--- .../EntityGrantCountRequestHandler.java | 18 +++++----- ...pOfScienceVisualizationRequestHandler.java | 20 +++++------ .../ModelConstructorUtilities.java | 22 ++++++------ ...ciatedPeopleModelWithTypesConstructor.java | 4 +-- ...OrganizationModelWithTypesConstructor.java | 4 +-- ...tsForSubOrganizationsModelConstructor.java | 4 +-- ...nsForSubOrganizationsModelConstructor.java | 4 +-- .../PeopleToGrantsModelConstructor.java | 4 +-- .../PeopleToPublicationsModelConstructor.java | 4 +-- .../PersonToGrantsModelConstructor.java | 4 +-- .../PersonToPublicationsModelConstructor.java | 4 +-- ...SubOrganizationWithinModelConstructor.java | 4 +-- .../factory/ModelFactoryInterface.java | 2 +- ...AssociatedPeopleModelWithTypesFactory.java | 8 ++--- .../OrganizationModelWithTypesFactory.java | 8 ++--- ...ionToGrantsForSubOrganizationsFactory.java | 8 ++--- ...ublicationsForSubOrganizationsFactory.java | 8 ++--- .../factory/PeopleToGrantsFactory.java | 8 ++--- .../factory/PeopleToPublicationsFactory.java | 8 ++--- .../factory/PersonToGrantsFactory.java | 8 ++--- .../factory/PersonToPublicationsFactory.java | 8 ++--- .../SubOrganizationWithinModelFactory.java | 8 ++--- .../PersonGrantCountQueryRunner.java | 8 ++--- .../PersonGrantCountRequestHandler.java | 14 ++++---- .../PersonGrantCountVisCodeGenerator.java | 8 ++--- .../PersonLevelRequestHandler.java | 34 +++++++++---------- .../PersonPublicationCountQueryRunner.java | 8 ++--- .../PersonPublicationCountRequestHandler.java | 14 ++++---- ...ersonPublicationCountVisCodeGenerator.java | 8 ++--- .../utilities/UtilitiesRequestHandler.java | 14 ++++---- .../valueobjects/Activity.java | 4 +-- .../valueobjects/Collaboration.java | 6 ++-- .../valueobjects/Collaborator.java | 6 ++-- .../valueobjects/ConstructedModelTracker.java | 2 +- .../{freemarker => }/valueobjects/Entity.java | 2 +- .../valueobjects/GenericQueryMap.java | 2 +- .../valueobjects/Individual.java | 2 +- .../valueobjects/JsonObject.java | 2 +- .../valueobjects/SparklineData.java | 2 +- .../valueobjects/SubEntity.java | 2 +- .../valueobjects/SubjectEntityJSON.java | 2 +- .../YearToEntityCountDataElement.java | 2 +- .../visutils/AllPropertiesQueryRunner.java | 4 +-- .../visutils/CachedModelConstructor.java | 2 +- .../visutils/GenericQueryRunner.java | 2 +- .../visutils/GenericQueryRunnerOnModel.java | 2 +- .../visutils/ModelConstructor.java | 2 +- .../visutils/PDFDocument.java | 2 +- .../visutils/QueryRunner.java | 2 +- .../visutils/SelectOnModelUtilities.java | 26 +++++++------- .../visutils/UniqueIDGenerator.java | 2 +- .../visutils/UtilityFunctions.java | 12 +++---- .../visutils/VisualizationRequestHandler.java | 2 +- 84 files changed, 325 insertions(+), 325 deletions(-) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coauthorship/CoAuthorshipGraphMLWriter.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coauthorship/CoAuthorshipQueryRunner.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coauthorship/CoAuthorshipRequestHandler.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coauthorship/CoAuthorshipVisCodeGenerator.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CoAuthorshipData.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CoInvestigationData.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CollaborationComparator.java (69%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CollaborationData.java (80%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/collaborationutils/CollaboratorComparator.java (68%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java (98%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIGrantCountQueryRunner.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIGrantCountRequestHandler.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIGraphMLWriter.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/coprincipalinvestigator/CoPIVisCodeGenerator.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntityPublicationCountConstructQueryRunner.java (98%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntityPublicationCountQueryRunner.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntityPublicationCountRequestHandler.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java (97%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/EntitySubOrganizationTypesQueryRunner.java (97%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/OrganizationUtilityFunctions.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitygrantcount/EntityGrantCountConstructQueryRunner.java (98%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitygrantcount/EntityGrantCountQueryRunner.java (96%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/entitygrantcount/EntityGrantCountRequestHandler.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/mapofscience/MapOfScienceVisualizationRequestHandler.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/ModelConstructorUtilities.java (55%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/OrganizationModelWithTypesConstructor.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/PeopleToGrantsModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/PeopleToPublicationsModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/PersonToGrantsModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/PersonToPublicationsModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/SubOrganizationWithinModelConstructor.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/ModelFactoryInterface.java (81%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/OrganizationModelWithTypesFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java (74%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/PeopleToGrantsFactory.java (71%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/PeopleToPublicationsFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/PersonToGrantsFactory.java (71%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/PersonToPublicationsFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/modelconstructor/factory/SubOrganizationWithinModelFactory.java (73%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/persongrantcount/PersonGrantCountQueryRunner.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/persongrantcount/PersonGrantCountRequestHandler.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/persongrantcount/PersonGrantCountVisCodeGenerator.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/personlevel/PersonLevelRequestHandler.java (85%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/personpubcount/PersonPublicationCountQueryRunner.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/personpubcount/PersonPublicationCountRequestHandler.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/personpubcount/PersonPublicationCountVisCodeGenerator.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/utilities/UtilitiesRequestHandler.java (96%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Activity.java (90%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Collaboration.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Collaborator.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/ConstructedModelTracker.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Entity.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/GenericQueryMap.java (87%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/Individual.java (85%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/JsonObject.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/SparklineData.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/SubEntity.java (95%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/SubjectEntityJSON.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/valueobjects/YearToEntityCountDataElement.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/AllPropertiesQueryRunner.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/CachedModelConstructor.java (83%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/GenericQueryRunner.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/GenericQueryRunnerOnModel.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/ModelConstructor.java (81%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/PDFDocument.java (99%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/QueryRunner.java (78%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/SelectOnModelUtilities.java (91%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/UniqueIDGenerator.java (75%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/UtilityFunctions.java (94%) rename src/edu/cornell/mannlib/vitro/webapp/visualization/{freemarker => }/visutils/VisualizationRequestHandler.java (93%) diff --git a/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml b/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml index 7fd32b8b..6e3e9b5f 100644 --- a/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml +++ b/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml @@ -11,34 +11,34 @@ + class="edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.utilities.UtilitiesRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount.PersonGrantCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.personlevel.PersonLevelRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIGrantCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.EntityPublicationCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.cached.TemporalPublicationVisualizationRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.entitygrantcount.EntityGrantCountRequestHandler" /> + class="edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.cached.TemporalGrantVisualizationRequestHandler" /> diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java index 08f9e9b9..d9499c48 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/AjaxVisualizationController.java @@ -21,8 +21,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.TemplateProcessingHelper.TemplateProcessingException; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -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.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; import freemarker.template.Configuration; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java index 88cc9bf2..534536b4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/DataVisualizationController.java @@ -20,8 +20,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -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.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * Services a visualization request. This will return a simple error message and a 501 if diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java index 3b5b8b93..20652bac 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/ShortURLVisualizationController.java @@ -23,8 +23,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -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.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * Services a standard visualization request, which involves templates. This will return a simple diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java index aeaf4c23..4eeed864 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/StandardVisualizationController.java @@ -16,8 +16,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -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.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * Services a standard visualization request, which involves templates. This will return a simple diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java index 31f86e17..19dd2423 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java @@ -3,7 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; import java.util.Map; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class VisualizationInjector { private Map visualizationIDToClass; diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java index e06afff0..9fe4388f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationsDependencyInjector.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class VisualizationsDependencyInjector { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipGraphMLWriter.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipGraphMLWriter.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java index 066d1f0b..8dc3166c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipGraphMLWriter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship; +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.util.ArrayList; import java.util.Collections; @@ -11,11 +11,11 @@ import java.util.Set; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaboratorComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationComparator; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; public class CoAuthorshipGraphMLWriter { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java index 79f0ca69..9c108c6a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship; +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.util.ArrayList; import java.util.Collections; @@ -26,17 +26,17 @@ import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.RDFNode; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CoAuthorshipData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaboratorComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UniqueIDGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator; /** * This query runner is used to execute a sparql query to get all the publications diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java index ddf1b389..e497d1fd 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship; +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.util.HashMap; import java.util.Map; @@ -18,12 +18,12 @@ 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.visualization.freemarker.DataVisualizationController; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -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; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * This request handler is used when information related to co-authorship network diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java index 220cbfb9..27006e03 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship; +package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship; import java.util.ArrayList; import java.util.Calendar; @@ -17,10 +17,10 @@ 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.Collaborator; -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; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; public class CoAuthorshipVisCodeGenerator { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoAuthorshipData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoAuthorshipData.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java index 2c08a59b..31cab024 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoAuthorshipData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoAuthorshipData.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; public class CoAuthorshipData extends CollaborationData { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoInvestigationData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoInvestigationData.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java index 3f844b7c..12cd67f7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CoInvestigationData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; public class CoInvestigationData extends CollaborationData { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationComparator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java similarity index 69% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationComparator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java index 8fe49e88..9b71a140 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationComparator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationComparator.java @@ -1,10 +1,10 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.Comparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java similarity index 80% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationData.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java index 8a958b76..a28f8073 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaborationData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaborationData.java @@ -1,12 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.Map; import java.util.Set; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; public abstract class CollaborationData { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaboratorComparator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java similarity index 68% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaboratorComparator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java index f3c3aa7e..178e9f89 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/collaborationutils/CollaboratorComparator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CollaboratorComparator.java @@ -1,10 +1,10 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils; +package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; import java.util.Comparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java similarity index 98% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java index 8f3b9025..256e1b29 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.HashSet; import java.util.Set; @@ -22,7 +22,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class CoPIGrantCountConstructQueryRunner implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java index c85d4dc8..4f6924c0 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.ArrayList; import java.util.Collections; @@ -27,17 +27,17 @@ import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.RDFNode; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CoInvestigationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaboratorComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UniqueIDGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator; /** * @author bkoniden * Deepak Konidena diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java index 2ecb135e..79714a18 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.HashMap; import java.util.Map; @@ -17,13 +17,13 @@ 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.visualization.freemarker.DataVisualizationController; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -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; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGraphMLWriter.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGraphMLWriter.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java index 98a5d922..666c9337 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGraphMLWriter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.ArrayList; import java.util.Collections; @@ -11,11 +11,11 @@ import java.util.Set; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaboratorComparator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaboration; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationComparator; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaboratorComparator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; /** * @author bkoniden * Deepak Konidena diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java index a3a3a51c..10370ad1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator; +package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.ArrayList; import java.util.Calendar; @@ -17,10 +17,10 @@ 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.Collaborator; -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; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * This class contains code for rendering sparklines and displaying tables for diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountConstructQueryRunner.java similarity index 98% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountConstructQueryRunner.java index 02b9a88e..c9cf3838 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountConstructQueryRunner.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.LinkedHashSet; import java.util.Set; @@ -22,7 +22,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class EntityPublicationCountConstructQueryRunner implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountQueryRunner.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountQueryRunner.java index c742a204..b7b28467 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.HashMap; import java.util.Map; @@ -26,10 +26,10 @@ import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java index 6b528bfb..276bda1f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntityPublicationCountRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.ArrayList; import java.util.HashMap; @@ -24,13 +24,13 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Data 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.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -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; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class EntityPublicationCountRequestHandler implements VisualizationRequestHandler { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java similarity index 97% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java index f7aa55b6..48cee0e1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesConstructQueryRunner.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.LinkedHashSet; import java.util.Set; @@ -22,7 +22,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class EntitySubOrganizationTypesConstructQueryRunner implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java similarity index 97% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java index 2ba8f8d4..b9a62279 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntitySubOrganizationTypesQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.HashMap; import java.util.HashSet; @@ -26,7 +26,7 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/OrganizationUtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/OrganizationUtilityFunctions.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/OrganizationUtilityFunctions.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/OrganizationUtilityFunctions.java index f2b94577..ddc92f4b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/OrganizationUtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/OrganizationUtilityFunctions.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.HashMap; import java.util.Map; @@ -22,11 +22,11 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.GenericQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.GenericQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; public class OrganizationUtilityFunctions { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java index 9b26c7a6..f51e5ef8 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.cached; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.cached; import java.util.ArrayList; import java.util.HashMap; @@ -23,16 +23,16 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Data 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.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubjectEntityJSON; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.SelectOnModelUtilities; -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.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class TemporalGrantVisualizationRequestHandler implements diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java index bbd94a9d..36cf0d1c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.cached; +package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.cached; import java.util.ArrayList; import java.util.HashMap; @@ -23,16 +23,16 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Data 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.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubjectEntityJSON; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.SelectOnModelUtilities; -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.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class TemporalPublicationVisualizationRequestHandler implements VisualizationRequestHandler { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountConstructQueryRunner.java similarity index 98% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountConstructQueryRunner.java index 13aec8a3..40bd5a8d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountConstructQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountConstructQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitygrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.entitygrantcount; import java.util.LinkedHashSet; import java.util.Set; @@ -23,7 +23,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class EntityGrantCountConstructQueryRunner implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountQueryRunner.java similarity index 96% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountQueryRunner.java index 44257d21..58310d80 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitygrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.entitygrantcount; import java.util.HashMap; import java.util.Map; @@ -25,10 +25,10 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; /** * This query runner is used to execute a sparql query that will fetch all the diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java index 1666563e..ad2d4005 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitygrantcount/EntityGrantCountRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitygrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.entitygrantcount; import java.util.ArrayList; import java.util.HashMap; @@ -23,15 +23,15 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem 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.constants.VOConstants; +import edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -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; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class EntityGrantCountRequestHandler implements diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java index 4b2bd1e8..454c465b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/mapofscience/MapOfScienceVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.mapofscience; +package edu.cornell.mannlib.vitro.webapp.visualization.mapofscience; import java.util.ArrayList; import java.util.HashMap; @@ -23,16 +23,16 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Data 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.entitycomparison.OrganizationUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.OrganizationUtilityFunctions; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubjectEntityJSON; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.SelectOnModelUtilities; -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.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.JsonObject; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubjectEntityJSON; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; public class MapOfScienceVisualizationRequestHandler implements VisualizationRequestHandler { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/ModelConstructorUtilities.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java similarity index 55% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/ModelConstructorUtilities.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java index 39669842..f4d857a7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/ModelConstructorUtilities.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorUtilities.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashMap; import java.util.Map; @@ -8,16 +8,16 @@ import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.ModelFactoryInterface; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.OrganizationAssociatedPeopleModelWithTypesFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.OrganizationModelWithTypesFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.OrganizationToGrantsForSubOrganizationsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.OrganizationToPublicationsForSubOrganizationsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.PeopleToGrantsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.PeopleToPublicationsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.PersonToGrantsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.PersonToPublicationsFactory; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory.SubOrganizationWithinModelFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.ModelFactoryInterface; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.OrganizationAssociatedPeopleModelWithTypesFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.OrganizationModelWithTypesFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.OrganizationToGrantsForSubOrganizationsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.OrganizationToPublicationsForSubOrganizationsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.PeopleToGrantsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.PeopleToPublicationsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.PersonToGrantsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.PersonToPublicationsFactory; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory.SubOrganizationWithinModelFactory; public class ModelConstructorUtilities { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java index 034d0e80..3d55858f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationAssociatedPeopleModelWithTypesConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationAssociatedPeopleModelWithTypesConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationModelWithTypesConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationModelWithTypesConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java index df624e90..57571e9f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationModelWithTypesConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationModelWithTypesConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationModelWithTypesConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java index 3c9abdcf..a8936ffb 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationToGrantsForSubOrganizationsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java index 60be6462..25344e72 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationToPublicationsForSubOrganizationsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToGrantsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToGrantsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java index 83c6d2be..7a43b1a9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToGrantsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PeopleToGrantsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToPublicationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToPublicationsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java index b24beed6..bf87900b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PeopleToPublicationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PeopleToPublicationsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToGrantsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToGrantsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java index f2603fc8..cd3f0261 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToGrantsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PersonToGrantsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToPublicationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToPublicationsModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java index 62ceea22..19818ee1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/PersonToPublicationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PersonToPublicationsModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/SubOrganizationWithinModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/SubOrganizationWithinModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java index e4905874..f5e099c7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/SubOrganizationWithinModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/SubOrganizationWithinModelConstructor.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -15,7 +15,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class SubOrganizationWithinModelConstructor implements ModelConstructor { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/ModelFactoryInterface.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java similarity index 81% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/ModelFactoryInterface.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java index f1c29b41..a3aa7f55 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/ModelFactoryInterface.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/ModelFactoryInterface.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java index 7346008b..789e97e3 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationAssociatedPeopleModelWithTypesFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationAssociatedPeopleModelWithTypesConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationAssociatedPeopleModelWithTypesConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationAssociatedPeopleModelWithTypesFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationModelWithTypesFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationModelWithTypesFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java index 45b2127f..f1cd50ea 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationModelWithTypesFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationModelWithTypesFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationModelWithTypesConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationModelWithTypesConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationModelWithTypesFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java index b3b93b28..92d469c9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToGrantsForSubOrganizationsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationToGrantsForSubOrganizationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationToGrantsForSubOrganizationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationToGrantsForSubOrganizationsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java similarity index 74% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java index 9257d8e8..6ad5c18b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/OrganizationToPublicationsForSubOrganizationsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationToPublicationsForSubOrganizationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationToPublicationsForSubOrganizationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class OrganizationToPublicationsForSubOrganizationsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToGrantsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java similarity index 71% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToGrantsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java index cb4e5e62..3523268f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToGrantsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToGrantsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PeopleToGrantsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PeopleToGrantsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PeopleToGrantsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToPublicationsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToPublicationsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java index 5a63cecb..4cb11cc0 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PeopleToPublicationsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PeopleToPublicationsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PeopleToPublicationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PeopleToPublicationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PeopleToPublicationsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToGrantsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java similarity index 71% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToGrantsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java index d674b895..27d0ac08 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToGrantsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToGrantsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PersonToGrantsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PersonToGrantsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PersonToGrantsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToPublicationsFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToPublicationsFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java index 65a36d17..503d15c3 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/PersonToPublicationsFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/PersonToPublicationsFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PersonToPublicationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PersonToPublicationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class PersonToPublicationsFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/SubOrganizationWithinModelFactory.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java similarity index 73% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/SubOrganizationWithinModelFactory.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java index e1e07979..ea9c2d15 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/modelconstructor/factory/SubOrganizationWithinModelFactory.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/factory/SubOrganizationWithinModelFactory.java @@ -1,13 +1,13 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.factory; +package edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.factory; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.SubOrganizationWithinModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.SubOrganizationWithinModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.ConstructedModelTracker; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; public class SubOrganizationWithinModelFactory implements ModelFactoryInterface { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java index ad95526c..f90c34a6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; import java.util.HashSet; import java.util.Set; @@ -24,9 +24,9 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java index 7ebcaffe..15cd9b8b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; import java.util.HashMap; import java.util.Map; @@ -19,12 +19,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem 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.Activity; -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.QueryRunner; -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.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java index bc05ef0e..4d4ed129 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount; +package edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount; import java.util.ArrayList; import java.util.Calendar; @@ -16,9 +16,9 @@ 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.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; public class PersonGrantCountVisCodeGenerator { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java similarity index 85% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java index b6c6e27d..c12417be 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personlevel; +package edu.cornell.mannlib.vitro.webapp.visualization.personlevel; import java.util.HashMap; import java.util.Map; @@ -16,23 +16,23 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; 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.visualization.coauthorship.CoAuthorshipQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.coauthorship.CoAuthorshipVisCodeGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData; +import edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIGrantCountConstructQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIGrantCountQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator.CoPIVisCodeGenerator; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship.CoAuthorshipQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship.CoAuthorshipVisCodeGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator.CoPIGrantCountConstructQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator.CoPIGrantCountQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coprincipalinvestigator.CoPIVisCodeGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount.PersonGrantCountQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.persongrantcount.PersonGrantCountVisCodeGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount.PersonPublicationCountQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount.PersonPublicationCountVisCodeGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.ModelConstructor; -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; +import edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount.PersonGrantCountQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.persongrantcount.PersonGrantCountVisCodeGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.personpubcount.PersonPublicationCountVisCodeGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.ModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * This request handler is used to serve content rendered on the person level vis page diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java index 692b65fa..1631cc2c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount; +package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; import java.util.HashSet; import java.util.Set; @@ -24,9 +24,9 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java index ec8a7b07..ed75910b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount; +package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; import java.util.HashMap; import java.util.Map; @@ -19,12 +19,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem 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.Activity; -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.QueryRunner; -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.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java index 760b16ed..bc1d70f5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.personpubcount; +package edu.cornell.mannlib.vitro.webapp.visualization.personpubcount; import java.util.ArrayList; import java.util.Calendar; @@ -16,9 +16,9 @@ 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.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.YearToEntityCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; public class PersonPublicationCountVisCodeGenerator { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/utilities/UtilitiesRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java similarity index 96% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/utilities/UtilitiesRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java index 7d64d4f8..9c2da768 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/utilities/UtilitiesRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.utilities; +package edu.cornell.mannlib.vitro.webapp.visualization.utilities; import java.util.HashMap; import java.util.Map; @@ -26,12 +26,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.Visu import edu.cornell.mannlib.vitro.webapp.filestorage.FileServingHelper; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.AllPropertiesQueryRunner; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.GenericQueryRunner; -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; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.AllPropertiesQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.GenericQueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; /** * This request handler is used when you need helpful information to add more context diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Activity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java similarity index 90% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Activity.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java index cf3307bb..cf015d8a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Activity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Activity.java @@ -1,8 +1,8 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * This interface will make sure that VOs conveying any person's academic output like publications, diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaboration.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaboration.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java index ccd1caa7..daf960d2 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaboration.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaboration.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collections; import java.util.HashMap; @@ -9,8 +9,8 @@ import java.util.Map; import java.util.Set; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UniqueIDGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaborator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaborator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java index dbf4592c..66025f66 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Collaborator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Collaborator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collections; import java.util.HashMap; @@ -9,8 +9,8 @@ import java.util.Map; import java.util.Set; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UniqueIDGenerator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator; +import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/ConstructedModelTracker.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/ConstructedModelTracker.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java index d5d66295..ca018ffe 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/ConstructedModelTracker.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/ConstructedModelTracker.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.HashMap; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java index 08ce73d9..08449938 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Entity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/GenericQueryMap.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java similarity index 87% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/GenericQueryMap.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java index f9b13d5f..2c01d34d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/GenericQueryMap.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/GenericQueryMap.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.HashMap; import java.util.HashSet; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Individual.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java similarity index 85% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Individual.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java index e3d3872f..89c6ddd5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/Individual.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Individual.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; public class Individual { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/JsonObject.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/JsonObject.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java index c97761fb..017dabe6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/JsonObject.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java index 89830407..0e48cb61 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SparklineData.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.List; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java index 7cd3438d..87b341b6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubEntity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collection; import java.util.HashSet; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubjectEntityJSON.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubjectEntityJSON.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubjectEntityJSON.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubjectEntityJSON.java index 58f94a52..e3bcd6fb 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SubjectEntityJSON.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubjectEntityJSON.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.HashMap; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearToEntityCountDataElement.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearToEntityCountDataElement.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java index 96d6577b..0c7408f5 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearToEntityCountDataElement.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/YearToEntityCountDataElement.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; +package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; /** * This object is used to store information about the yearToEntityCount Map in the format diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/AllPropertiesQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/AllPropertiesQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java index 85d45c83..1f3d0aef 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/AllPropertiesQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -21,7 +21,7 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/CachedModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java similarity index 83% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/CachedModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java index 23aadc6c..f48f33b9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/CachedModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/CachedModelConstructor.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import com.hp.hpl.jena.rdf.model.Model; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java index 08e9c9ed..25ac9a57 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunnerOnModel.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunnerOnModel.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java index ca90c6f6..2a6ff9f7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/GenericQueryRunnerOnModel.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.Map; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/ModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java similarity index 81% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/ModelConstructor.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java index 5306ca78..05f382c8 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/ModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/ModelConstructor.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import com.hp.hpl.jena.rdf.model.Model; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/PDFDocument.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/PDFDocument.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java index 9a687849..d6a737cf 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/PDFDocument.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.awt.BasicStroke; import java.awt.Color; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/QueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java similarity index 78% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/QueryRunner.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java index 4c01a7f4..58a572ae 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/QueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/QueryRunner.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/SelectOnModelUtilities.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java similarity index 91% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/SelectOnModelUtilities.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java index c86954c6..53501679 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/SelectOnModelUtilities.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.Collection; import java.util.HashMap; @@ -18,18 +18,18 @@ import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.ModelConstructorUtilities; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationAssociatedPeopleModelWithTypesConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationModelWithTypesConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationToGrantsForSubOrganizationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.OrganizationToPublicationsForSubOrganizationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PeopleToGrantsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.PeopleToPublicationsModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.modelconstructor.SubOrganizationWithinModelConstructor; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.ModelConstructorUtilities; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationAssociatedPeopleModelWithTypesConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationModelWithTypesConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationToGrantsForSubOrganizationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.OrganizationToPublicationsForSubOrganizationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PeopleToGrantsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.PeopleToPublicationsModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.modelconstructor.SubOrganizationWithinModelConstructor; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; public class SelectOnModelUtilities { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UniqueIDGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java similarity index 75% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UniqueIDGenerator.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java index b41995b6..ddfa0b27 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UniqueIDGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UniqueIDGenerator.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; public class UniqueIDGenerator { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java similarity index 94% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java index ece95482..00df4df7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/UtilityFunctions.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.io.IOException; import java.util.HashMap; @@ -25,13 +25,13 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMa 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.visualization.collaborationutils.CollaborationData; 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.collaborationutils.CollaborationData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Collaborator; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.GenericQueryMap; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap; +import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity; public class UtilityFunctions { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/VisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/VisualizationRequestHandler.java rename to src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java index 99dd685c..c0f446d1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/VisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/VisualizationRequestHandler.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils; +package edu.cornell.mannlib.vitro.webapp.visualization.visutils; import java.util.Map;