From: Jan-Pascal van Best Date: Thu, 16 Jan 2014 21:47:12 +0000 (+0100) Subject: Preparing 1.6.0 release X-Git-Tag: v1.6.0 X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=2561e8ce5b45a135e496d5a78f433466e068a1e0;p=tv_grab_nl_java Preparing 1.6.0 release --- diff --git a/Changelog b/Changelog index 3941f35..e919840 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,9 @@ Changelog for tv_grab_nl_java ============================= +tv_grab_nl_java-1.6.0 (2014-01-16) +- Parser for new RTL site. Only provides RTL4, 5, 7 and 8. + tv_grab_nl_java-1.5.2 (2014-01-14) - Fix null object exception (thanks to Stephan for the bug report) diff --git a/pom.xml b/pom.xml index 956f852..c82bf6a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.vanbest.xmltv.tv_grab_nl_java tv_grab_nl_java - 1.5.3-SNAPSHOT + 1.6.0 scm:git:git://github.com/janpascal/tv_grab_nl_java.git - scm:git:https://janpascal@github.com/janpascal/tv_grab_nl_java.git - https://github.com/janpascal/tv_grab_nl_java + scm:git:git://github.com/janpascal/tv_grab_nl_java.git + scm:git:git://github.com/janpascal/tv_grab_nl_java.git diff --git a/src/main/java/org/vanbest/xmltv/Channel.java b/src/main/java/org/vanbest/xmltv/Channel.java index d824e83..67e3075 100644 --- a/src/main/java/org/vanbest/xmltv/Channel.java +++ b/src/main/java/org/vanbest/xmltv/Channel.java @@ -43,19 +43,7 @@ public class Channel { c.names.add(name); return c; } -/* - static Channel getChannel(int source, String id, String name, String extraConfig) { - Channel c; - if(EPGSourceFactory.getChannelSourceName(source).equals(Horizon.NAME)) { - long horizonId=Long.parseLong(extraConfig); - c = new Horizon.HorizonChannel(source, id, horizonId); - } else { - c = new Channel(source, id); - } - c.names.add(name); - return c; - } -*/ + public String getXmltvChannelId() { return xmltv; // id + "." + getSourceName(); } diff --git a/src/main/resources/tv_grab_nl_java.properties b/src/main/resources/tv_grab_nl_java.properties index 398911e..d5f155c 100644 --- a/src/main/resources/tv_grab_nl_java.properties +++ b/src/main/resources/tv_grab_nl_java.properties @@ -2,7 +2,3 @@ project.version=${project.version} project.name=${project.name} project.description=${project.description} build.time=${build.time} -org.vanbest.xmltv.epgsource.impl.1=org.vanbest.xmltv.TvGids -org.vanbest.xmltv.epgsource.impl.2=org.vanbest.xmltv.RTL -org.vanbest.xmltv.epgsource.impl.3=org.vanbest.xmltv.Horizon -org.vanbest.xmltv.epgsource.impl.4=org.vanbest.xmltv.ZiggoGids