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

[scottp svn gnome org]

Author: scottp
Date: Sun Feb  3 13:00:52 2008
New Revision: 3137
URL: http://svn.gnome.org/viewvc/banshee?rev=3137&view=rev

Log:
* MusicBrainz/Utilities.cs: Minor improvement to enum-to-string method.
* MusicBrainz/MusicBrainzObject.cs, MusicBrainz/Event.cs,
  MusicBrainz/MusicBrainzException.cs, MusicBrainz/Query.cs: Sealed
  some classes.

Modified:
   trunk/musicbrainz-sharp/src/MusicBrainz/ChangeLog
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Event.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzException.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzObject.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs
   trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Utilities.cs

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	Sun Feb  3 13:00:52 2008
@@ -11,7 +11,7 @@
 
 namespace MusicBrainz
 {
-    public class Event
+    public sealed class Event
     {
         string date;
         string country;

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzException.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzException.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/MusicBrainzException.cs	Sun Feb  3 13:00:52 2008
@@ -10,7 +10,7 @@
 
 namespace MusicBrainz
 {
-    public class MusicBrainzInvalidParameterException : Exception
+    public sealed class MusicBrainzInvalidParameterException : Exception
     {
         public MusicBrainzInvalidParameterException()
             : base("One of the parameters is invalid. The MBID may be invalid, or you may be using an illegal parameter for this resource type.")
@@ -18,7 +18,7 @@
         }
     }
 
-    public class MusicBrainzNotFoundException : Exception
+    public sealed class MusicBrainzNotFoundException : Exception
     {
         public MusicBrainzNotFoundException()
             : base("Specified resource was not found. Perhaps it was merged or deleted.")
@@ -26,7 +26,7 @@
         }
     }
 
-    public class MusicBrainzUnauthorizedException : Exception
+    public sealed class MusicBrainzUnauthorizedException : Exception
     {
         public MusicBrainzUnauthorizedException()
             : base("The client is not authorized to perform this action. You may not have authenticated, or the username or password may be incorrect.")

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	Sun Feb  3 13:00:52 2008
@@ -327,7 +327,7 @@
             try {
                 request.CachePolicy = CachePolicy;
                 cache_implemented = true;
-            } catch(System.NotImplementedException) {
+            } catch(NotImplementedException) {
             }
             HttpWebResponse response = null;
             try {

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Query.cs	Sun Feb  3 13:00:52 2008
@@ -12,7 +12,7 @@
 
 namespace MusicBrainz
 {
-    public class Query<T> : IEnumerable<T> where T : MusicBrainzObject
+    public sealed class Query<T> : IEnumerable<T> where T : MusicBrainzObject
     {
         string parameters;
         string url_extension;
@@ -62,13 +62,11 @@
         int? count;
         public int Count
         {
-            #pragma warning disable 0642
             get {
                 if(!count.HasValue && ResultsWindow == null)
-                    ; // just accessing ResultsWindow will give count a value
+                    { } // just accessing ResultsWindow will give count a value
                 return count.Value;
             }
-            #pragma warning restore 0642
         }
 
         public T this[int i]
@@ -113,7 +111,7 @@
     {
     }
 
-    internal class QueryNameAttribute : QueryablePropertyAttribute
+    internal sealed class QueryNameAttribute : QueryablePropertyAttribute
     {
         public readonly string Name;
         public QueryNameAttribute(string name)
@@ -122,7 +120,7 @@
         }
     }
 
-    internal class QueryMemberAttribute : QueryablePropertyAttribute
+    internal sealed class QueryMemberAttribute : QueryablePropertyAttribute
     {
         public readonly string Name;
         public readonly string Member;

Modified: trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Utilities.cs
==============================================================================
--- trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Utilities.cs	(original)
+++ trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz/Utilities.cs	Sun Feb  3 13:00:52 2008
@@ -15,11 +15,14 @@
     {
         public static string EnumToString(Enum enumeration)
         {
-            string output = enumeration.ToString();
-            for(int i = 1; i < output.Length; i++)
-                if(output[i] >= 'A' && output[i] <= 'Z')
-                    output = output.Insert(i++, "-");
-            return output;
+            string str = enumeration.ToString();
+            StringBuilder builder = new StringBuilder(str.Length);
+            for(int i = 1; i < str.Length; i++) {
+                if(str[i] >= 'A' && str[i] <= 'Z')
+                    builder.Append('-');
+                builder.Append(str[i]);
+            }
+            return builder.ToString();
         }
         
         public static string PercentEncode(string value)