Author: fejj
Date: 2007-03-29 15:00:07 -0500 (Thu, 29 Mar 2007)
New Revision: 75171

Added:
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultNavigationPoint.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/INavigationPoint.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationService.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewContentEventHandler.cs
   
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/TextNavigationPoint.cs
Modified:
   trunk/monodevelop/ChangeLog
   trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
   trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IViewContent.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
   trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
   trunk/monodevelop/Extras/MonoDevelop.SourceEditor/Makefile.am
   
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
   
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
   trunk/monodevelop/Extras/VersionControl/ChangeLog
   
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
Log:


Modified: trunk/monodevelop/ChangeLog
===================================================================
--- trunk/monodevelop/ChangeLog 2007-03-29 19:27:42 UTC (rev 75170)
+++ trunk/monodevelop/ChangeLog 2007-03-29 20:00:07 UTC (rev 75171)
@@ -1,3 +1,7 @@
+2007-03-29  Jeffrey Stedfast  <[EMAIL PROTECTED]> 
+
+       
+
 2007-03-17 Lluis Sanchez Gual  <[EMAIL PROTECTED]> 
 
        * configure.in: Added galician translation.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-03-29 
19:27:42 UTC (rev 75170)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-03-29 
20:00:07 UTC (rev 75171)
@@ -1,3 +1,25 @@
+2007-03-29  Jeffrey Stedfast  <[EMAIL PROTECTED]>
+
+       * MonoDevelop.Ide.Gui/Workbench.cs (OpenDocument): Log the 
NavigationPoint.
+
+       * MonoDevelop.Ide.Gui/ViewContentEventHandler.cs: New source file.
+
+       * MonoDevelop.Ide.Gui/NavigationService.cs: New Navigation Service.
+
+       * MonoDevelop.Ide.Gui/IViewContent.cs: Added a BuildNavPoint() method.
+
+       * MonoDevelop.Ide.Gui/INavigationPoint.cs: New source file describing
+       the NavigationPoint interface.
+
+       * MonoDevelop.Ide.Gui/DefaultNavigationPoint.cs: New source file
+       implementing the default NavigationPoint interface.
+
+       * MonoDevelop.Ide.Gui/AbstractViewContent.cs: Added a BuildNavPoint()
+       virtual method.
+
+       * MonoDevelop.Ide.Commands/NavigationCommands.cs: New source file 
+       implementing the code navigation commands.
+
 2007-03-29  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Ide.Commands/ProjectCommands.cs: Track api changes.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am      2007-03-29 
19:27:42 UTC (rev 75170)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am      2007-03-29 
20:00:07 UTC (rev 75171)
@@ -58,6 +58,7 @@
        MonoDevelop.Ide.Commands/EditCommands.cs \
        MonoDevelop.Ide.Commands/FileCommands.cs \
        MonoDevelop.Ide.Commands/HelpCommands.cs \
+       MonoDevelop.Ide.Commands/NavigationCommands.cs \
        MonoDevelop.Ide.Commands/ProjectCommands.cs \
        MonoDevelop.Ide.Commands/RefactoryCommands.cs \
        MonoDevelop.Ide.Commands/SearchCommands.cs \
@@ -200,6 +201,7 @@
        MonoDevelop.Ide.Gui/AddinUpdateHandler.cs \
        MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs \
        MonoDevelop.Ide.Gui/ConfigurationComboBox.cs \
+       MonoDevelop.Ide.Gui/DefaultNavigationPoint.cs \
        MonoDevelop.Ide.Gui/DefaultStatusBarService.cs \
        MonoDevelop.Ide.Gui/DefaultWorkbench.cs \
        MonoDevelop.Ide.Gui/DisplayBindingService.cs \
@@ -212,6 +214,7 @@
        MonoDevelop.Ide.Gui/IBaseViewContent.cs \
        MonoDevelop.Ide.Gui/Ide.cs \
        MonoDevelop.Ide.Gui/IdeStartup.cs \
+       MonoDevelop.Ide.Gui/INavigationPoint.cs \
        MonoDevelop.Ide.Gui/IPadContainer.cs \
        MonoDevelop.Ide.Gui/IPadContent.cs \
        MonoDevelop.Ide.Gui/ISecondaryViewContent.cs \
@@ -222,6 +225,7 @@
        MonoDevelop.Ide.Gui/IWorkbenchLayout.cs \
        MonoDevelop.Ide.Gui/IWorkbenchWindow.cs \
        MonoDevelop.Ide.Gui/LayoutComboBox.cs \
+       MonoDevelop.Ide.Gui/NavigationService.cs \
        MonoDevelop.Ide.Gui/OutputProgressMonitor.cs \
        MonoDevelop.Ide.Gui/Pad.cs \
        MonoDevelop.Ide.Gui/PadCollection.cs \
@@ -237,6 +241,7 @@
        MonoDevelop.Ide.Gui/TipOfTheDayStartupHandler.cs \
        MonoDevelop.Ide.Gui/ViewCommandHandlers.cs \
        MonoDevelop.Ide.Gui/ViewContentCollection.cs \
+       MonoDevelop.Ide.Gui/ViewContentEventHandler.cs \
        MonoDevelop.Ide.Gui/Workbench.cs \
        MonoDevelop.Ide.Gui/WorkbenchMemento.cs \
        MonoDevelop.Ide.Gui/WorkbenchWindowCollection.cs \

