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 <rickbarrette@gmail.com>

OSJ Forum/AndroidManifest.xml

@@ -1,5 +1,5 @@
-<manifest package="com.RickBarrette.osj.forum"
+<manifest package="org.RickBarrette.osj.forum"
-    android:versionCode="178"
+    android:versionCode="195"
     android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
 
     <uses-sdk

OSJ Forum/res/layout/activity_forum_list.xml

@@ -1,6 +1,6 @@
 <fragment xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:name="com.RickBarrette.osj.forum.ForumListFragment"
+    android:name="org.RickBarrette.osj.forum.ForumListFragment"
     android:id="@+id/forum_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

OSJ Forum/res/layout/activity_forum_twopane.xml

@@ -17,7 +17,7 @@
 
         <fragment
             android:id="@+id/forum_list"
-            android:name="com.RickBarrette.osj.forum.ForumListFragment"
+            android:name="org.RickBarrette.osj.forum.ForumListFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </FrameLayout>

OSJ Forum/res/layout/activity_topic_list.xml

@@ -1,6 +1,6 @@
 <fragment xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:name="com.RickBarrette.osj.forum.TopicListFragment"
+    android:name="org.RickBarrette.osj.forum.TopicListFragment"
     android:id="@+id/topic_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

OSJ Forum/res/layout/activity_topic_twopane.xml

@@ -9,7 +9,7 @@
     android:showDividers="middle"
     tools:context=".TopicListActivity">
 
-    <fragment android:name="com.RickBarrette.osj.forum.TopicListFragment"
+    <fragment android:name="org.RickBarrette.osj.forum.TopicListFragment"
         android:id="@+id/topic_list"
         android:layout_width="0dp"
         android:layout_height="match_parent"

OSJ Forum/res/layout/fragment_forum_detail.xml

@@ -1,8 +0,0 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="?android:attr/textAppearanceLarge"
-    android:id="@+id/forum_detail"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dp"
-    tools:context=".ForumDetailFragment" />

OSJ Forum/res/layout/fragment_topic_detail.xml

@@ -1,8 +0,0 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="?android:attr/textAppearanceLarge"
-    android:id="@+id/topic_detail"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dp"
-    tools:context=".TopicDetailFragment" />

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

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;

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

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;
 
 /**

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;
 
 /**
  * 

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

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;

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 {
 

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 {

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 {
 

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

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

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;
 

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

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

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

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

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

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.
  *