[tx-robot] updated from transifex

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / OCFile.java

diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index 4e05fa3..a6e6a54 100644 (file)
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -20,7 +20,8 @@ package com.owncloud.android.datamodel;
 
 import java.io.File;
 
 
 import java.io.File;
 

-import com.owncloud.android.Log_OC;
+import com.owncloud.android.utils.Log_OC;
+

 
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import android.os.Parcel;
 import android.os.Parcelable;


@@ -41,6 +42,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     };
 
     public static final String PATH_SEPARATOR = "/";
     };
 
     public static final String PATH_SEPARATOR = "/";

+    public static final String ROOT_PATH = PATH_SEPARATOR;

 
     private static final String TAG = OCFile.class.getSimpleName();
     
 
     private static final String TAG = OCFile.class.getSimpleName();
     


@@ -146,11 +148,11 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
     }
 
     /**
     }
 
     /**

-     * Use this to find out if this file is a Directory
+     * Use this to find out if this file is a folder.

      * 
      * 

-     * @return true if it is a directory
+     * @return true if it is a folder

      */
      */

-    public boolean isDirectory() {
+    public boolean isFolder() {

         return mMimeType != null && mMimeType.equals("DIR");
     }
 
         return mMimeType != null && mMimeType.equals("DIR");
     }
 


@@ -257,7 +259,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      */
     public String getFileName() {
         File f = new File(getRemotePath());
      */
     public String getFileName() {
         File f = new File(getRemotePath());

-        return f.getName().length() == 0 ? PATH_SEPARATOR : f.getName();
+        return f.getName().length() == 0 ? ROOT_PATH : f.getName();

     }
     
     /**
     }
     
     /**


@@ -267,11 +269,11 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      */
     public void setFileName(String name) {
         Log_OC.d(TAG, "OCFile name changin from " + mRemotePath);
      */
     public void setFileName(String name) {
         Log_OC.d(TAG, "OCFile name changin from " + mRemotePath);

-        if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) && !mRemotePath.equals(PATH_SEPARATOR)) {
+        if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) && !mRemotePath.equals(ROOT_PATH)) {

             String parent = (new File(getRemotePath())).getParent();
             parent = (parent.endsWith(PATH_SEPARATOR)) ? parent : parent + PATH_SEPARATOR;
             mRemotePath =  parent + name;
             String parent = (new File(getRemotePath())).getParent();
             parent = (parent.endsWith(PATH_SEPARATOR)) ? parent : parent + PATH_SEPARATOR;
             mRemotePath =  parent + name;

-            if (isDirectory()) {
+            if (isFolder()) {

                 mRemotePath += PATH_SEPARATOR;
             }
             Log_OC.d(TAG, "OCFile name changed to " + mRemotePath);
                 mRemotePath += PATH_SEPARATOR;
             }
             Log_OC.d(TAG, "OCFile name changed to " + mRemotePath);


@@ -296,7 +298,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      *             not a directory
      */
     public void addFile(OCFile file) throws IllegalStateException {
      *             not a directory
      */
     public void addFile(OCFile file) throws IllegalStateException {

-        if (isDirectory()) {
+        if (isFolder()) {

             file.mParentId = mId;
             mNeedsUpdating = true;
             return;
             file.mParentId = mId;
             mNeedsUpdating = true;
             return;


@@ -419,11 +421,11 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
 
     @Override
     public int compareTo(OCFile another) {
 
     @Override
     public int compareTo(OCFile another) {

-        if (isDirectory() && another.isDirectory()) {
+        if (isFolder() && another.isFolder()) {

             return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());
             return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());

-        } else if (isDirectory()) {
+        } else if (isFolder()) {

             return -1;
             return -1;

-        } else if (another.isDirectory()) {
+        } else if (another.isFolder()) {

             return 1;
         }
         return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());
             return 1;
         }
         return getRemotePath().toLowerCase().compareTo(another.getRemotePath().toLowerCase());


@@ -443,7 +445,7 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
 
     @Override
     public String toString() {
 
     @Override
     public String toString() {

-        String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, parentId=%s, keepInSinc=%s etag=%]";
+        String asString = "[id=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, parentId=%s, keepInSinc=%s etag=%s]";

         asString = String.format(asString, Long.valueOf(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath, Long.valueOf(mParentId), Boolean.valueOf(mKeepInSync), mEtag);
         return asString;
     }
         asString = String.format(asString, Long.valueOf(mId), getFileName(), mMimeType, isDown(), mLocalPath, mRemotePath, Long.valueOf(mParentId), Boolean.valueOf(mKeepInSync), mEtag);
         return asString;
     }