Added: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs
   2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs
   2007-03-29 20:00:07 UTC (rev 75171)
@@ -0,0 +1,37 @@
+
+using System;
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components.Commands;
+
+namespace MonoDevelop.Ide.Commands {
+       public enum NavigationCommands {
+               NavigateBack,
+               NavigateForward
+       }
+       
+       internal class NavigateBack : CommandHandler {
+               protected override void Run ()
+               {
+                       NavigationService.Go (-1);
+               }
+               
+               protected override void Update (CommandInfo info)
+               {
+                       info.Enabled = NavigationService.CanNavigateBack;
+               }
+       }
+       
+       internal class NavigateForward : CommandHandler {
+               protected override void Run ()
+               {
+                       NavigationService.Go (1);
+               }
+               
+               protected override void Update (CommandInfo info)
+               {
+                       info.Enabled = NavigationService.CanNavigateForwards;
+               }
+       }
+}

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
       2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
       2007-03-29 20:00:07 UTC (rev 75171)
@@ -95,7 +95,12 @@
                }
                
                public abstract void Load(string fileName);
-
+               
+               public virtual INavigationPoint BuildNavPoint ()
+               {
+                       return new DefaultNavigationPoint (contentName);
+               }
+               
                public virtual Project Project
                {
                        get

Added: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultNavigationPoint.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultNavigationPoint.cs
    2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultNavigationPoint.cs
    2007-03-29 20:00:07 UTC (rev 75171)
@@ -0,0 +1,156 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="David Alpert" email="[EMAIL PROTECTED]"/>
+//     <version>$Revision: 1963 $</version>
+// </file>
+
+using System;
+using System.Globalization;
+
+using MonoDevelop.Core;
+
+namespace MonoDevelop.Ide.Gui {
+       /// <summary>
+       /// Default implementation for classes that wrap Navigational
+       /// information for the <see cref="NavigationService"/>.
+       /// </summary>
+       public class DefaultNavigationPoint : INavigationPoint {
+               string fileName;
+               object data;
+               
+#region constructor
+               public DefaultNavigationPoint () : this (String.Empty, null)
+               {
+                       
+               }
+               
+               public DefaultNavigationPoint (string fileName) : this 
(fileName, null)
+               {
+                       
+               }
+               
+               public DefaultNavigationPoint (string fileName, object data)
+               {
+                       this.fileName = fileName == null ? String.Empty : 
fileName;
+                       this.data = data;
+               }
+#endregion
+               
+#region overrides
+               public override string ToString ()
+               {
+                       return String.Format (CultureInfo.CurrentCulture,
+                                             "[{0}: {1}]",
+                                             GetType ().Name,
+                                             Description);
+               }
+#endregion
+               
+#region INavigationPoint implementation
+               public virtual string FileName {
+                       get { return fileName; }
+               }
+               
+               public virtual string Description {
+                       get {
+                               return String.Format 
(CultureInfo.CurrentCulture,
+                                                     "{0}: {1}", fileName, 
data);
+                       }
+               }
+               
+               public virtual string FullDescription {
+                       get { return Description; }
+               }
+               
+               public virtual string ToolTip {
+                       get { return Description; }
+               }
+               
+//             public string TabName {
+//                     get { return tabName; }
+//             }
+               
+               public virtual int Index {
+                       get { return 0; }
+               }
+               
+               public object NavigationData {
+                       get { return data; }
+                       set { data = value; }
+               }
+               
+               public virtual void JumpTo ()
+               {
+                       IdeApp.Workbench.OpenDocument (fileName, 1, 1, true);
+               }
+               
+               public void FileNameChanged (string newName)
+               {
+                       fileName = newName == null ? String.Empty : newName;
+               }
+               
+               public virtual void ContentChanging (object sender, EventArgs e)
+               {
+                       //throw new NotImplementedException();
+               }
+#endregion
+               
+#region Equality
+               
+               public override bool Equals (object obj)
+               {
+                       DefaultNavigationPoint b = obj as 
DefaultNavigationPoint;
+                       
+                       if (object.ReferenceEquals (b, null))
+                               return false;
+                       
+                       return FileName == b.FileName;
+               }
+               
+               public override int GetHashCode ()
+               {
+                       return FileName.GetHashCode ();
+               }
+#endregion
+               
+#region IComparable
+               public virtual int CompareTo (object obj)
+               {
+                       if (obj == null)
+                               return 1;
+                       
+                       if (GetType () != obj.GetType ()) {
+                               // if of different types, sort the types by name
+                               return GetType ().Name.CompareTo (obj.GetType 
().Name);
+                       }
+                       
+                       DefaultNavigationPoint b = obj as 
DefaultNavigationPoint;
+                       
+                       return FileName.CompareTo (b.FileName);
+               }
+               
+               // Omitting any of the following operator overloads
+               // violates rule: OverrideMethodsOnComparableTypes.
+               public static bool operator == (DefaultNavigationPoint p1, 
DefaultNavigationPoint p2)
+               {
+                       return object.Equals (p1, p2); // checks for null and 
calls p1.Equals(p2)
+               }
+               
+               public static bool operator != (DefaultNavigationPoint p1, 
DefaultNavigationPoint p2)
+               {
+                       return !(p1 == p2);
+               }
+               
+               public static bool operator < (DefaultNavigationPoint p1, 
DefaultNavigationPoint p2)
+               {
+                       return p1 == null ? p2 != null : (p1.CompareTo (p2) < 
0);
+               }
+               
+               public static bool operator > (DefaultNavigationPoint p1, 
DefaultNavigationPoint p2)
+               {
+                       return p1 == null ? false : (p1.CompareTo (p2) > 0);
+               }
+#endregion
+       }
+}
\ No newline at end of file

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
  2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
  2007-03-29 20:00:07 UTC (rev 75171)
@@ -1,7 +1,7 @@
 // <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Kr�¼ger" email="[EMAIL PROTECTED]"/>
+//     <owner name="Mike Krüger" email="[EMAIL PROTECTED]"/>
 //     <version value="$version"/>
 // </file>
 

Added: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/INavigationPoint.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/INavigationPoint.cs
  2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/INavigationPoint.cs
  2007-03-29 20:00:07 UTC (rev 75171)
@@ -0,0 +1,68 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="David Alpert" email="[EMAIL PROTECTED]"/>
+//     <version>$Revision: 1963 $</version>
+// </file>
+
+using System;
+
+namespace MonoDevelop.Ide.Gui {
+       /// <summary>
+       /// Interface for classes that store Navigational information for 
+       /// the <see cref="NavigationService"/>.
+       /// </summary>
+       public interface INavigationPoint : IComparable {
+               /// <summary>
+               /// The path to the file containing the <see 
cref="INavigationPoint"/>
+               /// </summary>
+               string FileName { get; }
+               
+               /// <summary>
+               /// Gets the text that will appear in the drop-down menu to 
select
+               /// this <see cref="INavigationPoint"/>.
+               /// </summary>
+               string Description { get; }
+               
+               /// <summary>
+               /// Gets more detailed text that cam be used to describe
+               /// this <see cref="INavigationPoint"/>.
+               /// </summary>
+               string FullDescription { get; }
+               
+               string ToolTip { get; }
+               
+//             /// <summary>
+//             /// 
+//             /// </summary>
+//             string TabName { get; }
+               
+               /// <summary>
+               /// Gets the specific data, if any, needed to 
+               /// navigate to this <see cref="INavigationPoint"/>.
+               /// </summary>
+               object NavigationData { get; }
+               
+               int Index { get; }
+               
+               /// <summary>
+               /// Navigates to this <see cref="INavigationPoint"/>.
+               /// </summary>
+               void JumpTo ();
+               
+               /// <summary>
+               /// Updates the <see cref="FileName"/>.
+               /// </summary>
+               /// <param name="newName"></param>
+               void FileNameChanged (string newName);
+               
+               /// <summary>
+               /// Responsible for updating the internal data of the 
+               /// <see cref="INavigationPoint"/> to synch it with 
+               /// changes in the IViewContent containing the point.
+               /// </summary>
+               /// <param name="sender"></param>
+               /// <param name="e"></param>
+               void ContentChanging (object sender, EventArgs e);
+       }
+}

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IViewContent.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IViewContent.cs  
    2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IViewContent.cs  
    2007-03-29 20:00:07 UTC (rev 75171)
@@ -6,6 +6,7 @@
 // </file>
 
 using System;
+
 using MonoDevelop.Projects;
 
 namespace MonoDevelop.Ide.Gui
@@ -84,6 +85,8 @@
                /// </summary>
                void Load(string fileName);
                
+               INavigationPoint BuildNavPoint ();
+               
                /// <summary>
                /// The name of the project the content is attached to
                /// </summary>

Added: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationService.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationService.cs
 2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationService.cs
 2007-03-29 20:00:07 UTC (rev 75171)
@@ -0,0 +1,326 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="David Alpert" email="[EMAIL PROTECTED]"/>
+//     <version>$Revision: 1963 $</version>
+// </file>
+
+using System;
+using System.Collections.Generic;
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.Ide.Gui {
+       /// <summary>
+       /// Provides the infrastructure to handle generalized code navigation.
+       /// </summary>
+       /// <remarks>
+       /// <para>This service is not limited to navigating code; rather, it
+       /// integrates with SharpDevelop's extendable <see cref="IViewContent"/>
+       /// interface so that each window has the opportunity to implement a
+       /// contextually appropriate navigation scheme.</para>
+       /// <para>The default scheme, <see cref="DefaultNavigationPoint"/>, is
+       /// created automatically in the <see cref="AbstractViewContent"/>
+       /// implementation.  This scheme supports the basic function of logging 
a
+       /// filename and returning to that file's default view.</para>
+       /// <para>The default text editor provides a slightly more sophisticated
+       /// scheme, <see 
cref="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorNavigationPoint">
+       /// TextEditorNavigationPoint</see>, that logs filename and line 
number.</para>
+       /// <para>To implement your own navigation scheme, implement
+       /// <see cref="IViewContent"/> or derive from
+       /// <see cref="AbstractViewContent"/> and override the
+       /// <see 
cref="IViewContent.BuildNavigationPoint">BuildNavigationPoint</see>
+       /// method.</para>
+       /// <para>
+       /// <i>History logic based in part on Orlando Curioso's <i>Code 
Project</i> article:
+       /// <see 
href="http://www.codeproject.com/cs/miscctrl/WinFormsHistory.asp";>
+       /// Navigational history (go back/forward) for WinForms 
controls</see></i>
+       /// </para>
+       /// </remarks>
+       public class NavigationService {
+#region Private members
+               static LinkedList<INavigationPoint> history = new 
LinkedList<INavigationPoint> ();
+               static LinkedListNode<INavigationPoint> currentNode; // 
autoinitialized to null (FxCop)
+               static bool loggingSuspended; // autoinitialized to false 
(FxCop)
+#endregion
+               
+               // TODO: FxCop says "find another way to do this" 
(ReviewVisibleEventHandlers)
+               static NavigationService ()
+               {
+                       //WorkbenchSingleton.WorkbenchCreated += 
WorkbenchCreatedHandler;
+                       
+                       IdeApp.ProjectOperations.FileRenamedInProject += 
FileRenamed;
+                       IdeApp.ProjectOperations.CombineClosed += 
SolutionClosed;
+               }
+               
+#region Public Properties
+               public static bool CanNavigateBack {
+                       get { return currentNode != history.First && 
currentNode != null; }
+               }
+               
+               public static bool CanNavigateForwards {
+                       get { return currentNode != history.Last && currentNode 
!= null; }
+               }
+               
+               public static int Count {
+                       get { return history.Count; }
+               }
+               
+               public static INavigationPoint CurrentPosition {
+                       get {
+                               return currentNode == null ? (INavigationPoint) 
null : currentNode.Value;
+                       }
+                       set {
+                               Log (value);
+                       }
+               }
+               
+               public static bool IsLogging {
+                       get { return !loggingSuspended; }
+               }
+#endregion
+
+#region Public Methods
+               // TODO: FxCop says "find another way to do this" 
(ReviewVisibleEventHandlers)
+               public static void ContentChanging (object sender, EventArgs e)
+               {
+                       foreach (INavigationPoint p in history) {
+                               p.ContentChanging (sender, e);
+                       }
+               }
+               
+#region private helpers
+               static void Log (IWorkbenchWindow window)
+               {
+                       if (window == null)
+                               return;
+                       
+                       // TODO: Navigation - enable logging of subpanes via 
window.ActiveViewContent
+                       Log (window.ViewContent);
+               }
+               
+               static void Log (IViewContent vc)
+               {
+                       if (vc == null)
+                               return;
+                       
+                       Log (vc.BuildNavPoint ());
+               }
+#endregion
+               
+               public static void Log (INavigationPoint pointToLog)
+               {
+                       if (loggingSuspended)
+                               return;
+                       
+                       LogInternal (pointToLog);
+               }
+
+               // refactoring this out of Log() allows the NavigationService
+               // to call this and ensure it will work regardless of the
+               // requested state of loggingSuspended
+               private static void LogInternal (INavigationPoint p)
+               {
+                       if (p == null || p.FileName == null || p.FileName == 
String.Empty)
+                               return;
+                       
+                       if (currentNode == null) {
+                               currentNode = history.AddFirst (p);
+                       } else if (p.Equals (currentNode.Value)) {
+                               // replace it
+                               currentNode.Value = p;
+                       } else {
+                               currentNode = history.AddAfter (currentNode, p);
+                       }
+                       
+                       OnHistoryChanged ();
+               }
+               
+               // untested
+               public static INavigationPoint Log ()
+               {
+//                     IWorkbenchWindow window = 
WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
+//                     if (window == null) {
+//                             return null;
+//                     }
+//
+//                     IViewContent view = window.ViewContent;
+//                     if (view == null) {
+//                             return null;
+//                     }
+//
+//                     return view.BuildNavPoint();
+                       return null;
+               }
+               
+               public static ICollection<INavigationPoint> Points
+               {
+                       get { return new List<INavigationPoint> (history); }
+               }
+               
+               public static void ClearHistory ()
+               {
+                       ClearHistory (false);
+               }
+               
+               public static void ClearHistory (bool clearCurrentPosition)
+               {
+                       INavigationPoint currentPosition = CurrentPosition;
+                       history.Clear ();
+                       currentNode = null;
+                       
+                       if (!clearCurrentPosition)
+                               LogInternal (currentPosition);
+                       
+                       OnHistoryChanged ();
+               }
+               
+               public static void Go (int delta)
+               {
+                       if (delta == 0) {
+                               return;
+                       } else if (delta < 0) {
+                               // move backwards
+                               while (delta < 0 && currentNode != 
history.First) {
+                                       currentNode = currentNode.Previous;
+                                       delta++;
+                               }
+                       } else {
+                               // move forwards
+                               while (delta > 0 && currentNode != 
history.Last) {
+                                       currentNode = currentNode.Next;
+                                       delta--;
+                               }
+                       }
+                       
+                       SyncViewWithModel ();
+               }
+               
+               public static void Go (INavigationPoint target)
+               {
+                       if (target == null)
+                               return;
+                       
+                       LinkedListNode<INavigationPoint> targetNode;
+                       targetNode = history.Find (target);
+                       
+                       if (targetNode != null) {
+                               currentNode = targetNode;
+                       } else {
+                               Runtime.LoggingService.ErrorFormat ("Logging 
additional point: {0}", target);
+                               LogInternal (target);
+                               //currentNode = history.AddAfter(currentNode, 
target);
+                       }
+                       
+                       SyncViewWithModel ();
+               }
+               
+               private static void SyncViewWithModel ()
+               {
+                       //LoggingService.Info ("suspend logging");
+                       SuspendLogging ();
+                       
+                       if (CurrentPosition != null) {
+                               CurrentPosition.JumpTo ();
+                       }
+                       
+                       //LoggingService.Info ("resume logging");
+                       ResumeLogging ();
+               }
+               
+               public static void SuspendLogging ()
+               {
+                       loggingSuspended = true;
+               }
+               
+               public static void ResumeLogging ()
+               {
+                       // ENH: possible enhancement: use int instead of bool 
so resume statements are incremental rather than definitive.
+                       loggingSuspended = false;
+               }
+#endregion
+
+               // the following code is not covered by Unit tests as i wasn't 
sure
+               // how to test code triggered by the user interacting with the 
workbench
+#region event trapping
+               
+//#region ViewContent events
+//             static void WorkbenchCreatedHandler (object sender, EventArgs e)
+//             {
+//                     IdeApp.Workbench.DocumentOpened += 
+//                             new ViewContentEventHandler (ViewContentOpened);
+//                     IdeApp.Workbench.DocumentClosed +=
+//                             new ViewContentEventHandler (ViewContentClosed);
+//                     //WorkbenchSingleton.Workbench.ViewOpened +=
+//                     //      new ViewContentEventHandler (ViewContentOpened);
+//                     //WorkbenchSingleton.Workbench.ViewClosed +=
+//                     //      new ViewContentEventHandler (ViewContentClosed);
+//             }
+//             
+//             static void ViewContentOpened (object sender, 
ViewContentEventArgs e)
+//             {
+//                     //Log (e.Content);
+//                     e.Content.WorkbenchWindow.WindowSelected += 
WorkBenchWindowSelected;
+//             }
+//             
+//             static void ViewContentClosed (object sender, 
ViewContentEventArgs e)
+//             {
+//                     e.Content.WorkbenchWindow.WindowSelected -= 
WorkBenchWindowSelected;
+//             }
+//             
+//             static IWorkbenchWindow lastSelectedWindow;
+//             
+//             static void WorkBenchWindowSelected (object sender, EventArgs e)
+//             {
+//                     try {
+//                             IWorkbenchWindow window = sender as 
IWorkbenchWindow;
+//                             if (window == lastSelectedWindow) {
+//                                     return;
+//                             }
+//                             
+//                             //int n = NavigationService.Count;
+//                             Log (window);
+//                             
+//                             //LoggingService.DebugFormatted 
("WorkbenchSelected: logging {0}", window.Title);
+//                             
+//                             // HACK: Navigation - for some reason, 
JumpToFilePosition returns _before_ this
+//                             //       gets fired, (not the behaviour i 
expected) so we need to remember the
+//                             //       previous selected window to ensure 
that we only log once per visit to
+//                             //       a given window.
+//                             lastSelectedWindow = window;
+//                     } catch (Exception ex) {
+//                             LoggingService.ErrorFormatted ("{0}:\n{1}", 
ex.Message, ex.StackTrace);
+//                             throw;
+//                     }
+//             }
+//#endregion
+               
+               static void FileRenamed (object sender, 
ProjectFileRenamedEventArgs e)
+               {
+                       foreach (INavigationPoint p in history) {
+                               if (p.FileName.Equals (e.OldName)) {
+                                       p.FileNameChanged (e.NewName);
+                               }
+                       }
+               }
+               
+               static void SolutionClosed (object sender, EventArgs e)
+               {
+                       NavigationService.ClearHistory (true);
+               }
+#endregion
+               
+#region Public Events
+               public static event System.EventHandler HistoryChanged;
+               
+               static void OnHistoryChanged ()
+               {
+                       if (HistoryChanged != null) {
+                               HistoryChanged 
(NavigationService.CurrentPosition, EventArgs.Empty);
+                       }
+               }
+#endregion
+       }
+}

