X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c880929ffd512c13fc7c7e7a085504b99ab5c09d..ff82b51e49f40155e7c340090f5ee759af2bf3ad:/src/com/owncloud/android/services/observer/FolderObserver.java diff --git a/src/com/owncloud/android/services/observer/FolderObserver.java b/src/com/owncloud/android/services/observer/FolderObserver.java index ea1a9ede..5329b526 100644 --- a/src/com/owncloud/android/services/observer/FolderObserver.java +++ b/src/com/owncloud/android/services/observer/FolderObserver.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -30,9 +33,9 @@ import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.operations.SynchronizeFileOperation; import com.owncloud.android.ui.activity.ConflictsResolveActivity; -import com.owncloud.android.utils.Log_OC; /** * Observer watching a folder to request the synchronization of kept-in-sync files @@ -46,8 +49,6 @@ import com.owncloud.android.utils.Log_OC; * The second case requires to monitor the folder parent of the files, since a direct * {@link FileObserver} on it will not receive more events after the file is deleted to * be replaced. - * - * @author David A. Velasco */ public class FolderObserver extends FileObserver {