From c0bd32ce16cc9e154f9f4f11974e83b866a9aa14 Mon Sep 17 00:00:00 2001
From: "a.babadshanjan" <a.babadshanjan@localhost>
Date: Tue, 7 Oct 2008 13:26:14 +0000
Subject: [PATCH] Changed locality from type String to type LanguageStringBase

---
 .../java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java   | 8 ++++----
 .../eu/etaxonomy/cdm/model/occurrence/GatheringEvent.java | 7 ++++---
 .../java/eu/etaxonomy/cdm/test/function/TestSpecimen.java | 6 +++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
index 142b035cce..c71799a148 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
@@ -270,10 +270,10 @@ public abstract class TaxonNameBase<T extends TaxonNameBase, S extends INameCach
 	
 	public void setFullTitleCache(String fullTitleCache, boolean protectCache){
 		//TODO truncation of full title cache
-//		if (fullTitleCache != null && fullTitleCache.length() > 254){
-//			logger.warn("Truncation of full title cache: " + this.toString() + "/" + fullTitleCache);
-//			fullTitleCache = fullTitleCache.substring(0, 249) + "...";
-//		}
+		if (fullTitleCache != null && fullTitleCache.length() > 329){
+			logger.warn("Truncation of full title cache: " + this.toString() + "/" + fullTitleCache);
+			fullTitleCache = fullTitleCache.substring(0, 329) + "...";
+		}
 		this.fullTitleCache = fullTitleCache;
 		this.setProtectedFullTitleCache(protectCache);
 	}
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/GatheringEvent.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/GatheringEvent.java
index bf96cdba9f..acf428c8c2 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/GatheringEvent.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/GatheringEvent.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.model.agent.Agent;
 import eu.etaxonomy.cdm.model.common.EventBase;
+import eu.etaxonomy.cdm.model.common.LanguageStringBase;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.Point;
 
@@ -55,7 +56,7 @@ public class GatheringEvent extends EventBase {
 
 	//Locality name (as free text) where this occurrence happened
 	@XmlElement(name = "Locality")
-	private String locality;
+	private LanguageStringBase locality;
 	
 	@XmlElement(name = "ExactLocation")
 	private Point exactLocation;
@@ -123,10 +124,10 @@ public class GatheringEvent extends EventBase {
 		this.collectingAreas.remove(area);
 	}
 
-	public String getLocality(){
+	public LanguageStringBase getLocality(){
 		return this.locality;
 	}
-	public void setLocality(String locality){
+	public void setLocality(LanguageStringBase locality){
 		this.locality = locality;
 	}
 
diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestSpecimen.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestSpecimen.java
index 8c4cce8883..3793404cbd 100644
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestSpecimen.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestSpecimen.java
@@ -18,6 +18,9 @@ import eu.etaxonomy.cdm.model.agent.Agent;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.LanguageString;
+import eu.etaxonomy.cdm.model.common.LanguageStringBase;
 import eu.etaxonomy.cdm.model.common.OriginalSource;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
@@ -90,7 +93,8 @@ public class TestSpecimen {
 		
 		gatheringEvent.addCollectingArea(namedArea);
 		String localityString = "Sierras Pampeanas, Sauce Chico";
-		gatheringEvent.setLocality(localityString);
+		LanguageStringBase locality = LanguageString.NewInstance(localityString, Language.DEFAULT());
+		gatheringEvent.setLocality(locality);
 		
 		
 		logger.info("Create new specimen ...");
-- 
2.34.1