From 4795f259f05145590b38a53679192748ebdc8a86 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 19 Jun 2012 18:32:18 +0400 Subject: categorize more stuff --- src/org/fox/ttrss/ArticleList.java | 51 ------------------------- src/org/fox/ttrss/FeedCategoriesFragment.java | 1 + src/org/fox/ttrss/FeedCategoryList.java | 54 --------------------------- src/org/fox/ttrss/FeedList.java | 53 -------------------------- src/org/fox/ttrss/FeedsFragment.java | 1 + src/org/fox/ttrss/HeadlinesFragment.java | 1 + src/org/fox/ttrss/MainActivity.java | 1 + src/org/fox/ttrss/types/ArticleList.java | 50 +++++++++++++++++++++++++ src/org/fox/ttrss/types/FeedCategoryList.java | 52 ++++++++++++++++++++++++++ src/org/fox/ttrss/types/FeedList.java | 52 ++++++++++++++++++++++++++ 10 files changed, 158 insertions(+), 158 deletions(-) delete mode 100644 src/org/fox/ttrss/ArticleList.java delete mode 100644 src/org/fox/ttrss/FeedCategoryList.java delete mode 100644 src/org/fox/ttrss/FeedList.java create mode 100644 src/org/fox/ttrss/types/ArticleList.java create mode 100644 src/org/fox/ttrss/types/FeedCategoryList.java create mode 100644 src/org/fox/ttrss/types/FeedList.java (limited to 'src/org') diff --git a/src/org/fox/ttrss/ArticleList.java b/src/org/fox/ttrss/ArticleList.java deleted file mode 100644 index 2ff61e59..00000000 --- a/src/org/fox/ttrss/ArticleList.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.fox.ttrss; - -import java.util.ArrayList; - -import org.fox.ttrss.types.Article; - -import android.os.Parcel; -import android.os.Parcelable; - -@SuppressWarnings("serial") -public class ArticleList extends ArrayList
implements Parcelable { - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeInt(this.size()); - for (Article article : this) { - out.writeParcelable(article, flags); - } - } - - public void readFromParcel(Parcel in) { - int length = in.readInt(); - - for (int i = 0; i < length; i++) { - Article article = in.readParcelable(Article.class.getClassLoader()); - this.add(article); - } - } - - public ArticleList() { } - - public ArticleList(Parcel in) { - readFromParcel(in); - } - - @SuppressWarnings("rawtypes") - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - public ArticleList createFromParcel(Parcel in) { - return new ArticleList(in); - } - - public ArticleList[] newArray(int size) { - return new ArticleList[size]; - } - }; -} \ No newline at end of file diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java index bfe137e9..4de02f6b 100644 --- a/src/org/fox/ttrss/FeedCategoriesFragment.java +++ b/src/org/fox/ttrss/FeedCategoriesFragment.java @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.List; import org.fox.ttrss.types.FeedCategory; +import org.fox.ttrss.types.FeedCategoryList; import android.app.Activity; import android.content.Context; diff --git a/src/org/fox/ttrss/FeedCategoryList.java b/src/org/fox/ttrss/FeedCategoryList.java deleted file mode 100644 index 71e99161..00000000 --- a/src/org/fox/ttrss/FeedCategoryList.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.fox.ttrss; - -import java.util.ArrayList; - -import org.fox.ttrss.types.Feed; -import org.fox.ttrss.types.FeedCategory; - -import android.os.Parcel; -import android.os.Parcelable; - -@SuppressWarnings("serial") -public class FeedCategoryList extends ArrayList implements Parcelable { - - public FeedCategoryList() { } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeInt(this.size()); - for (FeedCategory feed : this) { - out.writeParcelable(feed, flags); - } - } - - public void readFromParcel(Parcel in) { - int length = in.readInt(); - - for (int i = 0; i < length; i++) { - FeedCategory feed = in.readParcelable(Feed.class.getClassLoader()); - this.add(feed); - } - - } - - public FeedCategoryList(Parcel in) { - readFromParcel(in); - } - - @SuppressWarnings("rawtypes") - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - public FeedCategoryList createFromParcel(Parcel in) { - return new FeedCategoryList(in); - } - - public FeedCategoryList[] newArray(int size) { - return new FeedCategoryList[size]; - } - }; - } diff --git a/src/org/fox/ttrss/FeedList.java b/src/org/fox/ttrss/FeedList.java deleted file mode 100644 index 2d3f0933..00000000 --- a/src/org/fox/ttrss/FeedList.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.fox.ttrss; - -import java.util.ArrayList; - -import org.fox.ttrss.types.Feed; - -import android.os.Parcel; -import android.os.Parcelable; - -@SuppressWarnings("serial") -public class FeedList extends ArrayList implements Parcelable { - - public FeedList() { } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeInt(this.size()); - for (Feed feed : this) { - out.writeParcelable(feed, flags); - } - } - - public void readFromParcel(Parcel in) { - int length = in.readInt(); - - for (int i = 0; i < length; i++) { - Feed feed = in.readParcelable(Feed.class.getClassLoader()); - this.add(feed); - } - - } - - public FeedList(Parcel in) { - readFromParcel(in); - } - - @SuppressWarnings("rawtypes") - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - public FeedList createFromParcel(Parcel in) { - return new FeedList(in); - } - - public FeedList[] newArray(int size) { - return new FeedList[size]; - } - }; - } diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index 9d18feba..b2062b54 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -33,6 +33,7 @@ import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.HttpContext; import org.fox.ttrss.types.Feed; import org.fox.ttrss.types.FeedCategory; +import org.fox.ttrss.types.FeedList; import org.fox.ttrss.util.EasySSLSocketFactory; import android.app.Activity; diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 5ca0a961..b26fab42 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.TimeZone; import org.fox.ttrss.types.Article; +import org.fox.ttrss.types.ArticleList; import org.fox.ttrss.types.Attachment; import org.fox.ttrss.types.Feed; import org.jsoup.Jsoup; diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 4564b9f9..3a51096a 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -12,6 +12,7 @@ import org.fox.ttrss.offline.OfflineActivity; import org.fox.ttrss.offline.OfflineDownloadService; import org.fox.ttrss.offline.OfflineUploadService; import org.fox.ttrss.types.Article; +import org.fox.ttrss.types.ArticleList; import org.fox.ttrss.types.Feed; import org.fox.ttrss.types.FeedCategory; import org.fox.ttrss.types.Label; diff --git a/src/org/fox/ttrss/types/ArticleList.java b/src/org/fox/ttrss/types/ArticleList.java new file mode 100644 index 00000000..a03546c3 --- /dev/null +++ b/src/org/fox/ttrss/types/ArticleList.java @@ -0,0 +1,50 @@ +package org.fox.ttrss.types; + +import java.util.ArrayList; + + +import android.os.Parcel; +import android.os.Parcelable; + +@SuppressWarnings("serial") +public class ArticleList extends ArrayList
implements Parcelable { + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeInt(this.size()); + for (Article article : this) { + out.writeParcelable(article, flags); + } + } + + public void readFromParcel(Parcel in) { + int length = in.readInt(); + + for (int i = 0; i < length; i++) { + Article article = in.readParcelable(Article.class.getClassLoader()); + this.add(article); + } + } + + public ArticleList() { } + + public ArticleList(Parcel in) { + readFromParcel(in); + } + + @SuppressWarnings("rawtypes") + public static final Parcelable.Creator CREATOR = + new Parcelable.Creator() { + public ArticleList createFromParcel(Parcel in) { + return new ArticleList(in); + } + + public ArticleList[] newArray(int size) { + return new ArticleList[size]; + } + }; +} \ No newline at end of file diff --git a/src/org/fox/ttrss/types/FeedCategoryList.java b/src/org/fox/ttrss/types/FeedCategoryList.java new file mode 100644 index 00000000..74cbdd48 --- /dev/null +++ b/src/org/fox/ttrss/types/FeedCategoryList.java @@ -0,0 +1,52 @@ +package org.fox.ttrss.types; + +import java.util.ArrayList; + + +import android.os.Parcel; +import android.os.Parcelable; + +@SuppressWarnings("serial") +public class FeedCategoryList extends ArrayList implements Parcelable { + + public FeedCategoryList() { } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeInt(this.size()); + for (FeedCategory feed : this) { + out.writeParcelable(feed, flags); + } + } + + public void readFromParcel(Parcel in) { + int length = in.readInt(); + + for (int i = 0; i < length; i++) { + FeedCategory feed = in.readParcelable(Feed.class.getClassLoader()); + this.add(feed); + } + + } + + public FeedCategoryList(Parcel in) { + readFromParcel(in); + } + + @SuppressWarnings("rawtypes") + public static final Parcelable.Creator CREATOR = + new Parcelable.Creator() { + public FeedCategoryList createFromParcel(Parcel in) { + return new FeedCategoryList(in); + } + + public FeedCategoryList[] newArray(int size) { + return new FeedCategoryList[size]; + } + }; + } diff --git a/src/org/fox/ttrss/types/FeedList.java b/src/org/fox/ttrss/types/FeedList.java new file mode 100644 index 00000000..e5775f70 --- /dev/null +++ b/src/org/fox/ttrss/types/FeedList.java @@ -0,0 +1,52 @@ +package org.fox.ttrss.types; + +import java.util.ArrayList; + + +import android.os.Parcel; +import android.os.Parcelable; + +@SuppressWarnings("serial") +public class FeedList extends ArrayList implements Parcelable { + + public FeedList() { } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeInt(this.size()); + for (Feed feed : this) { + out.writeParcelable(feed, flags); + } + } + + public void readFromParcel(Parcel in) { + int length = in.readInt(); + + for (int i = 0; i < length; i++) { + Feed feed = in.readParcelable(Feed.class.getClassLoader()); + this.add(feed); + } + + } + + public FeedList(Parcel in) { + readFromParcel(in); + } + + @SuppressWarnings("rawtypes") + public static final Parcelable.Creator CREATOR = + new Parcelable.Creator() { + public FeedList createFromParcel(Parcel in) { + return new FeedList(in); + } + + public FeedList[] newArray(int size) { + return new FeedList[size]; + } + }; + } -- cgit v1.2.3