From 6ea7d9ef37cd2b5379492b0d128f6eb4981df596 Mon Sep 17 00:00:00 2001 From: hudajkhan Date: Tue, 13 Aug 2013 12:23:49 -0400 Subject: [PATCH] adding licence to classes, removing sparql feed related classes --- .../freemarker/edit/forms/js/addConcept.js | 16 +- .../mannlib/semservices/bo/BaseObject.java | 1 + .../mannlib/semservices/bo/Concept.java | 2 + .../mannlib/semservices/bo/ConceptInfo.java | 2 + .../cornell/mannlib/semservices/bo/Day.java | 2 + .../semservices/bo/SemanticServicesError.java | 2 + .../bo/SemanticServicesInfoBase.java | 2 + .../mannlib/semservices/bo/SparqlFeed.java | 208 ------------------ .../semservices/bo/SparqlFeedParam.java | 61 ----- .../mannlib/semservices/bo/SparqlPlugin.java | 54 ----- .../cornell/mannlib/semservices/bo/Time.java | 2 + .../exceptions/ConceptsNotFoundException.java | 2 + .../service/ExternalConceptService.java | 2 + .../service/impl/GemetService.java | 2 + .../semservices/service/impl/UMLSService.java | 2 + .../mannlib/semservices/util/ClassUtils.java | 2 + .../semservices/util/DateConverter.java | 2 + .../mannlib/semservices/util/DateUtils.java | 2 + .../semservices/util/DayConverter.java | 2 + .../util/MetadataNamespaceContext.java | 2 + .../mannlib/semservices/util/ObjectUtils.java | 3 + .../semservices/util/TimeConverter.java | 2 + .../semservices/util/TimestampConverter.java | 2 + .../util/XMLGregorianCalendarConverter.java | 3 + .../mannlib/semservices/util/XMLUtils.java | 2 + .../view/BeanToJsonSerializer.java | 2 + 26 files changed, 58 insertions(+), 326 deletions(-) delete mode 100644 src/edu/cornell/mannlib/semservices/bo/SparqlFeed.java delete mode 100644 src/edu/cornell/mannlib/semservices/bo/SparqlFeedParam.java delete mode 100644 src/edu/cornell/mannlib/semservices/bo/SparqlPlugin.java diff --git a/productMods/templates/freemarker/edit/forms/js/addConcept.js b/productMods/templates/freemarker/edit/forms/js/addConcept.js index 94411ff9..4c882f33 100644 --- a/productMods/templates/freemarker/edit/forms/js/addConcept.js +++ b/productMods/templates/freemarker/edit/forms/js/addConcept.js @@ -203,7 +203,9 @@ var addConceptForm = { var definedBy = conceptResult.definedBy; var type = conceptResult.type; var uri = conceptResult.uri; - return addConceptForm.generateIndividualConceptDisplay(uri, label, definition, type, definedBy, isBestMatch); + //this will be null if there are no alternate labels + var altLabels = conceptResult.altLabelList; + return addConceptForm.generateIndividualConceptDisplay(uri, label, altLabels, definition, type, definedBy, isBestMatch); }, //This should now return all best matches in one array and other results in another parseResults:function(resultsArray) { @@ -260,12 +262,12 @@ var addConceptForm = { this.externalConceptSemanticTypeLabel.val(conceptSemanticTypes); return true; }, - generateIndividualConceptDisplay: function(cuiURI, label, definition, type, definedBy, isBestMatch) { + generateIndividualConceptDisplay: function(cuiURI, label, altLabels, definition, type, definedBy, isBestMatch) { var htmlAdd = "
  • " + "
    " + "
    " + addConceptForm.generateIndividualCUIInput(cuiURI, label, type, definedBy) + - label + addConceptForm.generateIndividualTypeDisplay(type) + "
    " + + addConceptForm.generateIndividualLabelsDisplay(label, altLabels) + addConceptForm.generateIndividualTypeDisplay(type) + "
    " + addConceptForm.generateIndividualDefinitionDisplay(definition) + addConceptForm.generateBestOrAlternate(isBestMatch) + "" + @@ -275,6 +277,14 @@ var addConceptForm = { generateIndividualCUIInput:function(cuiURI, label, type, definedBy) { return ""; }, + //In case there are multiple labels display those + generateIndividualLabelsDisplay:function(label, altLabels) { + var labelDisplay = label; + if(altLabels != null && altLabels.length > 0) { + labelDisplay += "
    (" + altLabels + ")"; + } + return labelDisplay; + }, generateIndividualTypeDisplay:function(type) { if(type != null && type.length > 0) { return " (" + type + ")"; diff --git a/src/edu/cornell/mannlib/semservices/bo/BaseObject.java b/src/edu/cornell/mannlib/semservices/bo/BaseObject.java index f8f199b4..6be8ebcb 100644 --- a/src/edu/cornell/mannlib/semservices/bo/BaseObject.java +++ b/src/edu/cornell/mannlib/semservices/bo/BaseObject.java @@ -1,3 +1,4 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.semservices.bo; public class BaseObject { diff --git a/src/edu/cornell/mannlib/semservices/bo/Concept.java b/src/edu/cornell/mannlib/semservices/bo/Concept.java index 35cc5712..9b8ccac5 100644 --- a/src/edu/cornell/mannlib/semservices/bo/Concept.java +++ b/src/edu/cornell/mannlib/semservices/bo/Concept.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.bo; import java.util.ArrayList; diff --git a/src/edu/cornell/mannlib/semservices/bo/ConceptInfo.java b/src/edu/cornell/mannlib/semservices/bo/ConceptInfo.java index 4f111b3a..af3cb0a1 100644 --- a/src/edu/cornell/mannlib/semservices/bo/ConceptInfo.java +++ b/src/edu/cornell/mannlib/semservices/bo/ConceptInfo.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.bo; diff --git a/src/edu/cornell/mannlib/semservices/bo/Day.java b/src/edu/cornell/mannlib/semservices/bo/Day.java index 9c7bb998..1decc4e3 100644 --- a/src/edu/cornell/mannlib/semservices/bo/Day.java +++ b/src/edu/cornell/mannlib/semservices/bo/Day.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.bo; import java.util.Calendar; diff --git a/src/edu/cornell/mannlib/semservices/bo/SemanticServicesError.java b/src/edu/cornell/mannlib/semservices/bo/SemanticServicesError.java index f6c903d4..e6107e94 100644 --- a/src/edu/cornell/mannlib/semservices/bo/SemanticServicesError.java +++ b/src/edu/cornell/mannlib/semservices/bo/SemanticServicesError.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.bo; public class SemanticServicesError { diff --git a/src/edu/cornell/mannlib/semservices/bo/SemanticServicesInfoBase.java b/src/edu/cornell/mannlib/semservices/bo/SemanticServicesInfoBase.java index e434c594..d477f753 100644 --- a/src/edu/cornell/mannlib/semservices/bo/SemanticServicesInfoBase.java +++ b/src/edu/cornell/mannlib/semservices/bo/SemanticServicesInfoBase.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.bo; public class SemanticServicesInfoBase { diff --git a/src/edu/cornell/mannlib/semservices/bo/SparqlFeed.java b/src/edu/cornell/mannlib/semservices/bo/SparqlFeed.java deleted file mode 100644 index 50858203..00000000 --- a/src/edu/cornell/mannlib/semservices/bo/SparqlFeed.java +++ /dev/null @@ -1,208 +0,0 @@ -package edu.cornell.mannlib.semservices.bo; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -public class SparqlFeed extends BaseObject implements Serializable { - - - /** - * - */ - private static final long serialVersionUID = 6024170338796859330L; - private String name; - private String endpoint; - private String repository; - private String query; - private int mapperId; - private int fetcherId; - private Map parameterMap; - - /** - * Constructor - */ - public SparqlFeed() { - super(); - parameterMap = new HashMap(); - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the endpoint - */ - public String getEndpoint() { - return endpoint; - } - - /** - * @param endpoint the endpoint to set - */ - public void setEndpoint(String endpoint) { - this.endpoint = endpoint; - } - - /** - * @return the repository - */ - public String getRepository() { - return repository; - } - - /** - * @param repository the repository to set - */ - public void setRepository(String repository) { - this.repository = repository; - } - - /** - * @return the query - */ - public String getQuery() { - return query; - } - - /** - * @param query the query to set - */ - public void setQuery(String query) { - this.query = query; - } - - /** - * @return the mapperId - */ - public int getMapperId() { - return mapperId; - } - - /** - * @param mapperId the mapperId to set - */ - public void setMapperId(int mapperId) { - this.mapperId = mapperId; - } - - /** - * @return the fetcherId - */ - public int getFetcherId() { - return fetcherId; - } - - /** - * @param fetcherId the fetcherId to set - */ - public void setFetcherId(int fetcherId) { - this.fetcherId = fetcherId; - } - - /** - * @return the parameterMap - */ - public Map getParameterMap() { - return parameterMap; - } - - /** - * @param parameterMap the parameterMap to set - */ - public void setParameterMap(Map parameterMap) { - this.parameterMap = parameterMap; - } - - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((endpoint == null) ? 0 : endpoint.hashCode()); - result = prime * result + fetcherId; - result = prime * result + mapperId; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result - + ((parameterMap == null) ? 0 : parameterMap.hashCode()); - result = prime * result + ((query == null) ? 0 : query.hashCode()); - result = prime * result - + ((repository == null) ? 0 : repository.hashCode()); - return result; - } - - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - SparqlFeed other = (SparqlFeed) obj; - if (endpoint == null) { - if (other.endpoint != null) { - return false; - } - } else if (!endpoint.equals(other.endpoint)) { - return false; - } - if (fetcherId != other.fetcherId) { - return false; - } - if (mapperId != other.mapperId) { - return false; - } - if (name == null) { - if (other.name != null) { - return false; - } - } else if (!name.equals(other.name)) { - return false; - } - if (parameterMap == null) { - if (other.parameterMap != null) { - return false; - } - } else if (!parameterMap.equals(other.parameterMap)) { - return false; - } - if (query == null) { - if (other.query != null) { - return false; - } - } else if (!query.equals(other.query)) { - return false; - } - if (repository == null) { - if (other.repository != null) { - return false; - } - } else if (!repository.equals(other.repository)) { - return false; - } - return true; - } - - - -} diff --git a/src/edu/cornell/mannlib/semservices/bo/SparqlFeedParam.java b/src/edu/cornell/mannlib/semservices/bo/SparqlFeedParam.java deleted file mode 100644 index 28cb8f4e..00000000 --- a/src/edu/cornell/mannlib/semservices/bo/SparqlFeedParam.java +++ /dev/null @@ -1,61 +0,0 @@ -package edu.cornell.mannlib.semservices.bo; - -import java.io.Serializable; - -public class SparqlFeedParam extends BaseObject implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 4602167398212576479L; - private int sparqlFeedId; - private String param; - private String value; - - public SparqlFeedParam() { - // default constructor - } - - /** - * @return the sparqlFeedId - */ - public int getSparqlFeedId() { - return sparqlFeedId; - } - - /** - * @param sparqlFeedId the sparqlFeedId to set - */ - public void setSparqlFeedId(int sparqlFeedId) { - this.sparqlFeedId = sparqlFeedId; - } - - /** - * @return the param - */ - public String getParam() { - return param; - } - - /** - * @param param the param to set - */ - public void setParam(String param) { - this.param = param; - } - - /** - * @return the value - */ - public String getValue() { - return value; - } - - /** - * @param value the value to set - */ - public void setValue(String value) { - this.value = value; - } - -} diff --git a/src/edu/cornell/mannlib/semservices/bo/SparqlPlugin.java b/src/edu/cornell/mannlib/semservices/bo/SparqlPlugin.java deleted file mode 100644 index bb6c74c5..00000000 --- a/src/edu/cornell/mannlib/semservices/bo/SparqlPlugin.java +++ /dev/null @@ -1,54 +0,0 @@ -package edu.cornell.mannlib.semservices.bo; - - -import java.util.HashMap; -import java.util.Map; - -public class SparqlPlugin extends BaseObject { - private String type; - private String name; - private String classname; - - /** - * - */ - public SparqlPlugin() { - super(); - } - /** - * @return the name - */ - public String getName() { - return name; - } - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - /** - * @return the type - */ - public String getType() { - return type; - } - /** - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } - /** - * @return the classname - */ - public String getClassname() { - return classname; - } - /** - * @param classname the classname to set - */ - public void setClassname(String classname) { - this.classname = classname; - } -} diff --git a/src/edu/cornell/mannlib/semservices/bo/Time.java b/src/edu/cornell/mannlib/semservices/bo/Time.java index 6723947e..546caa1a 100644 --- a/src/edu/cornell/mannlib/semservices/bo/Time.java +++ b/src/edu/cornell/mannlib/semservices/bo/Time.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.bo; import java.util.Date; diff --git a/src/edu/cornell/mannlib/semservices/exceptions/ConceptsNotFoundException.java b/src/edu/cornell/mannlib/semservices/exceptions/ConceptsNotFoundException.java index c57f49a6..1264905e 100644 --- a/src/edu/cornell/mannlib/semservices/exceptions/ConceptsNotFoundException.java +++ b/src/edu/cornell/mannlib/semservices/exceptions/ConceptsNotFoundException.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.exceptions; public class ConceptsNotFoundException extends Exception { diff --git a/src/edu/cornell/mannlib/semservices/service/ExternalConceptService.java b/src/edu/cornell/mannlib/semservices/service/ExternalConceptService.java index 69f70f9b..034df4e3 100644 --- a/src/edu/cornell/mannlib/semservices/service/ExternalConceptService.java +++ b/src/edu/cornell/mannlib/semservices/service/ExternalConceptService.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.service; import java.util.List; diff --git a/src/edu/cornell/mannlib/semservices/service/impl/GemetService.java b/src/edu/cornell/mannlib/semservices/service/impl/GemetService.java index 7ee4c52e..1fe52b2f 100644 --- a/src/edu/cornell/mannlib/semservices/service/impl/GemetService.java +++ b/src/edu/cornell/mannlib/semservices/service/impl/GemetService.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.service.impl; diff --git a/src/edu/cornell/mannlib/semservices/service/impl/UMLSService.java b/src/edu/cornell/mannlib/semservices/service/impl/UMLSService.java index c95c0e8e..ef930223 100644 --- a/src/edu/cornell/mannlib/semservices/service/impl/UMLSService.java +++ b/src/edu/cornell/mannlib/semservices/service/impl/UMLSService.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.service.impl; import java.io.BufferedReader; diff --git a/src/edu/cornell/mannlib/semservices/util/ClassUtils.java b/src/edu/cornell/mannlib/semservices/util/ClassUtils.java index 457734c2..1c1c5ca0 100644 --- a/src/edu/cornell/mannlib/semservices/util/ClassUtils.java +++ b/src/edu/cornell/mannlib/semservices/util/ClassUtils.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + /* * $Id$ * CONFIDENTIAL AND PROPRIETARY. ? 2007 Revolution Health Group LLC. All rights reserved. diff --git a/src/edu/cornell/mannlib/semservices/util/DateConverter.java b/src/edu/cornell/mannlib/semservices/util/DateConverter.java index 9c1980f2..02ddc491 100644 --- a/src/edu/cornell/mannlib/semservices/util/DateConverter.java +++ b/src/edu/cornell/mannlib/semservices/util/DateConverter.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + /* * $Id: DateConverter.java 50408 2007-03-28 19:14:46Z jdamick $ * diff --git a/src/edu/cornell/mannlib/semservices/util/DateUtils.java b/src/edu/cornell/mannlib/semservices/util/DateUtils.java index 42a54874..7e18b736 100644 --- a/src/edu/cornell/mannlib/semservices/util/DateUtils.java +++ b/src/edu/cornell/mannlib/semservices/util/DateUtils.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.util; import java.text.ParsePosition; diff --git a/src/edu/cornell/mannlib/semservices/util/DayConverter.java b/src/edu/cornell/mannlib/semservices/util/DayConverter.java index c8ba9f2b..f21edefa 100644 --- a/src/edu/cornell/mannlib/semservices/util/DayConverter.java +++ b/src/edu/cornell/mannlib/semservices/util/DayConverter.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.util; diff --git a/src/edu/cornell/mannlib/semservices/util/MetadataNamespaceContext.java b/src/edu/cornell/mannlib/semservices/util/MetadataNamespaceContext.java index 8c177eea..298b16b1 100644 --- a/src/edu/cornell/mannlib/semservices/util/MetadataNamespaceContext.java +++ b/src/edu/cornell/mannlib/semservices/util/MetadataNamespaceContext.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.util; import java.util.Iterator; import javax.xml.XMLConstants; diff --git a/src/edu/cornell/mannlib/semservices/util/ObjectUtils.java b/src/edu/cornell/mannlib/semservices/util/ObjectUtils.java index b79eb200..c146ede7 100644 --- a/src/edu/cornell/mannlib/semservices/util/ObjectUtils.java +++ b/src/edu/cornell/mannlib/semservices/util/ObjectUtils.java @@ -1,4 +1,7 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + /* + * $Id$ * CONFIDENTIAL AND PROPRIETARY. © 2007 Revolution Health Group LLC. All rights reserved. * This source code may not be disclosed to others, used or reproduced without the written permission of Revolution Health Group. diff --git a/src/edu/cornell/mannlib/semservices/util/TimeConverter.java b/src/edu/cornell/mannlib/semservices/util/TimeConverter.java index 41a04448..ccd6147c 100644 --- a/src/edu/cornell/mannlib/semservices/util/TimeConverter.java +++ b/src/edu/cornell/mannlib/semservices/util/TimeConverter.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.util; import edu.cornell.mannlib.semservices.bo.Time; import java.util.Date; diff --git a/src/edu/cornell/mannlib/semservices/util/TimestampConverter.java b/src/edu/cornell/mannlib/semservices/util/TimestampConverter.java index 8c015ee3..c4f3baa8 100644 --- a/src/edu/cornell/mannlib/semservices/util/TimestampConverter.java +++ b/src/edu/cornell/mannlib/semservices/util/TimestampConverter.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.util; import java.sql.Timestamp; import java.text.SimpleDateFormat; diff --git a/src/edu/cornell/mannlib/semservices/util/XMLGregorianCalendarConverter.java b/src/edu/cornell/mannlib/semservices/util/XMLGregorianCalendarConverter.java index 69d23eb9..2caaf4ce 100644 --- a/src/edu/cornell/mannlib/semservices/util/XMLGregorianCalendarConverter.java +++ b/src/edu/cornell/mannlib/semservices/util/XMLGregorianCalendarConverter.java @@ -1,4 +1,7 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + /* + * $Id: XMLGregorianCalendarConverter.java 28642 2006-10-25 13:41:54Z jdamick $ * * Copyright 2006- Revolution Health Group. All rights reserved. diff --git a/src/edu/cornell/mannlib/semservices/util/XMLUtils.java b/src/edu/cornell/mannlib/semservices/util/XMLUtils.java index 5c6407c0..f4735ea4 100644 --- a/src/edu/cornell/mannlib/semservices/util/XMLUtils.java +++ b/src/edu/cornell/mannlib/semservices/util/XMLUtils.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.semservices.util; import java.io.BufferedWriter; diff --git a/src/edu/cornell/mannlib/semservices/view/BeanToJsonSerializer.java b/src/edu/cornell/mannlib/semservices/view/BeanToJsonSerializer.java index ddc58286..13d4d859 100644 --- a/src/edu/cornell/mannlib/semservices/view/BeanToJsonSerializer.java +++ b/src/edu/cornell/mannlib/semservices/view/BeanToJsonSerializer.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + /* * $Id: BeanToJsonSerializer.java 66350 2007-08-20 21:11:41Z xluan $ *