[Monodevelop-patches-list] r2579 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui/Pads/SolutionPad Internal/Project/Combine

[Lluis Sanchez <lluis@ximian.com>]

Author: lluis
Date: 2005-06-02 13:30:49 -0400 (Thu, 02 Jun 2005)
New Revision: 2579

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs
Log:
2005-06-02  Lluis Sanchez Gual  <lluis at novell.com> 

	* Gui/Pads/SolutionPad/TreeViewPad.cs: Fix warning.
	* Internal/Project/Combine/CombineEntry.cs: Added ParentCombine property.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-06-02 14:05:17 UTC (rev 2578)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-06-02 17:30:49 UTC (rev 2579)
@@ -1,3 +1,8 @@
+2005-06-02  Lluis Sanchez Gual  <lluis at novell.com> 
+
+	* Gui/Pads/SolutionPad/TreeViewPad.cs: Fix warning.
+	* Internal/Project/Combine/CombineEntry.cs: Added ParentCombine property.
+
 2005-06-01  John Luke  <john.luke at gmail.com>
 
 	* Core/src/MonoDevelop.Base/Services/ResourceService.cs: remove

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs	2005-06-02 14:05:17 UTC (rev 2578)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs	2005-06-02 17:30:49 UTC (rev 2579)
@@ -1341,7 +1341,7 @@
 					object data = DataItem;
 					NodeBuilder[] chain = BuilderChain;
 					if (chain != null && chain.Length > 0) return ((TypeNodeBuilder)chain[0]).GetNodeName (this, data);
-					else return store.GetValue (currentIter, TreeViewPad.TextColumn) as string;;
+					else return store.GetValue (currentIter, TreeViewPad.TextColumn) as string;
 				}
 			}
 			

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs	2005-06-02 14:05:17 UTC (rev 2578)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs	2005-06-02 17:30:49 UTC (rev 2579)
@@ -96,6 +96,10 @@
 			set {}
 		}
 		
+		public Combine ParentCombine {
+			get { return parentCombine; }
+		}
+		
 		public virtual void Save (string fileName, IProgressMonitor monitor)
 		{
 			FileName = fileName;