corrected a merge error
This commit is contained in:
@@ -72,11 +72,6 @@ public class IncludedNote {
|
|||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IncludedNote setContent(String content) {
|
|
||||||
this.content = content;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public SubjectCode getSubjectCode() {
|
public SubjectCode getSubjectCode() {
|
||||||
return subjectCode;
|
return subjectCode;
|
||||||
}
|
}
|
||||||
@@ -93,9 +88,9 @@ public class IncludedNote {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public String toCiiXml(){
|
public String toCiiXml() {
|
||||||
String result = INCLUDE_START + CONTENT_START +
|
String result = INCLUDE_START + CONTENT_START +
|
||||||
XMLTools.encodeXML(getContent() )+ CONTENT_END;
|
XMLTools.encodeXML(getContent()) + CONTENT_END;
|
||||||
if (getSubjectCode() != null) {
|
if (getSubjectCode() != null) {
|
||||||
result += SUBJECT_CODE_START + getSubjectCode() + SUBJECT_CODE_END;
|
result += SUBJECT_CODE_START + getSubjectCode() + SUBJECT_CODE_END;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user