From 2561e8ce5b45a135e496d5a78f433466e068a1e0 Mon Sep 17 00:00:00 2001
From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Thu, 16 Jan 2014 22:47:12 +0100
Subject: [PATCH] Preparing 1.6.0 release
---
Changelog | 3 +++
pom.xml | 6 +++---
src/main/java/org/vanbest/xmltv/Channel.java | 14 +-------------
src/main/resources/tv_grab_nl_java.properties | 4 ----
4 files changed, 7 insertions(+), 20 deletions(-)
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 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.vanbest.xmltv.tv_grab_nl_java</groupId>
<artifactId>tv_grab_nl_java</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.6.0</version>
<scm>
<connection>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</connection>
- <developerConnection>scm:git:https://janpascal@github.com/janpascal/tv_grab_nl_java.git</developerConnection>
- <url>https://github.com/janpascal/tv_grab_nl_java</url>
+ <developerConnection>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</developerConnection>
+ <url>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</url>
</scm>
<dependencies>
<dependency>
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
--
2.39.5