Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/FileFragment.java b/src/com/owncloud/android/ui/fragment/FileFragment.java
index 87dca25..fd5aeef 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileFragment.java
@@ -24,7 +24,6 @@ import android.accounts.Account;
 import android.app.Activity;
 import android.support.v4.app.Fragment;
 
 import android.app.Activity;
 import android.support.v4.app.Fragment;
 

-import com.actionbarsherlock.app.SherlockFragment;

 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;


@@ -34,7 +33,7 @@ import com.owncloud.android.ui.activity.ComponentsGetter;
 /**
  * Common methods for {@link Fragment}s containing {@link OCFile}s
  */
 /**
  * Common methods for {@link Fragment}s containing {@link OCFile}s
  */

-public class FileFragment extends SherlockFragment {
+public class FileFragment extends Fragment {

     
     private OCFile mFile;
     
     
     private OCFile mFile;
     


@@ -44,7 +43,8 @@ public class FileFragment extends SherlockFragment {
     /**
      * Creates an empty fragment.
      * 
     /**
      * Creates an empty fragment.
      * 

-     * It's necessary to keep a public constructor without parameters; the system uses it when tries to reinstantiate a fragment automatically. 
+     * It's necessary to keep a public constructor without parameters; the system uses it when
+     * tries to reinstantiate a fragment automatically.

      */
     public FileFragment() {
         mFile = null;
      */
     public FileFragment() {
         mFile = null;


@@ -84,7 +84,8 @@ public class FileFragment extends SherlockFragment {
             mContainerActivity = (ContainerActivity) activity;
             
         } catch (ClassCastException e) {
             mContainerActivity = (ContainerActivity) activity;
             
         } catch (ClassCastException e) {

-            throw new ClassCastException(activity.toString() + " must implement " + ContainerActivity.class.getSimpleName());
+            throw new ClassCastException(activity.toString() + " must implement " +
+                    ContainerActivity.class.getSimpleName());

         }
     }
     
         }
     }
     


@@ -113,11 +114,13 @@ public class FileFragment extends SherlockFragment {
         public void showDetails(OCFile file);
 
         
         public void showDetails(OCFile file);
 
         

-        ///// TO UNIFY IN A SINGLE CALLBACK METHOD - EVENT NOTIFICATIONs  -> something happened inside the fragment, MAYBE activity is interested --> unify in notification method
+        ///// TO UNIFY IN A SINGLE CALLBACK METHOD - EVENT NOTIFICATIONs  -> something happened
+        // inside the fragment, MAYBE activity is interested --> unify in notification method

         /**
         /**

-         * Callback method invoked when a the user browsed into a different folder through the list of files
+         * Callback method invoked when a the user browsed into a different folder through the
+         * list of files

          *  
          *  

-         * @param file
+         * @param folder

          */
         public void onBrowsedDownTo(OCFile folder);                 
 
          */
         public void onBrowsedDownTo(OCFile folder);                 
 


@@ -126,11 +129,13 @@ public class FileFragment extends SherlockFragment {
          * 
          * This happens when a download or upload is started or ended for a file.
          * 
          * 
          * This happens when a download or upload is started or ended for a file.
          * 

-         * This method is necessary by now to update the user interface of the double-pane layout in tablets
-         * because methods {@link FileDownloaderBinder#isDownloading(Account, OCFile)} and {@link FileUploaderBinder#isUploading(Account, OCFile)}
+         * This method is necessary by now to update the user interface of the double-pane layout
+         * in tablets because methods {@link FileDownloaderBinder#isDownloading(Account, OCFile)}
+         * and {@link FileUploaderBinder#isUploading(Account, OCFile)}

          * won't provide the needed response before the method where this is called finishes. 
          * 
          * won't provide the needed response before the method where this is called finishes. 
          * 

-         * TODO Remove this when the transfer state of a file is kept in the database (other thing TODO)
+         * TODO Remove this when the transfer state of a file is kept in the database
+         * (other thing TODO)

          * 
          * @param file          OCFile which state changed.
          * @param downloading   Flag signaling if the file is now downloading.
          * 
          * @param file          OCFile which state changed.
          * @param downloading   Flag signaling if the file is now downloading.