Merge lp:~jassmith/do/itemactionmerge into lp:do

[Jason Smith]

[lp:~jassmith/do/itemactionmerge]

1233. By Jason Smith <jason@t500> on 2009-06-17

Merge trunk

1234. By Jason Smith <jason@t500> on 2009-06-17

Merge el trunko

1235. By Jason Smith <jason@t500> on 2009-06-17

Merge trunk

1236. By Jason Smith <jason@t500> on 2009-06-17

Merge trunk

1237. By Jason Smith <jason@t500> on 2009-06-17

Embarassing, and fix crash

[Chris S. (cszikszoy)]

review: Approve

[Chris S. (cszikszoy)]

Not sure if my review matters, but it looks good to me :)

review: Approve

[Robert Dyer (psybers)]

Note: any line mentioned is the line in the diff attached to the merge request.

All over the place you use 'Do.Universe.Item' instead of adding a 'using' to the files. Unless 'Item' is ambiguous I would change those and add 'using'. Notice how it was 'Element' before?

In Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs 'RenderElement' should be renamed 'RenderItem', which will require tracking the API as well

Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs add spaces before 'Surface' in the generic types (lines 116, 125)

Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/DefaultElements.cs was renamed in the comment header, but the file itself was not renamed to DefaultItems.cs!

Do/src/Do.Core/Controller.cs line 1094 you dont need brackets on this if block
again Do/src/Do.Core/SecondSearchController.cs foreach line 1476
again Do/src/Do.Core/SecondSearchController.cs if line 1494

Do/src/Do.Core/SimpleSearchContext.cs line 1559, either make the spacing line up with the others or only put a single space before the {'s

line 1845 has a comment 'FIXME' so why dont you investigate and resolve that issue

review: Needs Fixing

[lp:~jassmith/do/itemactionmerge]

1238. By Jason Smith <jason@t500> on 2009-06-18

Fix summon mode renderer and histogramrelevanceprovider to properly check for action with proxy items

1239. By Jason Smith <jason@t500> on 2009-06-18

Rename file

1240. By Jason Smith <jason@t500> on 2009-06-18

RenderElement -> RenderItem

1241. By Jason Smith <jason@t500> on 2009-06-18

Fix build

1242. By Jason Smith <jason@t500> on 2009-06-18

Cosmetic issues

=== modified file 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs'
--- Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs	2009-05-28 14:13:10 +0000
+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs	2009-06-14 02:03:35 +0000
@@ -506,7 +506,7 @@
 			return DrawState.None;
 		}
 		
