diff --git a/Claunia.IO/ChangeLog b/Claunia.IO/ChangeLog index b8e8f0a..c5ea13b 100644 --- a/Claunia.IO/ChangeLog +++ b/Claunia.IO/ChangeLog @@ -1,3 +1,9 @@ +2015-02-08 Natalia Portillo + + * FileInfo.cs: + * DirectoryInfo.cs: + Remove sporious Using statements, and formatted. + 2015-02-08 Natalia Portillo * DirectoryInfo.cs: diff --git a/Claunia.IO/DirectoryInfo.cs b/Claunia.IO/DirectoryInfo.cs index f3e7e69..b188089 100644 --- a/Claunia.IO/DirectoryInfo.cs +++ b/Claunia.IO/DirectoryInfo.cs @@ -46,220 +46,227 @@ namespace Claunia.IO } // For manual casting - public DirectoryInfo (System.IO.DirectoryInfo dirInfo) + public DirectoryInfo(System.IO.DirectoryInfo dirInfo) { _dirInfo = dirInfo; } - public override bool Exists { - get { + public override bool Exists + { + get + { return _dirInfo.Exists; } } - public override string Name { + public override string Name + { get { return _dirInfo.Name; } } - public DirectoryInfo Parent { - get { + public DirectoryInfo Parent + { + get + { return new DirectoryInfo(_dirInfo.Parent); } } - public DirectoryInfo Root { - get { + public DirectoryInfo Root + { + get + { return new DirectoryInfo(_dirInfo.Root); } } - public void Create () + public void Create() { _dirInfo.Create(); } - public DirectoryInfo CreateSubdirectory (string path) + public DirectoryInfo CreateSubdirectory(string path) { return new DirectoryInfo(_dirInfo.CreateSubdirectory(path)); } - public FileInfo [] GetFiles () + public FileInfo [] GetFiles() { - System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles(); - FileInfo[] _fileInfos = new FileInfo[_systemFileInfos.Length]; + System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles(); + FileInfo[] _fileInfos = new FileInfo[_systemFileInfos.Length]; - for(int i = 0; i < _fileInfos.Length; i++) + for (int i = 0; i < _fileInfos.Length; i++) _fileInfos[i] = new FileInfo(_systemFileInfos[i]); return _fileInfos; } - public FileInfo [] GetFiles (string searchPattern) + public FileInfo [] GetFiles(string searchPattern) { - System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles(searchPattern); - FileInfo[] _fileInfos = new FileInfo[_systemFileInfos.Length]; + System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles(searchPattern); + FileInfo[] _fileInfos = new FileInfo[_systemFileInfos.Length]; - for(int i = 0; i < _fileInfos.Length; i++) + for (int i = 0; i < _fileInfos.Length; i++) _fileInfos[i] = new FileInfo(_systemFileInfos[i]); return _fileInfos; } - public FileInfo[] GetFiles (string searchPattern, System.IO.SearchOption searchOption) + public FileInfo[] GetFiles(string searchPattern, System.IO.SearchOption searchOption) { System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles(searchPattern, searchOption); FileInfo[] _fileInfos = new FileInfo[_systemFileInfos.Length]; - for(int i = 0; i < _fileInfos.Length; i++) + for (int i = 0; i < _fileInfos.Length; i++) _fileInfos[i] = new FileInfo(_systemFileInfos[i]); return _fileInfos; } - public DirectoryInfo [] GetDirectories () + public DirectoryInfo [] GetDirectories() { System.IO.DirectoryInfo[] _systemDirInfos = _dirInfo.GetDirectories(); DirectoryInfo[] _dirInfos = new DirectoryInfo[_systemDirInfos.Length]; - for(int i = 0; i < _dirInfos.Length; i++) + for (int i = 0; i < _dirInfos.Length; i++) _dirInfos[i] = new DirectoryInfo(_systemDirInfos[i]); return _dirInfos; } - public DirectoryInfo [] GetDirectories (string searchPattern) + public DirectoryInfo [] GetDirectories(string searchPattern) { System.IO.DirectoryInfo[] _systemDirInfos = _dirInfo.GetDirectories(searchPattern); DirectoryInfo[] _dirInfos = new DirectoryInfo[_systemDirInfos.Length]; - for(int i = 0; i < _dirInfos.Length; i++) + for (int i = 0; i < _dirInfos.Length; i++) _dirInfos[i] = new DirectoryInfo(_systemDirInfos[i]); return _dirInfos; } - public DirectoryInfo[] GetDirectories (string searchPattern, System.IO.SearchOption searchOption) + public DirectoryInfo[] GetDirectories(string searchPattern, System.IO.SearchOption searchOption) { System.IO.DirectoryInfo[] _systemDirInfos = _dirInfo.GetDirectories(searchPattern, searchOption); DirectoryInfo[] _dirInfos = new DirectoryInfo[_systemDirInfos.Length]; - for(int i = 0; i < _dirInfos.Length; i++) + for (int i = 0; i < _dirInfos.Length; i++) _dirInfos[i] = new DirectoryInfo(_systemDirInfos[i]); return _dirInfos; - } + } - public System.IO.FileSystemInfo [] GetFileSystemInfos () + public System.IO.FileSystemInfo [] GetFileSystemInfos() { return _dirInfo.GetFileSystemInfos(); } - public System.IO.FileSystemInfo [] GetFileSystemInfos (string searchPattern) + public System.IO.FileSystemInfo [] GetFileSystemInfos(string searchPattern) { return _dirInfo.GetFileSystemInfos(searchPattern); } public - System.IO.FileSystemInfo [] GetFileSystemInfos (string searchPattern, System.IO.SearchOption searchOption) + System.IO.FileSystemInfo [] GetFileSystemInfos(string searchPattern, System.IO.SearchOption searchOption) { return _dirInfo.GetFileSystemInfos(searchPattern, searchOption); } - public override void Delete () + public override void Delete() { _dirInfo.Delete(); } - public void Delete (bool recursive) + public void Delete(bool recursive) { _dirInfo.Delete(recursive); } - public void MoveTo (string destDirName) + public void MoveTo(string destDirName) { _dirInfo.MoveTo(destDirName); } - public override string ToString () + public override string ToString() { return _dirInfo.ToString(); } -#if !MOBILE - public void Create (DirectorySecurity directorySecurity) + #if !MOBILE + public void Create(DirectorySecurity directorySecurity) { _dirInfo.Create(directorySecurity); } - public DirectoryInfo CreateSubdirectory (string path, DirectorySecurity directorySecurity) + public DirectoryInfo CreateSubdirectory(string path, DirectorySecurity directorySecurity) { return new DirectoryInfo(_dirInfo.CreateSubdirectory(path, directorySecurity)); } - public DirectorySecurity GetAccessControl () + public DirectorySecurity GetAccessControl() { return _dirInfo.GetAccessControl(); } - public DirectorySecurity GetAccessControl (AccessControlSections includeSections) + public DirectorySecurity GetAccessControl(AccessControlSections includeSections) { return _dirInfo.GetAccessControl(includeSections); } - public void SetAccessControl (DirectorySecurity directorySecurity) + public void SetAccessControl(DirectorySecurity directorySecurity) { _dirInfo.SetAccessControl(directorySecurity); } -#endif + #endif - public IEnumerable EnumerateDirectories () + public IEnumerable EnumerateDirectories() { - foreach(System.IO.DirectoryInfo _sysDirInfo in _dirInfo.EnumerateDirectories()) + foreach (System.IO.DirectoryInfo _sysDirInfo in _dirInfo.EnumerateDirectories()) yield return new DirectoryInfo(_sysDirInfo); } - public IEnumerable EnumerateDirectories (string searchPattern) + public IEnumerable EnumerateDirectories(string searchPattern) { - foreach(System.IO.DirectoryInfo _sysDirInfo in _dirInfo.EnumerateDirectories(searchPattern)) + foreach (System.IO.DirectoryInfo _sysDirInfo in _dirInfo.EnumerateDirectories(searchPattern)) yield return new DirectoryInfo(_sysDirInfo); } - public IEnumerable EnumerateDirectories (string searchPattern, System.IO.SearchOption searchOption) + public IEnumerable EnumerateDirectories(string searchPattern, System.IO.SearchOption searchOption) { - foreach(System.IO.DirectoryInfo _sysDirInfo in _dirInfo.EnumerateDirectories(searchPattern, searchOption)) + foreach (System.IO.DirectoryInfo _sysDirInfo in _dirInfo.EnumerateDirectories(searchPattern, searchOption)) yield return new DirectoryInfo(_sysDirInfo); } - public IEnumerable EnumerateFiles () + public IEnumerable EnumerateFiles() { - foreach(System.IO.FileInfo _sysFileInfo in _dirInfo.EnumerateFiles()) + foreach (System.IO.FileInfo _sysFileInfo in _dirInfo.EnumerateFiles()) yield return new FileInfo(_sysFileInfo); } - public IEnumerable EnumerateFiles (string searchPattern) + public IEnumerable EnumerateFiles(string searchPattern) { - foreach(System.IO.FileInfo _sysFileInfo in _dirInfo.EnumerateFiles(searchPattern)) + foreach (System.IO.FileInfo _sysFileInfo in _dirInfo.EnumerateFiles(searchPattern)) yield return new FileInfo(_sysFileInfo); } - public IEnumerable EnumerateFiles (string searchPattern, System.IO.SearchOption searchOption) + public IEnumerable EnumerateFiles(string searchPattern, System.IO.SearchOption searchOption) { - foreach(System.IO.FileInfo _sysFileInfo in _dirInfo.EnumerateFiles(searchPattern, searchOption)) + foreach (System.IO.FileInfo _sysFileInfo in _dirInfo.EnumerateFiles(searchPattern, searchOption)) yield return new FileInfo(_sysFileInfo); } - public IEnumerable EnumerateFileSystemInfos () + public IEnumerable EnumerateFileSystemInfos() { return _dirInfo.EnumerateFileSystemInfos(); } - public IEnumerable EnumerateFileSystemInfos (string searchPattern) + public IEnumerable EnumerateFileSystemInfos(string searchPattern) { return _dirInfo.EnumerateFileSystemInfos(searchPattern); } - public IEnumerable EnumerateFileSystemInfos (string searchPattern, System.IO.SearchOption searchOption) + public IEnumerable EnumerateFileSystemInfos(string searchPattern, System.IO.SearchOption searchOption) { return _dirInfo.EnumerateFileSystemInfos(searchPattern, searchOption); } diff --git a/Claunia.IO/FileInfo.cs b/Claunia.IO/FileInfo.cs index 53fcadd..ea49667 100644 --- a/Claunia.IO/FileInfo.cs +++ b/Claunia.IO/FileInfo.cs @@ -25,10 +25,7 @@ // THE SOFTWARE. using System.Runtime.InteropServices; -using System.Runtime.Serialization; -using System.Security; using System; -using System.IO; #if !MOBILE using System.Security.AccessControl; @@ -43,166 +40,179 @@ namespace Claunia.IO // As FileInfo is sealed, let's gonna cheat a little :p readonly System.IO.FileInfo _fileInfo; - public FileInfo (string fileName) + public FileInfo(string fileName) { _fileInfo = new System.IO.FileInfo(fileName); } // For manual casting - public FileInfo (System.IO.FileInfo fileInfo) + public FileInfo(System.IO.FileInfo fileInfo) { _fileInfo = fileInfo; } - public override bool Exists { - get { + public override bool Exists + { + get + { return _fileInfo.Exists; } } - public override string Name { - get { + public override string Name + { + get + { return _fileInfo.Name; } } - public bool IsReadOnly { - get { + public bool IsReadOnly + { + get + { return _fileInfo.IsReadOnly; } - set { + set + { _fileInfo.IsReadOnly = value; } } - public void Encrypt () + public void Encrypt() { _fileInfo.Encrypt(); } - public void Decrypt () + public void Decrypt() { _fileInfo.Decrypt(); } - public long Length { - get { + public long Length + { + get + { return _fileInfo.Length; } } - public string DirectoryName { - get { + public string DirectoryName + { + get + { return _fileInfo.DirectoryName; } } - public DirectoryInfo Directory { - get { + public DirectoryInfo Directory + { + get + { return new DirectoryInfo(_fileInfo.Directory); } } - public StreamReader OpenText () + public System.IO.StreamReader OpenText() { return _fileInfo.OpenText(); } - public StreamWriter CreateText () + public System.IO.StreamWriter CreateText() { return _fileInfo.CreateText(); } - public StreamWriter AppendText () + public System.IO. StreamWriter AppendText() { return _fileInfo.AppendText(); } - public FileStream Create () + public System.IO.FileStream Create() { return _fileInfo.Create(); } - public FileStream OpenRead () + public System.IO.FileStream OpenRead() { return _fileInfo.OpenRead(); } - public FileStream OpenWrite () + public System.IO.FileStream OpenWrite() { return _fileInfo.OpenWrite(); } - public FileStream Open (FileMode mode) + public System.IO.FileStream Open(System.IO.FileMode mode) { return _fileInfo.Open(mode); } - public FileStream Open (FileMode mode, FileAccess access) + public System.IO.FileStream Open(System.IO.FileMode mode, System.IO.FileAccess access) { return _fileInfo.Open(mode, access); } - public FileStream Open (FileMode mode, FileAccess access, FileShare share) + public System.IO.FileStream Open(System.IO.FileMode mode, System.IO.FileAccess access, System.IO.FileShare share) { return _fileInfo.Open(mode, access, share); } - public override void Delete () + public override void Delete() { _fileInfo.Delete(); } - public void MoveTo (string destFileName) + public void MoveTo(string destFileName) { _fileInfo.MoveTo(destFileName); } - public FileInfo CopyTo (string destFileName) + public FileInfo CopyTo(string destFileName) { System.IO.FileInfo tmpFileInfo = _fileInfo.CopyTo(destFileName); return new FileInfo(tmpFileInfo); } - public FileInfo CopyTo (string destFileName, bool overwrite) + public FileInfo CopyTo(string destFileName, bool overwrite) { System.IO.FileInfo tmpFileInfo = _fileInfo.CopyTo(destFileName, overwrite); return new FileInfo(tmpFileInfo); } - public override string ToString () + public override string ToString() { return _fileInfo.ToString(); } #if !MOBILE - public FileSecurity GetAccessControl () + public FileSecurity GetAccessControl() { return _fileInfo.GetAccessControl(); } - public FileSecurity GetAccessControl (AccessControlSections includeSections) + public FileSecurity GetAccessControl(AccessControlSections includeSections) { return _fileInfo.GetAccessControl(includeSections); } - public FileInfo Replace (string destinationFileName, - string destinationBackupFileName) + public FileInfo Replace(string destinationFileName, + string destinationBackupFileName) { - System.IO.FileInfo tmpFileInfo =_fileInfo.Replace(destinationFileName, destinationBackupFileName); + System.IO.FileInfo tmpFileInfo = _fileInfo.Replace(destinationFileName, destinationBackupFileName); return new FileInfo(tmpFileInfo); } - public FileInfo Replace (string destinationFileName, - string destinationBackupFileName, - bool ignoreMetadataErrors) + public FileInfo Replace(string destinationFileName, + string destinationBackupFileName, + bool ignoreMetadataErrors) { System.IO.FileInfo tmpFileInfo = _fileInfo.Replace(destinationFileName, destinationBackupFileName, ignoreMetadataErrors); return new FileInfo(tmpFileInfo); } - public void SetAccessControl (FileSecurity fileSecurity) + public void SetAccessControl(FileSecurity fileSecurity) { _fileInfo.SetAccessControl(fileSecurity); }