From 9375231e128c5cee60c14e1d481de7417ec43aff Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 3 May 2017 01:54:02 +0100 Subject: [PATCH] Refactor code. --- osrepodbmgr/ChangeLog | 12 ++++++++++++ osrepodbmgr/Checksum.cs | 2 +- osrepodbmgr/Core.cs | 1 - osrepodbmgr/DicCore.cs | 18 +++++++++--------- osrepodbmgr/PluginBase.cs | 6 +++--- osrepodbmgr/SQLite.cs | 2 +- osrepodbmgr/dlgFilesystem.cs | 4 ++-- osrepodbmgr/dlgMetadata.cs | 1 - osrepodbmgr/dlgOpticalDisc.cs | 8 ++++---- 9 files changed, 32 insertions(+), 22 deletions(-) diff --git a/osrepodbmgr/ChangeLog b/osrepodbmgr/ChangeLog index 4c75c3b..7519bae 100644 --- a/osrepodbmgr/ChangeLog +++ b/osrepodbmgr/ChangeLog @@ -1,3 +1,15 @@ +2017-05-03 Natalia Portillo + + * Core.cs: + * SQLite.cs: + * DicCore.cs: + * Checksum.cs: + * PluginBase.cs: + * dlgMetadata.cs: + * dlgFilesystem.cs: + * dlgOpticalDisc.cs: + Refactor code. + 2017-05-03 Natalia Portillo * MainWindow.cs: diff --git a/osrepodbmgr/Checksum.cs b/osrepodbmgr/Checksum.cs index 4edb96d..fba215b 100644 --- a/osrepodbmgr/Checksum.cs +++ b/osrepodbmgr/Checksum.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.Collections.Generic; +using System.Threading; using DiscImageChef.Checksums; using Schemas; -using System.Threading; namespace osrepodbmgr { diff --git a/osrepodbmgr/Core.cs b/osrepodbmgr/Core.cs index 8edd009..ab30b7c 100644 --- a/osrepodbmgr/Core.cs +++ b/osrepodbmgr/Core.cs @@ -847,7 +847,6 @@ namespace osrepodbmgr if(UpdateProgress != null) UpdateProgress("Choosing files...", file, counter, MainClass.files.Count); - //FileStream fs = new FileStream(file, FileMode.Open, FileAccess.Read); FileInfo fi = new FileInfo(file); ZipEntry ze = zf.AddFile(file); diff --git a/osrepodbmgr/DicCore.cs b/osrepodbmgr/DicCore.cs index bb7a7b4..99a25e6 100644 --- a/osrepodbmgr/DicCore.cs +++ b/osrepodbmgr/DicCore.cs @@ -26,15 +26,15 @@ // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // using System; -using DiscImageChef.Filters; -using Schemas; -using System.IO; using System.Collections.Generic; +using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.Decoders.PCMCIA; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; using DiscImageChef.ImagePlugins; using DiscImageChef.PartPlugins; -using DiscImageChef.Filesystems; -using DiscImageChef.Decoders.PCMCIA; +using Schemas; namespace osrepodbmgr { @@ -156,7 +156,7 @@ namespace osrepodbmgr if(UpdateProgress2 != null) UpdateProgress2(null, null, 0, 0); - + switch(_imageFormat.ImageInfo.xmlMediaType) { case XmlMediaType.OpticalDisc: @@ -549,7 +549,7 @@ namespace osrepodbmgr } if(UpdateProgress != null) - UpdateProgress(null, "Checking filesystems", maxProgress-1, maxProgress); + UpdateProgress(null, "Checking filesystems", maxProgress - 1, maxProgress); List partitions = new List(); @@ -721,7 +721,7 @@ namespace osrepodbmgr currentProgress++; if(UpdateProgress != null) UpdateProgress(null, string.Format("Hashing file containing {0}", tagType), currentProgress, maxProgress); - + switch(tagType) { case MediaTagType.ATAPI_IDENTIFY: @@ -931,7 +931,7 @@ namespace osrepodbmgr } catch(Exception ex) { - if(Failed!=null) + if(Failed != null) Failed(string.Format("Error reading file: {0}\n{1}", ex.Message, ex.StackTrace)); } } diff --git a/osrepodbmgr/PluginBase.cs b/osrepodbmgr/PluginBase.cs index 631aec6..90bd8ca 100644 --- a/osrepodbmgr/PluginBase.cs +++ b/osrepodbmgr/PluginBase.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System; using System.Collections.Generic; -using DiscImageChef.Filesystems; -using DiscImageChef.PartPlugins; -using DiscImageChef.ImagePlugins; using System.Reflection; +using DiscImageChef.Filesystems; +using DiscImageChef.ImagePlugins; +using DiscImageChef.PartPlugins; namespace osrepodbmgr { diff --git a/osrepodbmgr/SQLite.cs b/osrepodbmgr/SQLite.cs index 1a899be..86dc2c0 100644 --- a/osrepodbmgr/SQLite.cs +++ b/osrepodbmgr/SQLite.cs @@ -134,7 +134,7 @@ namespace osrepodbmgr public override long LastInsertRowId { - get { return dbCon.LastInsertRowId;} + get { return dbCon.LastInsertRowId; } } #endregion diff --git a/osrepodbmgr/dlgFilesystem.cs b/osrepodbmgr/dlgFilesystem.cs index 098c294..bfbbd08 100644 --- a/osrepodbmgr/dlgFilesystem.cs +++ b/osrepodbmgr/dlgFilesystem.cs @@ -30,13 +30,13 @@ using Gtk; using Schemas; namespace osrepodbmgr { - public partial class dlgFilesystem : Gtk.Dialog + public partial class dlgFilesystem : Dialog { public FileSystemType Metadata; public dlgFilesystem() { - this.Build(); + Build(); } public void FillFields() diff --git a/osrepodbmgr/dlgMetadata.cs b/osrepodbmgr/dlgMetadata.cs index d5b9017..1c889af 100644 --- a/osrepodbmgr/dlgMetadata.cs +++ b/osrepodbmgr/dlgMetadata.cs @@ -30,7 +30,6 @@ using System.Collections.Generic; using System.Threading; using Gtk; using Schemas; -using System.Runtime.InteropServices; namespace osrepodbmgr { diff --git a/osrepodbmgr/dlgOpticalDisc.cs b/osrepodbmgr/dlgOpticalDisc.cs index 4e9c1e2..6c23bc9 100644 --- a/osrepodbmgr/dlgOpticalDisc.cs +++ b/osrepodbmgr/dlgOpticalDisc.cs @@ -26,13 +26,13 @@ // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // using System; -using Schemas; -using Gtk; using System.Collections.Generic; +using Gtk; +using Schemas; namespace osrepodbmgr { - public partial class dlgOpticalDisc : Gtk.Dialog + public partial class dlgOpticalDisc : Dialog { public OpticalDiscType Metadata; @@ -83,7 +83,7 @@ namespace osrepodbmgr public dlgOpticalDisc() { - this.Build(); + Build(); #region Set partitions table CellRendererText partSequenceCell = new CellRendererText();