Merge branch 'master' into xs6-editor-roslyn

Conflicts:
	README.md
	main/src/addins/AspNet/MonoDevelop.AspNet.csproj
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
	main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ExpandableObjectEditor.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/EditorManager.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/AutoSave.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
	main/tests/UnitTests/UnitTests.csproj
	version-checks

1 files changed, 22 insertions, 26 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ExpandableObjectEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ExpandableObjectEditor.cs
index 50aca9d08d..a172e7b4d3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ExpandableObjectEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ExpandableObjectEditor.cs
@@ -5,7 +5,7 @@
  * editing of all of an object's public properties 

  * 

  * Authors: 

- *  Michael Hutchinson <m.j.hutchinson@gmail.com>
+ *  Michael Hutchinson <m.j.hutchinson@gmail.com>

  *  Lluis Sanchez Gual

  *  

  * Copyright (C) 2005 Michael Hutchinson

@@ -30,36 +30,32 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

  * USE OR OTHER DEALINGS IN THE SOFTWARE.

- */
-
-using System;

+ */

+

 using Gtk;

-using System.ComponentModel;
-using System.ComponentModel.Design;

-using System.Collections;

 

 namespace MonoDevelop.Components.PropertyGrid.PropertyEditors

 {

 	class ExpandableObjectEditor : PropertyEditorCell

 	{

-		protected override string GetValueMarkup ()
-		{
-			string val;
-			if (Property.Converter.CanConvertTo (typeof(string)))
-				val = Property.Converter.ConvertToString (Value);
-			else
-				val = Value != null ? Value.ToString () : "";
-			
-			return "<b>" + GLib.Markup.EscapeText (val) + "</b>";
-		}
-		
-		protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, StateType state)
-		{
-			if (Property.Converter.CanConvertTo (typeof(string)) && Property.Converter.CanConvertFrom (typeof(string)))
-				return new PropertyTextEditor ();
-			else
-				return null;
-		}
-
+		protected override string GetValueMarkup ()

+		{

+			string val;

+			if (Property.Converter.CanConvertTo (Context, typeof(string)))

+				val = Property.Converter.ConvertToString (Context, Value);

+			else

+				val = Value != null ? Value.ToString () : "";

+			

+			return "<b>" + GLib.Markup.EscapeText (val) + "</b>";

+		}

+		

+		protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, StateType state)

+		{

+			if (Property.Converter.CanConvertTo (Context, typeof(string)) && Property.Converter.CanConvertFrom (Context, typeof(string)))

+				return new PropertyTextEditor ();

+			else

+				return null;

+		}

+

 	}

 }