consistently use UploadList (instead UploadsList)

AndroidManifest.xml

@@ -163,7 +163,7 @@
         <activity android:name=".ui.activity.LogHistoryActivity"/>
 
         <activity android:name=".ui.errorhandling.ErrorShowActivity" />
-        <activity android:name=".ui.activity.UploadsListActivity" >
+        <activity android:name=".ui.activity.UploadListActivity" >
 
             <!-- for testing only: -->
             <intent-filter>

res/layout/upload_list_layout.xml

@@ -3,9 +3,9 @@
     android:layout_height="match_parent" >
 
     <fragment
-        android:id="@+id/UploadsListFragment"
+        android:id="@+id/UploadListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        class="com.owncloud.android.ui.fragment.UploadsListFragment" />
+        class="com.owncloud.android.ui.fragment.UploadListFragment" />
 
 </FrameLayout>

res/menu/main_menu.xml

@@ -56,7 +56,7 @@
         android:showAsAction="never"
         android:title="@string/actionbar_sort"/>
 	<item
-        android:id="@+id/action_uploads_list"
+        android:id="@+id/action_upload_list"
         android:icon="@drawable/ic_action_settings"
         android:orderInCategory="2"
         android:showAsAction="never"

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -495,8 +495,8 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
             startActivity(loggerIntent);
             break;
         }
-        case R.id.action_uploads_list: {
-            Intent uploadListIntent = new Intent(getApplicationContext(),UploadsListActivity.class);
+        case R.id.action_upload_list: {
+            Intent uploadListIntent = new Intent(getApplicationContext(),UploadListActivity.class);
             startActivity(uploadListIntent);
             break;
         }

src/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -7,26 +7,26 @@ import android.os.Bundle;
 import com.owncloud.android.R;
 import com.owncloud.android.db.UploadDbHandler;
 import com.owncloud.android.ui.errorhandling.ExceptionHandler;
-import com.owncloud.android.ui.fragment.UploadsListFragment;
+import com.owncloud.android.ui.fragment.UploadListFragment;
 
 /**
  * Activity listing pending, active, and completed uploads. User can delete
  * completed uploads from view. Content of this list of coming from
  * {@link UploadDbHandler}.
  */
-public class UploadsListActivity extends FileActivity implements UploadsListFragment.ContainerActivity {
+public class UploadListActivity extends FileActivity implements UploadListFragment.ContainerActivity {
 
-    private static final String TAG = "UploadsListActivity";
+    private static final String TAG = "UploadListActivity";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
-        setContentView(R.layout.uploads_list_layout);
+        setContentView(R.layout.upload_list_layout);
     }
 
     // ////////////////////////////////////////
-    // UploadsListFragment.ContainerActivity
+    // UploadListFragment.ContainerActivity
     // ////////////////////////////////////////
     @Override
     public void onUploadItemClick(File file) {

src/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -26,12 +26,12 @@ import com.owncloud.android.utils.DisplayUtils;
  * Filtering possible.
  * 
  */
-public class UploadsListAdapter extends BaseAdapter implements ListAdapter {
+public class UploadListAdapter extends BaseAdapter implements ListAdapter {
     
     private Context mContext;
     private UploadDbObject[] mUploads = null;
 
-    public UploadsListAdapter(Context context) {
+    public UploadListAdapter(Context context) {
         mContext = context;
         loadUploadItemsFromDb();
     }
@@ -74,7 +74,7 @@ public class UploadsListAdapter extends BaseAdapter implements ListAdapter {
         if (view == null) {
             LayoutInflater inflator = (LayoutInflater) mContext
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            view = inflator.inflate(R.layout.uploads_list_item, null);
+            view = inflator.inflate(R.layout.upload_list_item, null);
         }
         if (mUploads != null && mUploads.length > position) {
             UploadDbObject file = mUploads[position];

src/com/owncloud/android/ui/fragment/UploadListFragment.java

@@ -32,7 +32,7 @@ import android.widget.ListView;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.ui.adapter.UploadsListAdapter;
+import com.owncloud.android.ui.adapter.UploadListAdapter;
 
 /**
  * A Fragment that lists all files and folders in a given LOCAL path.
@@ -40,17 +40,17 @@ import com.owncloud.android.ui.adapter.UploadsListAdapter;
  * @author LukeOwncloud
  *
  */
-public class UploadsListFragment extends ExtendedListFragment {
-    private static final String TAG = "LocalFileListFragment";
+public class UploadListFragment extends ExtendedListFragment {
+    private static final String TAG = "UploadListFragment";
 
     /**
      * Reference to the Activity which this fragment is attached to. For
      * callbacks
      */
-    private UploadsListFragment.ContainerActivity mContainerActivity;
+    private UploadListFragment.ContainerActivity mContainerActivity;
 
     /** Adapter to connect the data from the directory with the View object */
-    private UploadsListAdapter mAdapter = null;
+    private UploadListAdapter mAdapter = null;
 
     /**
      * {@inheritDoc}
@@ -62,7 +62,7 @@ public class UploadsListFragment extends ExtendedListFragment {
             mContainerActivity = (ContainerActivity) activity;
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString() + " must implement "
-                    + UploadsListFragment.ContainerActivity.class.getSimpleName());
+                    + UploadListFragment.ContainerActivity.class.getSimpleName());
         }
     }
 
@@ -89,7 +89,7 @@ public class UploadsListFragment extends ExtendedListFragment {
         Log_OC.i(TAG, "onActivityCreated() start");
 
         super.onActivityCreated(savedInstanceState);
-        mAdapter = new UploadsListAdapter(getActivity());
+        mAdapter = new UploadListAdapter(getActivity());
         setListAdapter(mAdapter);
 
         Log_OC.i(TAG, "onActivityCreated() stop");
@@ -111,7 +111,7 @@ public class UploadsListFragment extends ExtendedListFragment {
     }
 
     public void deselectAll() {
-        mAdapter = new UploadsListAdapter(getActivity());
+        mAdapter = new UploadListAdapter(getActivity());
         setListAdapter(mAdapter);
     }
 
@@ -164,7 +164,7 @@ public class UploadsListFragment extends ExtendedListFragment {
 
     /**
      * Interface to implement by any Activity that includes some instance of
-     * UploadsListFragment
+     * UploadListFragment
      *
      * @author LukeOwncloud
      */