Added: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewContentEventHandler.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewContentEventHandler.cs
   2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewContentEventHandler.cs
   2007-03-29 20:00:07 UTC (rev 75171)
@@ -0,0 +1,27 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Mike Krüger" email="[EMAIL PROTECTED]"/>
+//     <version>$Revision: 1965 $</version>
+// </file>
+
+using System;
+
+namespace MonoDevelop.Ide.Gui
+{
+       public delegate void ViewContentEventHandler (object sender, 
ViewContentEventArgs e);
+       
+       public class ViewContentEventArgs : System.EventArgs {
+               IViewContent content;
+               
+               public IViewContent Content {
+                       get { return content; }
+                       set { content = value; }
+               }
+               
+               public ViewContentEventArgs (IViewContent content)
+               {
+                       this.content = content;
+               }
+       }
+}

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs 
2007-03-29 19:27:42 UTC (rev 75170)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs 
2007-03-29 20:00:07 UTC (rev 75171)
@@ -317,15 +317,18 @@
                                                doc.Select ();
                                                doc.Window.SwitchView (vcIndex);
                                        }
+                                       
                                        IPositionable ipos = (IPositionable) 
vcFound.GetContent (typeof(IPositionable));
                                        if (line != -1 && ipos != null) {
                                                ipos.JumpTo (line, column != -1 
? column : 0);
                                        }
                                        
