banshee r3318 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Library src/Core/Banshee.Services/Banshee.PlayerMigration

[scottp svn gnome org]

Author: scottp
Date: Sun Feb 24 04:48:22 2008
New Revision: 3318
URL: http://svn.gnome.org/viewvc/banshee?rev=3318&view=rev

Log:
* src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs,
* src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:
  Renamed DoImport to ImportCore as per Framework Design Guidelines,
  also slapped the new keyword onto the static
  AmarokPlayerImportSource.CanImport property to get rid of the
  warning about it hiding a base member of the same name (which it
  should).

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs	Sun Feb 24 04:48:22 2008
@@ -137,19 +137,19 @@
             
             importing = true;
             CreateUserJob ();
-            ThreadPool.QueueUserWorkItem (DoImport);
+            ThreadPool.QueueUserWorkItem (ImportCore);
             DestroyUserJob ();
             importing = false;
         }
         
 #endregion
         
-        private void DoImport (object o)
+        private void ImportCore (object o)
         {
-            DoImport ();
+            ImportCore ();
         }
         
-        protected abstract void DoImport ();
+        protected abstract void ImportCore ();
         
     }
 }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs	Sun Feb 24 04:48:22 2008
@@ -51,7 +51,7 @@
                                                  "amarok"),
                                                  "collection.db");
 
-        protected override void DoImport ()
+        protected override void ImportCore ()
         {
             LibraryImportManager import_manager = ServiceManager.Get<LibraryImportManager> ("LibraryImportManager");
             IDbConnection conn;
@@ -208,7 +208,7 @@
             }
         }
         
-        public static bool CanImport
+        public static new bool CanImport
         {
             get { return File.Exists (library_path); }
         }