1 files changed, 25 insertions, 8 deletions

diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java b/vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java
index 709cb46..8d077bb 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java
@@ -2,7 +2,6 @@ package de.bjusystems.vdrmanager.data;
 
 import java.util.Date;
 
-
 import de.bjusystems.vdrmanager.StringUtils;
 import de.bjusystems.vdrmanager.app.C;
 
@@ -10,24 +9,35 @@ import static de.bjusystems.vdrmanager.gui.Utils.mapSpecialChars;
 
 /**
  * Class for EPG events
+ *
  * @author bju
  */
 public class Epg extends Event implements Timerable {
 
 	private Timer timer;
 
+	private TimerMatch timerMatch;
+
+	public TimerMatch getTimerMatch() {
+		return timerMatch;
+	}
+
+	public void setTimerMatch(TimerMatch timerMatch) {
+		this.timerMatch = timerMatch;
+	}
+
 	public Epg(final String line) {
-		final String[] words = StringUtils.splitPreserveAllTokens(line, C.DATA_SEPARATOR);
-		channelNumber = words[0].substring(1);
+		final String[] words = StringUtils.splitPreserveAllTokens(line,
+				C.DATA_SEPARATOR);
+		channelNumber = Long.valueOf(words[0].substring(1));
 		channelName = words[1];
-		start = new Date(Long.parseLong(words[2])*1000);
-		stop = new Date(Long.parseLong(words[3])*1000);
+		start = new Date(Long.parseLong(words[2]) * 1000);
+		stop = new Date(Long.parseLong(words[3]) * 1000);
 		title = mapSpecialChars(words[4]);
-		description = words.length > 5 ? mapSpecialChars(words[5]): "";
+		description = words.length > 5 ? mapSpecialChars(words[5]) : "";
 		shortText = words.length > 6 ? mapSpecialChars(words[6]) : "";
 		channelId = words.length > 7 ? mapSpecialChars(words[7]) : "";
 	}
-	
 
 	public Timer getTimer() {
 		return timer;
@@ -35,6 +45,13 @@ public class Epg extends Event implements Timerable {
 
 	public void setTimer(final Timer timer) {
 		this.timer = timer;
+		if (start.before(timer.getStart())) {
+			timerMatch = TimerMatch.End;
+		} else if (stop.after(timer.getStop())) {
+			timerMatch = TimerMatch.Begin;
+		} else {
+			timerMatch = TimerMatch.Full;
+		}
 	}
 
 	public TimerState getTimerState() {
@@ -44,7 +61,7 @@ public class Epg extends Event implements Timerable {
 			return timer.getTimerState();
 		}
 	}
-	
+
 	public Timer createTimer() {
 		return new Timer(this);
 	}