Merge remote-tracking branch 'remotes/upstream/master' into beta

[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 0c7cc71..1c2ec26 100644 (file)
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -27,18 +27,15 @@ import android.webkit.MimeTypeMap;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.File;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.File;

-import java.util.Enumeration;

 
 import third_parties.daveKoeller.AlphanumComparator;
 public class OCFile implements Parcelable, Comparable<OCFile> {
 
 
 import third_parties.daveKoeller.AlphanumComparator;
 public class OCFile implements Parcelable, Comparable<OCFile> {
 

-    public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {
-        @Override
+    public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {

         public OCFile createFromParcel(Parcel source) {
             return new OCFile(source);
         }
 
         public OCFile createFromParcel(Parcel source) {
             return new OCFile(source);
         }
 

-        @Override

         public OCFile[] newArray(int size) {
             return new OCFile[size];
         }
         public OCFile[] newArray(int size) {
             return new OCFile[size];
         }