tasque r97 - in trunk: . src src/Backends/EDS src/Backends/IceCore src/Backends/Rtm src/Backends/Sqlite

[bgmerrell svn gnome org]

Author: bgmerrell
Date: Tue Aug 26 21:55:45 2008
New Revision: 97
URL: http://svn.gnome.org/viewvc/tasque?rev=97&view=rev

Log:
Implement the ITask's Id property in the backend's and for dbus.
This fixes Bug 526492 â Implement id for ITask interface.  Thanks
Thomas Van Machelen!



Modified:
   trunk/ChangeLog
   trunk/MAINTAINERS
   trunk/README
   trunk/src/AbstractTask.cs
   trunk/src/Backends/EDS/EDSTask.cs
   trunk/src/Backends/IceCore/IceTask.cs
   trunk/src/Backends/Rtm/RtmTask.cs
   trunk/src/Backends/Sqlite/SqliteBackend.cs
   trunk/src/Backends/Sqlite/SqliteTask.cs
   trunk/src/ITask.cs
   trunk/src/RemoteControl.cs

Modified: trunk/MAINTAINERS
==============================================================================
--- trunk/MAINTAINERS	(original)
+++ trunk/MAINTAINERS	Tue Aug 26 21:55:45 2008
@@ -1,8 +1,7 @@
-Boyd Timothy
-E-mail: btimothy gmail com
-Userid: btimothy
-
-Calvin Gaisford 
-E-mail: calvinrg gmail com
-Userid: calvinrg
+Brian G. Merrell
+E-mail: bgmerrell gmail com
+Userid: bgmerrell
 
+Sandy Armstrong
+E-mail: sanfordarmstrong gmail com
+Userid: sharm

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Tue Aug 26 21:55:45 2008
@@ -2,8 +2,8 @@
 =====================================================================
 
 Website: http://live.gnome.org/Tasque
-Bugs/Issues: http://code.google.com/p/tasky/issues/list
-Mailing list: http://groups.google.com/group/tasky
+Bugs/Issues: http://bugzilla.gnome.org/enter_bug.cgi?product=Tasque
+Mailing list: http://mail.gnome.org/mailman/listinfo/tasque-list
 
 ======================================================================
                           KNOWN ISSUES:

Modified: trunk/src/AbstractTask.cs
==============================================================================
--- trunk/src/AbstractTask.cs	(original)
+++ trunk/src/AbstractTask.cs	Tue Aug 26 21:55:45 2008
@@ -11,6 +11,11 @@
 		private uint timerID = 0;
 		
 		#region Properties
+		public abstract string Id
+		{
+			get; 
+		}
+
 		public abstract string Name
 		{
 			get;

Modified: trunk/src/Backends/EDS/EDSTask.cs
==============================================================================
--- trunk/src/Backends/EDS/EDSTask.cs	(original)
+++ trunk/src/Backends/EDS/EDSTask.cs	Tue Aug 26 21:55:45 2008
@@ -59,10 +59,9 @@
                        this.taskComp.Commit ();
                }
 
-               public string Id
+               public override string Id
                {
                        get { return id; }
-                       set { id = value; }
                }
 
                public override string Name

Modified: trunk/src/Backends/IceCore/IceTask.cs
==============================================================================
--- trunk/src/Backends/IceCore/IceTask.cs	(original)
+++ trunk/src/Backends/IceCore/IceTask.cs	Tue Aug 26 21:55:45 2008
@@ -49,7 +49,7 @@
 		/// A unique ID in the format of
 		/// <team-id>-<team-folder-id>-<task-entry-id>
 		/// </value>
-		public string Id
+		public override string Id
 		{
 			get { return id; }
 		}

Modified: trunk/src/Backends/Rtm/RtmTask.cs
==============================================================================
--- trunk/src/Backends/Rtm/RtmTask.cs	(original)
+++ trunk/src/Backends/Rtm/RtmTask.cs	Tue Aug 26 21:55:45 2008
@@ -41,6 +41,13 @@
 		}
 		
 		#region Public Properties
+		/// <value>
+		/// Gets the id of the task
+		/// </value>
+		public override string Id
+		{
+			get { return taskSeries.Task.TaskID; } 
+		}
 
 		/// <value>
 		/// Holds the name of the task

Modified: trunk/src/Backends/Sqlite/SqliteBackend.cs
==============================================================================
--- trunk/src/Backends/Sqlite/SqliteBackend.cs	(original)
+++ trunk/src/Backends/Sqlite/SqliteBackend.cs	Tue Aug 26 21:55:45 2008
@@ -106,7 +106,7 @@
 			
 			Gtk.TreeIter iter = taskStore.AppendNode ();
 			taskStore.SetValue (iter, 0, task);
-			taskIters [task.Id] = iter;
+			taskIters [task.SqliteId] = iter;
 			
 			return task;
 		}
@@ -198,13 +198,13 @@
 			// Set the task in the store so the model will update the UI.
 			Gtk.TreeIter iter;
 			
-			if (taskIters.ContainsKey (task.Id) == false)
+			if (taskIters.ContainsKey (task.SqliteId) == false)
 				return;
 				
-			iter = taskIters [task.Id];
+			iter = taskIters [task.SqliteId];
 			
 			if (task.State == TaskState.Deleted) {
-				taskIters.Remove (task.Id);
+				taskIters.Remove (task.SqliteId);
 				if (taskStore.Remove (ref iter) == false) {
 					Logger.Debug ("Successfully deleted from taskStore: {0}",
 						task.Name);
@@ -294,7 +294,7 @@
 				newTask.Priority = TaskPriority.Medium;
 				iter = taskStore.AppendNode ();
 				taskStore.SetValue (iter, 0, newTask);	
-				taskIters [newTask.Id] = iter;
+				taskIters [newTask.SqliteId] = iter;
 			}
 		}
 

Modified: trunk/src/Backends/Sqlite/SqliteTask.cs
==============================================================================
--- trunk/src/Backends/Sqlite/SqliteTask.cs	(original)
+++ trunk/src/Backends/Sqlite/SqliteTask.cs	Tue Aug 26 21:55:45 2008
@@ -31,10 +31,14 @@
 		
 		#region Public Properties
 		
-		public int Id
+		public override string Id
 		{
-			get { return id; }
-			set { id = value; }
+			get { return id.ToString(); }
+		}
+
+		internal int SqliteId
+		{
+			get { return id; } 
 		}
 		
 		public override string Name

Modified: trunk/src/ITask.cs
==============================================================================
--- trunk/src/ITask.cs	(original)
+++ trunk/src/ITask.cs	Tue Aug 26 21:55:45 2008
@@ -10,6 +10,14 @@
 	{
 		#region Properties
 		/// <value>
+		/// A unique identifier for the task
+		/// </value>
+		string Id
+		{
+			get; 
+		}
+
+		/// <value>
 		/// A Task's Name will be used to show the task in the main list window.
 		/// </value>
 		string Name

Modified: trunk/src/RemoteControl.cs
==============================================================================
--- trunk/src/RemoteControl.cs	(original)
+++ trunk/src/RemoteControl.cs	Tue Aug 26 21:55:45 2008
@@ -114,7 +114,7 @@
 			
 			// TODO: Add ITask.Id and return the new Id of the task.
 			//return task.Id;
-			return "TaskIdNotImplementedYet";
+			return task.Id;
 		}
 		
 		/// <summary>