[Monodevelop-patches-list] r2608 - trunk/MonoDevelop/Core/src/MonoDevelop.Dock

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-06-27 17:51:23 -0400 (Mon, 27 Jun 2005)
New Revision: 2608

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO
Log:
catch exception on invalid xml


Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog	2005-06-27 21:13:48 UTC (rev 2607)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog	2005-06-27 21:51:23 UTC (rev 2608)
@@ -1,3 +1,7 @@
+2005-06-27  John Luke  <john.luke at gmail.com>
+
+	* DockLayout.cs: catch exception on invalid XML
+
 2005-06-04  John Luke  <john.luke at gmail.com>
 
 	* DockPaned.cs: handle Shift|F8 to avoid crash for now

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs	2005-06-27 21:13:48 UTC (rev 2607)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs	2005-06-27 21:51:23 UTC (rev 2608)
@@ -163,7 +163,13 @@
 			{
 				doc = new XmlDocument ();
 				Stream s = File.OpenRead (file);
-				doc.Load (s);
+				try {
+					doc.Load (s);
+				} catch {
+					Console.WriteLine ("WARNING: could not load dock layout XML");
+					// FIXME: remove corrupt file?
+					doc = null;
+				}
 				s.Close ();
 				// minimum validation: test root element
 				if (this.RootNode != null) {

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO	2005-06-27 21:13:48 UTC (rev 2607)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO	2005-06-27 21:51:23 UTC (rev 2608)
@@ -5,7 +5,6 @@
  - when we can use pango 1.6, use the built-in ellipsizing
  - audit event emitting frequency
  - use less ArrayLists
- - Shift|F8 gtk_paned_find neighbors, see ximian bug 61113
 
 potential new features
  - restore size/position on de-iconify?