banshee r3611 - in trunk/musicbrainz-sharp/src/MusicBrainz: . MusicBrainz

[scottp svn gnome org]

Author: scottp
Date: Mon Mar 31 07:30:24 2008
New Revision: 3611
URL: http://svn.gnome.org/viewvc/banshee?rev=3611&view=rev

Log:
* src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs,
  src/MusicBrainz/MusicBrainz/Label.cs,
  src/MusicBrainz/MusicBrainz/Release.cs,
  src/MusicBrainz/MusicBrainz/Event.cs,
  src/MusicBrainz/MusicBrainz/MusicBrainzEntity.cs,
  src/MusicBrainz/MusicBrainz/Track.cs,
  src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs,
  src/MusicBrainz/MusicBrainz/Artist.cs: Formatting fixes.

Modified:
   trunk/musicbrainz-sharp/src/MusicBrainz/ChangeLog
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Artist.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Event.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzEntity.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Artist.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Artist.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Artist.cs	Mon Mar 31 07:30:24 2008
@@ -81,23 +81,7 @@
     {
         const string EXTENSION = "artist";
         
-        protected override string UrlExtension {
-            get { return EXTENSION; }
-        }
-
-        public static ArtistReleaseType DefaultArtistReleaseType =
-            new ArtistReleaseType (ReleaseStatus.Official, false);
-        
-        ArtistReleaseType artist_release_type = DefaultArtistReleaseType;
-        
-        public ArtistReleaseType ArtistReleaseType {
-            get { return artist_release_type; }
-            set {
-                artist_release_type = value;
-                releases = null;
-                have_all_releases = false;
-            }
-        }
+        #region Constructors
 
         Artist (string mbid) : base (mbid, null)
         {
@@ -117,21 +101,29 @@
         internal Artist (XmlReader reader) : base (reader, false)
         {
         }
+        
+        #endregion
+        
+        #region Protected Overrides
+        
+        protected override string UrlExtension {
+            get { return EXTENSION; }
+        }
 
-        protected override void HandleCreateInc (StringBuilder builder)
+        protected override void CreateIncCore (StringBuilder builder)
         {
             AppendIncParameters (builder, artist_release_type.ToString ());
-            base.HandleCreateInc (builder);
+            base.CreateIncCore (builder);
         }
 
-        protected override void HandleLoadMissingData ()
+        protected override void LoadMissingDataCore ()
         {
             Artist artist = new Artist (Id, CreateInc ());
             type = artist.Type;
-            base.HandleLoadMissingData (artist);
+            base.LoadMissingDataCore (artist);
         }
 
-        protected override bool HandleAttributes (XmlReader reader)
+        protected override bool ProcessAttributes (XmlReader reader)
         {
             switch (reader ["type"]) {
             case "Group":
@@ -144,10 +136,10 @@
             return type != ArtistType.Unknown;
         }
 
-        protected override bool HandleXml (XmlReader reader)
+        protected override bool ProcessXml (XmlReader reader)
         {
             reader.Read ();
-            bool result = base.HandleXml (reader);
+            bool result = base.ProcessXml (reader);
             if (!result) {
                 result = true;
                 switch (reader.Name) {
@@ -168,8 +160,24 @@
             reader.Close ();
             return result;
         }
+        
+        #endregion
 
         #region Properties
+        
+        public static ArtistReleaseType DefaultArtistReleaseType =
+            new ArtistReleaseType (ReleaseStatus.Official, false);
+        
+        ArtistReleaseType artist_release_type = DefaultArtistReleaseType;
+        
+        public ArtistReleaseType ArtistReleaseType {
+            get { return artist_release_type; }
+            set {
+                artist_release_type = value;
+                releases = null;
+                have_all_releases = false;
+            }
+        }
 
         [Queryable ("arid")]
         public override string Id {

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Event.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Event.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Event.cs	Mon Mar 31 07:30:24 2008
@@ -43,10 +43,10 @@
             catalog_number = reader ["catalog-number"];
             barcode = reader ["barcode"];
             format = Utils.StringToEnum<ReleaseFormat> (reader ["format"]);
-                if (reader.ReadToDescendant ("label")) {
-                    label = new Label (reader.ReadSubtree ());
-                    reader.Read (); // FIXME this is a workaround for Mono bug 334752
-                }
+            if (reader.ReadToDescendant ("label")) {
+                label = new Label (reader.ReadSubtree ());
+                reader.Read (); // FIXME this is a workaround for Mono bug 334752
+            }
             reader.Close ();
         }
 

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Label.cs	Mon Mar 31 07:30:24 2008
@@ -57,23 +57,23 @@
         {
         }
 
-        protected override void HandleLoadMissingData ()
+        protected override void LoadMissingDataCore ()
         {
             Label label = new Label (Id, CreateInc ());
             type = label.Type;
-            base.HandleLoadMissingData (label);
+            base.LoadMissingDataCore (label);
         }
 
-        protected override bool HandleAttributes (XmlReader reader)
+        protected override bool ProcessAttributes (XmlReader reader)
         {
             type = Utils.StringToEnum<LabelType> (reader ["type"]);
             return this.type != null;
         }
 
-        protected override bool HandleXml (XmlReader reader)
+        protected override bool ProcessXml (XmlReader reader)
         {
             reader.Read ();
-            bool result = base.HandleXml (reader);
+            bool result = base.ProcessXml (reader);
             if (!result) {
                 if (reader.Name == "country") {
                     result = true;

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzEntity.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzEntity.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzEntity.cs	Mon Mar 31 07:30:24 2008
@@ -32,6 +32,9 @@
     // A person-like entity, such as an artist or a label.
     public abstract class MusicBrainzEntity : MusicBrainzObject
     {
+        
+        #region Constructors
+        
         internal MusicBrainzEntity (string mbid, string parameters) : base (mbid, parameters)
         {
         }
@@ -39,14 +42,18 @@
         internal MusicBrainzEntity (XmlReader reader, bool all_rels_loaded) : base (reader, all_rels_loaded)
         {
         }
+        
+        #endregion
+        
+        #region Protected Overrides
 
-        protected override void HandleCreateInc (StringBuilder builder)
+        protected override void CreateIncCore (StringBuilder builder)
         {
             if (aliases == null) AppendIncParameters (builder, "aliases");
-            base.HandleCreateInc (builder);
+            base.CreateIncCore (builder);
         }
 
-        protected void HandleLoadMissingData (MusicBrainzEntity entity)
+        protected void LoadMissingDataCore (MusicBrainzEntity entity)
         {
             name = entity.Name;
             sort_name = entity.SortName;
@@ -54,10 +61,10 @@
             begin_date = entity.BeginDate;
             end_date = entity.EndDate;
             if (aliases == null) aliases = entity.Aliases;
-            base.HandleLoadMissingData (entity);
+            base.LoadMissingDataCore (entity);
         }
 
-        protected override bool HandleXml (XmlReader reader)
+        protected override bool ProcessXml (XmlReader reader)
         {
             bool result = true;
             switch (reader.Name) {
@@ -97,8 +104,10 @@
             }
             return result;
         }
+        
+        #endregion
 
-        # region Properties
+        #region Properties
 
         string name;
         public virtual string Name {

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzItem.cs	Mon Mar 31 07:30:24 2008
@@ -101,6 +101,9 @@
     // The item-like product of an artist, such as a track or a release.
     public abstract class MusicBrainzItem : MusicBrainzObject
     {
+        
+        #region Constructors
+        
         internal MusicBrainzItem (string mbid, string parameters) : base (mbid, parameters)
         {
         }
@@ -109,21 +112,25 @@
         {
             if (this.artist == null) this.artist = artist;
         }
+        
+        #endregion
+        
+        #region Protected Overrides
 
-        protected override void HandleCreateInc (StringBuilder builder)
+        protected override void CreateIncCore (StringBuilder builder)
         {
             if (artist == null) AppendIncParameters(builder, "artist");
-            base.HandleCreateInc (builder);
+            base.CreateIncCore (builder);
         }
 
-        protected void HandleLoadMissingData (MusicBrainzItem item)
+        protected void LoadMissingDataCore (MusicBrainzItem item)
         {
             title = item.Title;
             if (artist == null) artist = item.Artist;
-            base.HandleLoadMissingData (item);
+            base.LoadMissingDataCore (item);
         }
 
-        protected override bool HandleXml (XmlReader reader)
+        protected override bool ProcessXml (XmlReader reader)
         {
             bool result = true;
             switch (reader.Name) {
@@ -141,7 +148,11 @@
             }
             return result;
         }
+        
+        #endregion
 
+        #region Properties
+        
         string title;
         public virtual string Title {
             get { return GetPropertyOrNull (ref title); }
@@ -152,8 +163,11 @@
         public virtual Artist Artist {
             get { return GetPropertyOrNull (ref artist); }
         }
+        
+        #endregion
 
-        public override string ToString () {
+        public override string ToString ()
+        {
             return title;
         }
     }

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs	Mon Mar 31 07:30:24 2008
@@ -69,7 +69,7 @@
         protected string CreateInc ()
         {
             StringBuilder builder = new StringBuilder ();
-            HandleCreateInc (builder);
+            CreateIncCore (builder);
             return builder.ToString ();
         }
         
@@ -81,7 +81,7 @@
             "url-rels"
         };
 
-        protected virtual void HandleCreateInc (StringBuilder builder)
+        protected virtual void CreateIncCore (StringBuilder builder)
         {
             if (!all_rels_loaded)
                 AppendIncParameters (builder, rels_params);
@@ -120,14 +120,15 @@
             );
         }
 
-        protected abstract bool HandleAttributes (XmlReader reader);
-        protected abstract bool HandleXml (XmlReader reader);
+        protected abstract bool ProcessAttributes (XmlReader reader);
+        protected abstract bool ProcessXml (XmlReader reader);
+        
         void CreateFromXml (XmlReader reader)
         {
             reader.Read ();
             id = reader ["id"];
             byte.TryParse (reader ["ext:score"], out score);
-            HandleAttributes (reader);
+            ProcessAttributes (reader);
             while (reader.Read () && reader.NodeType != XmlNodeType.EndElement) {
                 if (reader.Name == "relation-list") {
                     all_rels_loaded = true;
@@ -175,7 +176,7 @@
                         break;
                     }
                 } else
-                    HandleXml (reader.ReadSubtree ());
+                    ProcessXml (reader.ReadSubtree ());
             }
             reader.Close ();
         }
@@ -183,13 +184,13 @@
         protected void LoadMissingData ()
         {
             if (!all_data_loaded) {
-                HandleLoadMissingData ();
+                LoadMissingDataCore ();
                 all_data_loaded = true;
             }
         }
 
-        protected abstract void HandleLoadMissingData ();
-        protected void HandleLoadMissingData (MusicBrainzObject obj)
+        protected abstract void LoadMissingDataCore ();
+        protected void LoadMissingDataCore (MusicBrainzObject obj)
         {
             if (!all_rels_loaded) {
                 artist_rels = obj.ArtistRelations;
@@ -344,8 +345,7 @@
             try {
                 request.CachePolicy = MusicBrainzService.CachePolicy;
                 cache_implemented = true;
-            } catch (NotImplementedException) {
-            }
+            } catch (NotImplementedException) {}
             
             HttpWebResponse response = null;
             

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Release.cs	Mon Mar 31 07:30:24 2008
@@ -29,7 +29,8 @@
 
 namespace MusicBrainz
 {
-    # region Enums
+    
+    #region Enums
 
     public enum ReleaseType
     {
@@ -140,9 +141,7 @@
     {
         const string EXTENSION = "release";
         
-        protected override string UrlExtension {
-            get { return EXTENSION; }
-        }
+        #region Constructors
 
         Release (string mbid) : base (mbid, null)
         {
@@ -156,9 +155,17 @@
         {
         }
         
+        #endregion
+        
+        #region Protected Overrides
+        
+        protected override string UrlExtension {
+            get { return EXTENSION; }
+        }
+        
         static readonly string [] track_params = new string [] { "tracks", "track-level-rels", "artist" };
         
-        protected override void HandleCreateInc (StringBuilder builder)
+        protected override void CreateIncCore (StringBuilder builder)
         {
             AppendIncParameters (builder, "release-events", "labels");
             if (discs == null) AppendIncParameters (builder, "discs");
@@ -166,10 +173,10 @@
                 AppendIncParameters (builder, track_params);
                 AllRelsLoaded = false;
             }
-            base.HandleCreateInc (builder);
+            base.CreateIncCore (builder);
         }
 
-        protected override void HandleLoadMissingData ()
+        protected override void LoadMissingDataCore ()
         {
             Release release = new Release (Id, CreateInc ());
             type = release.Type;
@@ -180,10 +187,10 @@
             events = release.Events;
             if (discs == null) discs = release.Discs;
             if (tracks == null) tracks = release.Tracks;
-            base.HandleLoadMissingData (release);
+            base.LoadMissingDataCore (release);
         }
 
-        protected override bool HandleAttributes (XmlReader reader)
+        protected override bool ProcessAttributes (XmlReader reader)
         {
             // How sure am I about getting the type and status in the "Type Status" format?
             // MB really ought to specify these two things seperatly.
@@ -199,10 +206,10 @@
             return this.type != null || this.status != null;
         }
 
-        protected override bool HandleXml (XmlReader reader)
+        protected override bool ProcessXml (XmlReader reader)
         {
             reader.Read ();
-            bool result = base.HandleXml (reader);
+            bool result = base.ProcessXml (reader);
             if (!result) {
                 result = true;
                 switch (reader.Name) {
@@ -254,6 +261,8 @@
             reader.Close ();
             return result;
         }
+        
+        #endregion
 
         #region Properties
 
@@ -277,7 +286,6 @@
         [Queryable]
         public ReleaseStatus Status {
             get { return GetPropertyOrDefault (ref status, ReleaseStatus.None); }
-
         }
 
         string language;

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Track.cs	Mon Mar 31 07:30:24 2008
@@ -93,9 +93,7 @@
     {
         const string EXTENSION = "track";
         
-        protected override string UrlExtension {
-            get { return EXTENSION; }
-        }
+        #region Constructors
 
         Track (string mbid) : base (mbid, null)
         {
@@ -112,32 +110,40 @@
         internal Track (XmlReader reader, Artist artist, bool all_rels_loaded) : base (reader, artist, all_rels_loaded)
         {
         }
+        
+        #endregion
 
-        protected override void HandleCreateInc (StringBuilder builder)
+        #region Protected Overrides
+        
+        protected override string UrlExtension {
+            get { return EXTENSION; }
+        }
+        
+        protected override void CreateIncCore (StringBuilder builder)
         {
             if (releases == null) AppendIncParameters (builder, "releases");
             if (puids == null) AppendIncParameters (builder, "puids");
-            base.HandleCreateInc (builder);
+            base.CreateIncCore (builder);
         }
 
-        protected override void HandleLoadMissingData ()
+        protected override void LoadMissingDataCore ()
         {
             Track track = new Track (Id, CreateInc ());
             duration = track.Duration;
             if (releases == null) releases = track.Releases;
             if (puids == null) puids = track.Puids;
-            base.HandleLoadMissingData (track);
+            base.LoadMissingDataCore (track);
         }
 
-        protected override bool HandleAttributes (XmlReader reader)
+        protected override bool ProcessAttributes (XmlReader reader)
         {
             return true;
         }
 
-        protected override bool HandleXml (XmlReader reader)
+        protected override bool ProcessXml (XmlReader reader)
         {
             reader.Read ();
-            bool result = base.HandleXml (reader);
+            bool result = base.ProcessXml (reader);
             if (!result) {
                 result = true;
                 switch (reader.Name) {
@@ -171,6 +177,8 @@
             reader.Close ();
             return result;
         }
+        
+        #endregion
 
         #region Properties