honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build failure

This commit is contained in:
James Agnew 2014-12-04 11:41:13 -05:00
parent e3ad2d8a2d
commit c901330583
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java
View File

@ -102,28 +102,24 @@ public abstract class BaseHumanNameDt extends BaseIdentifiableElement {
public String getSuffixAsSingleString() { public String getSuffixAsSingleString() {
return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getSuffix()); return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getSuffix());
} }
/** /**
* Gets the value(s) for <b>text</b> (Text representation of the full name). * Gets the value(s) for <b>text</b> (Text representation of the full name). creating it if it does not exist. Will not return <code>null</code>.
* creating it if it does
* not exist. Will not return <code>null</code>.
* *
* <p> * <p>
* <b>Definition:</b> * <b>Definition:</b> A full text representation of the name
* A full text representation of the name * </p>
* </p>
*/ */
public abstract StringDt getText() ; public abstract StringDt getTextElement();
/** /**
* Sets the value(s) for <b>text</b> (Text representation of the full name) * Sets the value(s) for <b>text</b> (Text representation of the full name)
* *
* <p> * <p>
* <b>Definition:</b> * <b>Definition:</b> A full text representation of the name
* A full text representation of the name * </p>
* </p>
*/ */
public abstract BaseHumanNameDt setText(StringDt theValue); public abstract BaseHumanNameDt setText(StringDt theValue);
@Override @Override
public String toString() { public String toString() {
@ -132,15 +128,26 @@ public abstract class BaseHumanNameDt extends BaseIdentifiableElement {
b.append("given", getGivenAsSingleString()); b.append("given", getGivenAsSingleString());
return b.toString(); return b.toString();
} }
public String getNameAsSingleString(){ /**
* Returns all of the components of the name (prefix, given, family, suffix) as a
* single string with a single spaced string separating each part.
* <p>
* If none of the parts are populated, returns the {@link #getTextElement() text}
* element value instead.
* </p>
*/
public String getNameAsSingleString() {
List<StringDt> nameParts = new ArrayList<StringDt>(); List<StringDt> nameParts = new ArrayList<StringDt>();
nameParts.addAll(getPrefix()); nameParts.addAll(getPrefix());
nameParts.addAll(getGiven()); nameParts.addAll(getGiven());
nameParts.addAll(getFamily()); nameParts.addAll(getFamily());
nameParts.addAll(getSuffix()); nameParts.addAll(getSuffix());
if(nameParts.size() > 0) return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(nameParts); if (nameParts.size() > 0) {
else return getText().getValue(); return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(nameParts);
} else {
return getTextElement().getValue();
}
} }
} }