diff --git a/productMods/js/visualization/entityComparison/constants.js b/productMods/js/visualization/entityComparison/constants.js index e867617d..50bfe361 100644 --- a/productMods/js/visualization/entityComparison/constants.js +++ b/productMods/js/visualization/entityComparison/constants.js @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ //Hard coded color constants var TURQUOISE = "#8DD3C7"; diff --git a/productMods/js/visualization/entityComparison/util.js b/productMods/js/visualization/entityComparison/util.js index b91489fe..b3422c5a 100644 --- a/productMods/js/visualization/entityComparison/util.js +++ b/productMods/js/visualization/entityComparison/util.js @@ -1,4 +1,7 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + /** + * init sets some initial options for the default graph. i.e for when the page * is initially loaded or when its refreshed or when all the checkboxes on the * page are unchecked. diff --git a/productMods/templates/freemarker/visualization/vistest.ftl b/productMods/templates/freemarker/visualization/vistest.ftl deleted file mode 100644 index e69de29b..00000000 diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationController.java deleted file mode 100644 index 06f38515..00000000 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationController.java +++ /dev/null @@ -1,5 +0,0 @@ -package edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker; - -public class VisualizationController { - -} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java index a924ee8a..7a6134aa 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.ArrayList; @@ -33,7 +35,10 @@ import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Grant; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.CoPINode; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UniqueIDGenerator; - +/** + * @author bkoniden + * Deepak Konidena + */ public class CoPIGrantCountQueryRunner implements QueryRunner { private static final int MAX_PI_PER_GRANT_ALLOWED = 100; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java index 06b2759e..7bbb2a3e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.io.IOException; @@ -27,7 +28,10 @@ import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.CoPINode; 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; - +/** + * @author bkoniden + * Deepak Konidena + */ public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler{ public void generateVisualization(VitroRequest vitroRequest, HttpServletRequest request, HttpServletResponse response, Log log, DataSource dataSource){ diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java index a16ddf2c..4423d635 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationController; @@ -13,7 +15,10 @@ import java.util.Collections; import java.util.List; import java.util.Set; import java.util.Map; - +/** + * @author bkoniden + * Deepak Konidena + */ public class CoPIGraphMLWriter { private StringBuilder coPIGraphMLContent; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPINodeComparator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPINodeComparator.java index 66d62e66..2e16e33d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPINodeComparator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPINodeComparator.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.vitro.webapp.visualization.coprincipalinvestigator; import java.util.Comparator; @@ -7,6 +9,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.CoPINode; /** * This Comparator is used to sort the CoPINodes based on their IDs in ascending order. * @author bkoniden + * Deepak Konidena */ public class CoPINodeComparator implements Comparator{ diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java index f233944f..ab0d892c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/entitycomparison/EntitySubOrganizationTypesQueryRunner.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.entitycomparison; import java.util.HashMap; @@ -27,6 +28,10 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner; import java.util.Set; import java.util.HashSet; +/** + * @author bkoniden + * Deepak Konidena + */ public class EntitySubOrganizationTypesQueryRunner implements QueryRunner>> { protected static final Syntax SYNTAX = Syntax.syntaxARQ; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/VisTestController.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/VisTestController.java deleted file mode 100644 index f4940e98..00000000 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/VisTestController.java +++ /dev/null @@ -1,53 +0,0 @@ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; - -import com.hp.hpl.jena.query.DataSource; - -import edu.cornell.mannlib.vitro.webapp.beans.Portal; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; -import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler; - - -public class VisTestController extends FreemarkerHttpServlet implements VisualizationRequestHandler { - - private static final String TEMPLATE_DEFAULT = "vistest.ftl"; - - public void generateVisualization(VitroRequest vitroRequest, HttpServletRequest request, HttpServletResponse response, Log log, DataSource dataSource){ - - return; - } - - @Override - protected ResponseValues processRequest(VitroRequest vitroRequest){ - - Portal portal = vitroRequest.getPortal(); - Map body = new HashMap(); - - String egoURI = vitroRequest.getParameter(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY); - String renderMode = vitroRequest.getParameter(VisualizationFrameworkConstants.RENDER_MODE_KEY); - String visMode = vitroRequest.getParameter(VisualizationFrameworkConstants.VIS_MODE_KEY); - - List parameters = new ArrayList(); - - parameters.add(egoURI); - parameters.add(renderMode); - parameters.add(visMode); - - body.put("parameters", parameters); - body.put("title", getTitle("VIVO Vis")); - - return new TemplateResponseValues(TEMPLATE_DEFAULT, body); - } - -} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Child.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Child.java index 927780b5..b7870aca 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Child.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Child.java @@ -1,8 +1,13 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Set; import java.util.HashSet; - +/** + * @author bkoniden + * Deepak Konidena + * + */ public class Child extends Individual { Set documents = new HashSet(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/CoPIEdge.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/CoPIEdge.java index 51817bff..1e419b52 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/CoPIEdge.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/CoPIEdge.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collections; @@ -13,7 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * This stores edge information for Co-PI vis. * @author bkoniden - * + * Deepak Konidena */ public class CoPIEdge { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/CoPINode.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/CoPINode.java index f4d94d67..50c5ce42 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/CoPINode.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/CoPINode.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Collections; @@ -13,6 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions; /** * CoPINode is the node in a CoPI vis. * @author bkoniden + * Deepak Konidena */ public class CoPINode extends Individual { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Department.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Department.java index 537d73f1..542905d3 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Department.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Department.java @@ -1,7 +1,13 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Set; +/** + * @author bkoniden + * Deepak Konidena + * + */ public class Department extends Individual{ Set publication; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java index d4ad4a6b..ca1228ec 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Entity.java @@ -1,9 +1,15 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.HashSet; import java.util.Set; import java.util.LinkedHashSet; +/** + * @author bkoniden + * Deepak Konidena + * + */ public class Entity extends Individual{ Set publications = new HashSet(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Grant.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Grant.java index cfbdb686..0d27f2cc 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Grant.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Grant.java @@ -1,7 +1,14 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; +/** + * @author bkoniden + * Deepak Konidena + * + */ + public class Grant extends Individual { private String grantStartYear; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java index 511197f5..62fa2a69 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/JsonObject.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.ArrayList; @@ -7,7 +8,7 @@ import java.util.List; * JsonObject is used for creating data in JSON format, * by just using the fields that are required to be included. * @author bkoniden - * + * Deepak Konidena */ public class JsonObject { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Person.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Person.java index 1ee435e4..f5944d37 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Person.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/Person.java @@ -1,8 +1,13 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.Set; import java.util.HashSet; +/** + * @author bkoniden + * Deepak Konidena + */ public class Person extends Individual { Set documents = new HashSet(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java index 0c431c43..348260b3 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/SubEntity.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects; import java.util.HashMap; @@ -5,6 +6,10 @@ import java.util.Map; import java.util.Set; import java.util.HashSet; +/** + * @author bkoniden + * Deepak Konidena + */ public class SubEntity extends Individual { Set publications = new HashSet(); diff --git a/themes/vivo-basic/css/visualization/entityComparison/layout.css b/themes/vivo-basic/css/visualization/entityComparison/layout.css index ac4c5f31..4cf022cb 100644 --- a/themes/vivo-basic/css/visualization/entityComparison/layout.css +++ b/themes/vivo-basic/css/visualization/entityComparison/layout.css @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ @CHARSET "UTF-8"; head,#body {