Merge branch 'master' of github.com:icsharpcode/SharpDevelop

src/AddIns/Analysis/CodeQuality/Src/Controls/DependencyMatrixControl.cs

@@ -8,10 +8,11 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls.Primitives;
+using ICSharpCode.CodeQualityAnalysis.Utility;
 
 namespace ICSharpCode.CodeQualityAnalysis.Controls
 {
-    public class DependencyMatrixControl : MatrixControl<INode, Relationship>
+    public class DependencyMatrixControl : MatrixControl<VisibleMatrix<INode, Relationship>, INode, Relationship>
     {
     	
     }

src/AddIns/Analysis/CodeQuality/Src/Controls/MatrixControl.cs

@@ -14,13 +14,14 @@ using System.Windows.Media.Imaging;
 
 namespace ICSharpCode.CodeQualityAnalysis.Controls
 {
-	public class MatrixControl<TItem, TValue> : FrameworkElement, IScrollInfo
+	public class MatrixControl<TMatrix, TItem, TValue> : FrameworkElement, IScrollInfo
 		where TValue : IValue
+		where TMatrix : Matrix<TItem, TValue>
 	{
 		public event EventHandler<HoveredCellEventArgs<TValue>> HoveredCellChanged;
 		
 		private Dictionary<string, ImageSource> imgs = new Dictionary<string, ImageSource>();
-		private Coords currentCell = new Coords(-1, -1);
+		private Coords currentCell = new Coords(0, 0);
 		private string font;
 
 		private bool canHorizontalScroll = true;
@@ -36,9 +37,9 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 		private int fontSize = 0;
 		private int penSize = 0;
 
-		private Matrix<TItem, TValue> matrix;
+		private TMatrix matrix;
 		
-		public Matrix<TItem, TValue> Matrix
+		public TMatrix Matrix
 		{
 			get { return matrix; }
 			set
@@ -74,16 +75,13 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 		
 		public void SetVisibleItems(HeaderType tree, ICollection<TItem> visibleItems)
 		{
-			var items = tree == HeaderType.Columns ? matrix.HeaderColumns : matrix.HeaderRows;
+			matrix.SetVisibleItems(tree, visibleItems);
 			
-			foreach (var item in items)
+			matrixHeight = matrix.HeaderRows.Count;
-			{
+			matrixWidth = matrix.HeaderColumns.Count;
-				var foundItem = visibleItems.Where(n => n.Equals(item.Value)).SingleOrDefault();
-				item.Visible = foundItem != null;
-			}
 			
-			matrixHeight = matrix.HeaderRows.Count - 1;
+			if (matrixHeight >= 0 && matrixWidth >= 0)
-			matrixWidth = matrix.HeaderColumns.Count - 1;
+				InvalidateVisual();
 		}
 		
 		protected override void OnMouseMove(System.Windows.Input.MouseEventArgs e)
@@ -184,8 +182,8 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 			// text
 			for (int i = 0; i < cellsHorizontally; i++) {
 				for (int j = 0; j < cellsVertically; j++) { // dont draw text in unavailables places
-					int rowIndex = i + scaledOffsetX;
+					int rowIndex = j + scaledOffsetX;
-					int columnIndex = j + scaledOffsetY;
+					int columnIndex = i + scaledOffsetY;
 					var value = matrix[rowIndex, columnIndex];
 						
 					if (Colorizer != null) {
@@ -464,10 +462,4 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 			HoveredCell = cell;
 		}
 	}
-	
-	public enum HeaderType
-	{
-		Columns,
-		Rows
-	}
 }

src/AddIns/Analysis/CodeQuality/Src/Controls/TreeMatrixControl.xaml.cs

@@ -29,11 +29,11 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 		private ScrollViewer leftScrollViewer;
 		private ScrollViewer topScrollViewer;
 		
-		public Matrix<INode, Relationship> Matrix
+		public DependencyMatrix Matrix
 		{
 			get
 			{
-				return matrixControl.Matrix;
+				return (DependencyMatrix) matrixControl.Matrix;
 			}
 			
 			set
@@ -52,16 +52,15 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 		
 		public void DrawTree(Module module)
 		{	
-			Helper.FillTree(leftTree,module);
 			var leftCol = leftTree.Items.SourceCollection as INotifyCollectionChanged;
 			leftCol.CollectionChanged += BuildLeftINodeList;
+			Helper.FillTree(leftTree, module);
 			
-			Helper.FillTree(topTree,module);
 			var topCol = topTree.Items.SourceCollection as INotifyCollectionChanged;
 			topCol.CollectionChanged += BuildTopINodeList;
+			Helper.FillTree(topTree, module);
 		}
 		
-		
 		void Trees_Loaded (object sender, EventArgs e)
 		{
 			leftTree.ApplyTemplate();
@@ -71,7 +70,6 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 			topScrollViewer = Helper.FindVisualChild<ScrollViewer>(topTree);
 		}
 		
-		
 		bool rebuildLeftNodeListRequested;
 		
 		void BuildLeftINodeList(object sender,NotifyCollectionChangedEventArgs e)
@@ -81,8 +79,11 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 			rebuildLeftNodeListRequested = true;
 			Dispatcher.BeginInvoke(
 				DispatcherPriority.DataBind,
-				new Action(
+				new Action(SetVisibleItemsForRows));
-					delegate {
+		}
+
+		void SetVisibleItemsForRows()
+		{
 			List<INode> leftNodes = new List<INode>();
 			foreach (DependecyTreeNode element in leftTree.Items) {
 				var n = element.INode;
@@ -91,8 +92,6 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 			rebuildLeftNodeListRequested = false;
 			matrixControl.SetVisibleItems(HeaderType.Rows, leftNodes);
 		}
-				));
-		}
 		
 		
 		bool rebuildTopNodeListRequested;
@@ -104,8 +103,11 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 			rebuildTopNodeListRequested = true;
 			Dispatcher.BeginInvoke(
 				DispatcherPriority.DataBind,
-				new Action(
+				new Action(SetVisibleItemsForColumns));
-					delegate {
+		}
+
+		void SetVisibleItemsForColumns()
+		{
 			List<INode> topNodes = new List<INode>();
 			foreach (DependecyTreeNode element in topTree.Items) {
 				var n = element.INode;
@@ -114,8 +116,6 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 			rebuildTopNodeListRequested = false;
 			matrixControl.SetVisibleItems(HeaderType.Columns, topNodes);
 		}
-				));
-		}
 		
 		void OnHoverChanged(object sender ,HoveredCellEventArgs <Relationship> e)
 		{
@@ -130,8 +130,6 @@ namespace ICSharpCode.CodeQualityAnalysis.Controls
 				topTree.SelectedItem = topNode;
 				topTree.FocusNode(topNode);
 			}
-			
-			
 		}
 		
 		

src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml.cs

@@ -104,13 +104,22 @@ namespace ICSharpCode.CodeQualityAnalysis
 			var matrix = new DependencyMatrix();
 
 			foreach (var ns in metricsReader.MainModule.Namespaces) {
-				matrix.HeaderRows.Add(new Cell<INode>(ns));
+				matrix.AddRow(ns);
 				foreach (var type in ns.Types) {
-					matrix.HeaderRows.Add(new Cell<INode>(type));
+					matrix.AddRow(type);
+					foreach (var field in type.Fields)
+						matrix.AddRow(field);
+					foreach (var method in type.Methods)
+						matrix.AddRow(method);
 				}
-				matrix.HeaderColumns.Add(new Cell<INode>(ns));
+				
+				matrix.AddColumn(ns);
 				foreach (var type in ns.Types) {
-					matrix.HeaderColumns.Add(new Cell<INode>(type));
+					matrix.AddColumn(type);
+					foreach (var field in type.Fields)
+						matrix.AddColumn(field);
+					foreach (var method in type.Methods)
+						matrix.AddColumn(method);
 				}
 			}
 

src/AddIns/Analysis/CodeQuality/Src/Utility/Matrix.cs

@@ -10,18 +10,42 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility
 {
 	public abstract class Matrix<TItem, TValue>
     {
-        public List<Cell<TItem>> HeaderRows { get; set; }
+		protected List<Cell<TItem>> headerRows;
-        public List<Cell<TItem>> HeaderColumns { get; set; }
+		protected List<Cell<TItem>> headerColumns;
+			
+        public virtual List<Cell<TItem>> HeaderRows 
+        { 
+        	get {
+        		return headerRows;
+        	}
+        }
+        
+        public virtual List<Cell<TItem>> HeaderColumns
+        {
+        	get {
+        		return headerColumns;
+        	}
+        }
         
         private DoubleKeyDictionary<int, int, TValue> cache;
 
         protected Matrix()
         {
-            HeaderRows = new List<Cell<TItem>>();
+            headerRows = new List<Cell<TItem>>();
-            HeaderColumns = new List<Cell<TItem>>();
+            headerColumns = new List<Cell<TItem>>();
             cache = new DoubleKeyDictionary<int, int, TValue>();
         }
         
+        public void AddRow(TItem value)
+        {
+        	headerRows.Add(new Cell<TItem>(value));
+        }
+        
+        public void AddColumn(TItem value)
+        {
+        	headerColumns.Add(new Cell<TItem>(value));
+        }
+        
         private TValue GetFromCache(int rowIndex, int columnIndex)
     	{
         	return cache[rowIndex, columnIndex];
@@ -50,6 +74,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility
         	}
 		}
         
+        public abstract void SetVisibleItems(HeaderType type, ICollection<TItem> visibleItems);
         protected abstract TValue GetCellValue(int rowIndex, int columnIndex);
     }
 
@@ -63,4 +88,10 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility
             Value = value;
         }
     }
