From commit-watcher at mono-cvs.ximian.com Mon Nov 1 12:57:56 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Mon, 1 Nov 2004 12:57:56 -0500 (EST) Subject: [Monodevelop-patches-list] r2012 - in trunk/MonoDevelop/Core/src/Main/Base: . Services/File Message-ID: <20041101175756.8D10F94763@mono-cvs.ximian.com> Author: tberman Date: 2004-11-01 12:57:56 -0500 (Mon, 01 Nov 2004) New Revision: 2012 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs Log: fix a weird little recent files bug the prevented renaming from the project browser. Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-10-30 03:46:33 UTC (rev 2011) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-01 17:57:56 UTC (rev 2012) @@ -1,3 +1,10 @@ +2004-11-01 Todd Berman + + * Services/File/RecentOpen.cs: Properly handle if the renaming occurs + on a Directory, or if it is using SourceFile instead of FileName. + + Need to investigate why SourceFile and FileName both exist. + 2004-10-29 Todd Berman * Commands/FileCommands: Fix SaveAs. Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-10-30 03:46:33 UTC (rev 2011) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-11-01 17:57:56 UTC (rev 2012) @@ -123,13 +123,22 @@ public void FileRemoved(object sender, FileEventArgs e) { + if (e.IsDirectory) + return; + recentFiles.RemoveItem (new Uri (e.FileName)); UpdateLastFile (); } public void FileRenamed(object sender, FileEventArgs e) { - recentFiles.RenameItem (new Uri (e.FileName), new Uri (e.TargetFile)); + if (e.IsDirectory) + return; + + if (e.FileName == null) + recentFiles.RenameItem (new Uri (e.SourceFile), new Uri (e.TargetFile)); + else + recentFiles.RenameItem (new Uri (e.FileName), new Uri (e.TargetFile)); UpdateLastFile (); } From commit-watcher at mono-cvs.ximian.com Mon Nov 1 15:32:15 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Mon, 1 Nov 2004 15:32:15 -0500 (EST) Subject: [Monodevelop-patches-list] r2013 - in trunk/MonoDevelop/Core/src/Main/Base: . Commands Message-ID: <20041101203215.35DFA94763@mono-cvs.ximian.com> Author: tberman Date: 2004-11-01 15:32:15 -0500 (Mon, 01 Nov 2004) New Revision: 2013 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs Log: really open the last project Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-01 17:57:56 UTC (rev 2012) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-01 20:32:15 UTC (rev 2013) @@ -1,5 +1,9 @@ 2004-11-01 Todd Berman + * Commands/AutoStartCommands.cs: Open the real last project. + +2004-11-01 Todd Berman + * Services/File/RecentOpen.cs: Properly handle if the renaming occurs on a Directory, or if it is using SourceFile instead of FileName. Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs 2004-11-01 17:57:56 UTC (rev 2012) +++ trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs 2004-11-01 20:32:15 UTC (rev 2013) @@ -62,7 +62,7 @@ RecentOpen recentOpen = ((IFileService)MonoDevelop.Core.Services.ServiceManager.GetService (typeof (IFileService))).RecentOpen; if (recentOpen.RecentProject != null && recentOpen.RecentProject.Length > 0) { - projectService.OpenCombine(recentOpen.RecentProject[0].ToString()); + projectService.OpenCombine(recentOpen.RecentProject[recentOpen.RecentProject.Length - 1].ToString()); } } From commit-watcher at mono-cvs.ximian.com Mon Nov 1 16:27:50 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Mon, 1 Nov 2004 16:27:50 -0500 (EST) Subject: [Monodevelop-patches-list] r2014 - trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding Message-ID: <20041101212750.0418994763@mono-cvs.ximian.com> Author: tberman Date: 2004-11-01 16:27:49 -0500 (Mon, 01 Nov 2004) New Revision: 2014 Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs.in trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog Log: fix execute script. Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs.in =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs.in 2004-11-01 20:32:15 UTC (rev 2013) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs.in 2004-11-01 21:27:49 UTC (rev 2014) @@ -65,8 +65,11 @@ ProcessStartInfo psi; if (parameters.ExecuteScript != null && parameters.ExecuteScript.Length > 0) { - //Console.WriteLine("EXECUTE SCRIPT!!!!!!"); - psi = new ProcessStartInfo("\"" + parameters.ExecuteScript + "\""); + string additionalCommands = ""; + if (parameters.PauseConsoleOutput) + additionalCommands = @"echo; read -p 'press any key to continue...' -n1;"; + psi = new ProcessStartInfo("xterm", + String.Format (@"-e ""cd {3} ; '{0}' {1} ; {2}""", parameters.ExecuteScript, args, additionalCommands, project.BaseDirectory)); psi.UseShellExecute = false; } else { string runtimeStarter = "mono --debug "; Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2004-11-01 20:32:15 UTC (rev 2013) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2004-11-01 21:27:49 UTC (rev 2014) @@ -1,3 +1,8 @@ +2004-11-01 Todd Berman + + * CSharpBindingExecutionManager.cs.in: Add fu to actually properly run + the execute script. + 2004-09-25 Peter Johanson * CSharpBindingCompilerManager.cs: Hack to a hack to fix compilation From commit-watcher at mono-cvs.ximian.com Mon Nov 1 22:02:13 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Mon, 1 Nov 2004 22:02:13 -0500 (EST) Subject: [Monodevelop-patches-list] r2015 - in trunk/MonoDevelop/Core/src/Main/Base: . Internal/Parser/SharpAssemblyLayer Message-ID: <20041102030213.078AE94763@mono-cvs.ximian.com> Author: fawad Date: 2004-11-01 22:02:12 -0500 (Mon, 01 Nov 2004) New Revision: 2015 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyEvent.cs trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyField.cs trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyMethod.cs trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyProperty.cs trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyReturnType.cs Log: 2004-11-01 Fawad Halim * Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs * Internal/Parser/SharpAssemblyLayer/SharpAssemblyMethod.cs * Internal/Parser/SharpAssemblyLayer/SharpAssemblyReturnType.cs * Internal/Parser/SharpAssemblyLayer/SharpAssemblyEvent.cs * Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs * Internal/Parser/SharpAssemblyLayer/SharpAssemblyField.cs * Internal/Parser/SharpAssemblyLayer/SharpAssemblyProperty.cs: Added using aliases for AssemblyReader and SharpCustomAttribute to allow compilation with mono HEAD. Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-01 21:27:49 UTC (rev 2014) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-02 03:02:12 UTC (rev 2015) @@ -1,3 +1,15 @@ +2004-11-01 Fawad Halim + + * Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs + * Internal/Parser/SharpAssemblyLayer/SharpAssemblyMethod.cs + * Internal/Parser/SharpAssemblyLayer/SharpAssemblyReturnType.cs + * Internal/Parser/SharpAssemblyLayer/SharpAssemblyEvent.cs + * Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs + * Internal/Parser/SharpAssemblyLayer/SharpAssemblyField.cs + * Internal/Parser/SharpAssemblyLayer/SharpAssemblyProperty.cs: + Added using aliases for AssemblyReader and SharpCustomAttribute + to allow compilation with mono HEAD + 2004-11-01 Todd Berman * Commands/AutoStartCommands.cs: Open the real last project. Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs 2004-11-01 21:27:49 UTC (rev 2014) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs 2004-11-02 03:02:12 UTC (rev 2015) @@ -14,10 +14,10 @@ using MonoDevelop.SharpAssembly.Metadata.Rows; using MonoDevelop.SharpAssembly.Metadata; using MonoDevelop.SharpAssembly.PE; -using MonoDevelop.SharpAssembly.Assembly; +using SharpAssembly=MonoDevelop.SharpAssembly.Assembly.SharpAssembly; +using AssemblyReader=MonoDevelop.SharpAssembly.Assembly.AssemblyReader; +using SharpCustomAttribute=MonoDevelop.SharpAssembly.Assembly.SharpCustomAttribute; -using SharpAssembly = MonoDevelop.SharpAssembly.Assembly.SharpAssembly; - namespace MonoDevelop.Internal.Parser { [Serializable] Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyEvent.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyEvent.cs 2004-11-01 21:27:49 UTC (rev 2014) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyEvent.cs 2004-11-02 03:02:12 UTC (rev 2015) @@ -13,10 +13,10 @@ using MonoDevelop.SharpAssembly.Metadata.Rows; using MonoDevelop.SharpAssembly.Metadata; using MonoDevelop.SharpAssembly.PE; -using MonoDevelop.SharpAssembly.Assembly; +using SharpAssembly=MonoDevelop.SharpAssembly.Assembly.SharpAssembly; +using AssemblyReader=MonoDevelop.SharpAssembly.Assembly.AssemblyReader; +using SharpCustomAttribute=MonoDevelop.SharpAssembly.Assembly.SharpCustomAttribute; -using SharpAssembly = MonoDevelop.SharpAssembly.Assembly.SharpAssembly; - namespace MonoDevelop.Internal.Parser { [Serializable] Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyField.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyField.cs 2004-11-01 21:27:49 UTC (rev 2014) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyField.cs 2004-11-02 03:02:12 UTC (rev 2015) @@ -13,10 +13,9 @@ using MonoDevelop.SharpAssembly.Metadata.Rows; using MonoDevelop.SharpAssembly.Metadata; using MonoDevelop.SharpAssembly.PE; -using MonoDevelop.SharpAssembly.Assembly; +using SharpAssembly=MonoDevelop.SharpAssembly.Assembly.SharpAssembly; +using SharpCustomAttribute=MonoDevelop.SharpAssembly.Assembly.SharpCustomAttribute; -using SharpAssembly = MonoDevelop.SharpAssembly.Assembly.SharpAssembly; - namespace MonoDevelop.Internal.Parser { [Serializable] Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyMethod.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyMethod.cs 2004-11-01 21:27:49 UTC (rev 2014) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyMethod.cs 2004-11-02 03:02:12 UTC (rev 2015) @@ -14,10 +14,10 @@ using MonoDevelop.SharpAssembly.Metadata.Rows; using MonoDevelop.SharpAssembly.Metadata; using MonoDevelop.SharpAssembly.PE; -using MonoDevelop.SharpAssembly.Assembly; +using SharpAssembly=MonoDevelop.SharpAssembly.Assembly.SharpAssembly; +using SharpCustomAttribute=MonoDevelop.SharpAssembly.Assembly.SharpCustomAttribute; +using AssemblyReader=MonoDevelop.SharpAssembly.Assembly.AssemblyReader; -using SharpAssembly = MonoDevelop.SharpAssembly.Assembly.SharpAssembly; - namespace MonoDevelop.Internal.Parser { [Serializable] Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs 2004-11-01 21:27:49 UTC (rev 2014) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs 2004-11-02 03:02:12 UTC (rev 2015) @@ -13,10 +13,10 @@ using MonoDevelop.SharpAssembly.Metadata.Rows; using MonoDevelop.SharpAssembly.Metadata; using MonoDevelop.SharpAssembly.PE; -using MonoDevelop.SharpAssembly.Assembly; +using SharpAssembly=MonoDevelop.SharpAssembly.Assembly.SharpAssembly; +using AssemblyReader=MonoDevelop.SharpAssembly.Assembly.AssemblyReader; +using SharpCustomAttribute=MonoDevelop.SharpAssembly.Assembly.SharpCustomAttribute; -using SharpAssembly = MonoDevelop.SharpAssembly.Assembly.SharpAssembly; - namespace MonoDevelop.Internal.Parser { [Serializable] Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyProperty.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyProperty.cs 2004-11-01 21:27:49 UTC (rev 2014) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyProperty.cs 2004-11-02 03:02:12 UTC (rev 2015) @@ -13,10 +13,10 @@ using MonoDevelop.SharpAssembly.Metadata.Rows; using MonoDevelop.SharpAssembly.Metadata; using MonoDevelop.SharpAssembly.PE; -using MonoDevelop.SharpAssembly.Assembly; +using SharpAssembly=MonoDevelop.SharpAssembly.Assembly.SharpAssembly; +using AssemblyReader=MonoDevelop.SharpAssembly.Assembly.AssemblyReader; +using SharpCustomAttribute=MonoDevelop.SharpAssembly.Assembly.SharpCustomAttribute; -using SharpAssembly = MonoDevelop.SharpAssembly.Assembly.SharpAssembly; - namespace MonoDevelop.Internal.Parser { [Serializable] Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyReturnType.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyReturnType.cs 2004-11-01 21:27:49 UTC (rev 2014) +++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyReturnType.cs 2004-11-02 03:02:12 UTC (rev 2015) @@ -13,10 +13,9 @@ using MonoDevelop.SharpAssembly.Metadata.Rows; using MonoDevelop.SharpAssembly.Metadata; using MonoDevelop.SharpAssembly.PE; -using MonoDevelop.SharpAssembly.Assembly; +using SharpAssembly=MonoDevelop.SharpAssembly.Assembly.SharpAssembly; +using AssemblyReader=MonoDevelop.SharpAssembly.Assembly.AssemblyReader; -using SharpAssembly = MonoDevelop.SharpAssembly.Assembly.SharpAssembly; - namespace MonoDevelop.Internal.Parser { [Serializable] From commit-watcher at mono-cvs.ximian.com Tue Nov 2 15:06:23 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 2 Nov 2004 15:06:23 -0500 (EST) Subject: [Monodevelop-patches-list] r2016 - in trunk/MonoDevelop/Core/src/Main/Base: . Commands Services/File Message-ID: <20041102200623.9723494763@mono-cvs.ximian.com> Author: jluke Date: 2004-11-02 15:06:23 -0500 (Tue, 02 Nov 2004) New Revision: 2016 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs Log: 2004-11-02 John Luke * Services/File/RecentOpen.cs: use simpler RecentFiles AddWithLimit * Services/File/RecentFiles.cs: sort and return items in the right order among some other incremental improvements, should also fix bug #68999 * Commands/AutoStartCommands.cs: revert Todds workaround from yesterday Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-02 03:02:12 UTC (rev 2015) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-02 20:06:23 UTC (rev 2016) @@ -1,3 +1,10 @@ +2004-11-02 John Luke + + * Services/File/RecentOpen.cs: use simpler RecentFiles AddWithLimit + * Services/File/RecentFiles.cs: sort and return items in the right order + among some other incremental improvements, should also fix bug #68999 + * Commands/AutoStartCommands.cs: revert Todds workaround from yesterday + 2004-11-01 Fawad Halim * Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs 2004-11-02 03:02:12 UTC (rev 2015) +++ trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs 2004-11-02 20:06:23 UTC (rev 2016) @@ -62,7 +62,7 @@ RecentOpen recentOpen = ((IFileService)MonoDevelop.Core.Services.ServiceManager.GetService (typeof (IFileService))).RecentOpen; if (recentOpen.RecentProject != null && recentOpen.RecentProject.Length > 0) { - projectService.OpenCombine(recentOpen.RecentProject[recentOpen.RecentProject.Length - 1].ToString()); + projectService.OpenCombine(recentOpen.RecentProject[0].ToString()); } } Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs 2004-11-02 03:02:12 UTC (rev 2015) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs 2004-11-02 20:06:23 UTC (rev 2016) @@ -30,6 +30,10 @@ // implementation of the freedesktop.org Recent Files spec // http://freedesktop.org/Standards/recent-file-spec/recent-file-spec-0.2.html +// Note: the file may not exist, apps should account for that themselves + +// Lets keep things sorted as we go, and reverse before saving it. + namespace Freedesktop.RecentFiles { // Currently using XmlSerializer to read/write the recent files list @@ -59,7 +63,6 @@ [XmlElement ("RecentItem")] public RecentItem[] RecentItems; - // FIXME: maybe not write until Save () is called manually public void AddItem (RecentItem item) { if (RecentItems == null) @@ -96,6 +99,26 @@ Save (); } + // ensure that that only max items are kept in group + public void AddWithLimit (RecentItem item, string group, int max) + { + if (max < 1) + throw new ArgumentException ("max must be > 0"); + + // we add it first in case the Uri is already there + AddItem (item); + + // then we adjust for the limit + RecentItem[] inGroup = GetItemsInGroup (group); + if (inGroup.Length > max) + { + while (inGroup.Length > max) { + RemoveItem (GetOldestItem (inGroup)); + inGroup = GetItemsInGroup (group); + } + } + } + public void Clear () { RecentItems = null; @@ -130,26 +153,6 @@ Save (); } -/* - private void ClearMissing () - { - ArrayList list = new ArrayList (); - foreach (RecentItem ri in RecentItems) - { - // we cant test !file:// Uris can we? - if (!ri.Uri.StartsWith ("file://")) - list.Add (ri); - else if (File.Exists (ri.Uri.Substring (7))) - list.Add (ri); - } - - RecentItem[] items = new RecentItem [list.Count]; - list.CopyTo (items); - RecentItems = items; - Save (); - } -*/ - private void EmitChangedEvent () { if (Changed != null) @@ -163,6 +166,7 @@ XmlTextReader reader = new XmlTextReader (RecentFileStore); RecentFiles rf = (RecentFiles) serializer.Deserialize (reader); reader.Close (); + rf.Sort (); return rf; } catch (IOException e) @@ -183,9 +187,6 @@ if (RecentItems == null) return null; - // disable for now - // ClearMissing (); - ArrayList list = new ArrayList (); foreach (RecentItem ri in RecentItems) { @@ -201,17 +202,49 @@ return items; } + public RecentItem[] GetMostRecentInGroup (int count, string group) + { + if (count < 1) + throw new ArgumentException ("count must be > 0"); + + RecentItem[] inGroup = GetItemsInGroup (group); + return GetMostRecent (count, inGroup); + } + + public RecentItem[] GetMostRecent (int count) + { + if (count < 1) + throw new ArgumentException ("count must be > 0"); + + return GetMostRecent (count, RecentItems); + } + + // return the last X items in newest to oldest order + private RecentItem[] GetMostRecent (int count, RecentItem[] items) + { + if (count >= items.Length) + { + return items; + } + else + { + RecentItem[] countedItems = new RecentItem[count]; + // get the last count items + Array.Copy (items, items.Length - count - 1, countedItems, 0, count); + + return countedItems; + } + } + + public static RecentItem GetOldestItem (RecentItem[] items) + { + return items[items.Length - 1]; + } + public RecentItem OldestItem { get { - RecentItem item = RecentItems[0]; - for (int i = 1; i < RecentItems.Length; i ++) - { - // the lowest number is the oldest - if (RecentItems[i].Timestamp < item.Timestamp) - item = RecentItems[i]; - } - return item; + return RecentItems[0]; } } @@ -229,10 +262,16 @@ } else if (ri.Uri == item.Uri) { - // remove the groups - foreach (string g in item.Groups) - ri.RemoveGroup (g); - l.Add (ri); + if (ri.Groups != null) + { + // remove the groups + if (item.Groups != null) + { + foreach (string g in item.Groups) + ri.RemoveGroup (g); + } + l.Add (ri); + } } else { @@ -277,9 +316,15 @@ } } + // FIXME: only append new items, instead of re-writing // Save implies EmitChangedEvent (otherwise why would we save?) private void Save () { + // make sure we are in order + this.Sort (); + // but we need to write in oldest-to-newest order + Array.Reverse (RecentItems); + // if we specifically set Encoding UTF 8 here it writes the BOM // which confuses others (egg-recent-files) I guess XmlTextWriter writer = new XmlTextWriter (new StreamWriter (RecentFileStore)); @@ -287,8 +332,18 @@ serializer.Serialize (writer, this); writer.Close (); EmitChangedEvent (); + + // back to normal + this.Sort (); } + // this gives us the items in newest-to-oldest order + public void Sort () + { + if (RecentItems != null) + Array.Sort (RecentItems); + } + public override string ToString () { if (RecentItems == null) @@ -310,7 +365,7 @@ } } - public class RecentItem + public class RecentItem : IComparable { [XmlElement ("URI")] public string Uri; @@ -380,6 +435,21 @@ AddGroup (s); } + // we want newer items first + public int CompareTo (object item) + { + RecentItem other = item as RecentItem; + if (other == null) + throw new ArgumentException ("item is not of type " + typeof (RecentItem)); + + if (this.Timestamp == other.Timestamp) + return 0; + else if (this.Timestamp < other.Timestamp) + return 1; // older + else + return -1; // newer + } + public static int NewTimestamp { get { Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-11-02 03:02:12 UTC (rev 2015) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-11-02 20:06:23 UTC (rev 2016) @@ -73,19 +73,7 @@ public void AddLastFile (string name) { - if (lastfile != null && lastfile.Length >= MAX_LENGTH) - { - RecentItem oldestItem = lastfile[0]; - for (int i = 1; i < lastfile.Length - 1; i ++) - { - // the lowest number is the oldest - if (lastfile[i].Timestamp < oldestItem.Timestamp) - oldestItem = lastfile[i]; - } - recentFiles.RemoveItem (oldestItem); - } - - recentFiles.AddItem (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Files")); + recentFiles.AddWithLimit (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Files"), "MonoDevelop Files", MAX_LENGTH); UpdateLastFile (); } @@ -105,19 +93,7 @@ public void AddLastProject (string name) { - if (lastproject != null && lastproject.Length >= MAX_LENGTH) - { - RecentItem oldestItem = lastproject[0]; - for (int i = 1; i < lastproject.Length; i ++) - { - // the lowest number is the oldest - if (lastproject[i].Timestamp < oldestItem.Timestamp) - oldestItem = lastproject[i]; - } - recentFiles.RemoveItem (oldestItem); - } - - recentFiles.AddItem (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Projects")); + recentFiles.AddWithLimit (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Projects"), "MonoDevelop Projects", MAX_LENGTH); UpdateLastProject (); } From commit-watcher at mono-cvs.ximian.com Tue Nov 2 15:26:35 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 2 Nov 2004 15:26:35 -0500 (EST) Subject: [Monodevelop-patches-list] r2017 - trunk/MonoDevelop/Core/src/Main/Base/Services/File Message-ID: <20041102202635.63BDD94763@mono-cvs.ximian.com> Author: jluke Date: 2004-11-02 15:26:35 -0500 (Tue, 02 Nov 2004) New Revision: 2017 Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs Log: foo Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs 2004-11-02 20:06:23 UTC (rev 2016) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentFiles.cs 2004-11-02 20:26:35 UTC (rev 2017) @@ -323,7 +323,8 @@ // make sure we are in order this.Sort (); // but we need to write in oldest-to-newest order - Array.Reverse (RecentItems); + if (RecentItems != null) + Array.Reverse (RecentItems); // if we specifically set Encoding UTF 8 here it writes the BOM // which confuses others (egg-recent-files) I guess From commit-watcher at mono-cvs.ximian.com Tue Nov 2 15:51:47 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 2 Nov 2004 15:51:47 -0500 (EST) Subject: [Monodevelop-patches-list] r2018 - in trunk/MonoDevelop/Core/src/Main/Base: . Commands Services/File Services/Project Message-ID: <20041102205147.55FAD94763@mono-cvs.ximian.com> Author: jluke Date: 2004-11-02 15:51:47 -0500 (Tue, 02 Nov 2004) New Revision: 2018 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs trunk/MonoDevelop/Core/src/Main/Base/Services/Project/DefaultProjectService.cs Log: * Services/File/RecentOpen.cs: * Services/Project/DefaultProjectService: * Commands/MenuItemBuilders.cs: display project name for projects Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-02 20:26:35 UTC (rev 2017) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-02 20:51:47 UTC (rev 2018) @@ -5,6 +5,10 @@ among some other incremental improvements, should also fix bug #68999 * Commands/AutoStartCommands.cs: revert Todds workaround from yesterday + * Services/File/RecentOpen.cs: + * Services/Project/DefaultProjectService: + * Commands/MenuItemBuilders.cs: display project name for projects + 2004-11-01 Fawad Halim * Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs 2004-11-02 20:26:35 UTC (rev 2017) +++ trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs 2004-11-02 20:51:47 UTC (rev 2018) @@ -13,20 +13,19 @@ using MonoDevelop.Core.AddIns; using MonoDevelop.Core.AddIns.Codons; using MonoDevelop.Core.AddIns.Conditions; - using MonoDevelop.Core.Properties; using MonoDevelop.Core.Services; - using MonoDevelop.Services; using MonoDevelop.Gui; using MonoDevelop.Gui.Components; using MonoDevelop.Gui.ErrorHandlers; using MonoDevelop.Gui.Dialogs; using MonoDevelop.Internal.Project; - using MonoDevelop.Internal.ExternalTool; using MonoDevelop.Gui.Pads.ProjectBrowser; +using Freedesktop.RecentFiles; + namespace MonoDevelop.Commands { @@ -97,9 +96,11 @@ RPMItem[] items = new RPMItem[recentOpen.RecentProject.Length]; for (int i = 0; i < recentOpen.RecentProject.Length; ++i) { string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : ""; - items[i] = new RPMItem(null, null, accelaratorKeyPrefix + recentOpen.RecentProject[i].ToString().Replace ("_", "__"), new EventHandler(LoadRecentProject)); - items[i].Tag = recentOpen.RecentProject[i].ToString(); - items[i].Description = String.Format (GettextCatalog.GetString ("load solution {0}"), recentOpen.RecentProject[i].ToString ()); + RecentItem ri = recentOpen.RecentProject[i]; + string label = ri.Private == null ? ri.ToString () : ri.Private; + items[i] = new RPMItem(null, null, accelaratorKeyPrefix + label.Replace ("_", "__"), new EventHandler(LoadRecentProject)); + items[i].Tag = ri.ToString (); + items[i].Description = String.Format (GettextCatalog.GetString ("load solution {0}"), ri.ToString ()); } return items; } Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-11-02 20:26:35 UTC (rev 2017) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-11-02 20:51:47 UTC (rev 2018) @@ -71,6 +71,9 @@ UpdateLastProject (); } + // FIXME: store the Project name also + // so we can optionally display in the menu + // filename [Project] public void AddLastFile (string name) { recentFiles.AddWithLimit (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Files"), "MonoDevelop Files", MAX_LENGTH); @@ -91,9 +94,12 @@ OnRecentProjectChange(); } - public void AddLastProject (string name) + public void AddLastProject (string uri, string projectName) { - recentFiles.AddWithLimit (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Projects"), "MonoDevelop Projects", MAX_LENGTH); + + RecentItem ri = new RecentItem (new Uri (uri), Vfs.GetMimeType (uri), "MonoDevelop Projects"); + ri.Private = projectName; + recentFiles.AddWithLimit (ri, "MonoDevelop Projects", MAX_LENGTH); UpdateLastProject (); } Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/Project/DefaultProjectService.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-11-02 20:26:35 UTC (rev 2017) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-11-02 20:51:47 UTC (rev 2018) @@ -177,7 +177,7 @@ openCombineFileName = filename; IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService)); - fileService.RecentOpen.AddLastProject(filename); + fileService.RecentOpen.AddLastProject (filename, openCombine.Name); OnCombineOpened(new CombineEventArgs(openCombine)); openCombine.FileAddedToProject += new ProjectFileEventHandler (NotifyFileAddedToProject); From commit-watcher at mono-cvs.ximian.com Tue Nov 2 16:14:26 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 2 Nov 2004 16:14:26 -0500 (EST) Subject: [Monodevelop-patches-list] r2019 - in trunk/MonoDevelop/Core/src/Main/Base: . Commands Services/File Message-ID: <20041102211426.1A9BD94763@mono-cvs.ximian.com> Author: jluke Date: 2004-11-02 16:14:25 -0500 (Tue, 02 Nov 2004) New Revision: 2019 Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs Log: * Services/File/DefaultFileService.cs: * Services/File/RecentOpen.cs: * Commands/MenuItemBuilders.cs: * Commands/FileCommand.cs: display File [Project] or just File Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-02 20:51:47 UTC (rev 2018) +++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog 2004-11-02 21:14:25 UTC (rev 2019) @@ -9,6 +9,11 @@ * Services/Project/DefaultProjectService: * Commands/MenuItemBuilders.cs: display project name for projects + * Services/File/DefaultFileService.cs: + * Services/File/RecentOpen.cs: + * Commands/MenuItemBuilders.cs: + * Commands/FileCommand.cs: display File [Project] or just File + 2004-11-01 Fawad Halim * Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs 2004-11-02 20:51:47 UTC (rev 2018) +++ trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs 2004-11-02 21:14:25 UTC (rev 2019) @@ -175,7 +175,7 @@ // do actual save if (fileUtilityService.ObservedSave(new NamedFileOperationDelegate(window.ViewContent.Save), filename) == FileOperationResult.OK) { - fileService.RecentOpen.AddLastFile(filename); + fileService.RecentOpen.AddLastFile (filename, null); } } } Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs 2004-11-02 20:51:47 UTC (rev 2018) +++ trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs 2004-11-02 21:14:25 UTC (rev 2019) @@ -56,8 +56,10 @@ for (int i = 0; i < recentOpen.RecentFile.Length; ++i) { string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : ""; - items[i] = new RFMItem(null, null, accelaratorKeyPrefix + recentOpen.RecentFile[i].ToString().Replace ("_", "__"), new EventHandler(LoadRecentFile)); - items[i].Tag = recentOpen.RecentFile[i].ToString(); + RecentItem ri = recentOpen.RecentFile[i]; + string label = ri.Private == null ? ri.ToString () : ri.Private; + items[i] = new RFMItem (null, null, accelaratorKeyPrefix + label.Replace ("_", "__"), new EventHandler (LoadRecentFile)); + items[i].Tag = ri.ToString (); } return items; } Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs 2004-11-02 20:51:47 UTC (rev 2018) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs 2004-11-02 21:14:25 UTC (rev 2019) @@ -162,13 +162,13 @@ if (combine != null && project != null) { if (fileUtilityService.ObservedLoad(new NamedFileOperationDelegate(new LoadFileWrapper(binding, project).Invoke), fileName) == FileOperationResult.OK) { - fileService.RecentOpen.AddLastFile(fileName); + fileService.RecentOpen.AddLastFile (fileName, project.Name); } } else { if (fileUtilityService.ObservedLoad(new NamedFileOperationDelegate(new LoadFileWrapper(binding, null).Invoke), fileName) == FileOperationResult.OK) { - fileService.RecentOpen.AddLastFile(fileName); + fileService.RecentOpen.AddLastFile (fileName, null); } } } else { @@ -182,7 +182,7 @@ } } catch { if (fileUtilityService.ObservedLoad(new NamedFileOperationDelegate (new LoadFileWrapper (displayBindingService.LastBinding, null).Invoke), fileName) == FileOperationResult.OK) { - fileService.RecentOpen.AddLastFile (fileName); + fileService.RecentOpen.AddLastFile (fileName, null); } } } Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-11-02 20:51:47 UTC (rev 2018) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-11-02 21:14:25 UTC (rev 2019) @@ -71,12 +71,15 @@ UpdateLastProject (); } - // FIXME: store the Project name also - // so we can optionally display in the menu - // filename [Project] - public void AddLastFile (string name) + public void AddLastFile (string name, string project) { - recentFiles.AddWithLimit (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Files"), "MonoDevelop Files", MAX_LENGTH); + RecentItem ri = new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Files"); + if (project == null) + ri.Private = String.Format ("{0}", Path.GetFileName (name)); + else + ri.Private = String.Format ("{0} [{1}]", Path.GetFileName (name), project); + + recentFiles.AddWithLimit (ri, "MonoDevelop Files", MAX_LENGTH); UpdateLastFile (); } From commit-watcher at mono-cvs.ximian.com Tue Nov 2 16:20:53 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 2 Nov 2004 16:20:53 -0500 (EST) Subject: [Monodevelop-patches-list] r2020 - trunk/MonoDevelop/Core/src/Main/Base/Services/File Message-ID: <20041102212053.9527D94763@mono-cvs.ximian.com> Author: jluke Date: 2004-11-02 16:20:53 -0500 (Tue, 02 Nov 2004) New Revision: 2020 Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs Log: pffft Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs =================================================================== --- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-11-02 21:14:25 UTC (rev 2019) +++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs 2004-11-02 21:20:53 UTC (rev 2020) @@ -75,7 +75,7 @@ { RecentItem ri = new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Files"); if (project == null) - ri.Private = String.Format ("{0}", Path.GetFileName (name)); + ri.Private = Path.GetFileName (name); else ri.Private = String.Format ("{0} [{1}]", Path.GetFileName (name), project); From commit-watcher at mono-cvs.ximian.com Tue Nov 9 13:53:52 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 9 Nov 2004 13:53:52 -0500 (EST) Subject: [Monodevelop-patches-list] r2021 - trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding Message-ID: <20041109185352.C096194764@mono-cvs.ximian.com> Author: tberman Date: 2004-11-09 13:53:51 -0500 (Tue, 09 Nov 2004) New Revision: 2021 Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog Log: 2004-11-09 Todd Berman * CSharpBindingCompilerManager.cs: Use SAS for assembly detection. This doesnt seem to break anything for me. Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-11-02 21:20:53 UTC (rev 2020) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-11-09 18:53:51 UTC (rev 2021) @@ -145,10 +145,29 @@ IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService)); ArrayList allProjects = Combine.GetAllProjects(projectService.CurrentOpenCombine); - - foreach (ProjectReference lib in p.ProjectReferences) { - string fileName = lib.GetReferencedFileName(p); - writer.WriteLine("\"/r:" + fileName + "\""); + SystemAssemblyService sas = (SystemAssemblyService)ServiceManager.GetService (typeof (SystemAssemblyService)); + ArrayList pkg_references = new ArrayList (); + foreach (ProjectReference lib in project.ProjectReferences) { + switch (lib.ReferenceType) { + case ReferenceType.Gac: + string pkg = sas.GetPackageFromFullName (lib.Reference); + if (pkg == "MONO-SYSTEM") { + writer.WriteLine ("\"/r:" + Path.GetFileName (lib.GetReferencedFileName (project)) + "\""); + } else if (!pkg_references.Contains (pkg)) { + pkg_references.Add (pkg); + writer.WriteLine ("\"-pkg:" + pkg + "\""); + } + break; + case ReferenceType.Assembly: + string assembly_fileName = lib.GetReferencedFileName (project); + string rel_path_to = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, Path.GetDirectoryName (assembly_fileName)); + writer.WriteLine ("\"/r:" + Path.Combine (rel_path_to, Path.GetFileName (assembly_fileName)) + "\""); + break; + case ReferenceType.Project: + string project_fileName = lib.GetReferencedFileName (project); + writer.WriteLine ("\"/r:" + project_fileName + "\""); + break; + } } writer.WriteLine("/nologo"); Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2004-11-02 21:20:53 UTC (rev 2020) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2004-11-09 18:53:51 UTC (rev 2021) @@ -1,3 +1,8 @@ +2004-11-09 Todd Berman + + * CSharpBindingCompilerManager.cs: Use SAS for assembly detection. + This doesnt seem to break anything for me. + 2004-11-01 Todd Berman * CSharpBindingExecutionManager.cs.in: Add fu to actually properly run From commit-watcher at mono-cvs.ximian.com Tue Nov 9 21:31:04 2004 From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com) Date: Tue, 9 Nov 2004 21:31:04 -0500 (EST) Subject: [Monodevelop-patches-list] r2022 - trunk/md-website/include Message-ID: <20041110023104.1AC7394764@mono-cvs.ximian.com> Author: deboald Date: 2004-11-09 21:31:03 -0500 (Tue, 09 Nov 2004) New Revision: 2022 Modified: trunk/md-website/include/header.ascx Log: Added wiki to webpage sidebar Modified: trunk/md-website/include/header.ascx =================================================================== --- trunk/md-website/include/header.ascx 2004-11-09 18:53:51 UTC (rev 2021) +++ trunk/md-website/include/header.ascx 2004-11-10 02:31:03 UTC (rev 2022) @@ -53,6 +53,7 @@

+ /// This class handles the auto and smart indenting in the textbuffer while + /// you type. + ///

+ public class VBFormattingStrategy : DefaultFormattingStrategy + { + ArrayList statements; + StringCollection keywords; + + bool doCasing; + bool doInsertion; + + public VBFormattingStrategy() + { + + statements = new ArrayList(); + statements.Add(new VBStatement("^if.*?then$", "^end ?if$", "End If", 1)); + statements.Add(new VBStatement("\\bclass \\w+$", "^end class$", "End Class", 1)); + statements.Add(new VBStatement("\\bnamespace \\w+$", "^end namespace$", "End Namespace", 1)); + statements.Add(new VBStatement("\\bmodule \\w+$", "^end module$", "End Module", 1)); + statements.Add(new VBStatement("\\bstructure \\w+$", "^end structure$", "End Structure", 1)); + statements.Add(new VBStatement("^while ", "^end while$", "End While", 1)); + statements.Add(new VBStatement("^select case", "^end select$", "End Select", 2)); + statements.Add(new VBStatement("(? + /// Define VB.net specific smart indenting for a line :) + /// + protected override int SmartIndentLine(IFormattableDocument textArea, int lineNr) + { + PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService)); + doCasing = propertyService.GetProperty("VBBinding.TextEditor.EnableCasing", true); + IFormattableDocument