From fc86aa6fa7156a5970d4d28ccc5efc83c18f2503 Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Fri, 14 Sep 2012 12:18:13 -0400 Subject: [PATCH] Performed a refactor and removed unneeded files Renamed package to org.RickBarretet.osj.forum refactored some layout names removed unused layout files Signed-off-by: Ricky Barrette --- OSJ Forum/AndroidManifest.xml | 4 ++-- OSJ Forum/res/layout/activity_forum_list.xml | 2 +- OSJ Forum/res/layout/activity_forum_twopane.xml | 2 +- OSJ Forum/res/layout/activity_topic_list.xml | 2 +- OSJ Forum/res/layout/activity_topic_twopane.xml | 2 +- OSJ Forum/res/layout/fragment_forum_detail.xml | 8 -------- OSJ Forum/res/layout/fragment_topic_detail.xml | 8 -------- .../res/layout/{forum_item.xml => item_forum.xml} | 0 .../res/layout/{post_item.xml => item_post.xml} | 0 .../{sub_forum_item.xml => item_sub_forum.xml} | 0 .../res/layout/{topic_item.xml => item_topic.xml} | 0 .../RickBarrette/osj/forum/Constraints.java | 2 +- .../RickBarrette/osj/forum/ForumDetailActivity.java | 4 ++-- .../RickBarrette/osj/forum/ForumDetailFragment.java | 13 +++++++------ .../RickBarrette/osj/forum/ForumListActivity.java | 5 +++-- .../RickBarrette/osj/forum/ForumListFragment.java | 9 +++++---- .../{com => org}/RickBarrette/osj/forum/Log.java | 2 +- .../RickBarrette/osj/forum/TopicDetailActivity.java | 4 ++-- .../RickBarrette/osj/forum/TopicDetailFragment.java | 13 +++++++------ .../RickBarrette/osj/forum/TopicListActivity.java | 5 +++-- .../RickBarrette/osj/forum/TopicListFragment.java | 9 +++++---- .../osj/forum/content/ForumAdapter.java | 10 +++++----- .../osj/forum/content/ForumContent.java | 4 ++-- .../osj/forum/content/OnItemSelectedListener.java | 2 +- .../osj/forum/content/SubForumAdapter.java | 8 ++++---- .../osj/forum/content/ThreadAdapter.java | 8 ++++---- .../osj/forum/content/ThreadContent.java | 4 ++-- .../osj/forum/content/TopicAdapter.java | 8 ++++---- .../osj/forum/content/TopicContent.java | 4 ++-- OSJ Forum/src/org/xmlrpc/android/XMLRPCClient.java | 5 ++--- 30 files changed, 68 insertions(+), 79 deletions(-) delete mode 100644 OSJ Forum/res/layout/fragment_forum_detail.xml delete mode 100644 OSJ Forum/res/layout/fragment_topic_detail.xml rename OSJ Forum/res/layout/{forum_item.xml => item_forum.xml} (100%) rename OSJ Forum/res/layout/{post_item.xml => item_post.xml} (100%) rename OSJ Forum/res/layout/{sub_forum_item.xml => item_sub_forum.xml} (100%) rename OSJ Forum/res/layout/{topic_item.xml => item_topic.xml} (100%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/Constraints.java (97%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/ForumDetailActivity.java (95%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/ForumDetailFragment.java (91%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/ForumListActivity.java (95%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/ForumListFragment.java (94%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/Log.java (99%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/TopicDetailActivity.java (95%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/TopicDetailFragment.java (91%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/TopicListActivity.java (96%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/TopicListFragment.java (93%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/content/ForumAdapter.java (93%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/content/ForumContent.java (97%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/content/OnItemSelectedListener.java (96%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/content/SubForumAdapter.java (95%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/content/ThreadAdapter.java (96%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/content/ThreadContent.java (97%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/content/TopicAdapter.java (96%) rename OSJ Forum/src/{com => org}/RickBarrette/osj/forum/content/TopicContent.java (96%) diff --git a/OSJ Forum/AndroidManifest.xml b/OSJ Forum/AndroidManifest.xml index a16af0f..af59499 100644 --- a/OSJ Forum/AndroidManifest.xml +++ b/OSJ Forum/AndroidManifest.xml @@ -1,5 +1,5 @@ - diff --git a/OSJ Forum/res/layout/activity_topic_list.xml b/OSJ Forum/res/layout/activity_topic_list.xml index 687616e..3898dc3 100644 --- a/OSJ Forum/res/layout/activity_topic_list.xml +++ b/OSJ Forum/res/layout/activity_topic_list.xml @@ -1,6 +1,6 @@ - diff --git a/OSJ Forum/res/layout/fragment_topic_detail.xml b/OSJ Forum/res/layout/fragment_topic_detail.xml deleted file mode 100644 index 82c7b1d..0000000 --- a/OSJ Forum/res/layout/fragment_topic_detail.xml +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/OSJ Forum/res/layout/forum_item.xml b/OSJ Forum/res/layout/item_forum.xml similarity index 100% rename from OSJ Forum/res/layout/forum_item.xml rename to OSJ Forum/res/layout/item_forum.xml diff --git a/OSJ Forum/res/layout/post_item.xml b/OSJ Forum/res/layout/item_post.xml similarity index 100% rename from OSJ Forum/res/layout/post_item.xml rename to OSJ Forum/res/layout/item_post.xml diff --git a/OSJ Forum/res/layout/sub_forum_item.xml b/OSJ Forum/res/layout/item_sub_forum.xml similarity index 100% rename from OSJ Forum/res/layout/sub_forum_item.xml rename to OSJ Forum/res/layout/item_sub_forum.xml diff --git a/OSJ Forum/res/layout/topic_item.xml b/OSJ Forum/res/layout/item_topic.xml similarity index 100% rename from OSJ Forum/res/layout/topic_item.xml rename to OSJ Forum/res/layout/item_topic.xml diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/Constraints.java b/OSJ Forum/src/org/RickBarrette/osj/forum/Constraints.java similarity index 97% rename from OSJ Forum/src/com/RickBarrette/osj/forum/Constraints.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/Constraints.java index 269d68e..984c8bf 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/Constraints.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/Constraints.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; /** * This class will be used to house the constraints of this application diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumDetailActivity.java b/OSJ Forum/src/org/RickBarrette/osj/forum/ForumDetailActivity.java similarity index 95% rename from OSJ Forum/src/com/RickBarrette/osj/forum/ForumDetailActivity.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/ForumDetailActivity.java index eb3f06d..17ac6bd 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumDetailActivity.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/ForumDetailActivity.java @@ -17,9 +17,9 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; -import com.RickBarrette.osj.forum.content.OnItemSelectedListener; +import org.RickBarrette.osj.forum.content.OnItemSelectedListener; import android.content.Intent; import android.os.Bundle; diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumDetailFragment.java b/OSJ Forum/src/org/RickBarrette/osj/forum/ForumDetailFragment.java similarity index 91% rename from OSJ Forum/src/com/RickBarrette/osj/forum/ForumDetailFragment.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/ForumDetailFragment.java index 8e48cd8..50988fd 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumDetailFragment.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/ForumDetailFragment.java @@ -17,7 +17,13 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; + +import org.RickBarrette.osj.forum.content.ForumContent; +import org.RickBarrette.osj.forum.content.OnItemSelectedListener; +import org.RickBarrette.osj.forum.content.TopicAdapter; +import org.RickBarrette.osj.forum.content.TopicContent; +import org.RickBarrette.osj.forum.content.ForumContent.ForumItem; import android.app.Activity; import android.os.Bundle; @@ -27,11 +33,6 @@ import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.ListView; -import com.RickBarrette.osj.forum.content.ForumContent; -import com.RickBarrette.osj.forum.content.ForumContent.ForumItem; -import com.RickBarrette.osj.forum.content.OnItemSelectedListener; -import com.RickBarrette.osj.forum.content.TopicAdapter; -import com.RickBarrette.osj.forum.content.TopicContent; /** * This fragment will be used to display information about the forum diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumListActivity.java b/OSJ Forum/src/org/RickBarrette/osj/forum/ForumListActivity.java similarity index 95% rename from OSJ Forum/src/com/RickBarrette/osj/forum/ForumListActivity.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/ForumListActivity.java index db52b9d..ab11ad2 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumListActivity.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/ForumListActivity.java @@ -17,14 +17,15 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; + +import org.RickBarrette.osj.forum.content.OnItemSelectedListener; import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentActivity; -import com.RickBarrette.osj.forum.content.OnItemSelectedListener; import com.TwentyCodes.android.exception.ExceptionHandler; /** diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumListFragment.java b/OSJ Forum/src/org/RickBarrette/osj/forum/ForumListFragment.java similarity index 94% rename from OSJ Forum/src/com/RickBarrette/osj/forum/ForumListFragment.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/ForumListFragment.java index 79f8734..232dfd8 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/ForumListFragment.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/ForumListFragment.java @@ -17,7 +17,11 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; + +import org.RickBarrette.osj.forum.content.ForumAdapter; +import org.RickBarrette.osj.forum.content.ForumContent; +import org.RickBarrette.osj.forum.content.OnItemSelectedListener; import android.app.Activity; import android.os.Bundle; @@ -28,9 +32,6 @@ import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.ListView; -import com.RickBarrette.osj.forum.content.ForumAdapter; -import com.RickBarrette.osj.forum.content.ForumContent; -import com.RickBarrette.osj.forum.content.OnItemSelectedListener; /** * diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/Log.java b/OSJ Forum/src/org/RickBarrette/osj/forum/Log.java similarity index 99% rename from OSJ Forum/src/com/RickBarrette/osj/forum/Log.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/Log.java index b461426..e046a08 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/Log.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/Log.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; /** * A convince class for logging with log level constraints diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/TopicDetailActivity.java b/OSJ Forum/src/org/RickBarrette/osj/forum/TopicDetailActivity.java similarity index 95% rename from OSJ Forum/src/com/RickBarrette/osj/forum/TopicDetailActivity.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/TopicDetailActivity.java index 0c1d6bc..e5155b1 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/TopicDetailActivity.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/TopicDetailActivity.java @@ -17,9 +17,9 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; -import com.RickBarrette.osj.forum.content.OnItemSelectedListener; +import org.RickBarrette.osj.forum.content.OnItemSelectedListener; import android.content.Intent; import android.os.Bundle; diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/TopicDetailFragment.java b/OSJ Forum/src/org/RickBarrette/osj/forum/TopicDetailFragment.java similarity index 91% rename from OSJ Forum/src/com/RickBarrette/osj/forum/TopicDetailFragment.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/TopicDetailFragment.java index 89c426f..291798c 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/TopicDetailFragment.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/TopicDetailFragment.java @@ -17,7 +17,13 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; + +import org.RickBarrette.osj.forum.content.OnItemSelectedListener; +import org.RickBarrette.osj.forum.content.ThreadAdapter; +import org.RickBarrette.osj.forum.content.ThreadContent; +import org.RickBarrette.osj.forum.content.TopicContent; +import org.RickBarrette.osj.forum.content.TopicContent.TopicItem; import android.app.Activity; import android.os.Bundle; @@ -27,11 +33,6 @@ import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.ListView; -import com.RickBarrette.osj.forum.content.OnItemSelectedListener; -import com.RickBarrette.osj.forum.content.ThreadAdapter; -import com.RickBarrette.osj.forum.content.ThreadContent; -import com.RickBarrette.osj.forum.content.TopicContent; -import com.RickBarrette.osj.forum.content.TopicContent.TopicItem; public class TopicDetailFragment extends ListFragment { diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/TopicListActivity.java b/OSJ Forum/src/org/RickBarrette/osj/forum/TopicListActivity.java similarity index 96% rename from OSJ Forum/src/com/RickBarrette/osj/forum/TopicListActivity.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/TopicListActivity.java index 9b53d8a..e9afc98 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/TopicListActivity.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/TopicListActivity.java @@ -17,14 +17,15 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; + +import org.RickBarrette.osj.forum.content.OnItemSelectedListener; import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentActivity; -import com.RickBarrette.osj.forum.content.OnItemSelectedListener; import com.TwentyCodes.android.exception.ExceptionHandler; public class TopicListActivity extends FragmentActivity implements OnItemSelectedListener { diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/TopicListFragment.java b/OSJ Forum/src/org/RickBarrette/osj/forum/TopicListFragment.java similarity index 93% rename from OSJ Forum/src/com/RickBarrette/osj/forum/TopicListFragment.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/TopicListFragment.java index a5ce2dc..46372da 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/TopicListFragment.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/TopicListFragment.java @@ -17,7 +17,11 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum; +package org.RickBarrette.osj.forum; + +import org.RickBarrette.osj.forum.content.OnItemSelectedListener; +import org.RickBarrette.osj.forum.content.TopicAdapter; +import org.RickBarrette.osj.forum.content.TopicContent; import android.app.Activity; import android.os.Bundle; @@ -28,9 +32,6 @@ import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.ListView; -import com.RickBarrette.osj.forum.content.OnItemSelectedListener; -import com.RickBarrette.osj.forum.content.TopicAdapter; -import com.RickBarrette.osj.forum.content.TopicContent; public class TopicListFragment extends ListFragment { diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/content/ForumAdapter.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ForumAdapter.java similarity index 93% rename from OSJ Forum/src/com/RickBarrette/osj/forum/content/ForumAdapter.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/content/ForumAdapter.java index 6be84ea..841b011 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/content/ForumAdapter.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ForumAdapter.java @@ -17,7 +17,10 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum.content; +package org.RickBarrette.osj.forum.content; + +import org.RickBarrette.osj.forum.R; +import org.RickBarrette.osj.forum.content.ForumContent.ForumItem; import android.content.Context; import android.view.LayoutInflater; @@ -26,9 +29,6 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.TextView; -import com.RickBarrette.osj.forum.R; -import com.RickBarrette.osj.forum.content.ForumContent.ForumItem; - /** * This adapter will be used to populate a list view with forum entries * @author ricky barrette @@ -93,7 +93,7 @@ public class ForumAdapter extends BaseAdapter { // supplied // by ListView is null. if (convertView == null) { - convertView = mInflater.inflate(R.layout.forum_item, null); + convertView = mInflater.inflate(R.layout.item_forum, null); // Creates a ViewHolder and store references to the two children // views diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/content/ForumContent.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ForumContent.java similarity index 97% rename from OSJ Forum/src/com/RickBarrette/osj/forum/content/ForumContent.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/content/ForumContent.java index 84dc91b..a67aca8 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/content/ForumContent.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ForumContent.java @@ -17,19 +17,19 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum.content; +package org.RickBarrette.osj.forum.content; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.RickBarrette.osj.forum.Log; import org.xmlrpc.android.XMLRPCClient; import org.xmlrpc.android.XMLRPCException; import android.content.Context; -import com.RickBarrette.osj.forum.Log; /** * This class is used to maintain an instance of a forum's content data diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/content/OnItemSelectedListener.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/OnItemSelectedListener.java similarity index 96% rename from OSJ Forum/src/com/RickBarrette/osj/forum/content/OnItemSelectedListener.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/content/OnItemSelectedListener.java index ad9c9af..7a2606a 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/content/OnItemSelectedListener.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/OnItemSelectedListener.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum.content; +package org.RickBarrette.osj.forum.content; import android.support.v4.app.Fragment; diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/content/SubForumAdapter.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/SubForumAdapter.java similarity index 95% rename from OSJ Forum/src/com/RickBarrette/osj/forum/content/SubForumAdapter.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/content/SubForumAdapter.java index 7cedbd9..e42164a 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/content/SubForumAdapter.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/SubForumAdapter.java @@ -17,10 +17,12 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum.content; +package org.RickBarrette.osj.forum.content; import java.util.HashMap; +import org.RickBarrette.osj.forum.R; + import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -28,8 +30,6 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.TextView; -import com.RickBarrette.osj.forum.R; - /** * This adapter will be used to display sub-forums to the user * @author ricky barrette @@ -98,7 +98,7 @@ public class SubForumAdapter extends BaseAdapter { // supplied // by ListView is null. if (convertView == null) { - convertView = mInflater.inflate(R.layout.forum_item, null); + convertView = mInflater.inflate(R.layout.item_forum, null); // Creates a ViewHolder and store references to the two children // views diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/content/ThreadAdapter.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadAdapter.java similarity index 96% rename from OSJ Forum/src/com/RickBarrette/osj/forum/content/ThreadAdapter.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadAdapter.java index d674c97..9228ee4 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/content/ThreadAdapter.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadAdapter.java @@ -17,10 +17,12 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum.content; +package org.RickBarrette.osj.forum.content; import java.util.HashMap; +import org.RickBarrette.osj.forum.R; + import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -29,8 +31,6 @@ import android.widget.BaseAdapter; import android.widget.QuickContactBadge; import android.widget.TextView; -import com.RickBarrette.osj.forum.R; - /** * This adapter will be used to populte a list view with post from a thread * @author ricky barrette @@ -102,7 +102,7 @@ public class ThreadAdapter extends BaseAdapter { // supplied // by ListView is null. if (convertView == null) { - convertView = mInflater.inflate(R.layout.post_item, null); + convertView = mInflater.inflate(R.layout.item_post, null); // Creates a ViewHolder and store references to the two children // views diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/content/ThreadContent.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java similarity index 97% rename from OSJ Forum/src/com/RickBarrette/osj/forum/content/ThreadContent.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java index 84b0b60..e1ee94f 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/content/ThreadContent.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java @@ -17,19 +17,19 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum.content; +package org.RickBarrette.osj.forum.content; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.RickBarrette.osj.forum.Log; import org.xmlrpc.android.XMLRPCClient; import org.xmlrpc.android.XMLRPCException; import android.content.Context; -import com.RickBarrette.osj.forum.Log; /** * This class is used to maintain an instance of a thread's data content diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/content/TopicAdapter.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicAdapter.java similarity index 96% rename from OSJ Forum/src/com/RickBarrette/osj/forum/content/TopicAdapter.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicAdapter.java index 647ee0d..392ba97 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/content/TopicAdapter.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicAdapter.java @@ -17,10 +17,12 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum.content; +package org.RickBarrette.osj.forum.content; import java.util.HashMap; +import org.RickBarrette.osj.forum.R; + import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -29,8 +31,6 @@ import android.widget.BaseAdapter; import android.widget.QuickContactBadge; import android.widget.TextView; -import com.RickBarrette.osj.forum.R; - /** * This adapter will be used to display topics to the user * @author ricky barrette @@ -98,7 +98,7 @@ public class TopicAdapter extends BaseAdapter { // supplied // by ListView is null. if (convertView == null) { - convertView = mInflater.inflate(R.layout.topic_item, null); + convertView = mInflater.inflate(R.layout.item_topic, null); // Creates a ViewHolder and store references to the two children // views diff --git a/OSJ Forum/src/com/RickBarrette/osj/forum/content/TopicContent.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java similarity index 96% rename from OSJ Forum/src/com/RickBarrette/osj/forum/content/TopicContent.java rename to OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java index 5b333ff..9a46d4a 100644 --- a/OSJ Forum/src/com/RickBarrette/osj/forum/content/TopicContent.java +++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java @@ -17,19 +17,19 @@ * See the License for the specific language governing permissions and * limitations under the License */ -package com.RickBarrette.osj.forum.content; +package org.RickBarrette.osj.forum.content; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.RickBarrette.osj.forum.Log; import org.xmlrpc.android.XMLRPCClient; import org.xmlrpc.android.XMLRPCException; import android.content.Context; -import com.RickBarrette.osj.forum.Log; /** * This class is used to maintain an instance of a topic's content data diff --git a/OSJ Forum/src/org/xmlrpc/android/XMLRPCClient.java b/OSJ Forum/src/org/xmlrpc/android/XMLRPCClient.java index 261f5b3..0c397a4 100644 --- a/OSJ Forum/src/org/xmlrpc/android/XMLRPCClient.java +++ b/OSJ Forum/src/org/xmlrpc/android/XMLRPCClient.java @@ -10,6 +10,8 @@ import java.net.URL; import java.util.Map; import java.util.Vector; +import org.RickBarrette.osj.forum.Constraints; +import org.RickBarrette.osj.forum.R; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; @@ -31,9 +33,6 @@ import org.xmlpull.v1.XmlPullParserFactory; import android.content.Context; -import com.RickBarrette.osj.forum.Constraints; -import com.RickBarrette.osj.forum.R; - /** * XMLRPCClient allows to call remote XMLRPC method. *