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 aa41845ab6160274b3d8640702f6239fa6b43302..3ac496be064d1ae1a0f96cefc96cede5ef14d935 100644 (file)
--- 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 02832b8aabbf9cae61ee6a709127bf5aa2f64c12..654c4fb161b399cff3a4f04f1ea18070751effdb 100644 (file)
--- 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)
         *