From f4036a5b6d2b1922050cf795d1a3828e328a493f Mon Sep 17 00:00:00 2001
From: jstaerk <jstaerk@usegroup.de>
Date: Wed, 4 Dec 2024 14:39:14 +0100
Subject: [PATCH] corrected a merge error

---
 .../java/org/mustangproject/IncludedNote.java | 115 +++++++++---------
 1 file changed, 55 insertions(+), 60 deletions(-)

diff --git a/library/src/main/java/org/mustangproject/IncludedNote.java b/library/src/main/java/org/mustangproject/IncludedNote.java
index db34e793..0bcf3133 100644
--- a/library/src/main/java/org/mustangproject/IncludedNote.java
+++ b/library/src/main/java/org/mustangproject/IncludedNote.java
@@ -9,77 +9,72 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class IncludedNote {
-  private String content;
+	private String content;
 
-  private SubjectCode subjectCode;
+	private SubjectCode subjectCode;
 
-  private static final String INCLUDE_START = "<ram:IncludedNote>";
-  private static final String INCLUDE_END = "</ram:IncludedNote>";
-  private static final String CONTENT_START = "<ram:Content>";
-  private static final String CONTENT_END = "</ram:Content>";
-  private static final String SUBJECT_CODE_START = "<ram:SubjectCode>";
-  private static final String SUBJECT_CODE_END = "</ram:SubjectCode>";
+	private static final String INCLUDE_START = "<ram:IncludedNote>";
+	private static final String INCLUDE_END = "</ram:IncludedNote>";
+	private static final String CONTENT_START = "<ram:Content>";
+	private static final String CONTENT_END = "</ram:Content>";
+	private static final String SUBJECT_CODE_START = "<ram:SubjectCode>";
+	private static final String SUBJECT_CODE_END = "</ram:SubjectCode>";
 
-  public IncludedNote(String content, SubjectCode subjectCode) {
-    this.content = content;
-    this.subjectCode = subjectCode;
-  }
+	public IncludedNote(String content, SubjectCode subjectCode) {
+		this.content = content;
+		this.subjectCode = subjectCode;
+	}
 
 	/**
 	 * bean constructor
 	 */
-	public  IncludedNote() {
+	public IncludedNote() {
 
 	}
 
-  public static IncludedNote generalNote(String content) {
-    return new IncludedNote(content, SubjectCode.AAI);
-  }
+	public static IncludedNote generalNote(String content) {
+		return new IncludedNote(content, SubjectCode.AAI);
+	}
 
-  public static IncludedNote regulatoryNote(String content) {
-    return new IncludedNote(content, SubjectCode.REG);
-  }
+	public static IncludedNote regulatoryNote(String content) {
+		return new IncludedNote(content, SubjectCode.REG);
+	}
 
-  public static IncludedNote legalNote(String content) {
-    return new IncludedNote(content, SubjectCode.ABL);
-  }
+	public static IncludedNote legalNote(String content) {
+		return new IncludedNote(content, SubjectCode.ABL);
+	}
 
-  public static IncludedNote customsNote(String content) {
-    return new IncludedNote(content, SubjectCode.CUS);
-  }
+	public static IncludedNote customsNote(String content) {
+		return new IncludedNote(content, SubjectCode.CUS);
+	}
 
-  public static IncludedNote sellerNote(String content) {
-    return new IncludedNote(content, SubjectCode.SUR);
-  }
+	public static IncludedNote sellerNote(String content) {
+		return new IncludedNote(content, SubjectCode.SUR);
+	}
 
-  public static IncludedNote taxNote(String content) {
-    return new IncludedNote(content, SubjectCode.TXD);
-  }
+	public static IncludedNote taxNote(String content) {
+		return new IncludedNote(content, SubjectCode.TXD);
+	}
 
-  public static IncludedNote introductionNote(String content) {
-    return new IncludedNote(content, SubjectCode.ACY);
-  }
+	public static IncludedNote introductionNote(String content) {
+		return new IncludedNote(content, SubjectCode.ACY);
+	}
 
-  public static IncludedNote discountBonusNote(String content) {
-    return new IncludedNote(content, SubjectCode.AAK);
-  }
+	public static IncludedNote discountBonusNote(String content) {
+		return new IncludedNote(content, SubjectCode.AAK);
+	}
 
-  public static IncludedNote unspecifiedNote(String content) {
-    return new IncludedNote(content, null);
-  }
+	public static IncludedNote unspecifiedNote(String content) {
+		return new IncludedNote(content, null);
+	}
 
-  public String getContent() {
-    return content;
-  }
+	public String getContent() {
+		return content;
+	}
 
-  public IncludedNote setContent(String content) {
-    this.content = content;
-    return this;
-}
-
-  public SubjectCode getSubjectCode() {
-    return subjectCode;
-  }
+	public SubjectCode getSubjectCode() {
+		return subjectCode;
+	}
 
 
 	public IncludedNote setSubjectCode(SubjectCode subjectCode) {
@@ -93,13 +88,13 @@ public class IncludedNote {
 	}
 
 
-  public String toCiiXml(){
-    String result = INCLUDE_START + CONTENT_START +
-        XMLTools.encodeXML(getContent() )+ CONTENT_END;
-    if (getSubjectCode() != null) {
-      result += SUBJECT_CODE_START + getSubjectCode() + SUBJECT_CODE_END;
-    }
-    return result + INCLUDE_END;
-  }
-  
+	public String toCiiXml() {
+		String result = INCLUDE_START + CONTENT_START +
+			XMLTools.encodeXML(getContent()) + CONTENT_END;
+		if (getSubjectCode() != null) {
+			result += SUBJECT_CODE_START + getSubjectCode() + SUBJECT_CODE_END;
+		}
+		return result + INCLUDE_END;
+	}
+
 }