From 814d38e1149606d8bde5081b94a8a6287de7bf37 Mon Sep 17 00:00:00 2001 From: grahamtriggs Date: Mon, 2 Nov 2015 18:00:57 +0000 Subject: [PATCH] [VIVO-1031] Reduce redundancy in creating grant sparkles --- .../CoPIGrantCountQueryRunner.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 8022a308..4c2d9d7c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountQueryRunner.java @@ -232,10 +232,10 @@ public class CoPIGrantCountQueryRunner implements QueryRunner return sparqlQuery; } - public CollaborationData getQueryResult() + public CoInvestigationData getQueryResult() throws MalformedQueryParametersException { - CollaborationData data = getCachedData(this.egoURI); + CoInvestigationData data = getCachedData(this.egoURI); if (data != null) { return data; } @@ -243,7 +243,7 @@ public class CoPIGrantCountQueryRunner implements QueryRunner return getQueryResultAndCache(); } - private CollaborationData getCachedData(String egoURI) { + private CoInvestigationData getCachedData(String egoURI) { CollaborationDataCacheEntry entry = collaborationDataCache.get(egoURI); if (entry != null && !entry.hasExpired()) { entry.accessTime = new Date().getTime(); @@ -254,10 +254,10 @@ public class CoPIGrantCountQueryRunner implements QueryRunner return null; } - private synchronized CollaborationData getQueryResultAndCache() + private synchronized CoInvestigationData getQueryResultAndCache() throws MalformedQueryParametersException { - CollaborationData data = getCachedData(this.egoURI); + CoInvestigationData data = getCachedData(this.egoURI); if (data != null) { return data; } @@ -319,7 +319,7 @@ public class CoPIGrantCountQueryRunner implements QueryRunner private static class CollaborationDataCacheEntry { String uri; - CollaborationData data; + CoInvestigationData data; long creationTime; long accessTime; @@ -489,8 +489,8 @@ public class CoPIGrantCountQueryRunner implements QueryRunner } - public CollaborationData getData() { - return new CoInvestigationData(egoNode, nodes, edges); + public CoInvestigationData getData() { + return new CoInvestigationData(egoNode, nodes, edges, grantURLToVO); } private void createCoPIEdges(Map grantURLToVO,