textencoding is fully optional now

Author: mkleen

src/main/scala/scid3/model/frames/FrameBodyDateTime.scala

@@ -12,8 +12,8 @@ trait FrameBodyDateTime extends FrameBodyTextInformation {
 object TDENFrameBody {
 	def apply(tok: ByteArrayTokenizer): TDENFrameBody = {
 
-		val textEncoding = TextEncoding(tok.next()) orNull
-		val text = tok.textStrings(textEncoding)
+		val textEncoding = TextEncoding(tok.next())
+		val text = textEncoding.toList.flatMap { tok.textStrings }
 		val dateTime = text.head
 		// TODO Parse DateTime
 		// dateTime	   = text.isEmpty() ? null : text.get(0).replace(' ', 'T');
@@ -24,15 +24,15 @@ object TDENFrameBody {
 case class TDENFrameBody(
 	text: Seq[String],
 	dateTime: String,
-	textEncoding: TextEncoding) extends FrameBodyDateTime {
+	textEncoding: Option[TextEncoding]) extends FrameBodyDateTime {
 	val frameBodyType = TDEN
 }
 
 object TDORFrameBody {
 	def apply(tok: ByteArrayTokenizer): TDORFrameBody = {
 
-		val textEncoding = TextEncoding(tok.next()) orNull
-		val text = tok.textStrings(textEncoding)
+		val textEncoding = TextEncoding(tok.next())
+		val text = textEncoding.toList.flatMap { tok.textStrings }
 		val dateTime = text.head
 		// TODO Parse DateTime
 		// dateTime	   = text.isEmpty() ? null : text.get(0).replace(' ', 'T');
@@ -43,15 +43,15 @@ object TDORFrameBody {
 case class TDORFrameBody(
 	text: Seq[String],
 	dateTime: String,
-	textEncoding: TextEncoding) extends FrameBodyDateTime {
+	textEncoding: Option[TextEncoding]) extends FrameBodyDateTime {
 	val frameBodyType = TDOR
 }
 
 object TDRCFrameBody {
 	def apply(tok: ByteArrayTokenizer): TDRCFrameBody = {
 
-		val textEncoding = TextEncoding(tok.next()) orNull
-		val text = tok.textStrings(textEncoding)
+		val textEncoding = TextEncoding(tok.next())
+		val text = textEncoding.toList.flatMap { tok.textStrings }
 		val dateTime = text.head
 		// TODO Parse DateTime
 		// dateTime	   = text.isEmpty() ? null : text.get(0).replace(' ', 'T');
@@ -62,15 +62,15 @@ object TDRCFrameBody {
 case class TDRCFrameBody(
 	text: Seq[String],
 	dateTime: String,
-	textEncoding: TextEncoding) extends FrameBodyDateTime {
+	textEncoding: Option[TextEncoding]) extends FrameBodyDateTime {
 	val frameBodyType = TDRC
 }
 
 object TDRLFrameBody {
 	def apply(tok: ByteArrayTokenizer): TDRLFrameBody = {
 
-		val textEncoding = TextEncoding(tok.next()) orNull
-		val text = tok.textStrings(textEncoding)
+		val textEncoding = TextEncoding(tok.next())
+		val text = textEncoding.toList.flatMap { tok.textStrings }
 		val dateTime = text.head
 		// TODO Parse DateTime
 		// dateTime	   = text.isEmpty() ? null : text.get(0).replace(' ', 'T');
@@ -81,15 +81,15 @@ object TDRLFrameBody {
 case class TDRLFrameBody(
 	text: Seq[String],
 	dateTime: String,
-	textEncoding: TextEncoding) extends FrameBodyDateTime {
+	textEncoding: Option[TextEncoding]) extends FrameBodyDateTime {
 	val frameBodyType = TDRL
 }
 
 object TDTGFrameBody {
 	def apply(tok: ByteArrayTokenizer): TDTGFrameBody = {
 
-		val textEncoding = TextEncoding(tok.next()) orNull
-		val text = tok.textStrings(textEncoding)
+		val textEncoding = TextEncoding(tok.next()) 
+		val text = textEncoding.toList.flatMap { tok.textStrings }
 		val dateTime = text.head
 		// TODO Parse DateTime
 		// dateTime	   = text.isEmpty() ? null : text.get(0).replace(' ', 'T');
@@ -100,6 +100,6 @@ object TDTGFrameBody {
 case class TDTGFrameBody(
 		text: Seq[String],
 		dateTime: String,
-		textEncoding: TextEncoding) extends FrameBodyDateTime {
+		textEncoding: Option[TextEncoding]) extends FrameBodyDateTime {
 	val frameBodyType = TDTG
 }