From 2ebef34408570b68d7ef9b16afb8887698d2eee3 Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Fri, 21 Sep 2012 18:45:34 +0200 Subject: [PATCH] Renamed simplechapter variable names --- .../antennapod/activity/AudioplayerActivity.java | 4 ++-- .../{SCListAdapter.java => ChapterListAdapter.java} | 6 +++--- src/de/danoeh/antennapod/feed/FeedManager.java | 4 ++-- src/de/danoeh/antennapod/storage/PodDBAdapter.java | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) rename src/de/danoeh/antennapod/adapter/{SCListAdapter.java => ChapterListAdapter.java} (96%) diff --git a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java index 7764b3429..5cd2ed24a 100644 --- a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -16,7 +16,7 @@ import com.viewpagerindicator.TabPageIndicator; import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.adapter.SCListAdapter; +import de.danoeh.antennapod.adapter.ChapterListAdapter; import de.danoeh.antennapod.feed.FeedMedia; import de.danoeh.antennapod.feed.SimpleChapter; import de.danoeh.antennapod.fragment.CoverFragment; @@ -130,7 +130,7 @@ public class AudioplayerActivity extends MediaplayerActivity { }; - sCChapterFragment.setListAdapter(new SCListAdapter( + sCChapterFragment.setListAdapter(new ChapterListAdapter( activity, 0, media.getItem() .getChapters())); diff --git a/src/de/danoeh/antennapod/adapter/SCListAdapter.java b/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java similarity index 96% rename from src/de/danoeh/antennapod/adapter/SCListAdapter.java rename to src/de/danoeh/antennapod/adapter/ChapterListAdapter.java index 3479cdc39..e13b930eb 100644 --- a/src/de/danoeh/antennapod/adapter/SCListAdapter.java +++ b/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java @@ -24,11 +24,11 @@ import de.danoeh.antennapod.feed.Chapter; import de.danoeh.antennapod.feed.SimpleChapter; import de.danoeh.antennapod.util.Converter; -public class SCListAdapter extends ArrayAdapter { +public class ChapterListAdapter extends ArrayAdapter { - private static final String TAG = "SCListAdapter"; + private static final String TAG = "ChapterListAdapter"; - public SCListAdapter(Context context, int textViewResourceId, + public ChapterListAdapter(Context context, int textViewResourceId, List objects) { super(context, textViewResourceId, objects); } diff --git a/src/de/danoeh/antennapod/feed/FeedManager.java b/src/de/danoeh/antennapod/feed/FeedManager.java index bd6f7c544..526334b2b 100644 --- a/src/de/danoeh/antennapod/feed/FeedManager.java +++ b/src/de/danoeh/antennapod/feed/FeedManager.java @@ -923,9 +923,9 @@ public class FeedManager { do { int chapterType = chapterCursor.getInt(PodDBAdapter.KEY_CHAPTER_TYPE_INDEX); Chapter chapter = null; - long start = chapterCursor.getLong(PodDBAdapter.KEY_SC_START_INDEX); + long start = chapterCursor.getLong(PodDBAdapter.KEY_CHAPTER_START_INDEX); String title = chapterCursor.getString(PodDBAdapter.KEY_TITLE_INDEX); - String link = chapterCursor.getString(PodDBAdapter.KEY_SC_LINK_INDEX); + String link = chapterCursor.getString(PodDBAdapter.KEY_CHAPTER_LINK_INDEX); switch (chapterType) { case SimpleChapter.CHAPTERTYPE_SIMPLECHAPTER: diff --git a/src/de/danoeh/antennapod/storage/PodDBAdapter.java b/src/de/danoeh/antennapod/storage/PodDBAdapter.java index f5efd4cc9..5be76faee 100644 --- a/src/de/danoeh/antennapod/storage/PodDBAdapter.java +++ b/src/de/danoeh/antennapod/storage/PodDBAdapter.java @@ -74,9 +74,9 @@ public class PodDBAdapter { public static final int KEY_FEEDITEM_INDEX = 1; public static final int KEY_QUEUE_FEED_INDEX = 2; // --------- Chapters indices - public static final int KEY_SC_START_INDEX = 2; - public static final int KEY_SC_FEEDITEM_INDEX = 3; - public static final int KEY_SC_LINK_INDEX = 4; + public static final int KEY_CHAPTER_START_INDEX = 2; + public static final int KEY_CHAPTER_FEEDITEM_INDEX = 3; + public static final int KEY_CHAPTER_LINK_INDEX = 4; public static final int KEY_CHAPTER_TYPE_INDEX = 5; // Key-constants @@ -109,7 +109,7 @@ public class PodDBAdapter { public static final String KEY_START = "start"; public static final String KEY_LANGUAGE = "language"; public static final String KEY_AUTHOR = "author"; - public static final String KEY_HAS_SIMPLECHAPTERS = "has_simple_chapters"; + public static final String KEY_HAS_CHAPTERS = "has_simple_chapters"; public static final String KEY_TYPE = "type"; public static final String KEY_ITEM_IDENTIFIER = "item_identifier"; public static final String KEY_FEED_IDENTIFIER = "feed_identifier"; @@ -145,7 +145,7 @@ public class PodDBAdapter { + " INTEGER," + KEY_READ + " INTEGER," + KEY_LINK + " TEXT," + KEY_DESCRIPTION + " TEXT," + KEY_PAYMENT_LINK + " TEXT," + KEY_MEDIA + " INTEGER," + KEY_FEED + " INTEGER," - + KEY_HAS_SIMPLECHAPTERS + " INTEGER," + KEY_ITEM_IDENTIFIER + + KEY_HAS_CHAPTERS + " INTEGER," + KEY_ITEM_IDENTIFIER + " TEXT)"; private static final String CREATE_TABLE_FEED_IMAGES = "CREATE TABLE " @@ -333,7 +333,7 @@ public class PodDBAdapter { } values.put(KEY_FEED, item.getFeed().getId()); values.put(KEY_READ, item.isRead()); - values.put(KEY_HAS_SIMPLECHAPTERS, item.getChapters() != null); + values.put(KEY_HAS_CHAPTERS, item.getChapters() != null); values.put(KEY_ITEM_IDENTIFIER, item.getItemIdentifier()); if (item.getId() == 0) { item.setId(db.insert(TABLE_NAME_FEED_ITEMS, null, values));