banshee r2988 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Database src/Core/Hyena src/Core/Hyena/Hyena.Data.Sqlite

[scottp svn gnome org]

Author: scottp
Date: Fri Jan 18 20:04:51 2008
New Revision: 2988
URL: http://svn.gnome.org/viewvc/banshee?rev=2988&view=rev

Log:
* src/Core/Hyena/Hyena.Data.Sqlite/ModelProvider.cs,
  src/Core/Hyena/Hyena.Data.Sqlite/SqliteModelProvider.cs,
  src/Core/Banshee.Services/Banshee.Database/BansheeModelProvider.cs:
  Renamed ModelProvider to SqliteModelProvider

* src/Core/Hyena/Hyena.Data.Sqlite/ModelCache.cs,
  src/Core/Hyena/Hyena.Data.Sqlite/SqilteModelCache.cs,
  src/Core/Banshee.Services/Banshee.Database/BansheeModelCache.cs:
  Renamed ModelCache to SqliteModelCache

Added:
   trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/SqilteModelCache.cs
      - copied, changed from r2984, /trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/ModelCache.cs
   trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/SqliteModelProvider.cs
      - copied, changed from r2984, /trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/ModelProvider.cs
Removed:
   trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/ModelCache.cs
   trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/ModelProvider.cs
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeModelCache.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeModelProvider.cs
   trunk/banshee/src/Core/Hyena/Hyena.mdp
   trunk/banshee/src/Core/Hyena/Makefile.am

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeModelCache.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeModelCache.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeModelCache.cs	Fri Jan 18 20:04:51 2008
@@ -34,7 +34,7 @@
 
 namespace Banshee.Database
 {
-    public class BansheeModelCache <T> : ModelCache <T> where T : IDatabaseItem, new ()
+    public class BansheeModelCache <T> : SqliteModelCache <T> where T : IDatabaseItem, new ()
     {
         public BansheeModelCache (HyenaSqliteConnection connection,
                                   string uuid,

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeModelProvider.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeModelProvider.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeModelProvider.cs	Fri Jan 18 20:04:51 2008
@@ -39,7 +39,7 @@
         int DbIndex { set; }
     }
     
-    public class BansheeModelProvider<T> : ModelProvider<T> where T : IDatabaseItem, new ()
+    public class BansheeModelProvider<T> : SqliteModelProvider<T> where T : IDatabaseItem, new ()
     {
         private BansheeDbConnection connection;
 

Copied: trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/SqilteModelCache.cs (from r2984, /trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/ModelCache.cs)
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/ModelCache.cs	(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/SqilteModelCache.cs	Fri Jan 18 20:04:51 2008
@@ -1,5 +1,5 @@
 //
-// DatabaseModelCache.cs
+// SqliteModelCache.cs
 //
 // Author:
 //   Scott Peterson <lunchtimemama gmail com>
@@ -32,11 +32,11 @@
 
 namespace Hyena.Data.Sqlite
 {
-    public class ModelCache<T> : Hyena.Data.ModelCache<T>
+    public class SqliteModelCache<T> : ModelCache<T>
     {
         private HyenaSqliteConnection connection;
         private ICacheableDatabaseModel model;
-        private ModelProvider<T> provider;
+        private SqliteModelProvider<T> provider;
         private HyenaSqliteCommand select_range_command;
         private HyenaSqliteCommand count_command;
 
@@ -45,10 +45,10 @@
         private int rows = 0;
         private bool warm = false;
 
-        public ModelCache (HyenaSqliteConnection connection,
+        public SqliteModelCache (HyenaSqliteConnection connection,
                            string uuid,
                            ICacheableDatabaseModel model,
-                           ModelProvider<T> provider)
+                           SqliteModelProvider<T> provider)
             : base (model)
         {
             this.connection = connection;

Copied: trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/SqliteModelProvider.cs (from r2984, /trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/ModelProvider.cs)
==============================================================================
--- /trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/ModelProvider.cs	(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Data.Sqlite/SqliteModelProvider.cs	Fri Jan 18 20:04:51 2008
@@ -1,5 +1,5 @@
 //
-// DatabaseModel.cs
+// SqliteModelProvider.cs
 //
 // Author:
 //   Scott Peterson  <lunchtimemama gmail com>
@@ -34,7 +34,7 @@
 
 namespace Hyena.Data.Sqlite
 {
-    public abstract class ModelProvider<T>
+    public abstract class SqliteModelProvider<T>
     {
         private readonly List<DatabaseColumn> columns = new List<DatabaseColumn> ();
         private readonly List<VirtualDatabaseColumn> virtual_columns = new List<VirtualDatabaseColumn> ();
@@ -68,7 +68,7 @@
             get { return "HyenaModelVersions"; }
         }
         
-        protected ModelProvider (HyenaSqliteConnection connection)
+        protected SqliteModelProvider (HyenaSqliteConnection connection)
         {
             foreach (DatabaseTableAttribute attribute in typeof (T).GetCustomAttributes (typeof (DatabaseTableAttribute), true)) {
                 table_name = attribute.Name;

Modified: trunk/banshee/src/Core/Hyena/Hyena.mdp
==============================================================================
--- trunk/banshee/src/Core/Hyena/Hyena.mdp	(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.mdp	Fri Jan 18 20:04:51 2008
@@ -42,8 +42,8 @@
     <File name="Hyena.Data.Query/QueryFieldSet.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Data.Sqlite/DatabaseColumn.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Data.Sqlite/DatabaseAttributes.cs" subtype="Code" buildaction="Compile" />
-    <File name="Hyena.Data.Sqlite/ModelProvider.cs" subtype="Code" buildaction="Compile" />
-    <File name="Hyena.Data.Sqlite/ModelCache.cs" subtype="Code" buildaction="Compile" />
+    <File name="Hyena.Data.Sqlite/SqliteModelProvider.cs" subtype="Code" buildaction="Compile" />
+    <File name="Hyena.Data.Sqlite/SqilteModelCache.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Data.Sqlite/HyenaSqliteCommand.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Data.Sqlite/HyenaSqliteConnection.cs" subtype="Code" buildaction="Compile" />
     <File name="Hyena.Data.Sqlite/ICacheableDatabaseModel.cs" subtype="Code" buildaction="Compile" />

Modified: trunk/banshee/src/Core/Hyena/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Hyena/Makefile.am	(original)
+++ trunk/banshee/src/Core/Hyena/Makefile.am	Fri Jan 18 20:04:51 2008
@@ -26,8 +26,8 @@
 	Hyena.Data.Sqlite/HyenaSqliteCommand.cs \
 	Hyena.Data.Sqlite/HyenaSqliteConnection.cs \
 	Hyena.Data.Sqlite/ICacheableDatabaseModel.cs \
-	Hyena.Data.Sqlite/ModelCache.cs \
-	Hyena.Data.Sqlite/ModelProvider.cs \
+	Hyena.Data.Sqlite/SqilteModelCache.cs \
+	Hyena.Data.Sqlite/SqliteModelProvider.cs \
 	Hyena.Data/ColumnDescription.cs \
 	Hyena.Data/ICacheableModel.cs \
 	Hyena.Data/ICareAboutView.cs \