Remove sporious Using statements, and formatted.

This commit is contained in:
2015-02-08 03:43:27 +00:00
parent 59063bab6b
commit f4c5a87922
3 changed files with 122 additions and 99 deletions

View File

@@ -1,3 +1,9 @@
2015-02-08 Natalia Portillo <claunia@claunia.com>
* FileInfo.cs:
* DirectoryInfo.cs:
Remove sporious Using statements, and formatted.
2015-02-08 Natalia Portillo <claunia@claunia.com> 2015-02-08 Natalia Portillo <claunia@claunia.com>
* DirectoryInfo.cs: * DirectoryInfo.cs:

View File

@@ -46,220 +46,227 @@ namespace Claunia.IO
} }
// For manual casting // For manual casting
public DirectoryInfo (System.IO.DirectoryInfo dirInfo) public DirectoryInfo(System.IO.DirectoryInfo dirInfo)
{ {
_dirInfo = dirInfo; _dirInfo = dirInfo;
} }
public override bool Exists { public override bool Exists
get { {
get
{
return _dirInfo.Exists; return _dirInfo.Exists;
} }
} }
public override string Name { public override string Name
{
get { return _dirInfo.Name; } get { return _dirInfo.Name; }
} }
public DirectoryInfo Parent { public DirectoryInfo Parent
get { {
get
{
return new DirectoryInfo(_dirInfo.Parent); return new DirectoryInfo(_dirInfo.Parent);
} }
} }
public DirectoryInfo Root { public DirectoryInfo Root
get { {
get
{
return new DirectoryInfo(_dirInfo.Root); return new DirectoryInfo(_dirInfo.Root);
} }
} }
public void Create () public void Create()
{ {
_dirInfo.Create(); _dirInfo.Create();
} }
public DirectoryInfo CreateSubdirectory (string path) public DirectoryInfo CreateSubdirectory(string path)
{ {
return new DirectoryInfo(_dirInfo.CreateSubdirectory(path)); return new DirectoryInfo(_dirInfo.CreateSubdirectory(path));
} }
public FileInfo [] GetFiles () public FileInfo [] GetFiles()
{ {
System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles(); System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles();
FileInfo[] _fileInfos = new FileInfo[_systemFileInfos.Length]; 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]); _fileInfos[i] = new FileInfo(_systemFileInfos[i]);
return _fileInfos; return _fileInfos;
} }
public FileInfo [] GetFiles (string searchPattern) public FileInfo [] GetFiles(string searchPattern)
{ {
System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles(searchPattern); System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles(searchPattern);
FileInfo[] _fileInfos = new FileInfo[_systemFileInfos.Length]; 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]); _fileInfos[i] = new FileInfo(_systemFileInfos[i]);
return _fileInfos; 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); System.IO.FileInfo[] _systemFileInfos = _dirInfo.GetFiles(searchPattern, searchOption);
FileInfo[] _fileInfos = new FileInfo[_systemFileInfos.Length]; 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]); _fileInfos[i] = new FileInfo(_systemFileInfos[i]);
return _fileInfos; return _fileInfos;
} }
public DirectoryInfo [] GetDirectories () public DirectoryInfo [] GetDirectories()
{ {
System.IO.DirectoryInfo[] _systemDirInfos = _dirInfo.GetDirectories(); System.IO.DirectoryInfo[] _systemDirInfos = _dirInfo.GetDirectories();
DirectoryInfo[] _dirInfos = new DirectoryInfo[_systemDirInfos.Length]; 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]); _dirInfos[i] = new DirectoryInfo(_systemDirInfos[i]);
return _dirInfos; return _dirInfos;
} }
public DirectoryInfo [] GetDirectories (string searchPattern) public DirectoryInfo [] GetDirectories(string searchPattern)
{ {
System.IO.DirectoryInfo[] _systemDirInfos = _dirInfo.GetDirectories(searchPattern); System.IO.DirectoryInfo[] _systemDirInfos = _dirInfo.GetDirectories(searchPattern);
DirectoryInfo[] _dirInfos = new DirectoryInfo[_systemDirInfos.Length]; 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]); _dirInfos[i] = new DirectoryInfo(_systemDirInfos[i]);
return _dirInfos; 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); System.IO.DirectoryInfo[] _systemDirInfos = _dirInfo.GetDirectories(searchPattern, searchOption);
DirectoryInfo[] _dirInfos = new DirectoryInfo[_systemDirInfos.Length]; 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]); _dirInfos[i] = new DirectoryInfo(_systemDirInfos[i]);
return _dirInfos; return _dirInfos;
} }
public System.IO.FileSystemInfo [] GetFileSystemInfos () public System.IO.FileSystemInfo [] GetFileSystemInfos()
{ {
return _dirInfo.GetFileSystemInfos(); return _dirInfo.GetFileSystemInfos();
} }
public System.IO.FileSystemInfo [] GetFileSystemInfos (string searchPattern) public System.IO.FileSystemInfo [] GetFileSystemInfos(string searchPattern)
{ {
return _dirInfo.GetFileSystemInfos(searchPattern); return _dirInfo.GetFileSystemInfos(searchPattern);
} }
public 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); return _dirInfo.GetFileSystemInfos(searchPattern, searchOption);
} }
public override void Delete () public override void Delete()
{ {
_dirInfo.Delete(); _dirInfo.Delete();
} }
public void Delete (bool recursive) public void Delete(bool recursive)
{ {
_dirInfo.Delete(recursive); _dirInfo.Delete(recursive);
} }
public void MoveTo (string destDirName) public void MoveTo(string destDirName)
{ {
_dirInfo.MoveTo(destDirName); _dirInfo.MoveTo(destDirName);
} }
public override string ToString () public override string ToString()
{ {
return _dirInfo.ToString(); return _dirInfo.ToString();
} }
#if !MOBILE #if !MOBILE
public void Create (DirectorySecurity directorySecurity) public void Create(DirectorySecurity directorySecurity)
{ {
_dirInfo.Create(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)); return new DirectoryInfo(_dirInfo.CreateSubdirectory(path, directorySecurity));
} }
public DirectorySecurity GetAccessControl () public DirectorySecurity GetAccessControl()
{ {
return _dirInfo.GetAccessControl(); return _dirInfo.GetAccessControl();
} }
public DirectorySecurity GetAccessControl (AccessControlSections includeSections) public DirectorySecurity GetAccessControl(AccessControlSections includeSections)
{ {
return _dirInfo.GetAccessControl(includeSections); return _dirInfo.GetAccessControl(includeSections);
} }
public void SetAccessControl (DirectorySecurity directorySecurity) public void SetAccessControl(DirectorySecurity directorySecurity)
{ {
_dirInfo.SetAccessControl(directorySecurity); _dirInfo.SetAccessControl(directorySecurity);
} }
#endif #endif
public IEnumerable<DirectoryInfo> EnumerateDirectories () public IEnumerable<DirectoryInfo> EnumerateDirectories()
{ {
foreach(System.IO.DirectoryInfo _sysDirInfo in _dirInfo.EnumerateDirectories()) foreach (System.IO.DirectoryInfo _sysDirInfo in _dirInfo.EnumerateDirectories())
yield return new DirectoryInfo(_sysDirInfo); yield return new DirectoryInfo(_sysDirInfo);
} }
public IEnumerable<DirectoryInfo> EnumerateDirectories (string searchPattern) public IEnumerable<DirectoryInfo> 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); yield return new DirectoryInfo(_sysDirInfo);
} }
public IEnumerable<DirectoryInfo> EnumerateDirectories (string searchPattern, System.IO.SearchOption searchOption) public IEnumerable<DirectoryInfo> 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); yield return new DirectoryInfo(_sysDirInfo);
} }
public IEnumerable<FileInfo> EnumerateFiles () public IEnumerable<FileInfo> EnumerateFiles()
{ {
foreach(System.IO.FileInfo _sysFileInfo in _dirInfo.EnumerateFiles()) foreach (System.IO.FileInfo _sysFileInfo in _dirInfo.EnumerateFiles())
yield return new FileInfo(_sysFileInfo); yield return new FileInfo(_sysFileInfo);
} }
public IEnumerable<FileInfo> EnumerateFiles (string searchPattern) public IEnumerable<FileInfo> 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); yield return new FileInfo(_sysFileInfo);
} }
public IEnumerable<FileInfo> EnumerateFiles (string searchPattern, System.IO.SearchOption searchOption) public IEnumerable<FileInfo> 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); yield return new FileInfo(_sysFileInfo);
} }
public IEnumerable<System.IO.FileSystemInfo> EnumerateFileSystemInfos () public IEnumerable<System.IO.FileSystemInfo> EnumerateFileSystemInfos()
{ {
return _dirInfo.EnumerateFileSystemInfos(); return _dirInfo.EnumerateFileSystemInfos();
} }
public IEnumerable<System.IO.FileSystemInfo> EnumerateFileSystemInfos (string searchPattern) public IEnumerable<System.IO.FileSystemInfo> EnumerateFileSystemInfos(string searchPattern)
{ {
return _dirInfo.EnumerateFileSystemInfos(searchPattern); return _dirInfo.EnumerateFileSystemInfos(searchPattern);
} }
public IEnumerable<System.IO.FileSystemInfo> EnumerateFileSystemInfos (string searchPattern, System.IO.SearchOption searchOption) public IEnumerable<System.IO.FileSystemInfo> EnumerateFileSystemInfos(string searchPattern, System.IO.SearchOption searchOption)
{ {
return _dirInfo.EnumerateFileSystemInfos(searchPattern, searchOption); return _dirInfo.EnumerateFileSystemInfos(searchPattern, searchOption);
} }

