CodeCoverage Duplicate Code Refactoring

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageControl.cs

@@ -302,33 +302,13 @@ namespace ICSharpCode.CodeCoverage
 			item.SubItems.Add(sequencePoint.EndLine.ToString());
 			item.SubItems.Add(sequencePoint.EndColumn.ToString());
 			item.SubItems.Add(sequencePoint.Content.Length>80?sequencePoint.Content.Substring(0,80):sequencePoint.Content);
-			item.BackColor = GetSequencePointBackColor(sequencePoint);
+			item.BackColor = CodeCoverageHighlighter.GetSequencePointBackColor(sequencePoint);
-			item.ForeColor = GetSequencePointForeColor(sequencePoint);
+			item.ForeColor = CodeCoverageHighlighter.GetSequencePointForeColor(sequencePoint);
 			item.Tag = sequencePoint;
 			
 			listView.Items.Add(item);
 		}
 
-		static System.Drawing.Color GetSequencePointBackColor(CodeCoverageSequencePoint sequencePoint) {
-			if (sequencePoint.VisitCount > 0) {
-				if ( sequencePoint.BranchCoverage == true ) {
-					return CodeCoverageOptions.VisitedColor;
-				}
-				return CodeCoverageOptions.PartVisitedColor;
-			}
-			return CodeCoverageOptions.NotVisitedColor;
-		}
-		
-		static System.Drawing.Color GetSequencePointForeColor(CodeCoverageSequencePoint sequencePoint) {
-			if (sequencePoint.VisitCount > 0) {
-				if ( sequencePoint.BranchCoverage == true ) {
-					return CodeCoverageOptions.VisitedForeColor;
-				}
-				return CodeCoverageOptions.PartVisitedForeColor;
-			}
-			return CodeCoverageOptions.NotVisitedForeColor;
-		}
-
 		void ListViewItemActivate(object sender, EventArgs e)
 		{
 			if (listView.SelectedItems.Count > 0) {

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageHighlighter.cs

@@ -39,8 +39,8 @@ namespace ICSharpCode.CodeCoverage
 				int endOffset = document.PositionToOffset(sequencePoint.EndLine, sequencePoint.EndColumn);
 				ITextMarker marker = markerService.Create(startOffset, endOffset - startOffset);
 				marker.Tag = typeof(CodeCoverageHighlighter);
-				marker.BackgroundColor = GetSequencePointColor(sequencePoint);
+				marker.BackgroundColor = GetSequencePointBackColor(sequencePoint).ToWpf();
-				marker.ForegroundColor = GetSequencePointForeColor(sequencePoint);
+				marker.ForegroundColor = GetSequencePointForeColor(sequencePoint).ToWpf();
 			}
 		}
 		
@@ -90,27 +90,26 @@ namespace ICSharpCode.CodeCoverage
 			}
 			return true;
 		}
-		
+	
-		public static Color GetSequencePointColor(CodeCoverageSequencePoint sequencePoint)
+		public static System.Drawing.Color GetSequencePointBackColor(CodeCoverageSequencePoint sequencePoint) {
-		{
 			if (sequencePoint.VisitCount > 0) {
 				if ( sequencePoint.BranchCoverage == true ) {
-					return CodeCoverageOptions.VisitedColor.ToWpf();
+					return CodeCoverageOptions.VisitedColor;
 				}
-				return CodeCoverageOptions.PartVisitedColor.ToWpf();
+				return CodeCoverageOptions.PartVisitedColor;
 			}
-			return CodeCoverageOptions.NotVisitedColor.ToWpf();
+			return CodeCoverageOptions.NotVisitedColor;
 		}
 		
-		public static Color GetSequencePointForeColor(CodeCoverageSequencePoint sequencePoint)
+		public static System.Drawing.Color GetSequencePointForeColor(CodeCoverageSequencePoint sequencePoint) {
-		{
 			if (sequencePoint.VisitCount > 0) {
 				if ( sequencePoint.BranchCoverage == true ) {
-					return CodeCoverageOptions.VisitedForeColor.ToWpf();
+					return CodeCoverageOptions.VisitedForeColor;
 				}
-				return CodeCoverageOptions.PartVisitedForeColor.ToWpf();
+				return CodeCoverageOptions.PartVisitedForeColor;
 			}
-			return CodeCoverageOptions.NotVisitedForeColor.ToWpf();
+			return CodeCoverageOptions.NotVisitedForeColor;
 		}
+
 	}
 }