-		public void BezelSetPaneObject (Pane pane, Element obj)
+		public void BezelSetPaneObject (Pane pane, Do.Universe.Item obj)
 		{
 			if (Context.GetPaneObject (pane) == obj && obj != null)
 				return;
@@ -767,7 +767,7 @@
 		
 		private void RenderPixbuf (Pane pane, Context cr)
 		{
-			Element obj = Context.GetPaneObject (pane);
+			Do.Universe.Item obj = Context.GetPaneObject (pane);
 			RenderPixbuf (pane, cr, obj.Icon, 1);
 		}
 		

=== modified file 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs'
--- Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs	2009-04-19 22:45:56 +0000
+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs	2009-06-14 02:03:35 +0000
@@ -26,7 +26,7 @@
 {
 	public class BezelDrawingContext
 	{
-		private Element [] objects = new Element [3];
+		private Item [] objects = new Item [3];
 		private string [] queries = new string [3];
 		private bool [] text_mode = new bool [3];
 		
@@ -38,11 +38,11 @@
 			text_mode [(int) pane] = textMode;
 		}
 		
-		public Element GetPaneObject (Pane pane) {
+		public Item GetPaneObject (Pane pane) {
 			return objects [(int) pane];
 		}
 		
-		public void SetPaneObject (Pane pane, Element obj) {
+		public void SetPaneObject (Pane pane, Item obj) {
 			objects [(int) pane] = obj;
 		}
 		

=== modified file 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs'
--- Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs	2009-04-19 22:45:56 +0000
+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs	2009-06-14 02:03:35 +0000
@@ -34,7 +34,7 @@
 	public interface IBezelResultItemRenderer
 	{
 		int Height { get; }
-		void RenderElement (Context cr, Gdk.Point renderAnchor, int width, Element item, bool drawArrow);
+		void RenderElement (Context cr, Gdk.Point renderAnchor, int width, Do.Universe.Item item, bool drawArrow);
 	}
 	
 	public class BezelFullResultItemRenderer : IBezelResultItemRenderer
@@ -50,7 +50,7 @@
 			this.parent = parent;
 		}
 		
-		public void RenderElement (Context cr, Gdk.Point renderAnchor, int width, Element item, bool drawArrow)
+		public void RenderElement (Context cr, Gdk.Point renderAnchor, int width, Do.Universe.Item item, bool drawArrow)
 		{
 			cr.Rectangle (renderAnchor.X, renderAnchor.Y, width, Height);
 			cr.Color = new Cairo.Color (0, 0, 0, 0);
@@ -120,7 +120,7 @@
 			this.parent = parent;
 		}
 		
-		public void RenderElement (Context cr, Gdk.Point renderAnchor, int width, Element item, bool drawArrow)
+		public void RenderElement (Context cr, Gdk.Point renderAnchor, int width, Do.Universe.Item item, bool drawArrow)
 		{
 			cr.Rectangle (renderAnchor.X, renderAnchor.Y, width, Height);
 			cr.Color = new Cairo.Color (0, 0, 0, 0);

=== modified file 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs'
--- Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs	2009-04-26 21:00:06 +0000
+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs	2009-06-14 02:03:35 +0000
@@ -43,7 +43,7 @@
 		int num_results;
 		int width, height;
 		int border_width, top_border_width;
-		Dictionary <Element, Surface> surface_buffer;
+		Dictionary <Do.Universe.Item, Surface> surface_buffer;
 		Surface highlight_surface, backbuffer, child_inout_surface, triplebuffer, background;
 		
 		DateTime delta_time;
@@ -58,7 +58,7 @@
 		IUIContext context = null;
 		BezelColors colors;
 		
-		IList<Element> results;
+		IList<Do.Universe.Item> results;
 		
 		public int X { get; set; }
 		
@@ -127,7 +127,7 @@
 			}
 		}
 		
-		public IList<Element> Results {
+		public IList<Do.Universe.Item> Results {
 			get {
 				return results;
 			}
@@ -282,7 +282,7 @@
 				break;
 			}
 			
-			surface_buffer = new Dictionary <Element,Surface> ();
+			surface_buffer = new Dictionary <Do.Universe.Item,Surface> ();
 			secondary = new int[0];
 			border_width = 12;
 			top_border_width = 20;
@@ -392,7 +392,7 @@
 			foreach (Surface s in surface_buffer.Values)
 				s.Destroy ();
 			
-			surface_buffer = new Dictionary<Element,Surface> ();
+			surface_buffer = new Dictionary<Do.Universe.Item,Surface> ();
 			Draw ();
 		}
 		
@@ -717,14 +717,14 @@
 			return base.OnExposeEvent (evnt);
 		}
 
-		void BufferItem (Element item) 
+		void BufferItem (Do.Universe.Item item) 
 		{
 			if (!IsDrawable)
 				return;
 			Context cr = Gdk.CairoHelper.Create (GdkWindow);
 			Surface surface = cr.Target.CreateSimilar (cr.Target.Content, InternalWidth, SurfaceHeight);
 			Context cr2 = new Context (surface);
-			ItemRenderer.RenderElement (cr2, new Gdk.Point (border_width, 0), InternalWidth, item, controller.ElementHasChildren (item));
+			ItemRenderer.RenderElement (cr2, new Gdk.Point (border_width, 0), InternalWidth, item, controller.ItemHasChildren (item));
 			
 			surface_buffer[item] = surface;
 			

=== modified file 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs'
--- Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs	2009-04-19 22:45:56 +0000
+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs	2009-06-14 02:03:35 +0000
@@ -40,7 +40,7 @@
 		
 		int num_results;
 		int width, height;
-		Dictionary <Element, Surface> surface_buffer;
+		Dictionary <Do.Universe.Item, Surface> surface_buffer;
 		Surface highlight_surface, backbuffer, child_inout_surface, triplebuffer;
 		
 		DateTime delta_time;
@@ -50,10 +50,10 @@
 		
 		Cairo.Color odd_color, even_color;
 		
-		Element[] results;
-		
-		
-		public Element[] Results {
+		Do.Universe.Item[] results;
+		
+		
+		public Do.Universe.Item[] Results {
 			get {
 				return results;
 			}
@@ -124,7 +124,7 @@
 		public BezelResultsDrawingArea(int numberResults, int width) : base ()
 		{
 			num_results = numberResults;
-			surface_buffer = new Dictionary <Element,Surface> ();
+			surface_buffer = new Dictionary <Do.Universe.Item,Surface> ();
 			
 			this.width = width;
 			height = num_results * SurfaceHeight;
@@ -198,7 +198,7 @@
 			foreach (Surface s in surface_buffer.Values)
 				(s as IDisposable).Dispose ();
 			
-			surface_buffer = new Dictionary<Element,Surface> ();
+			surface_buffer = new Dictionary<Do.Universe.Item,Surface> ();
 		}
 		
 		private void Paint ()
@@ -311,7 +311,7 @@
 			return base.OnExposeEvent (evnt);
 		}
 
-		void BufferItem (Element item) 
+		void BufferItem (Do.Universe.Item item) 
 		{
 			if (!IsDrawable)
 				return;

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs'
--- Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs	2009-06-01 20:37:58 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs	2009-06-14 02:03:35 +0000
@@ -286,7 +286,7 @@
 					customItem = new ItemDockItem (o);
 				}
 			} else {
-				Item e = Services.Core.GetElement (identifier) as Item;
+				Item e = Services.Core.GetItem (identifier);
 				if (e != null)
 					customItem = new ItemDockItem (e);
 				else
@@ -459,7 +459,7 @@
 		#endregion
 		
 		#region Item Management
-		bool InternalAddItemToDock (Element item, int position)
+		bool InternalAddItemToDock (Item item, int position)
 		{
 			if (!(item is Item)) {
 				Log<ItemsService>.Error ("Could not add {0} to custom items for dock", item.Safe.Name);
@@ -640,7 +640,7 @@
 			}
 		}
 		
-		public void AddItemToDock (Element item)
+		public void AddItemToDock (Item item)
 		{
 			AddItemToDock (item, LastPosition + 1);
 		}
@@ -650,7 +650,7 @@
 			AddItemToDock (identifier, LastPosition + 1);
 		}
 		
-		public void AddItemToDock (Element item, int position)
+		public void AddItemToDock (Item item, int position)
 		{
 			position = DockItems [position].Position;
 			if (InternalAddItemToDock (item, position)) {

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Core/IItemsService.cs'
--- Do.Interface.Linux.Docky/src/Docky.Core/IItemsService.cs	2009-06-01 20:37:58 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Core/IItemsService.cs	2009-06-14 02:03:35 +0000
@@ -50,11 +50,11 @@
 		ReadOnlyCollection<AbstractDockItem> DockItems { get; }
 		
 		#region AddItem Overloads
-		void AddItemToDock (Element item);
+		void AddItemToDock (Item item);
 		
 		void AddItemToDock (string identifier);
 		
-		void AddItemToDock (Element item, int position);
+		void AddItemToDock (Item item, int position);
 		
 		void AddItemToDock (string identifier, int position);
 		#endregion

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockState.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockState.cs	2009-04-07 05:13:44 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockState.cs	2009-06-14 02:03:35 +0000
@@ -37,8 +37,8 @@
 
 		public event EventHandler StateChanged;
 		
-		Element [] current_items = new Element [3];
-		Element [] old_items = new Element [3];
+		Item [] current_items = new Item [3];
+		Item [] old_items = new Item [3];
 		
 		string [] queries = new string [3];
 		
@@ -54,8 +54,8 @@
 		DateTime [] cursor_timestamps = new DateTime [3];
 		DateTime [] text_mode_timestamps = new DateTime [3];
 		
-		IList<Element> [] results = new IList<Element> [3];
-		IList<Element> [] results_prev = new IList<Element> [3];
+		IList<Item> [] results = new IList<Item> [3];
+		IList<Item> [] results_prev = new IList<Item> [3];
 		
 		Pane currentPane, previousPane = Pane.Second;
 		
@@ -65,7 +65,7 @@
 		
 		bool third_pane_visible;
 		
-		Element IntroObject { get; set; }
+		Item IntroObject { get; set; }
 		
 		public Pane CurrentPane {
 			get {
@@ -103,19 +103,19 @@
 			get { return third_pane_visibility_change; }
 		}
 		
-		public Element First {
+		public Item First {
 			get {
 				return GetPaneItem (Pane.First);
 			}
 		}
 		
-		public Element Second {
+		public Item Second {
 			get {
 				return GetPaneItem (Pane.Second);
 			}
 		}
 		
-		public Element Third {
+		public Item Third {
 			get {
 				return GetPaneItem (Pane.Third);
 			}
@@ -153,7 +153,7 @@
 		}
 		#endregion
 		
-		public Element this [Pane pane] {
+		public Item this [Pane pane] {
 			get {
 				return GetPaneItem (pane);
 			}
@@ -166,10 +166,10 @@
 		DockState ()
 		{
 			third_pane_visible = false;
-			IntroObject = new DefaultLabelBoxElement ();
+			IntroObject = new DefaultLabelBoxItem ();
 		}
 
-		void SetItem (Element item, Pane pane)
+		void SetItem (Item item, Pane pane)
 		{
 			if (current_items [(int) pane] == item)
 				return;
@@ -186,7 +186,7 @@
 			OnStateChanged ();
 		}
 		
-		void SetResults (IList<Element> resultList, Pane pane)
+		void SetResults (IList<Item> resultList, Pane pane)
 		{
 			if (results [(int) pane] != null && resultList.Count == results [(int) pane].Count) {
 				bool same = true;
@@ -234,14 +234,14 @@
 			OnStateChanged ();
 		}
 		
-		public Element GetPaneItem (Pane pane)
+		public Item GetPaneItem (Pane pane)
 		{
 			if (pane == Pane.First && current_items [(int) pane] == null)
 				return IntroObject;
 			return current_items [(int) pane];
 		}
 		
-		public Element GetOldPaneItem (Pane pane)
+		public Item GetOldPaneItem (Pane pane)
 		{
 			return old_items [(int) pane];
 		}
@@ -251,12 +251,12 @@
 			return queries [(int) pane] ?? "";
 		}
 		
-		public IList<Element> GetPaneResults (Pane pane)
+		public IList<Item> GetPaneResults (Pane pane)
 		{
 			return results [(int) pane];
 		}
 		
-		public IList<Element> GetPanePreviousResults (Pane pane)
+		public IList<Item> GetPanePreviousResults (Pane pane)
 		{
 			return results_prev [(int) pane];
 		}
@@ -293,11 +293,11 @@
 		
 		public void Clear ()
 		{
-			current_items = new Element [3];
-			results = new IList<Element> [3];
+			current_items = new Item [3];
+			results = new IList<Item> [3];
 			result_timestamps = new DateTime [3];
 			queries = new string [3];
-			old_items = new Element [3];
+			old_items = new Item [3];
 			timestamps = new DateTime [3];
 			
 			text_mode = new bool [3];

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/SummonModeRenderer.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/SummonModeRenderer.cs	2009-06-16 06:01:28 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Painters/SummonModeRenderer.cs	2009-06-16 23:21:33 +0000
@@ -288,7 +288,7 @@
 			int base_x = dockArea.X + 15;
 			
 			string text;
-			Element current = State [State.CurrentPane];
+			Item current = State [State.CurrentPane];
 			
 			if (current == null)
 				text = State.GetPaneQuery (State.CurrentPane);
@@ -323,7 +323,7 @@
 			int base_x = dockArea.X + 15;
 			
 			string text;
-			Element current = State [State.CurrentPane];
+			Item current = State [State.CurrentPane];
 
 			if (current == null)
 				text = State.GetPaneQuery (State.CurrentPane);

=== modified file 'Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs'
--- Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs	2009-03-31 17:24:27 +0000
+++ Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs	2009-06-14 02:03:35 +0000
@@ -347,7 +347,7 @@
 			Resize (1, 1);
 			Reposition ();
 			
-			iconbox[0].DisplayObject = new Do.Interface.Widgets.DefaultIconBoxElement ();
+			iconbox[0].DisplayObject = new Do.Interface.Widgets.DefaultIconBoxItem ();
 			label.SetDisplayLabel (Catalog.GetString ("Type to begin searching"), 
 			                       Catalog.GetString ("Type to start searching."));
 		}
@@ -381,11 +381,11 @@
 			if (!context.Results.Any () && !context.LargeTextDisplay) {
 				if (pane == Pane.First && context.ParentContext == null) {
 					iconbox[0].TextOverlay = context.LargeTextDisplay;
-					iconbox[0].DisplayObject = new Do.Interface.Widgets.DefaultIconBoxElement ();
+					iconbox[0].DisplayObject = new Do.Interface.Widgets.DefaultIconBoxItem ();
 					label.SetDisplayLabel (Catalog.GetString ("Type to begin searching"), 
 					                       Catalog.GetString ("Type to start searching."));
 				} else {
-					Element noRes = new NoResultsFoundElement (context.Query);
+					Do.Universe.Item noRes = new NoResultsFoundItem (context.Query);
 					for (int i = (int) pane; i < 3; i++) {
 						iconbox[i].Clear ();
 						iconbox[i].DisplayObject = noRes;
@@ -400,7 +400,7 @@
 			
 			if (string.IsNullOrEmpty (context.Query) && context.LargeTextDisplay) {
 				iconbox[(int) pane].TextOverlay = context.LargeTextDisplay;
-				iconbox[(int) pane].DisplayObject = new TextItem ("Enter Text") as Element;
+				iconbox[(int) pane].DisplayObject = new TextItem ("Enter Text") as Do.Universe.Item;
 
 				if (!context.Results.Any ()) return;
 			} else {

=== modified file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/DefaultElements.cs'
--- Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/DefaultElements.cs	2008-12-20 00:31:54 +0000
+++ Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/DefaultElements.cs	2009-06-14 02:03:35 +0000
@@ -1,4 +1,4 @@
-// DefaultElements.cs
+// DefaultItems.cs
 //
 //  Copyright (C) 2008 Jason Smith
 //
@@ -26,11 +26,11 @@
 namespace Do.Interface.Widgets
 {
 	
-	public class NoResultsFoundElement : Element
+	public class NoResultsFoundItem : Item
 	{
 		string query;
 		
-		public NoResultsFoundElement (string query)
+		public NoResultsFoundItem (string query)
 		{
 			this.query = query;
 		}
@@ -44,14 +44,14 @@
 		}
 	}
 	
-	public class DefaultIconBoxElement : Element
+	public class DefaultIconBoxItem : Item
 	{
 		public override string Icon { get { return "search"; } }
 		public override string Name { get { return ""; } }
 		public override string Description { get { return ""; } }
 	}
 	
-	public class DefaultLabelBoxElement : Element
+	public class DefaultLabelBoxItem : Item
 	{
 		public override string Icon { get { return "search"; } }
 		public override string Name { get { return Catalog.GetString ("Type to begin searching"); } }

=== modified file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/IconBox.cs'
--- Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/IconBox.cs	2008-12-20 00:31:54 +0000
+++ Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/IconBox.cs	2009-06-14 02:03:35 +0000
@@ -187,7 +187,7 @@
 			}
 		}
 
-		public Element DisplayObject
+		public Do.Universe.Item DisplayObject
 		{
 			set {
 				string name, icon;

=== modified file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/ResultsWindow.cs'
--- Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/ResultsWindow.cs	2008-12-20 00:31:54 +0000
+++ Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/ResultsWindow.cs	2009-06-14 02:03:35 +0000
@@ -62,7 +62,7 @@
 
 		protected ScrolledWindow resultsScrolledWindow;
 		protected TreeView resultsTreeview;
-		protected IList<Element> results, stunted_results;
+		protected IList<Do.Universe.Item> results, stunted_results;
 		protected int startResult, endResult;
 		protected Frame frame;
 		protected string query;
@@ -85,7 +85,7 @@
 			this.NumberResultsDisplayed = NumberResults;
 			
 			Build ();
-			results = new Element[0];
+			results = new Do.Universe.Item[0];
 		}
 		
 		public ResultsWindow (Gdk.Color backgroundColor, int DefaultIconSize, 
@@ -98,7 +98,7 @@
 			this.NumberResultsDisplayed = NumberResults;
 			
 			Build ();
-			results = new Element[0];
+			results = new Do.Universe.Item[0];
 		}
 
 		protected void NotifySelectionChanged ()
@@ -180,7 +180,7 @@
 			resultsTreeview.Show ();
 
 			resultsTreeview.Model = new ListStore (new Type[] {
-				typeof (Element),				
+				typeof (Do.Universe.Item),				
 				typeof (string), 
 			});
 
@@ -223,7 +223,7 @@
 		                           TreeModel model, TreeIter iter)
 		{			
 			CellRendererPixbuf renderer = cell as CellRendererPixbuf;
-			Element o = (resultsTreeview.Model as ListStore).GetValue (iter, 0) as Element;
+			Do.Universe.Item o = (resultsTreeview.Model as ListStore).GetValue (iter, 0) as Do.Universe.Item;
 			bool isSecondary = false;
 			foreach (int i in secondary)
 				if (model.GetStringFromIter (iter) == i.ToString ())
@@ -287,7 +287,7 @@
 				
 				pushedUpdate = true;
 				if (value == null || !value.Results.Any ()) {
-					Results = new Element [0];
+					Results = new Do.Universe.Item [0];
 					return;
 				}
 				
@@ -305,7 +305,7 @@
 				if (endResult > results.Count)
 					endResult = results.Count;
 				
-				Element[] resultsArray = new Element[endResult - startResult];
+				Do.Universe.Item[] resultsArray = new Do.Universe.Item[endResult - startResult];
 				Array.Copy (results.ToArray (), startResult, resultsArray, 0, resultsArray.Length); 
 				
 				cursor = value.Cursor - offset;
@@ -376,7 +376,7 @@
 			});
 		}
 		
-		public Element SelectedObject
+		public Do.Universe.Item SelectedObject
 		{
 			get {
 				try {
@@ -387,11 +387,11 @@
 			}
 		}
 		
-		public IList<Element> Results
+		public IList<Do.Universe.Item> Results
 		{
 			get {
 				if (stunted_results == null)
-					stunted_results = new List<Element> (0);
+					stunted_results = new List<Do.Universe.Item> (0);
 				return stunted_results;
 			}
 			set {
@@ -412,7 +412,7 @@
 					store = resultsTreeview.Model as ListStore;
 					store.Clear ();
 					
-					foreach (Element result in value) {					
+					foreach (Do.Universe.Item result in value) {					
 						
 						info = string.Format (ResultInfoFormat, 
 						                      GLib.Markup.EscapeText (result.Name), 

=== modified file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/SymbolDisplayLabel.cs'
--- Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/SymbolDisplayLabel.cs	2008-12-20 00:31:54 +0000
+++ Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/SymbolDisplayLabel.cs	2009-06-14 02:03:35 +0000
@@ -51,10 +51,10 @@
 				new Gdk.Color (byte.MaxValue, byte.MaxValue, byte.MaxValue));
 		}
 		
-		public Element DisplayObject
+		public Do.Universe.Item DisplayObject
 		{
 			set {
-				Element displayObject;
+				Do.Universe.Item displayObject;
 				
 				displayObject = value;
 				name = description = highlight = "";

=== modified file 'Do.Interface.Linux/src/Do.Interface/IDoController.cs'
--- Do.Interface.Linux/src/Do.Interface/IDoController.cs	2008-12-22 20:17:15 +0000
+++ Do.Interface.Linux/src/Do.Interface/IDoController.cs	2009-06-14 02:03:35 +0000
@@ -62,12 +62,12 @@
 		/// <summary>
 		/// Check and see if an object likely has children
 		/// </summary>
-		/// <param name="element">
-		/// A <see cref="Element"/>
+		/// <param name="item">
+		/// A <see cref="Item"/>
 		/// </param>
 		/// <returns>
 		/// A <see cref="System.Boolean"/>
 		/// </returns>
-		bool ElementHasChildren (Element element);
+		bool ItemHasChildren (Item item);
 	}
 }

=== modified file 'Do.Interface.Linux/src/Do.Interface/IDoWindow.cs'
--- Do.Interface.Linux/src/Do.Interface/IDoWindow.cs	2009-01-05 21:11:58 +0000
+++ Do.Interface.Linux/src/Do.Interface/IDoWindow.cs	2009-06-13 20:22:14 +0000
@@ -25,6 +25,7 @@
 {
 	public enum Pane
 	{
+		None = -1,
 		First = 0,
 		Second = 1,
 		Third = 2,

=== modified file 'Do.Interface.Linux/src/Do.Interface/IUIContext.cs'
--- Do.Interface.Linux/src/Do.Interface/IUIContext.cs	2008-12-18 02:33:48 +0000
+++ Do.Interface.Linux/src/Do.Interface/IUIContext.cs	2009-06-14 02:03:35 +0000
@@ -37,12 +37,12 @@
 		/// <value>
 		/// The current selection
 		/// </value>
-		Element Selection {get;}
+		Item Selection {get;}
 		
 		/// <value>
 		/// The results list
 		/// </value>
-		IList<Element> Results {get;}
+		IList<Item> Results {get;}
 		
 		/// <value>
 		/// Integer index of the selection in the results list

=== modified file 'Do.Interface.Linux/src/Do.Interface/ResultsWindowSelectionEventArgs.cs'
--- Do.Interface.Linux/src/Do.Interface/ResultsWindowSelectionEventArgs.cs	2008-12-18 02:33:48 +0000
+++ Do.Interface.Linux/src/Do.Interface/ResultsWindowSelectionEventArgs.cs	2009-06-14 02:03:35 +0000
@@ -23,9 +23,9 @@
 	public class ResultsWindowSelectionEventArgs : EventArgs
 	{
 		int index;
-		Element selection;
+		Item selection;
 
-		public ResultsWindowSelectionEventArgs (int index, Element selection)
+		public ResultsWindowSelectionEventArgs (int index, Item selection)
 		{
 			this.index = index;
 			this.selection = selection;
@@ -36,7 +36,7 @@
 			get { return index; }
 		}
 
-		public Element SelectedObject
+		public Item SelectedObject
 		{
 			get {
 				return selection;

=== modified file 'Do.Interface.Linux/src/Do.Interface/SearchFinishState.cs'
--- Do.Interface.Linux/src/Do.Interface/SearchFinishState.cs	2008-12-18 02:33:48 +0000
+++ Do.Interface.Linux/src/Do.Interface/SearchFinishState.cs	2009-06-14 02:03:35 +0000
@@ -28,7 +28,7 @@
 	{
 		private bool selection_changed, query_changed;
 		private string query;
-		private Element selection;
+		private Item selection;
 		
 		public bool SelectionChanged { 
 			get {
@@ -46,13 +46,13 @@
 			}
 		}
 		
-		public Element Selection {
+		public Item Selection {
 			get {
 				return selection;
 			}
 		}
 		
-		public SearchFinishState(bool selectionChanged, bool queryChanged, Element selection, string query)
+		public SearchFinishState(bool selectionChanged, bool queryChanged, Item selection, string query)
 		{
 			selection_changed = selectionChanged;
 			query_changed = queryChanged;

=== modified file 'Do.Interface.Linux/src/Do.Interface/UIContext.cs'
--- Do.Interface.Linux/src/Do.Interface/UIContext.cs	2008-12-18 02:33:48 +0000
+++ Do.Interface.Linux/src/Do.Interface/UIContext.cs	2009-06-14 02:03:35 +0000
@@ -28,8 +28,8 @@
 	
 	public class UIContext : IUIContext
 	{
-		private Element selection;
-		private IList<Element> results;
+		private Item selection;
+		private IList<Item> results;
 		
 		private int cursor;
 		private int[] secondary;
@@ -40,13 +40,13 @@
 		
 		private IUIContext parentContext;
 			
-		public Element Selection {
+		public Item Selection {
 			get {
 				return selection;
 			}
 		}
 
-		public IList<Element> Results {
+		public IList<Item> Results {
 			get {
 				return results;
 			}
@@ -88,7 +88,7 @@
 			}
 		}
 		
-		public UIContext(Element selection, IList<Element> results, int cursor, int[] secondaryCursors, 
+		public UIContext(Item selection, IList<Item> results, int cursor, int[] secondaryCursors, 
 		                 string query, bool largeTextDisplay, TextModeType type, IUIContext parentContext)
 		{
 			this.selection  = selection;

=== modified file 'Do.Platform.Linux/gtk-gui/Do.Platform.Linux.AbstractLoginWidget.cs'
--- Do.Platform.Linux/gtk-gui/Do.Platform.Linux.AbstractLoginWidget.cs	2009-05-29 10:26:49 +0000
+++ Do.Platform.Linux/gtk-gui/Do.Platform.Linux.AbstractLoginWidget.cs	2009-06-12 23:10:48 +0000
@@ -130,7 +130,6 @@
             w6.Fill = false;
             // Container child account_vbox.Gtk.Box+BoxChild
             this.hbuttonbox1 = new Gtk.HButtonBox();
-            this.hbuttonbox1.Name = "hbuttonbox1";
             this.hbuttonbox1.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
             // Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild
             this.validate_btn = new Gtk.Button();

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Default/CoreService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Default/CoreService.cs	2009-01-08 22:18:14 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Default/CoreService.cs	2009-06-14 02:03:35 +0000
@@ -41,15 +41,15 @@
 			}
 		}
 		
-		public Element GetElement (string uid)
+		public Item GetItem (string uid)
 		{
-			Log.Debug ("Default ICoreService cannot get Elements.");
-			return new EmptyElement ();
+			Log.Debug ("Default ICoreService cannot get Items.");
+			return new EmptyItem ();
 		}
 		
 		public IEnumerable<Item> GetItemsOrderedByRelevance ()
 		{
-			Log.Debug ("Default ICoreService cannot get Elements.");
+			Log.Debug ("Default ICoreService cannot get Items.");
 			yield break;
 		}
 		

=== modified file 'Do.Platform/src/Do.Platform/ICoreService.cs'
--- Do.Platform/src/Do.Platform/ICoreService.cs	2009-01-08 22:18:14 +0000
+++ Do.Platform/src/Do.Platform/ICoreService.cs	2009-06-14 02:03:35 +0000
@@ -30,7 +30,7 @@
 	{
 		event EventHandler UniverseInitialized;
 		
-		Element GetElement (string uniqueId);
+		Item GetItem (string uniqueId);
 		
 		IEnumerable<Item> GetItemsOrderedByRelevance ();
 		

=== modified file 'Do.Universe/src/Do.Universe/Act.cs'
--- Do.Universe/src/Do.Universe/Act.cs	2008-12-20 01:37:52 +0000
+++ Do.Universe/src/Do.Universe/Act.cs	2009-06-12 23:10:48 +0000
@@ -26,7 +26,7 @@
 namespace Do.Universe
 {	
 
-	public abstract class Act : Element
+	public abstract class Act : Item
 	{
 		static SafeAct safe_act = new SafeAct ();
 

=== modified file 'Do.Universe/src/Do.Universe/ItemSource.cs'
--- Do.Universe/src/Do.Universe/ItemSource.cs	2008-12-20 01:37:52 +0000
+++ Do.Universe/src/Do.Universe/ItemSource.cs	2009-06-14 02:03:35 +0000
@@ -30,7 +30,7 @@
 	/// Example: A "EpiphanyBookmarkItemSource" could provide Items representing
 	/// Epiphany web browser bookmarks.
 	/// </summary>
-	public abstract class ItemSource : Element
+	public abstract class ItemSource : Item
 	{
 
 		static SafeItemSource safe_item_source = new SafeItemSource ();

=== modified file 'Do/Do.mdp'
--- Do/Do.mdp	2009-06-05 19:45:45 +0000
+++ Do/Do.mdp	2009-06-17 01:44:57 +0000
@@ -56,7 +56,6 @@
     <File name="gtk-gui/Do.UI.ColorConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.UI/PluginErrorDialog.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/Do.UI.PluginErrorDialog.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/Do.Core/ElementExtensions.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.Platform" subtype="Directory" buildaction="Compile" />
     <File name="Resources/Do.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
     <File name="src/Do.Core/UniverseManager.cs" subtype="Code" buildaction="Compile" />

=== modified file 'Do/Makefile.am'
--- Do/Makefile.am	2009-06-05 19:45:45 +0000
+++ Do/Makefile.am	2009-06-17 01:44:57 +0000
@@ -24,7 +24,6 @@
 	src/Do.Core/Do.Core.Addins/DockletAddinClassifier.cs \
 	src/Do.Core/Controller.cs \
 	src/Do.Core/DoAddinInstaller.cs \
-	src/Do.Core/ElementExtensions.cs \
 	src/Do.Core/FirstSearchController.cs \
 	src/Do.Core/HistogramRelevanceProvider.cs \
 	src/Do.Core/ISearchController.cs \

=== modified file 'Do/src/Do.Core/Controller.cs'
--- Do/src/Do.Core/Controller.cs	2009-05-16 06:15:14 +0000
+++ Do/src/Do.Core/Controller.cs	2009-06-17 01:44:57 +0000
@@ -309,6 +309,68 @@
 			}
 		}
 		
+		Pane WorkingActionPane {
+			get {
+				Item first, second;
+				first = GetSelection (Pane.First);
+				second = GetSelection (Pane.Second);
+				
+				if (first != null && second != null) {
+					if (first.IsAction () && first.AsAction ().Safe.SupportsItem (second)) {
+						return Pane.First;
+					} else if (second.IsAction () && second.AsAction ().Safe.SupportsItem (first)) {
+						return Pane.Second;
+					}
+				}
+				return Pane.None;
+			}
+		}
+		
+		Pane WorkingItemPane {
+			get {
+				Item first, second;
+				first = GetSelection (Pane.First);
+				second = GetSelection (Pane.Second);
+				
+				if (first != null && second != null) {
+					if (first.IsAction () && first.AsAction ().Safe.SupportsItem (second)) {
+						return Pane.Second;
+					} else if (second.IsAction () && second.AsAction ().Safe.SupportsItem (first)) {
+						return Pane.First;
+					}
+				}
+				return Pane.None;
+			}
+		}
+		
+		Act WorkingAction {
+			get {
+				return GetSelection (WorkingActionPane).AsAction ();
+			}
+		}
+		
+		Item WorkingItem {
+			get {
+				return GetSelection (WorkingItemPane);
+			}
+		}
+		
+		IEnumerable<Item> WorkingItems {
+			get {
+				Pane workingPane = WorkingItemPane;
+				if (workingPane == Pane.None)
+					return null;
+				
+				return controllers [(int) workingPane].FullSelection;
+			}
+		}
+		
+		IEnumerable<Item> WorkingModItems {
+			get {
+				return controllers [(int) Pane.Third].FullSelection;
+			}
+		}
+		
 		/// <summary>
 		/// Sets/Unsets third pane visibility if possible.
 		/// </summary>
@@ -345,12 +407,8 @@
 		/// </summary>
 		bool ThirdPaneAllowed {
 			get {
-				Act action;
-				Element first, second;
-
-				first = GetSelection (Pane.First);
-				second = GetSelection (Pane.Second);
-				action = first as Act ?? second as Act;
+				Act action = WorkingAction;
+				
 				return action != null &&
 					action.SupportedModifierItemTypes.Any () &&
 					controllers [1].Results.Any ();
@@ -363,14 +421,9 @@
 		/// </value>
 		bool ThirdPaneRequired {
 			get {
-				Item item;
-				Act action;
-				Element first, second;
-
-				first = GetSelection (Pane.First);
-				second = GetSelection (Pane.Second);
-				action = first as Act ?? second as Act;
-				item = first as Item ?? second as Item;
+				Item item = WorkingItem;
+				Act action = WorkingAction;
+				
 				return action != null && item != null &&
 					action.SupportedModifierItemTypes.Any () &&
 					!action.ModifierItemsOptional &&
@@ -395,9 +448,9 @@
 		/// Summons a window with elements in it... seems to work
 		/// </summary>
 		/// <param name="elements">
-		/// A <see cref="Element"/>
+		/// A <see cref="Item"/>
 		/// </param>
-		public void SummonWithElements (IEnumerable<Element> elements)
+		public void SummonWithItems (IEnumerable<Item> elements)
 		{
 			if (!IsSummonable) return;
 			
@@ -758,7 +811,7 @@
 		/// This method determines what to do when a search is completed and takes the appropriate action
 		/// </summary>
 		/// <param name="o">
-		/// A <see cref="System.Element"/>
+		/// A <see cref="System.Item"/>
 		/// </param>
 		/// <param name="state">
 		/// A <see cref="SearchFinishState"/>
@@ -856,9 +909,9 @@
 			results_grown = false;
 		}
 		
-		Element GetSelection (Pane pane)
+		Item GetSelection (Pane pane)
 		{
-			Element o;
+			Item o;
 
 			try {
 				o = controllers [(int) pane].Selection;
@@ -871,72 +924,59 @@
 		void PerformAction (bool vanish)
 		{
 			Act action;
-			Element first, second, third;
+			Item first, second, third;
 			string actionQuery, itemQuery, modItemQuery;
-			ICollection<Item> items, modItems;
+			IEnumerable<Item> items, modItems;
 
 			if (vanish) Vanish ();
 			// Flush main thread queue to get Vanish to complete.
 			Services.Application.FlushMainThreadQueue ();
 
-			items = new List<Item> ();
-			modItems = new List<Item> ();
-			first  = GetSelection (Pane.First);
-			second = GetSelection (Pane.Second);
-			third  = GetSelection (Pane.Third);
-			action = first as Act ?? second as Act;
-
+			action = WorkingAction;
+			items = WorkingItems;
+			modItems = WorkingModItems;
+			
 			// If the current state of the controller is invalid, warn and return
 			// early.
-			if (first == null || second == null || action == null) {
+			if (items == null || action == null) {
 				Log<Controller>
 					.Warn ("Controller state was not valid, so the action could not be performed.");
 				if (vanish) Reset ();
 				return;
 			}
-
-			if (first is Item) {
-				foreach (Item item in controllers [0].FullSelection)
-					items.Add (item);
-				itemQuery = controllers [0].Query;
-				actionQuery = controllers [1].Query;
-			} else {
-				foreach (Item item in controllers [1].FullSelection)
-					items.Add (item);
-				itemQuery = controllers [1].Query;
-				actionQuery = controllers [0].Query;
-			}
-
-			modItemQuery = null;
-			if (third != null && ThirdPaneVisible) {
-				foreach (Item item in controllers [2].FullSelection)
-					modItems.Add (item);
-				modItemQuery = controllers [2].Query;
-			}
+			
+			actionQuery  = controllers [(int) WorkingActionPane].Query;
+			itemQuery    = controllers [(int) WorkingItemPane].Query;
+			modItemQuery = controllers [(int) Pane.Third].Query;
+			
+			if (modItems != null && ThirdPaneVisible)
+				modItemQuery = controllers [(int) Pane.Third].Query;
 
 			/////////////////////////////////////////////////////////////
 			/// Relevance accounting
 			/////////////////////////////////////////////////////////////
 			
-			if (first is Item) {
+			if (WorkingActionPane == Pane.Second) {
 				// Act is in second pane.
 				// Increase the relevance of the items.
-				foreach (Element item in items)
+				foreach (Item item in items)
 					item.IncreaseRelevance (itemQuery, null);
 
 				// Increase the relevance of the action /for each item/:
-				foreach (Element item in items)
+				foreach (Item item in items)
 					action.IncreaseRelevance (actionQuery, item);
 			} else {
 				// Act is in first pane.
 				// Increase the relevance of each item for the action.
-				foreach (Element item in items)
+				foreach (Item item in items)
 					item.IncreaseRelevance (itemQuery, action);
 				action.IncreaseRelevance (actionQuery, null);
 			}
 
-			if (third != null && ThirdPaneVisible)
-				third.IncreaseRelevance (modItemQuery, action);
+			if (modItems != null && ThirdPaneVisible) {
+				foreach (Item item in modItems)
+					item.IncreaseRelevance (modItemQuery, action);
+			}
 
 			if (vanish) Reset ();
 
@@ -946,13 +986,13 @@
 
 		void PerformAction (Act action, IEnumerable<Item> items, IEnumerable<Item> modItems)
 		{
-			if (action == null) throw new ArgumentNullException ("action");
-			if (items == null) throw new ArgumentNullException ("items");
+			if (action == null)   throw new ArgumentNullException ("action");
+			if (items == null)    throw new ArgumentNullException ("items");
 			if (modItems == null) throw new ArgumentNullException ("modItems");
 
 			IEnumerable<Item> results = action.Safe.Perform (items, modItems);
 			if (results.Any ()) {
-				SummonWithElements (results.OfType<Element> ());
+				SummonWithItems (results);
 			}
 		}
 
@@ -1046,9 +1086,9 @@
 		
 		public ControlOrientation Orientation { get; set; }
 		
-		public bool ElementHasChildren (Element element)
+		public bool ItemHasChildren (Item item)
 		{
-			return element is Item && (element as Item).HasChildren ();
+			return item.HasChildren ();
 		}
 		
 		#endregion

=== removed file 'Do/src/Do.Core/ElementExtensions.cs'
--- Do/src/Do.Core/ElementExtensions.cs	2008-12-18 23:16:14 +0000
+++ Do/src/Do.Core/ElementExtensions.cs	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-// Element_RelevanceProvider.cs
-//
-// GNOME Do is the legal property of its developers. Please refer to the
-// COPYRIGHT file distributed with this source distribution.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-using System;
-
-using Do.Universe;
-
-namespace Do.Core
-{
-
-	/// <summary>
-	/// Relevance related extension methods on Element class.
-	/// </summary>
-	public static class Element_RelevanceProvider
-	{
-
-		static readonly IRelevanceProvider provider = RelevanceProvider.DefaultProvider;
-
-		/// <summary>
-		/// Increase the relevance of receiver for string match and other Element.
-		/// </summary>
-		/// <param name="self">
-		/// A <see cref="Element"/> whose relevance is to be increased.
-		/// </param>
-		/// <param name="match">
-		/// A <see cref="System.String"/> of user input for which the receiver should become more relevant.
-		/// </param>
-		/// <param name="other">
-		/// A <see cref="Element"/> (maybe null) context.
-		/// </param>
-		public static void IncreaseRelevance (this Element self, string match, Element other)
-		{
-			provider.IncreaseRelevance (self, match, other);
-		}
-
-		/// <summary>
-		/// Decrease the relevance of receiver for string match and other Element.
-		/// </summary>
-		/// <param name="self">
-		/// A <see cref="Element"/> whose relevance is to be increased.
-		/// </param>
-		/// <param name="match">
-		/// A <see cref="System.String"/> of user input for which the receiver should become less relevant.
-		/// </param>
-		/// <param name="other">
-		/// A <see cref="Element"/> (maybe null) context.
-		/// </param>
-		public static void DecreaseRelevance (this Element self, string match, Element other)
-		{
-			provider.DecreaseRelevance (self, match, other);
-		}
-
-		/// <summary>
-		/// Simply retrieves the receivers relevance and updates the receivers state
-		/// (Element.Relevance is set).
-		/// </summary>
-		/// <param name="self">
-		/// A <see cref="Element"/> whose relevance should be updated to reflect
-		/// the state of the world.
-		/// </param>
-		/// <param name="match">
-		/// A <see cref="System.String"/> to retrieve relevance info for.
-		/// </param>
-		/// <param name="other">
-		/// A <see cref="Element"/> (maybe null) to retrieve relevance info for.
-		/// </param>
-		public static void UpdateRelevance (this Element self, string match, Element other)
-		{
-			self.Relevance = provider.GetRelevance (self, match, other);
-		}
-	}
-}

=== modified file 'Do/src/Do.Core/HistogramRelevanceProvider.cs'
--- Do/src/Do.Core/HistogramRelevanceProvider.cs	2009-01-19 23:06:59 +0000
+++ Do/src/Do.Core/HistogramRelevanceProvider.cs	2009-06-14 02:03:35 +0000
@@ -49,7 +49,7 @@
 			hits = new Dictionary<string, RelevanceRecord> ();
 		}
 		
-		void UpdateMaxHits (RelevanceRecord rec, Element e)
+		void UpdateMaxHits (RelevanceRecord rec, Item e)
 		{
 			if (e is Act)
 				max_action_hits = Math.Max (max_action_hits, rec.Hits);
@@ -57,7 +57,7 @@
 				max_item_hits = Math.Max (max_item_hits, rec.Hits);
 		}
 
-		public override void IncreaseRelevance (Element element, string match, Element other)
+		public override void IncreaseRelevance (Item element, string match, Item other)
 		{
 			RelevanceRecord rec;
 
@@ -78,7 +78,7 @@
 			UpdateMaxHits (rec, element);
 		}
 
-		public override void DecreaseRelevance (Element element, string match, Element other)
+		public override void DecreaseRelevance (Item element, string match, Item other)
 		{
 			RelevanceRecord rec;
 
@@ -92,7 +92,7 @@
 			}
 		}
 
-		public override float GetRelevance (Element e, string match, Element other)
+		public override float GetRelevance (Item e, string match, Item other)
 		{
 			RelevanceRecord rec;
 			bool isAction;
@@ -175,7 +175,7 @@
 		public DateTime LastHit;
 		public string FirstChars;
 		
-		public RelevanceRecord (Element o)
+		public RelevanceRecord (Item o)
 		{
 			LastHit = DateTime.Now;
 			FirstChars = "";

=== modified file 'Do/src/Do.Core/ISearchController.cs'
--- Do/src/Do.Core/ISearchController.cs	2008-12-29 02:37:54 +0000
+++ Do/src/Do.Core/ISearchController.cs	2009-06-14 02:03:35 +0000
@@ -36,19 +36,19 @@
 		IUIContext UIContext {get;}
 		
 		/// <value>
-		/// Element Results from the current Query
+		/// Item Results from the current Query
 		/// </value>
-		IList<Element> Results {get; set;}
+		IList<Item> Results {get; set;}
 		
 		/// <value>
 		/// The full selection, including secondary selections
 		/// </value>
-		IList<Element> FullSelection {get;}
+		IList<Item> FullSelection {get;}
 		
 		/// <value>
 		/// The primary selection from the user curosr
 		/// </value>
-		Element Selection {get;}
+		Item Selection {get;}
 		
 		/// <value>
 		/// The location of the cursor in the results list

=== modified file 'Do/src/Do.Core/ItemExtensions.cs'
--- Do/src/Do.Core/ItemExtensions.cs	2008-12-20 00:31:54 +0000
+++ Do/src/Do.Core/ItemExtensions.cs	2009-06-17 01:44:57 +0000
@@ -29,7 +29,7 @@
 
 	static class ItemExtensions
 	{
-
+		static readonly IRelevanceProvider provider = RelevanceProvider.DefaultProvider;
 		static IDictionary<Item, bool> has_children;
 
 		static ItemExtensions ()
@@ -45,5 +45,67 @@
 			return has_children [self];
 		}
 
+		public static bool IsAction (this Item self) 
+		{
+			return ProxyItem.Unwrap (self) is Act;
+		}
+		
+		public static Act AsAction (this Item self)
+		{
+			return ProxyItem.Unwrap (self) as Act;
+		}
+		
+		/// <summary>
+		/// Increase the relevance of receiver for string match and other Item.
+		/// </summary>
+		/// <param name="self">
+		/// A <see cref="Item"/> whose relevance is to be increased.
+		/// </param>
+		/// <param name="match">
+		/// A <see cref="System.String"/> of user input for which the receiver should become more relevant.
+		/// </param>
+		/// <param name="other">
+		/// A <see cref="Item"/> (maybe null) context.
+		/// </param>
+		public static void IncreaseRelevance (this Item self, string match, Item other)
+		{
+			provider.IncreaseRelevance (self, match, other);
+		}
+
+		/// <summary>
+		/// Decrease the relevance of receiver for string match and other Item.
+		/// </summary>
+		/// <param name="self">
+		/// A <see cref="Item"/> whose relevance is to be increased.
+		/// </param>
+		/// <param name="match">
+		/// A <see cref="System.String"/> of user input for which the receiver should become less relevant.
+		/// </param>
+		/// <param name="other">
+		/// A <see cref="Item"/> (maybe null) context.
+		/// </param>
+		public static void DecreaseRelevance (this Item self, string match, Item other)
+		{
+			provider.DecreaseRelevance (self, match, other);
+		}
+
+		/// <summary>
+		/// Simply retrieves the receivers relevance and updates the receivers state
+		/// (Item.Relevance is set).
+		/// </summary>
+		/// <param name="self">
+		/// A <see cref="Item"/> whose relevance should be updated to reflect
+		/// the state of the world.
+		/// </param>
+		/// <param name="match">
+		/// A <see cref="System.String"/> to retrieve relevance info for.
+		/// </param>
+		/// <param name="other">
+		/// A <see cref="Item"/> (maybe null) to retrieve relevance info for.
+		/// </param>
+		public static float UpdateRelevance (this Item self, string match, Item other)
+		{
+			return self.Relevance = provider.GetRelevance (self, match, other);
+		}
 	}
 }

=== modified file 'Do/src/Do.Core/RelevanceProvider.cs'
--- Do/src/Do.Core/RelevanceProvider.cs	2009-01-19 23:27:07 +0000
+++ Do/src/Do.Core/RelevanceProvider.cs	2009-06-14 02:03:35 +0000
@@ -31,9 +31,9 @@
 
 	public interface IRelevanceProvider
 	{
-		void IncreaseRelevance (Element target, string match, Element other);
-		void DecreaseRelevance (Element target, string match, Element other);
-		float GetRelevance (Element target, string match, Element other);
+		void IncreaseRelevance (Item target, string match, Item other);
+		void DecreaseRelevance (Item target, string match, Item other);
+		float GetRelevance (Item target, string match, Item other);
 	}
 
 	[Serializable]
@@ -228,15 +228,15 @@
 			return bestMatch;
 		}
 
-		public virtual void IncreaseRelevance (Element r, string match, Element other)
-		{
-		}
-
-		public virtual void DecreaseRelevance (Element r, string match, Element other)
-		{
-		}
-
-		public virtual float GetRelevance (Element r, string match, Element other)
+		public virtual void IncreaseRelevance (Item r, string match, Item other)
+		{
+		}
+
+		public virtual void DecreaseRelevance (Item r, string match, Item other)
+		{
+		}
+
+		public virtual float GetRelevance (Item r, string match, Item other)
 		{
 			return StringScoreForAbbreviation (r.Safe.Name, match);
 		}

=== modified file 'Do/src/Do.Core/SecondSearchController.cs'
--- Do/src/Do.Core/SecondSearchController.cs	2009-05-18 22:01:43 +0000
+++ Do/src/Do.Core/SecondSearchController.cs	2009-06-17 01:44:57 +0000
@@ -42,7 +42,7 @@
 			}
 		}
 		
-		public override Element Selection {
+		public override Item Selection {
 			get { 
 				if (IsSearching)
 					FastSearch ();
@@ -78,16 +78,16 @@
 			base.OnSearchFinished (true, true, Selection, Query);
 		}
 		
-		protected override List<Element> InitialResults ()
+		protected override List<Item> InitialResults ()
 		{
 			// We continue off our previous results if possible
 			if (context.LastContext != null && context.LastContext.Results.Any ()) {
-				return new List<Element> (
+				return new List<Item> (
 					Do.UniverseManager.Search (context.Query, SearchTypes, context.LastContext.Results, FirstController.Selection));
 			} else if (context.ParentContext != null && context.Results.Any ()) {
-				return new List<Element> (context.Results);
+				return new List<Item> (context.Results);
 			} else { 
-				return new List<Element> (
+				return new List<Item> (
 					Do.UniverseManager.Search (context.Query, SearchTypes, FirstController.Selection));
 			}
 		}
@@ -114,26 +114,28 @@
 		/// Set up our results list.
 		/// </summary>
 		/// <returns>
-		/// A <see cref="Element"/>
+		/// A <see cref="Item"/>
 		/// </returns>
-		private Element[] GetContextResults ()
+		private Item [] GetContextResults ()
 		{
-			List<Element> results = new List<Element> ();
-			if (FirstController.Selection is Item) {
-				Item item = FirstController.Selection as Item;
+			List<Item> results = new List<Item> ();
+			Item first = FirstController.Selection;
+			
+			if (first.IsAction ()) {
+				// We need to find items for this action
+				Act action = first.AsAction ();
+				foreach (Item item in InitialResults ()) {
+					if (action.Safe.SupportsItem (item) || (item.IsAction () && item.AsAction ().Safe.SupportsItem (action)))
+						results.Add (item);
+				}
+			} else {
 				// We need to find actions for this item
 				// TODO -- Make this work for multiple items
-				foreach (Act action in InitialResults ()) {
-					if (action.Safe.SupportsItem (item)) {
-						results.Add (action);
-					}
-				}
-			} else if (FirstController.Selection is Act) {
-				// We need to find items for this action
-				Act action = FirstController.Selection as Act;
 				foreach (Item item in InitialResults ()) {
-					if (action.Safe.SupportsItem (item))
+					Act action = item.AsAction ();
+					if (action != null && action.Safe.SupportsItem (first)) {
 						results.Add (item);
+					}
 				}
 			}
 			
@@ -204,9 +206,11 @@
 
 		public override IEnumerable<Type> SearchTypes {
 			get { 
-				if (FirstController.Selection is Act) {
-					foreach (Type t in (FirstController.Selection as Act).SupportedItemTypes)
+				Item item = FirstController.Selection;
+				if (item.IsAction ()) {
+					foreach (Type t in item.AsAction ().Safe.SupportedItemTypes)
 						yield return t;
+					yield return typeof (Act);
 				} else if (TextMode) {
 					yield return typeof (ITextItem);
 				} else {
@@ -238,8 +242,8 @@
 				if (!value) {
 					textMode = value;
 					textModeFinalize = false;
-				} else if (FirstController.Selection is Act) {
-					Act action = FirstController.Selection as Act;
+				} else if (FirstController.Selection.IsAction ()) {
+					Act action = FirstController.Selection.AsAction ();
 					if (action.Safe.SupportsItem (new ImplicitTextItem (Query))) {
 						textMode = value;
 						textModeFinalize = false;
@@ -278,8 +282,8 @@
 		
 		protected override bool AcceptChildItem (Item item)
 		{
-			if (FirstController.Selection is Act) {
-				Act action = FirstController.Selection as Act;
+			if (FirstController.Selection.IsAction ()) {
+				Act action = FirstController.Selection.AsAction ();
 				return action.Safe.SupportsItem (item);
 			}
 			return true;

=== modified file 'Do/src/Do.Core/SimpleSearchContext.cs'
--- Do/src/Do.Core/SimpleSearchContext.cs	2008-12-29 02:37:54 +0000
+++ Do/src/Do.Core/SimpleSearchContext.cs	2009-06-14 02:03:35 +0000
@@ -30,18 +30,18 @@
 	{
 		string query;
 		int cursor;
-		IList<Element> results;
+		IList<Item> results;
 		
 		public SimpleSearchContext ()
 		{
-			SecondaryCursors = new Element[0];
+			SecondaryCursors = new Item[0];
 			query = "";
-			results = new Element[0];
+			results = new Item[0];
 		}
 		
 		public SimpleSearchContext LastContext   { get; set; }
 		public SimpleSearchContext ParentContext { get; set; }
-		public Element[] SecondaryCursors        { get; set; }
+		public Item[] SecondaryCursors        { get; set; }
 		
 		public string Query
 		{
@@ -53,23 +53,23 @@
 			set { query = value; }
 		}
 
-		public IList<Element> Results
+		public IList<Item> Results
 		{
 			get {
 				if (results == null)
-					results = new Element[0];
+					results = new Item[0];
 				return results;
 			}
 			set {
-				results = value ?? new List<Element> (0);
+				results = value ?? new List<Item> (0);
 				
 				cursor = 0;
 				
 				if (SecondaryCursors.Length == 0) return;
 				
-				List<Element> secondary = new List<Element> ();
-				foreach (Element obj in SecondaryCursors) {
-					foreach (Element robj in Results) {
+				List<Item> secondary = new List<Item> ();
+				foreach (Item obj in SecondaryCursors) {
+					foreach (Item robj in Results) {
 						if (obj == robj) {
 							secondary.Add (obj);
 						}
@@ -80,7 +80,7 @@
 			}
 		}
 		
-		public Element Selection
+		public Item Selection
 		{
 			get {
 				try {
@@ -91,10 +91,10 @@
 			}
 		}
 		
-		public Element[] FullSelection
+		public Item[] FullSelection
 		{
 			get {
-				List<Element> outList = new List<Element> ();
+				List<Item> outList = new List<Item> ();
 				outList.AddRange (SecondaryCursors);
 				
 				//Juggle our selection to front to give best possible legacy plugin support.  Ideally this
@@ -152,7 +152,7 @@
 				return new int[0];
 			List<int> cursors = new List<int> ();
 				
-			foreach (Element obj in SecondaryCursors) {
+			foreach (Item obj in SecondaryCursors) {
 				for (int i = 0; i < Results.Count; i++) {
 					if (Results[i] == obj)
 						cursors.Add (i);
@@ -172,8 +172,8 @@
 			clone.ParentContext = ParentContext;
 			clone.Cursor = Cursor;
 			clone.SecondaryCursors = SecondaryCursors; //Cloning these makes no sense
-//			clone.Results = results.Clone () as Element[];
-			clone.Results = new List<Element> (results);
+//			clone.Results = results.Clone () as Item[];
+			clone.Results = new List<Item> (results);
 			return clone;
 		}
 		

=== modified file 'Do/src/Do.Core/SimpleSearchController.cs'
--- Do/src/Do.Core/SimpleSearchController.cs	2009-05-18 22:01:43 +0000
+++ Do/src/Do.Core/SimpleSearchController.cs	2009-06-14 02:03:35 +0000
@@ -61,7 +61,7 @@
 			}
 		}
 		
-		public IList<Element> Results {
+		public IList<Item> Results {
 			get {
 				return context.Results;
 			}
@@ -71,13 +71,13 @@
 			}
 		}
 
-		public IList<Element> FullSelection {
+		public IList<Item> FullSelection {
 			get {
 				return context.FullSelection;
 			}
 		}
 
-		public virtual Element Selection {
+		public virtual Item Selection {
 			get {
 				return context.Selection;
 			}
@@ -88,7 +88,7 @@
 				return context.Cursor;
 			}
 			set {
-				Element tmp = Selection;
+				Item tmp = Selection;
 				int ctmp = context.Cursor;
 				context.Cursor = value;
 				if (tmp != Selection || context.Cursor != ctmp) {
@@ -143,14 +143,14 @@
 		
 		protected abstract void UpdateResults ();
 		
-		protected virtual List<Element> InitialResults ()
+		protected virtual List<Item> InitialResults ()
 		{
 			if (context.ParentContext != null) {
 				if (context.LastContext != null && context.LastContext.Results.Any ())
-					return new List<Element> (Do.UniverseManager.Search (context.Query, SearchTypes, context.LastContext.Results));
-				return new List<Element> (context.Results);
+					return new List<Item> (Do.UniverseManager.Search (context.Query, SearchTypes, context.LastContext.Results));
+				return new List<Item> (context.Results);
 			} else {
-				return new List<Element> (Do.UniverseManager.Search (context.Query, SearchTypes));
+				return new List<Item> (Do.UniverseManager.Search (context.Query, SearchTypes));
 			}
 		} 
 		
@@ -160,7 +160,7 @@
 				return;
 			}
 			
-			Element tmp = context.Selection;
+			Item tmp = context.Selection;
 			context = context.LastContext;
 			OnSearchFinished (tmp != context.Selection, true, Selection, Query);
 		}
@@ -169,10 +169,10 @@
 		{
 			if (Results.Count - 1 < cursorLocation) return false;
 			
-			List<Element> secondary;
-			secondary = new List<Element> (context.SecondaryCursors);
+			List<Item> secondary;
+			secondary = new List<Item> (context.SecondaryCursors);
 			
-			Element newObject = Results[cursorLocation];
+			Item newObject = Results[cursorLocation];
 			
 			if (secondary.Contains (newObject))
 				secondary.Remove (newObject);
@@ -191,11 +191,11 @@
 			if (context.Selection is Act)
 				return false;
 			
-			Item item = context.Selection as Item;
-			List<Element> children = new List<Element> ();
+			Item item = context.Selection;
+			List<Item> children = new List<Item> ();
 
 			foreach (ItemSource source in PluginManager.ItemSources) {
-				foreach (Element child in source.Safe.ChildrenOfItem (item).Where (i => AcceptChildItem (i)))
+				foreach (Item child in source.Safe.ChildrenOfItem (item).Where (i => AcceptChildItem (i)))
 					children.Add (child);
 			}
 			
@@ -245,7 +245,7 @@
 			SearchStarted (upstream_search);
 		}	
 		
-		protected void OnSearchFinished (bool selection_changed, bool query_changed, Element selection, string query)
+		protected void OnSearchFinished (bool selection_changed, bool query_changed, Item selection, string query)
 		{
 			SearchFinished (this, new SearchFinishState (selection_changed, query_changed, selection, query));
 		}

=== modified file 'Do/src/Do.Core/ThirdSearchController.cs'
--- Do/src/Do.Core/ThirdSearchController.cs	2009-06-07 23:53:40 +0000
+++ Do/src/Do.Core/ThirdSearchController.cs	2009-06-17 01:44:57 +0000
@@ -31,27 +31,62 @@
 	
 	public class ThirdSearchController : SimpleSearchController
 	{
-		private ISearchController FirstController, SecondController;
-		private uint timer = 0;
+		ISearchController FirstController, SecondController;
+		uint timer = 0;
 		
-		private bool SearchNeeded {
+		bool SearchNeeded {
 			get {
-				if (FirstController.Selection == null || SecondController.Selection == null)
-					return false;
+				Act act = null;
 				
-				Act action;
-				if (FirstController.Selection is Act) {
-					action = FirstController.Selection as Act;
-				} else if (SecondController.Selection is Act) {
-					action = SecondController.Selection as Act;
-				} else {
-					return false;
+				try {
+					act = GetContextualAction ();
+				} catch (Exception e) {
+					Log<ThirdSearchController>.Error (e.Message);
 				}
 				
-				return action.SupportedModifierItemTypes.Any ();
+				if (act == null)
+					return false;
+				
+				return act.SupportedModifierItemTypes.Any ();
 			}
 		}
 		
+		Act GetContextualAction ()
+		{
+			// fixme : This really should have a buffer to it that gets reset when an upstream selection changes
+			if (FirstController.Selection == null || SecondController.Selection == null)
+				return null;
+			
+			Item first, second;
+			first = FirstController.Selection;
+			second = SecondController.Selection;
+			
+			if (first.IsAction () && first.AsAction ().Safe.SupportsItem (second))
+				return first.AsAction ();
+			else if (second.IsAction () && second.AsAction ().SupportsItem (first))
+				return second.AsAction ();
+			// fixme
+			throw new Exception ("Something strange happened");
+		}
+		
+		Item GetContextualItem ()
+		{
+			// fixme : This really should have a buffer to it that gets reset when an upstream selection changes
+			if (FirstController.Selection == null || SecondController.Selection == null)
+				return null;
+			
+			Item first, second;
+			first = FirstController.Selection;
+			second = SecondController.Selection;
+			
+			if (first.IsAction () && first.AsAction ().Safe.SupportsItem (second))
+				return second;
+			else if (second.IsAction () && second.AsAction ().SupportsItem (first))
+				return first;
+			// fixme
+			throw new Exception ("Something strange happened");
+		}
+		
 		public ThirdSearchController(ISearchController FirstController, ISearchController SecondController) : base ()
 		{
 			this.FirstController  = FirstController;
@@ -82,12 +117,15 @@
 					textMode = value;
 					textModeFinalize = false;
 				} else {
-					Act action;
-					if (FirstController.Selection is Act)
-						action = FirstController.Selection as Act;
-					else if (SecondController.Selection is Act)
-						action = SecondController.Selection as Act;
-					else
+					Act action = null;
+					
+					try {
+						action = GetContextualAction ();
+					} catch (Exception e) {
+						Log<ThirdSearchController>.Error (e.Message);
+					}
+					
+					if (action == null)
 						return; //you have done something weird, ignore it!
 					
 					foreach (Type t in action.SupportedModifierItemTypes) {
@@ -106,6 +144,7 @@
 		private void OnUpstreamSelectionChanged ()
 		{
 			if (!SearchNeeded) {
+				//fixme - could be doing this a lot when its not needed? causing lots of UI draws?
 				context.Destroy ();
 				context = new SimpleSearchContext ();
 				
@@ -126,44 +165,57 @@
 			});
 		}
 		
-		protected override List<Element> InitialResults ()
+		protected override List<Item> InitialResults ()
 		{
+			Item other = null;
+			try {
+				other = GetContextualItem ();
+			} catch {
+				return new List<Item> ();
+			}
+			
 			// We continue off our previous results if possible
 			if (context.LastContext != null && context.LastContext.Results.Any ()) {
-				return new List<Element> (Do.UniverseManager.Search (context.Query, 
-					SearchTypes, context.LastContext.Results, FirstController.Selection));
+				return new List<Item> (Do.UniverseManager.Search (context.Query, SearchTypes, context.LastContext.Results, other));
 			} else if (context.ParentContext != null && context.Results.Any ()) {
-				return new List<Element> (context.Results);
+				return new List<Item> (context.Results);
 			} else { 
 				// else we do things the slow way
-				return new List<Element> (
-					Do.UniverseManager.Search (context.Query, SearchTypes, FirstController.Selection));
+				return new List<Item> (Do.UniverseManager.Search (context.Query, SearchTypes, other));
 			}
 		}
 
-		private IList<Element> GetContextResults ()
+		private IList<Item> GetContextResults ()
 		{
 			Item item = null;
 			Act action = null;
 			IEnumerable<Item> items = null;
 			List<Item> modItems = new List<Item> ();
-
-			if (FirstController.Selection is Act) {
-				action = FirstController.Selection as Act;
-				item = SecondController.Selection as Item;
-				items = SecondController.FullSelection.OfType<Item> ();
-			} else if (SecondController.Selection is Act) {
-				action = SecondController.Selection as Act;
-				item = FirstController.Selection as Item;
-				items = FirstController.FullSelection.OfType<Item> ();
+			
+			try {
+				action = GetContextualAction ();
+			} catch (Exception e) {
+				Log<ThirdSearchController>.Error (e.Message);
+				return modItems;
+			}
+			
+			if (action == null)
+				return modItems;
+			
+			if (FirstController.Selection == action) {
+				item = SecondController.Selection;
+				items = SecondController.FullSelection;
+			} else if (SecondController.Selection == action) {
+				item = FirstController.Selection;
+				items = FirstController.FullSelection;
 			} else {
-				Log.Debug ("No action found. The interface is out of sync.");
-				return new List<Element> ();
+				Log<ThirdSearchController>.Debug ("No action found. The interface is out of sync.");
+				return modItems;
 			}
-
-		// If we don't support modifier items, don't search.
-		if (!action.Safe.SupportedModifierItemTypes.Any ())
-			return new List<Element> ();
+			
+			// If we don't support modifier items, don't search.
+			if (!action.Safe.SupportedModifierItemTypes.Any ())
+				return modItems;
 		
 			// Add appropriate modifier items from universe.
 			foreach (Item modItem in InitialResults ()) {
@@ -179,7 +231,7 @@
 			}
 			// Sort modifier items before we potentially add a text item.
 			modItems.Sort ();
-			return modItems.OfType<Element> ().ToList<Element> ();
+			return modItems;
 		}
 		
 		public override void Reset ()
@@ -242,12 +294,13 @@
 		
 		protected override bool AcceptChildItem (Item item)
 		{
-			if (FirstController.Selection is Act) {
-				Act action = FirstController.Selection as Act;
-				return action.Safe.SupportsModifierItemForItems (SecondController.FullSelection.Cast<Item> (), item);
-			} else if (SecondController.Selection is Act) {
-				Act action = SecondController.Selection as Act;
-				return action.Safe.SupportsModifierItemForItems (FirstController.FullSelection.Cast<Item> (), item);
+			//fixme
+			if (FirstController.Selection.IsAction () && FirstController.Selection.AsAction ().SupportsItem (SecondController.Selection)) {
+				Act action = FirstController.Selection.AsAction ();
+				return action.Safe.SupportsModifierItemForItems (SecondController.FullSelection, item);
+			} else if (SecondController.Selection.IsAction ()) {
+				Act action = SecondController.Selection.AsAction ();
+				return action.Safe.SupportsModifierItemForItems (FirstController.FullSelection, item);
 			}
 			return true;
 		}

=== modified file 'Do/src/Do.Core/UniverseManager.cs'
--- Do/src/Do.Core/UniverseManager.cs	2009-01-25 20:32:52 +0000
+++ Do/src/Do.Core/UniverseManager.cs	2009-06-17 01:44:57 +0000
@@ -35,7 +35,7 @@
 	{
 
 		Thread update_thread;
-		Dictionary<string, Element> universe;
+		Dictionary<string, Item> universe;
 		EventHandler initialized;
 		
 		const float epsilon = 0.00001f;
@@ -75,7 +75,7 @@
 		
 		public UniverseManager ()
 		{
-			universe = new Dictionary<string, Element> ();
+			universe = new Dictionary<string, Item> ();
 
 			update_thread = new Thread (new ThreadStart (UniverseUpdateLoop));
 			update_thread.IsBackground = true;
@@ -103,41 +103,31 @@
 			update_thread.Start ();
 		}
 
-		public IEnumerable<Element> Search (string query, IEnumerable<Type> filter)
+		public IEnumerable<Item> Search (string query, IEnumerable<Type> filter)
 		{	
-			return Search (query, filter, (Element) null);
+			return Search (query, filter, (Item) null);
 		}
 		
-		public IEnumerable<Element> Search (string query, IEnumerable<Type> filter, Element other)
+		public IEnumerable<Item> Search (string query, IEnumerable<Type> filter, Item other)
 		{
-			if (filter.Count () == 1 && filter.First () == typeof (Act))
-				return Search (query, filter, PluginManager.Actions.OfType<Element> (), other);
-			else
-				lock (universe) 
-					return Search (query, filter, universe.Values, other);
+			lock (universe) 
+				return Search (query, filter, universe.Values, other);
 		}
 		
-		public IEnumerable<Element> Search (string query, IEnumerable<Type> filter, IEnumerable<Element> objects)
+		public IEnumerable<Item> Search (string query, IEnumerable<Type> filter, IEnumerable<Item> objects)
 		{
 			return Search (query, filter, objects, null);
 		}
 		
-		public IEnumerable<Element> Search (string query, IEnumerable<Type> filter, IEnumerable<Element> elements, Element other)
+		public IEnumerable<Item> Search (string query, IEnumerable<Type> filter, IEnumerable<Item> elements, Item other)
 		{
-			Element text = new ImplicitTextItem (query);
-
+			Item text = new ImplicitTextItem (query);
 			string lquery = query.ToLower ();
 
-			foreach (Element element in elements)
-				element.UpdateRelevance (lquery, other);
-
 			return elements
-				.Where (element => epsilon < Math.Abs (element.Relevance) && element.PassesTypeFilter (filter))
+				.Where (element => element.PassesTypeFilter (filter) && epsilon < Math.Abs (element.UpdateRelevance (lquery, other)))
 				.OrderByDescending (element => element.Relevance)
-				.Concat (text.PassesTypeFilter (filter)
-						? new [] { text }
-						: Enumerable.Empty<Element> ()
-				)
+				.Concat (text.PassesTypeFilter (filter) ? new [] { text } : Enumerable.Empty<Item> ())
 				.ToArray ();
 		}
 		
@@ -145,14 +135,14 @@
 		/// Returns if an object likely contains children.
 		/// </summary>
 		/// <param name="o">
-		/// A <see cref="Element"/>
+		/// A <see cref="Item"/>
 		/// </param>
 		/// <returns>
 		/// A <see cref="System.Boolean"/>
 		/// </returns>
-		public bool ElementHasChildren (Element element)
+		public bool ItemHasChildren (Item item)
 		{
-			return element is Item && (element as Item).HasChildren ();
+			return item.HasChildren ();
 		}
 		
 		/// <summary>
@@ -270,15 +260,15 @@
 		}
 
 		/// <summary>
-		/// Attempts to get an Element for a given UniqueId.
+		/// Attempts to get an Item for a given UniqueId.
 		/// </summary>
 		/// <param name="UniqueId">
 		/// A <see cref="System.String"/>
 		/// </param>
 		/// <param name="item">
-		/// A <see cref="Element"/>
+		/// A <see cref="Item"/>
 		/// </param>
-		public bool TryGetElementForUniqueId (string uid, out Element element)
+		public bool TryGetItemForUniqueId (string uid, out Item element)
 		{
 			lock (universe) {
 				if (universe.ContainsKey (uid)) {

=== modified file 'Do/src/Do.Platform/CoreService.cs'
--- Do/src/Do.Platform/CoreService.cs	2009-01-08 22:18:14 +0000
+++ Do/src/Do.Platform/CoreService.cs	2009-06-14 02:03:35 +0000
@@ -39,16 +39,16 @@
 			remove { Do.UniverseManager.Initialized -= value; }
 		}
 
-		public Element GetElement (string uniqueId)
+		public Item GetItem (string uniqueId)
 		{
-			Element element;
-			Do.UniverseManager.TryGetElementForUniqueId (uniqueId, out element);
+			Item element;
+			Do.UniverseManager.TryGetItemForUniqueId (uniqueId, out element);
 			return element;
 		}
 		
 		public IEnumerable<Item> GetItemsOrderedByRelevance ()
 		{
-			return Do.UniverseManager.Search ("", typeof (Item).Cons (null)).Cast<Item> ();
+			return Do.UniverseManager.Search ("", typeof (Item).Cons (null));
 		}
 
 		public void PerformDefaultAction (Item item, IEnumerable<Type> filter)