View File

@@ -25,10 +25,7 @@
// THE SOFTWARE. // THE SOFTWARE.
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Security;
using System; using System;
using System.IO;
#if !MOBILE #if !MOBILE
using System.Security.AccessControl; using System.Security.AccessControl;
@@ -43,166 +40,179 @@ namespace Claunia.IO
// As FileInfo is sealed, let's gonna cheat a little :p // As FileInfo is sealed, let's gonna cheat a little :p
readonly System.IO.FileInfo _fileInfo; readonly System.IO.FileInfo _fileInfo;
public FileInfo (string fileName) public FileInfo(string fileName)
{ {
_fileInfo = new System.IO.FileInfo(fileName); _fileInfo = new System.IO.FileInfo(fileName);
} }
// For manual casting // For manual casting
public FileInfo (System.IO.FileInfo fileInfo) public FileInfo(System.IO.FileInfo fileInfo)
{ {
_fileInfo = fileInfo; _fileInfo = fileInfo;
} }
public override bool Exists { public override bool Exists
get { {
get
{
return _fileInfo.Exists; return _fileInfo.Exists;
} }
} }
public override string Name { public override string Name
get { {
get
{
return _fileInfo.Name; return _fileInfo.Name;
} }
} }
public bool IsReadOnly { public bool IsReadOnly
get { {
get
{
return _fileInfo.IsReadOnly; return _fileInfo.IsReadOnly;
} }
set { set
{
_fileInfo.IsReadOnly = value; _fileInfo.IsReadOnly = value;
} }
} }
public void Encrypt () public void Encrypt()
{ {
_fileInfo.Encrypt(); _fileInfo.Encrypt();
} }
public void Decrypt () public void Decrypt()
{ {
_fileInfo.Decrypt(); _fileInfo.Decrypt();
} }
public long Length { public long Length
get { {
get
{
return _fileInfo.Length; return _fileInfo.Length;
} }
} }
public string DirectoryName { public string DirectoryName
get { {
get
{
return _fileInfo.DirectoryName; return _fileInfo.DirectoryName;
} }
} }
public DirectoryInfo Directory { public DirectoryInfo Directory
get { {
get
{
return new DirectoryInfo(_fileInfo.Directory); return new DirectoryInfo(_fileInfo.Directory);
} }
} }
public StreamReader OpenText () public System.IO.StreamReader OpenText()
{ {
return _fileInfo.OpenText(); return _fileInfo.OpenText();
} }
public StreamWriter CreateText () public System.IO.StreamWriter CreateText()
{ {
return _fileInfo.CreateText(); return _fileInfo.CreateText();
} }
public StreamWriter AppendText () public System.IO. StreamWriter AppendText()
{ {
return _fileInfo.AppendText(); return _fileInfo.AppendText();
} }
public FileStream Create () public System.IO.FileStream Create()
{ {
return _fileInfo.Create(); return _fileInfo.Create();
} }
public FileStream OpenRead () public System.IO.FileStream OpenRead()
{ {
return _fileInfo.OpenRead(); return _fileInfo.OpenRead();
} }
public FileStream OpenWrite () public System.IO.FileStream OpenWrite()
{ {
return _fileInfo.OpenWrite(); return _fileInfo.OpenWrite();
} }
public FileStream Open (FileMode mode) public System.IO.FileStream Open(System.IO.FileMode mode)
{ {
return _fileInfo.Open(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); 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); return _fileInfo.Open(mode, access, share);
} }
public override void Delete () public override void Delete()
{ {
_fileInfo.Delete(); _fileInfo.Delete();
} }
public void MoveTo (string destFileName) public void MoveTo(string destFileName)
{ {
_fileInfo.MoveTo(destFileName); _fileInfo.MoveTo(destFileName);
} }
public FileInfo CopyTo (string destFileName) public FileInfo CopyTo(string destFileName)
{ {
System.IO.FileInfo tmpFileInfo = _fileInfo.CopyTo(destFileName); System.IO.FileInfo tmpFileInfo = _fileInfo.CopyTo(destFileName);
return new FileInfo(tmpFileInfo); 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); System.IO.FileInfo tmpFileInfo = _fileInfo.CopyTo(destFileName, overwrite);
return new FileInfo(tmpFileInfo); return new FileInfo(tmpFileInfo);
} }
public override string ToString () public override string ToString()
{ {
return _fileInfo.ToString(); return _fileInfo.ToString();
} }
#if !MOBILE #if !MOBILE
public FileSecurity GetAccessControl () public FileSecurity GetAccessControl()
{ {
return _fileInfo.GetAccessControl(); return _fileInfo.GetAccessControl();
} }
public FileSecurity GetAccessControl (AccessControlSections includeSections) public FileSecurity GetAccessControl(AccessControlSections includeSections)
{ {
return _fileInfo.GetAccessControl(includeSections); return _fileInfo.GetAccessControl(includeSections);
} }
public FileInfo Replace (string destinationFileName, public FileInfo Replace(string destinationFileName,
string destinationBackupFileName) string destinationBackupFileName)
{ {
System.IO.FileInfo tmpFileInfo =_fileInfo.Replace(destinationFileName, destinationBackupFileName); System.IO.FileInfo tmpFileInfo = _fileInfo.Replace(destinationFileName, destinationBackupFileName);
return new FileInfo(tmpFileInfo); return new FileInfo(tmpFileInfo);
} }
public FileInfo Replace (string destinationFileName, public FileInfo Replace(string destinationFileName,
string destinationBackupFileName, string destinationBackupFileName,
bool ignoreMetadataErrors) bool ignoreMetadataErrors)
{ {
System.IO.FileInfo tmpFileInfo = _fileInfo.Replace(destinationFileName, destinationBackupFileName, ignoreMetadataErrors); System.IO.FileInfo tmpFileInfo = _fileInfo.Replace(destinationFileName, destinationBackupFileName, ignoreMetadataErrors);
return new FileInfo(tmpFileInfo); return new FileInfo(tmpFileInfo);
} }
public void SetAccessControl (FileSecurity fileSecurity) public void SetAccessControl(FileSecurity fileSecurity)
{ {
_fileInfo.SetAccessControl(fileSecurity); _fileInfo.SetAccessControl(fileSecurity);
} }