+                                       NavigationService.Log 
(doc.Window.ViewContent.BuildNavPoint ());
+                                       
                                        return doc;
                                }
                        }
-
+                       
                        IProgressMonitor pm = 
ProgressMonitors.GetStatusProgressMonitor (GettextCatalog.GetString ("Opening 
{0}", fileName), Stock.OpenFileIcon, true);
                        FileInformation openFileInfo = new FileInformation();
                        openFileInfo.ProgressMonitor = pm;

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml        
2007-03-29 19:27:42 UTC (rev 75170)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml        
2007-03-29 20:00:07 UTC (rev 75171)
@@ -34,6 +34,8 @@
                       class = "MonoDevelop.Ide.Gui.DefaultStatusBarService"/>
                <Class id    = "DisplayBindingService"
                       class = "MonoDevelop.Ide.Gui.DisplayBindingService"/>
+               <!--<Class id    = "NavigationService"
+                      class = "MonoDevelop.Ide.Gui.NavigationService"/>-->
        </Extension>
        
        <Extension path = "/SharpDevelop/Workbench/DisplayBindings" 
extension-nodes="DisplayBinding" description="Display bindings.">
@@ -129,7 +131,20 @@
                                _label = "Pre_ferences..."
                                icon = "gtk-preferences"
                                description = "Show MonoDevelop preferences 
window" />
-                               
+
+               <!-- NavigationCommands -->
+
+               <Command id = 
"MonoDevelop.Ide.Commands.NavigationCommands.NavigateBack"
+                               defaultHandler = 
"MonoDevelop.Ide.Commands.NavigateBack"
+                               _label = "_Back" 
+                               icon = "gtk-go-back" 
+                               _description = "Go back in time"/>
+               <Command id = 
"MonoDevelop.Ide.Commands.NavigationCommands.NavigateForward"
+                               defaultHandler = 
"MonoDevelop.Ide.Commands.NavigateForward"
+                               _label = "_Forward" 
+                               icon = "gtk-go-forward" 
+                               _description = "Go back to the future"/>
+
                <!-- ProjectCommands -->
                                
                <Command id = 
"MonoDevelop.Ide.Commands.ProjectCommands.AddNewProject"
@@ -813,6 +828,10 @@
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.ViewCommands.DeleteCurrentLayout" />
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.ViewCommands.FullScreen" />
                </ItemSet>
+               <ItemSet id = "Navigation" _label = "Navigation">
+                       <CommandItem id = 
"MonoDevelop.Ide.Commands.NavigationCommands.NavigateBack" />
+                       <CommandItem id = 
"MonoDevelop.Ide.Commands.NavigationCommands.NavigateForward" />
+               </ItemSet>
        </Extension>
 
        <!-- Main Menu -->

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp      
2007-03-29 19:27:42 UTC (rev 75170)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp      
2007-03-29 20:00:07 UTC (rev 75171)
@@ -271,6 +271,11 @@
     <File name="./MonoDevelop.Ide.Gui.Content/TextEditorExtension.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Gui/TextEditor.cs" subtype="Code" 
buildaction="Compile" />
     <File 
name="./gtk-gui/MonoDevelop.Ide.Gui.Dialogs.OpenFileInSolutionDialog.cs" 
subtype="Code" buildaction="Compile" />
+    <File name="./MonoDevelop.Ide.Gui/INavigationPoint.cs" subtype="Code" 
buildaction="Compile" />
+    <File name="./MonoDevelop.Ide.Gui/NavigationService.cs" subtype="Code" 
buildaction="Compile" />
+    <File name="./MonoDevelop.Ide.Gui/DefaultNavigationPoint.cs" 
subtype="Code" buildaction="Compile" />
+    <File name="./MonoDevelop.Ide.Gui/ViewContentEventHandler.cs" 
subtype="Code" buildaction="Compile" />
+    <File name="./MonoDevelop.Ide.Commands/NavigationCommands.cs" 
subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="False" refto="gecko-sharp, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />

Modified: trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2007-03-29 
19:27:42 UTC (rev 75170)
+++ trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2007-03-29 
20:00:07 UTC (rev 75171)
@@ -1,3 +1,18 @@
+2007-03-29  Jeffrey Stedfast  <[EMAIL PROTECTED]>
+
+       * MonoDevelop.SourceEditor.Gui/TextNavigationPoint.cs: New source 
+       file implementing the INavigationPoint interface for the SourceEditor.
+
+       * MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
+       (CursorPositionChanged): Log the new NavigationPoint.
+
+       * MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs: 
+
+       * MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
+       (BuildNavPoint): Implemented.
+       (GetLineColumnFromPosition): Make column 1-based like the line
+       already is (hopefully this doesn't break anything).
+
 2007-03-28  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs: Don't
@@ -8,8 +23,6 @@
        * MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs: Avoid
          crash when no entry is selected in the class combo.
 
-
-
 2007-03-26 James Fitzsimons <[EMAIL PROTECTED]>
 
        * MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs: Added 
class 

Modified: trunk/monodevelop/Extras/MonoDevelop.SourceEditor/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.SourceEditor/Makefile.am       
2007-03-29 19:27:42 UTC (rev 75170)
+++ trunk/monodevelop/Extras/MonoDevelop.SourceEditor/Makefile.am       
2007-03-29 20:00:07 UTC (rev 75171)
@@ -22,6 +22,7 @@
        MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs \
        MonoDevelop.SourceEditor.Gui/SourceEditorView.cs \
        MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs \
+       MonoDevelop.SourceEditor.Gui/TextNavigationPoint.cs \
        MonoDevelop.SourceEditor.Properties/TextEditorProperties.cs \
        MonoDevelop.SourceEditor/EditorCommands.cs \
        MonoDevelop.SourceEditor/Services.cs \

Modified: 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
        2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
        2007-03-29 20:00:07 UTC (rev 75171)
@@ -64,7 +64,7 @@
                        foreach (DesktopApplication app in 
DesktopApplication.GetApplications (mimetype))
                                if (app.Command == "gedit")
                                        return true;
-                               
+                       
                        return false;
                }
                
@@ -183,7 +183,7 @@
                }
                
                public SourceEditorDisplayBindingWrapper ()
-               {                       
+               {
                        mainBox = new VBox ();
                        mainBox.Spacing = 3;
                        editorBar = new VBox ();
@@ -220,7 +220,7 @@
                        classCombo.Model = classStore;  
                        memberStore = new ListStore(typeof(Gdk.Pixbuf), 
typeof(string), typeof(IMember));
                        membersCombo.Model = memberStore;
- 
+                       
                        se = new SourceEditor (this);
                        se.Buffer.ModifiedChanged += new EventHandler 
(OnModifiedChanged);
                        se.Buffer.MarkSet += new MarkSetHandler (OnMarkSet);
@@ -396,6 +396,17 @@
                        Editor.View.MoveCursor += new 
MoveCursorHandler(UpdateMethodBrowser);
                }
                
+               public override INavigationPoint BuildNavPoint ()
+               {
+                       int line, column;
+                       string content;
+                       
+                       GetLineColumnFromPosition (CursorPosition, out line, 
out column);
+                       content = GetLineTextAtOffset (CursorPosition);
+                       
+                       return new TextNavigationPoint (ContentName, line, 
column, content);
+               }
+               
                private void UpdateClassBrowser(object sender, 
ParseInformationEventArgs args)
                {
                        // This event handler can get called when files other 
than the current content are updated. eg.
@@ -613,28 +624,26 @@
                        membersCombo.Changed += new EventHandler 
(MemberChanged);
                }
                
-               
                private void MemberChanged(object sender, EventArgs e)
                {
                        Gtk.TreeIter iter;
-                   if (membersCombo.GetActiveIter (out iter)) {            
-                       // Find the IMember object in our list store by name 
from the member combo
-                       IMember member = (IMember) memberStore.GetValue (iter, 
2);
+                       if (membersCombo.GetActiveIter (out iter)) {        
+                               // Find the IMember object in our list store by 
name from the member combo
+                               IMember member = (IMember) memberStore.GetValue 
(iter, 2);
                                int line = member.Region.BeginLine;
                                
                                // Get a handle to the current document
                                if (IdeApp.Workbench.ActiveDocument == null) {
                                        return;
                                }
-                       
+                               
                                // If we can we navigate to the line location 
of the IMember.
                                IViewContent content = (IViewContent) 
IdeApp.Workbench.ActiveDocument.GetContent(typeof(IViewContent));
                                if (content is IPositionable) {
                                        ((IPositionable)content).JumpTo 
(Math.Max (1, line), 1);
                                }
-                   }
+                       }
                }
-
                
                private void ClassChanged(object sender, EventArgs e)
                {
@@ -789,12 +798,10 @@
                }
                
 #region IExtensibleTextEditor
-               
                ITextEditorExtension IExtensibleTextEditor.AttachExtension 
(ITextEditorExtension extension)
                {
                        return se.View.AttachExtension (extension);
                }
-               
 #endregion
 
 #region IEditableTextBuffer
@@ -864,7 +871,6 @@
                        Editor.Buffer.EndUserAction ();
                }
                
-               
                public string SelectedText {
                        get {
                                return se.Buffer.GetSelectedText ();
@@ -917,7 +923,7 @@
                }
                
 #endregion
-
+               
 #region Status Bar Handling
                IStatusBarService statusBarService = (IStatusBarService) 
ServiceManager.GetService (typeof (IStatusBarService));
                
@@ -1033,7 +1039,7 @@
                {
                        TextIter it = se.Buffer.GetIterAtOffset (position);
                        line = it.Line + 1;
-                       column = it.LineOffset;
+                       column = it.LineOffset + 1;
                }
                
                public void ShowPosition (int position)
@@ -1085,7 +1091,7 @@
                {
                        se.ClearBookmarks ();
                }
-
+               
 #region IDocumentInformation
                string IDocumentInformation.FileName {
                        get { return ContentName != null ? ContentName : 
UntitledName; }
@@ -1104,11 +1110,9 @@
                        start_line.LineOffset = 0;
                        end_line.ForwardToLineEnd ();
                        return se.Buffer.GetText (start_line.Offset, 
end_line.Offset - start_line.Offset);
-               }
-               
+               }               
 #endregion
 
-
                void SetInitialValues ()
                {
                        se.View.ModifyFont (TextEditorProperties.Font);

Modified: 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
  2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
  2007-03-29 20:00:07 UTC (rev 75171)
@@ -444,6 +444,7 @@
                
                void ITextEditorExtension.CursorPositionChanged ()
                {
+                       NavigationService.Log 
(ParentEditor.DisplayBinding.BuildNavPoint ());
                }
 
                internal bool GotoSelectionEnd ()

Added: 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/TextNavigationPoint.cs
===================================================================
--- 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/TextNavigationPoint.cs
       2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/TextNavigationPoint.cs
       2007-03-29 20:00:07 UTC (rev 75171)
@@ -0,0 +1,130 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="David Alpert" email="[EMAIL PROTECTED]"/>
+//     <version>$Revision: 2247 $</version>
+// </file>
+
+using System;
+using System.Drawing;
+using System.IO;
+
+using MonoDevelop.Ide.Gui;
+
+namespace MonoDevelop.SourceEditor.Gui {
+       /// <summary>
+       /// Description of TextNavigationPoint.
+       /// </summary>
+       public class TextNavigationPoint : DefaultNavigationPoint {
+               const int THREASHOLD = 5;
+               string content;
+               int lineNumber;
+               int column;
+               
+#region constructors
+               public TextNavigationPoint () : this (String.Empty, 1, 1)
+               {
+                       
+               }
+               
+               public TextNavigationPoint (string fileName) : this (fileName, 
1, 1)
+               {
+                       
+               }
+               
+               public TextNavigationPoint (string fileName, int lineNumber, 
int column)
+                       : this (fileName, lineNumber, column, String.Empty)
+               {
+                       
+               }
+               
+               public TextNavigationPoint (string fileName, int lineNumber, 
int column, string content)
+                       : base (fileName)
+               {
+                       this.column = column;
+                       this.lineNumber = lineNumber;
+                       this.content = content.Trim ();
+               }
+#endregion
+               
+               // TODO: Navigation - eventually, we'll store a reference to 
the document
+               //       itself so we can track filename changes, inserts (that 
affect
+               //       line numbers), and dynamically retrieve the text at 
this.lineNumber
+               //
+               //       what happens to the doc reference when the document is 
closed?
+               //
+               public int LineNumber {
+                       get { return lineNumber; }
+               }
+               
+               public int Column {
+                       get { return column; }
+               }
+               
+               public override void JumpTo ()
+               {
+                       IdeApp.Workbench.OpenDocument (FileName, lineNumber, 
column, true);
+               }
+               
+               public override void ContentChanging (object sender, EventArgs 
e)
+               {
+                       // TODO: Navigation - finish ContentChanging
+//                     if (e is DocumentEventArgs) {
+//                             DocumentEventArgs de = (DocumentEventArgs)e;
+//                             if (this.LineNumber >= 
+//                     }
+               }
+               
+#region IComparable
+               public override int CompareTo (object obj)
+               {
+                       int cmp;
+                       
+                       if ((cmp = base.CompareTo (obj)) != 0)
+                               return cmp;
+                       
+                       TextNavigationPoint b = obj as TextNavigationPoint;
+                       
+                       if (this.LineNumber == b.LineNumber)
+                               return 0;
+                       
+                       if (this.LineNumber > b.LineNumber)
+                               return 1;
+                       
+                       return -1;
+               }
+#endregion
+               
+#region Equality
+               public override bool Equals (object obj)
+               {
+                       TextNavigationPoint b = obj as TextNavigationPoint;
+                       
+                       if (b == null)
+                               return false;
+                       
+                       return this.FileName.Equals (b.FileName)
+                               && (Math.Abs (this.LineNumber - b.LineNumber) 
<= THREASHOLD);
+               }
+               
+               public override int GetHashCode ()
+               {
+                       return this.FileName.GetHashCode () ^ 
this.LineNumber.GetHashCode ();
+               }
+#endregion
+               
+               public override string Description {
+                       get {
+                               return String.Format ("{0},{1}: {2}", 
LineNumber, Column, content);
+                       }
+               }
+               
+               public override string FullDescription {
+                       get {
+                               return String.Format ("{0} - {1}",
+                                                     Path.GetFileName 
(FileName),
+                                                     Description);
+                       }
+               }
+       }
+}

Modified: trunk/monodevelop/Extras/VersionControl/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/VersionControl/ChangeLog   2007-03-29 19:27:42 UTC 
(rev 75170)
+++ trunk/monodevelop/Extras/VersionControl/ChangeLog   2007-03-29 20:00:07 UTC 
(rev 75171)
@@ -1,3 +1,8 @@
+2007-03-29  Jeffrey Stedfast  <[EMAIL PROTECTED]>
+
+       * MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs: 
Implement
+       BuildNavPoint().
+
 2007-03-21  Jeffrey Stedfast  <[EMAIL PROTECTED]>
 
        * 
MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlProjectService.cs

Modified: 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
===================================================================
--- 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
   2007-03-29 19:27:42 UTC (rev 75170)
+++ 
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
   2007-03-29 20:00:07 UTC (rev 75171)
@@ -29,8 +29,12 @@
                }
                void IViewContent.Save(string fileName) {
                        SaveAs(fileName);
-               }
-               
+               }
+               
+               INavigationPoint IViewContent.BuildNavPoint () {
+                       return new DefaultNavigationPoint (name);
+               }
+               
                string IViewContent.ContentName {
                        get { return name; }
                        set { }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to