+    
+	public enum HeaderType
+	{
+		Columns,
+		Rows
+	}
 }

src/AddIns/Analysis/CodeQuality/Src/Utility/VisibleMatrix.cs

@@ -12,30 +12,35 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility
 	/// </summary>
 	public abstract class VisibleMatrix<TItem, TValue> : Matrix<TItem, TValue>
 	{
-		public new List<Cell<TItem>> HeaderRows
+		protected List<Cell<TItem>> visibleHeaderRows;
-		{
+		protected List<Cell<TItem>> visibleHeaderColumns;
-			get
+		
+		public override List<Cell<TItem>> HeaderRows
 		{
-				return base.HeaderRows.Where(c => c.Visible).ToList();
+			get {
+				return visibleHeaderRows;
+			}
 		}
 		
-			set
+		public override List<Cell<TItem>> HeaderColumns
 		{
-				base.HeaderRows = value;
+			get {
+				return visibleHeaderColumns;
 			}
 		} 
 		
-		public new List<Cell<TItem>> HeaderColumns
+		public override void SetVisibleItems(HeaderType type, ICollection<TItem> visibleItems)
 		{
-			get
+			var items = type == HeaderType.Columns ? headerColumns : headerRows;
-			{
-				return base.HeaderColumns.Where(c => c.Visible).ToList();
-			}
 			
-			set
+			foreach (var item in items)
 			{
-				base.HeaderColumns = value;
+				var foundItem = visibleItems.Where(n => n.Equals(item.Value)).SingleOrDefault();
+				item.Visible = foundItem != null;
 			}
+			
+			visibleHeaderRows = headerRows.Where(c => c.Visible).ToList();
+			visibleHeaderColumns = headerColumns.Where(c => c.Visible).ToList();
 		}
 	}
 }

src/Main/Core/Project/Src/AddInTree/AddIn/AddInReference.cs

@@ -94,6 +94,15 @@ namespace ICSharpCode.Core
 				} else {
 					reference.maximumVersion = reference.minimumVersion = ParseVersion(version, hintPath);
 				}
+				
+				if (reference.Name == "SharpDevelop") {
+					// HACK: SD 4.1 AddIns work with SharpDevelop 4.2
+					// Because some 4.1 AddIns restrict themselves to SD 4.1, we extend the
+					// supported SD range.
+					if (reference.maximumVersion == new Version("4.1")) {
+						reference.maximumVersion = new Version("4.2");
+					}
+				}
 			}
 			reference.requirePreload = string.Equals(properties["requirePreload"], "true", StringComparison.OrdinalIgnoreCase);
 			return reference;