From cb0caee116d76b064140041d46f25f7e8ab8a187 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 14 Jan 2011 21:33:38 +0000
Subject: [PATCH] NIHVIVO-1713 Suppress display of vitro:Keyword property on
 individual page. Wasn't working on old individual page; back end editing for
 this property is buggy; and the property itself will be removed in 1.3.

---
 .../individual/IndividualTemplateModel.java   | 19 -------------------
 .../freemarker/body/individual/individual.ftl |  5 -----
 2 files changed, 24 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
index 5db09da2a..df3be635d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
@@ -160,27 +160,8 @@ public class IndividualTemplateModel extends BaseTemplateModel {
         return individual.getURI();
     }
     
-    public List<String> getKeywords() {
-        return individual.getKeywords();
-    }
-    
-    public String getKeywordString() {
-        // Since this is a display method, the implementation should be moved out of IndividualImpl to here.
-        return individual.getKeywordString();
-    }
-    
     public String getLocalName() {
         return individual.getLocalName();
-    }
-    
-    @Deprecated
-    public String getDescription() {
-        return individual.getDescription();
-    }
-    
-    @Deprecated
-    public String getBlurb() {
-        return individual.getBlurb();
     }   
     
 }
diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl
index ca993835e..2710730d6 100644
--- a/webapp/web/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual.ftl
@@ -59,11 +59,6 @@
 <#-- Ontology properties -->
 <#include "individual-properties.ftl">
 
-<#-- Keywords -->
-<#if individual.keywords?has_content>
-    <p id="keywords">Keywords: ${individual.keywordString}</p>
-</#if>
-
 ${stylesheets.add("/css/individual/individual.css")}
                            
 <#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) -->