From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Mon, 4 Mar 2013 11:03:05 +0000 (+0100)
Subject: Factor out fetchJSON to AbstractEPGSource
X-Git-Tag: 1.2.0~3
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=37059c920626abf58a0ee8e97f4101dfc5dae722;p=tv_grab_nl_java

Factor out fetchJSON to AbstractEPGSource
---

diff --git a/src/main/java/org/vanbest/xmltv/AbstractEPGSource.java b/src/main/java/org/vanbest/xmltv/AbstractEPGSource.java
index aa41845..3ac496b 100644
--- a/src/main/java/org/vanbest/xmltv/AbstractEPGSource.java
+++ b/src/main/java/org/vanbest/xmltv/AbstractEPGSource.java
@@ -6,6 +6,9 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+
+import net.sf.json.JSONObject;
+
 import org.apache.log4j.Logger;
 
 public abstract class AbstractEPGSource implements EPGSource {
@@ -77,6 +80,12 @@ public abstract class AbstractEPGSource implements EPGSource {
 		return buf.toString();
 	}
 
+	protected JSONObject fetchJSON(URL url) throws Exception {
+		String json = fetchURL(url);
+		logger.debug(json);
+		return JSONObject.fromObject(json);
+	}
+
 	public void clearCache() {
 		cache.clear(sourceId);
 	}
diff --git a/src/main/java/org/vanbest/xmltv/TvGids.java b/src/main/java/org/vanbest/xmltv/TvGids.java
index 02832b8..654c4fb 100644
--- a/src/main/java/org/vanbest/xmltv/TvGids.java
+++ b/src/main/java/org/vanbest/xmltv/TvGids.java
@@ -150,12 +150,6 @@ public class TvGids extends AbstractEPGSource implements EPGSource {
 		return result;
 	}
 
-	private JSONObject fetchJSON(URL url) throws Exception {
-		String json = fetchURL(url);
-		logger.debug(json);
-		return JSONObject.fromObject(json);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 *