From 9a1824d459121a0930113a051ddcf67a487a8b30 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sun, 5 Aug 2012 13:23:48 +0200
Subject: [PATCH] remove IHighlightingDefinition2

---
 .../Src/Options/NamedColorHighlightingItem.cs             | 5 +----
 .../Highlighting/HighlightingManager.cs                   | 7 ++-----
 .../Highlighting/IHighlightingDefinition.cs               | 8 +-------
 .../Highlighting/Xshd/XmlHighlightingDefinition.cs        | 2 +-
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/NamedColorHighlightingItem.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/NamedColorHighlightingItem.cs
index 75890d92b2..5a2f133374 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/NamedColorHighlightingItem.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/NamedColorHighlightingItem.cs
@@ -134,10 +134,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 		
 		IEnumerable<StringTagPair> GetXshdProperties()
 		{
-			IHighlightingDefinition2 def = ParentDefinition as IHighlightingDefinition2;
-			if (def == null)
-				yield break;
-			foreach (var p in def.Properties)
+			foreach (var p in ParentDefinition.Properties)
 				yield return new StringTagPair(p.Key, p.Value);
 		}
 		
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingManager.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingManager.cs
index ee1d5167c0..c75c1bb0ee 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingManager.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightingManager.cs
@@ -20,7 +20,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 	/// </remarks>
 	public class HighlightingManager : IHighlightingDefinitionReferenceResolver
 	{
-		sealed class DelayLoadedHighlightingDefinition : IHighlightingDefinition2
+		sealed class DelayLoadedHighlightingDefinition : IHighlightingDefinition
 		{
 			readonly object lockObj = new object();
 			readonly string name;
@@ -107,10 +107,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 			
 			public IDictionary<string, string> Properties {
 				get {
-					var def = GetDefinition() as IHighlightingDefinition2;
-					if (def != null)
-						return def.Properties;
-					return null;
+					return GetDefinition().Properties;
 				}
 			}
 		}
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlightingDefinition.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlightingDefinition.cs
index 7489fb8188..43f53d47d6 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlightingDefinition.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/IHighlightingDefinition.cs
@@ -39,13 +39,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting
 		/// Gets the list of named highlighting colors.
 		/// </summary>
 		IEnumerable<HighlightingColor> NamedHighlightingColors { get; }
-	}
-	
-	/// <summary>
-	/// Extension of IHighlightingDefinition to avoid breaking changes in the API.
-	/// </summary>
-	public interface IHighlightingDefinition2 : IHighlightingDefinition
-	{
+		
 		/// <summary>
 		/// Gets the list of properties.
 		/// </summary>
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs
index c5a15cf1e7..63356e8406 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs
@@ -13,7 +13,7 @@ using ICSharpCode.AvalonEdit.Utils;
 namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
 {
 	[Serializable]
-	sealed class XmlHighlightingDefinition : IHighlightingDefinition2
+	sealed class XmlHighlightingDefinition : IHighlightingDefinition
 	{
 		public string Name { get; private set; }