From 09ae33ea909aa5b547170210919931f83d5d8952 Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Mon, 31 Dec 2012 17:50:25 +0100 Subject: [PATCH] Moved namespace classes Deleted packages with only one class in it --- .../antennapod/syndication/handler/SyndHandler.java | 8 ++++---- .../syndication/namespace/{content => }/NSContent.java | 4 +--- .../syndication/namespace/{itunes => }/NSITunes.java | 4 +--- .../syndication/namespace/{rss20 => }/NSRSS20.java | 4 +--- .../namespace/{simplechapters => }/NSSimpleChapters.java | 4 +--- .../antennapod/syndication/namespace/atom/NSAtom.java | 2 +- 6 files changed, 9 insertions(+), 17 deletions(-) rename src/de/danoeh/antennapod/syndication/namespace/{content => }/NSContent.java (78%) rename src/de/danoeh/antennapod/syndication/namespace/{itunes => }/NSITunes.java (85%) rename src/de/danoeh/antennapod/syndication/namespace/{rss20 => }/NSRSS20.java (96%) rename src/de/danoeh/antennapod/syndication/namespace/{simplechapters => }/NSSimpleChapters.java (87%) diff --git a/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java b/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java index b52d4f6d2..4c73e72e8 100644 --- a/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java +++ b/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java @@ -7,13 +7,13 @@ import org.xml.sax.helpers.DefaultHandler; import android.util.Log; import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.feed.Feed; +import de.danoeh.antennapod.syndication.namespace.NSContent; +import de.danoeh.antennapod.syndication.namespace.NSITunes; +import de.danoeh.antennapod.syndication.namespace.NSRSS20; +import de.danoeh.antennapod.syndication.namespace.NSSimpleChapters; import de.danoeh.antennapod.syndication.namespace.Namespace; import de.danoeh.antennapod.syndication.namespace.SyndElement; import de.danoeh.antennapod.syndication.namespace.atom.NSAtom; -import de.danoeh.antennapod.syndication.namespace.content.NSContent; -import de.danoeh.antennapod.syndication.namespace.itunes.NSITunes; -import de.danoeh.antennapod.syndication.namespace.rss20.NSRSS20; -import de.danoeh.antennapod.syndication.namespace.simplechapters.NSSimpleChapters; /** Superclass for all SAX Handlers which process Syndication formats */ public class SyndHandler extends DefaultHandler { diff --git a/src/de/danoeh/antennapod/syndication/namespace/content/NSContent.java b/src/de/danoeh/antennapod/syndication/namespace/NSContent.java similarity index 78% rename from src/de/danoeh/antennapod/syndication/namespace/content/NSContent.java rename to src/de/danoeh/antennapod/syndication/namespace/NSContent.java index 54a007a98..7f2a3e87d 100644 --- a/src/de/danoeh/antennapod/syndication/namespace/content/NSContent.java +++ b/src/de/danoeh/antennapod/syndication/namespace/NSContent.java @@ -1,10 +1,8 @@ -package de.danoeh.antennapod.syndication.namespace.content; +package de.danoeh.antennapod.syndication.namespace; import org.xml.sax.Attributes; import de.danoeh.antennapod.syndication.handler.HandlerState; -import de.danoeh.antennapod.syndication.namespace.Namespace; -import de.danoeh.antennapod.syndication.namespace.SyndElement; public class NSContent extends Namespace { public static final String NSTAG = "content"; diff --git a/src/de/danoeh/antennapod/syndication/namespace/itunes/NSITunes.java b/src/de/danoeh/antennapod/syndication/namespace/NSITunes.java similarity index 85% rename from src/de/danoeh/antennapod/syndication/namespace/itunes/NSITunes.java rename to src/de/danoeh/antennapod/syndication/namespace/NSITunes.java index 92f25f15c..cd7fef509 100644 --- a/src/de/danoeh/antennapod/syndication/namespace/itunes/NSITunes.java +++ b/src/de/danoeh/antennapod/syndication/namespace/NSITunes.java @@ -1,11 +1,9 @@ -package de.danoeh.antennapod.syndication.namespace.itunes; +package de.danoeh.antennapod.syndication.namespace; import org.xml.sax.Attributes; import de.danoeh.antennapod.feed.FeedImage; import de.danoeh.antennapod.syndication.handler.HandlerState; -import de.danoeh.antennapod.syndication.namespace.Namespace; -import de.danoeh.antennapod.syndication.namespace.SyndElement; public class NSITunes extends Namespace{ public static final String NSTAG = "itunes"; diff --git a/src/de/danoeh/antennapod/syndication/namespace/rss20/NSRSS20.java b/src/de/danoeh/antennapod/syndication/namespace/NSRSS20.java similarity index 96% rename from src/de/danoeh/antennapod/syndication/namespace/rss20/NSRSS20.java rename to src/de/danoeh/antennapod/syndication/namespace/NSRSS20.java index 696fef6e1..dfdf188db 100644 --- a/src/de/danoeh/antennapod/syndication/namespace/rss20/NSRSS20.java +++ b/src/de/danoeh/antennapod/syndication/namespace/NSRSS20.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.syndication.namespace.rss20; +package de.danoeh.antennapod.syndication.namespace; import org.xml.sax.Attributes; @@ -8,8 +8,6 @@ import de.danoeh.antennapod.feed.FeedImage; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.feed.FeedMedia; import de.danoeh.antennapod.syndication.handler.HandlerState; -import de.danoeh.antennapod.syndication.namespace.Namespace; -import de.danoeh.antennapod.syndication.namespace.SyndElement; import de.danoeh.antennapod.syndication.util.SyndDateUtils; import de.danoeh.antennapod.syndication.util.SyndTypeUtils; diff --git a/src/de/danoeh/antennapod/syndication/namespace/simplechapters/NSSimpleChapters.java b/src/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java similarity index 87% rename from src/de/danoeh/antennapod/syndication/namespace/simplechapters/NSSimpleChapters.java rename to src/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java index 3a5d2a833..55c26e812 100644 --- a/src/de/danoeh/antennapod/syndication/namespace/simplechapters/NSSimpleChapters.java +++ b/src/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.syndication.namespace.simplechapters; +package de.danoeh.antennapod.syndication.namespace; import java.util.ArrayList; @@ -7,8 +7,6 @@ import org.xml.sax.Attributes; import de.danoeh.antennapod.feed.Chapter; import de.danoeh.antennapod.feed.SimpleChapter; import de.danoeh.antennapod.syndication.handler.HandlerState; -import de.danoeh.antennapod.syndication.namespace.Namespace; -import de.danoeh.antennapod.syndication.namespace.SyndElement; import de.danoeh.antennapod.syndication.util.SyndDateUtils; public class NSSimpleChapters extends Namespace { diff --git a/src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java b/src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java index b97fd49b8..51c30e579 100644 --- a/src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java +++ b/src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java @@ -6,9 +6,9 @@ import de.danoeh.antennapod.feed.FeedImage; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.feed.FeedMedia; import de.danoeh.antennapod.syndication.handler.HandlerState; +import de.danoeh.antennapod.syndication.namespace.NSRSS20; import de.danoeh.antennapod.syndication.namespace.Namespace; import de.danoeh.antennapod.syndication.namespace.SyndElement; -import de.danoeh.antennapod.syndication.namespace.rss20.NSRSS20; import de.danoeh.antennapod.syndication.util.SyndDateUtils; import de.danoeh.antennapod.syndication.util.SyndTypeUtils;