=== modified file 'Zeitgeist/Client/IBlacklist.cs'
--- Zeitgeist/Client/IBlacklist.cs 2010-09-10 20:28:31 +0000
+++ Zeitgeist/Client/IBlacklist.cs 2010-10-01 16:43:06 +0000
@@ -10,7 +10,7 @@
/// and if they match they will not be inserted in the log, and any matching monitors will not be signalled.
///
[NDesk.DBus.Interface ("org.gnome.zeitgeist.Blacklist")]
- public interface IBlacklist
+ internal interface IBlacklist
{
///
/// Get the current blacklist templates.
=== modified file 'Zeitgeist/Client/IDataSource.cs'
--- Zeitgeist/Client/IDataSource.cs 2010-09-10 16:34:11 +0000
+++ Zeitgeist/Client/IDataSource.cs 2010-10-01 16:43:06 +0000
@@ -9,7 +9,7 @@
/// (components inserting information into Zeitgeist). An option to disable such data-providers is also provided.
///
[NDesk.DBus.Interface ("org.gnome.zeitgeist.DataSourceRegistry")]
- public interface IDataSource
+ internal interface IDataSource
{
///
/// Get the list of known data-sources.
=== modified file 'Zeitgeist/Client/ILog.cs'
--- Zeitgeist/Client/ILog.cs 2010-09-10 20:09:19 +0000
+++ Zeitgeist/Client/ILog.cs 2010-10-01 16:43:06 +0000
@@ -12,7 +12,7 @@
/// All querying is heavily based around an “event template”-concept.
///
[NDesk.DBus.Interface ("org.gnome.zeitgeist.Log")]
- public interface ILog
+ internal interface ILog
{
///
/// Get full event data for a set of event IDs
=== modified file 'Zeitgeist/DataSourceClient.cs'
--- Zeitgeist/DataSourceClient.cs 2010-09-10 22:21:31 +0000
+++ Zeitgeist/DataSourceClient.cs 2010-10-01 16:43:06 +0000
@@ -64,7 +64,7 @@
foreach(RawDataSource src in srcs)
{
- DataSource et = DataSource.FromRaw(src);
+ DataSource et = RawDataSource.FromRaw(src);
srcList.Add(et);
}
=== modified file 'Zeitgeist/Datamodel/DataSource.cs'
--- Zeitgeist/Datamodel/DataSource.cs 2010-09-10 20:09:19 +0000
+++ Zeitgeist/Datamodel/DataSource.cs 2010-10-01 16:43:06 +0000
@@ -66,77 +66,13 @@
get;set;
}
- ///
- /// Convert an object of type RawDataSource to DataSource
- ///
- ///
- /// An instance of RawDataSource
- ///
- ///
- /// An instance of DataSource
- ///
- public static DataSource FromRaw(RawDataSource raw)
- {
- DataSource src = new DataSource();
-
- src.UniqueId = raw.UniqueId;
- src.Name = raw.Name;
- src.Description = raw.Description;
- src.Running = raw.Running;
- src.LastSeen = long.Parse(raw.LastSeen.ToString());
- src.Enabled = raw.Enabled;
-
- if(raw.RawEvents != null)
- {
- src.Events = new List();
- foreach(RawEvent evn in raw.RawEvents)
- {
- Event ev = Event.FromRaw(evn);
- src.Events.Add(ev);
- }
- }
-
- return src;
- }
- ///
- /// Convert an object of type DataSource to RawDataSource
- ///
- ///
- /// An instance of DataSource
- ///
- ///
- /// An instance of RawDataSource
- ///
- public static RawDataSource ToRaw(DataSource src)
- {
- RawDataSource raw = new RawDataSource();
-
- raw.UniqueId = src.UniqueId;
- raw.Name = src.Name;
- raw.Description = src.Description;
- raw.Running = src.Running;
- raw.LastSeen = UInt64.Parse(src.LastSeen.ToString());
- raw.Enabled = src.Enabled;
-
- if(raw.RawEvents != null)
- {
- List events = new List();
- foreach(Event evn in src.Events)
- {
- RawEvent ev = evn.GetRawEvent();
- events.Add(ev);
- }
- }
-
- return raw;
- }
}
///
/// A raw DBus based representation of Event
///
- public struct RawDataSource
+ internal struct RawDataSource
{
///
/// The Id of the RawDataSource
@@ -279,6 +215,72 @@
Enabled = enabled;
}
+ ///
+ /// Convert an object of type RawDataSource to DataSource
+ ///
+ ///
+ /// An instance of RawDataSource
+ ///
+ ///
+ /// An instance of DataSource
+ ///
+ public static DataSource FromRaw(RawDataSource raw)
+ {
+ DataSource src = new DataSource();
+
+ src.UniqueId = raw.UniqueId;
+ src.Name = raw.Name;
+ src.Description = raw.Description;
+ src.Running = raw.Running;
+ src.LastSeen = long.Parse(raw.LastSeen.ToString());
+ src.Enabled = raw.Enabled;
+
+ if(raw.RawEvents != null)
+ {
+ src.Events = new List();
+ foreach(RawEvent evn in raw.RawEvents)
+ {
+ Event ev = RawEvent.FromRaw(evn);
+ src.Events.Add(ev);
+ }
+ }
+
+ return src;
+ }
+
+ ///
+ /// Convert an object of type DataSource to RawDataSource
+ ///
+ ///
+ /// An instance of DataSource
+ ///
+ ///
+ /// An instance of RawDataSource
+ ///
+ public static RawDataSource ToRaw(DataSource src)
+ {
+ RawDataSource raw = new RawDataSource();
+
+ raw.UniqueId = src.UniqueId;
+ raw.Name = src.Name;
+ raw.Description = src.Description;
+ raw.Running = src.Running;
+ raw.LastSeen = UInt64.Parse(src.LastSeen.ToString());
+ raw.Enabled = src.Enabled;
+
+ if(raw.RawEvents != null)
+ {
+ List events = new List();
+ foreach(Event evn in src.Events)
+ {
+ RawEvent ev = evn.GetRawEvent();
+ events.Add(ev);
+ }
+ }
+
+ return raw;
+ }
+
#region Private Fields
private string _uniqueId;
=== modified file 'Zeitgeist/Datamodel/Event.cs'
--- Zeitgeist/Datamodel/Event.cs 2010-09-19 14:20:33 +0000
+++ Zeitgeist/Datamodel/Event.cs 2010-10-01 16:43:06 +0000
@@ -82,74 +82,7 @@
get;set;
}
- ///
- /// Create a Event from a RawEvent
- ///
- ///
- /// The instance of the RawEvent
- ///
- ///
- /// The instance of an Event
- ///
- public static Event FromRaw(RawEvent raw)
- {
- Event e = new Event();
-
- if(raw.metadata.Length != Enum.GetNames(typeof(EventMetadataPosition)).Length)
- return null;
-
- #region Metadata
-
- ulong id;
- UInt64.TryParse(raw.metadata[(int)EventMetadataPosition.Id], out id);
- e.Id = id;
-
- ulong timestamp;
- UInt64.TryParse(raw.metadata[(int)EventMetadataPosition.Timestamp], out timestamp);
- e.Timestamp = ZsUtils.ToDateTime(timestamp);
-
- e.Actor = raw.metadata[(int)EventMetadataPosition.Actor];
-
- string _interpretation = raw.metadata[(int)EventMetadataPosition.Interpretation];
- string _manifestation = raw.metadata[(int)EventMetadataPosition.Manifestation];
- e.Interpretation = Zeitgeist.Datamodel.Interpretation.Instance.Search(_interpretation);
- e.Manifestation = Zeitgeist.Datamodel.Manifestation.Instance.Search(_manifestation);
-
- #endregion
-
- #region Subjects
-
- e.Subjects= new List();
-
- for(int i = 0; i < raw.subjects.Length; i ++)
- {
- Subject sub = new Subject();
- string[] subjArr = raw.subjects[i];
-
- sub.Uri = subjArr[(int)EventSubjectPosition.Uri];
- sub.Origin = subjArr[(int)EventSubjectPosition.Origin];
- sub.MimeType = subjArr[(int)EventSubjectPosition.Mimetype];
- sub.Text = subjArr[(int)EventSubjectPosition.Text];
- sub.Storage = subjArr[(int)EventSubjectPosition.Storage];
-
- string sub_interpretation = subjArr[(int)EventSubjectPosition.Interpretation];
- string sub_manifestation = subjArr[(int)EventSubjectPosition.Manifestation];
- sub.Interpretation = Zeitgeist.Datamodel.Interpretation.Instance.Search(sub_interpretation);
- sub.Manifestation = Zeitgeist.Datamodel.Manifestation.Instance.Search(sub_manifestation);
-
- e.Subjects.Add(sub);
- }
-
- #endregion
-
- #region Payload
-
- e.Payload = raw.payload;
-
- #endregion
-
- return e;
- }
+
///
/// Get the RawEvent for this Event
@@ -157,7 +90,7 @@
///
/// The RawEvent instance generated from the current Event
///
- public RawEvent GetRawEvent()
+ internal RawEvent GetRawEvent()
{
return RawEvent.FromEvent(this);
}
@@ -166,7 +99,7 @@
///
/// The Raw form of Event. Get Event.FromRaw to create an Event from a RawEvent
///
- public struct RawEvent
+ internal struct RawEvent
{
///
/// The event Metadata
@@ -309,6 +242,75 @@
return raw;
}
+ ///
+ /// Create a Event from a RawEvent
+ ///
+ ///
+ /// The instance of the RawEvent
+ ///
+ ///
+ /// The instance of an Event
+ ///
+ public static Event FromRaw(RawEvent raw)
+ {
+ Event e = new Event();
+
+ if(raw.metadata.Length != Enum.GetNames(typeof(EventMetadataPosition)).Length)
+ return null;
+
+ #region Metadata
+
+ ulong id;
+ UInt64.TryParse(raw.metadata[(int)EventMetadataPosition.Id], out id);
+ e.Id = id;
+
+ ulong timestamp;
+ UInt64.TryParse(raw.metadata[(int)EventMetadataPosition.Timestamp], out timestamp);
+ e.Timestamp = ZsUtils.ToDateTime(timestamp);
+
+ e.Actor = raw.metadata[(int)EventMetadataPosition.Actor];
+
+ string _interpretation = raw.metadata[(int)EventMetadataPosition.Interpretation];
+ string _manifestation = raw.metadata[(int)EventMetadataPosition.Manifestation];
+ e.Interpretation = Zeitgeist.Datamodel.Interpretation.Instance.Search(_interpretation);
+ e.Manifestation = Zeitgeist.Datamodel.Manifestation.Instance.Search(_manifestation);
+
+ #endregion
+
+ #region Subjects
+
+ e.Subjects= new List();
+
+ for(int i = 0; i < raw.subjects.Length; i ++)
+ {
+ Subject sub = new Subject();
+ string[] subjArr = raw.subjects[i];
+
+ sub.Uri = subjArr[(int)EventSubjectPosition.Uri];
+ sub.Origin = subjArr[(int)EventSubjectPosition.Origin];
+ sub.MimeType = subjArr[(int)EventSubjectPosition.Mimetype];
+ sub.Text = subjArr[(int)EventSubjectPosition.Text];
+ sub.Storage = subjArr[(int)EventSubjectPosition.Storage];
+
+ string sub_interpretation = subjArr[(int)EventSubjectPosition.Interpretation];
+ string sub_manifestation = subjArr[(int)EventSubjectPosition.Manifestation];
+ sub.Interpretation = Zeitgeist.Datamodel.Interpretation.Instance.Search(sub_interpretation);
+ sub.Manifestation = Zeitgeist.Datamodel.Manifestation.Instance.Search(sub_manifestation);
+
+ e.Subjects.Add(sub);
+ }
+
+ #endregion
+
+ #region Payload
+
+ e.Payload = raw.payload;
+
+ #endregion
+
+ return e;
+ }
+
#region RawEvent Private Fields
private string[] _metadata;
=== modified file 'Zeitgeist/ZsUtils.cs'
--- Zeitgeist/ZsUtils.cs 2010-09-19 14:20:33 +0000
+++ Zeitgeist/ZsUtils.cs 2010-10-01 16:43:06 +0000
@@ -6,7 +6,7 @@
namespace Zeitgeist
{
- public class ZsUtils
+ internal class ZsUtils
{
#region Event <--> RawEvent Conversions
@@ -47,7 +47,7 @@
foreach(RawEvent rawEvent in rawEvents)
{
- Event evnt = Event.FromRaw(rawEvent);
+ Event evnt = RawEvent.FromRaw(rawEvent);
events.Add(evnt);
}