From a69d65fa5fc384cbbc357a340bddcf43855e88e3 Mon Sep 17 00:00:00 2001
From: peterforstmeier <peter.forstmeier@t-online.de>
Date: Mon, 21 Feb 2011 20:23:21 +0100
Subject: [PATCH] cleanup

---
 .../Project/DataManager/ChildNavigator.cs         |  2 +-
 .../Project/DataManager/Comparer/BaseComparer.cs  |  4 ++--
 .../DataManager/ListStrategy/BaseListStrategy.cs  | 15 +++++++++------
 .../ListStrategy/CollectionStrategy.cs            |  3 +--
 .../DataManager/ListStrategy/TableStrategy.cs     |  5 +++--
 .../Project/Interfaces/IDataViewStrategy.cs       |  3 ++-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs
index 1a41b76e42..a5699a5ac0 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs
@@ -70,7 +70,7 @@ namespace ICSharpCode.Reports.Core
 		
 		public object Current {
 			get {
-                return dataStore.myCurrent(this.indexList[CurrentRow].ListIndex);
+                return dataStore.CurrentFromPosition(this.indexList[CurrentRow].ListIndex);
 			}
 		}
 		
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs
index 6aa1904dc9..bcb89e1c20 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs
@@ -11,13 +11,13 @@ using System.Collections.ObjectModel;
 /// 	created by - Forstmeier Peter
 /// 	created on - 10.11.2005 23:41:04
 /// </remarks>
-namespace ICSharpCode.Reports.Core {	
+namespace ICSharpCode.Reports.Core 
+{
 	public class BaseComparer : System.IComparable {
 		
 		private int listIndex;
 		private object[] objectArray;
 
-//		Collection<AbstractColumn> columnCollection;
 		ColumnCollection columnCollection;
 		/// <summary>
 		/// Default constructor - initializes all fields to default values
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs
index 832debe52a..fcea324a48 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs
@@ -36,7 +36,8 @@ namespace ICSharpCode.Reports.Core {
 	}
 		
 	
-	internal  abstract class BaseListStrategy :IDataViewStrategy,IEnumerator {
+	internal  abstract class BaseListStrategy :IDataViewStrategy,IEnumerator
+	{
 
 		private IndexList indexList;
 		private AvailableFieldsCollection availableFields;
@@ -181,11 +182,11 @@ namespace ICSharpCode.Reports.Core {
 			return new CurrentItemsCollection();
 		}
 
-        public virtual object myCurrent(int pos)
-        {
-            return null;
-        }
-
+		public virtual object CurrentFromPosition (int pos)
+		{
+			throw new NotImplementedException();
+		}
+		
 
         public virtual CurrentItemsCollection FillDataRow(int pos)
         {
@@ -292,5 +293,7 @@ namespace ICSharpCode.Reports.Core {
 		}
 		#endregion
 		
+		
+	
 	}
 }
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs
index 941f8604f8..156869cc35 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs
@@ -272,9 +272,8 @@ namespace ICSharpCode.Reports.Core {
 		
 		#region test
 
-        public override object myCurrent(int pos)
+        public override object CurrentFromPosition (int pos)
         {
-           // return this.IndexList[pos];
             return this.IndexList[this.CurrentPosition];
         }
 
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs
index 7f1b1e0fee..da2ea5297e 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs
@@ -189,7 +189,7 @@ namespace ICSharpCode.Reports.Core
 		}
 		
 		
-		public override object myCurrent (int pos)
+		public override object CurrentFromPosition (int pos)
 		{
 			return this.table.Rows[pos];
 		}
@@ -246,7 +246,8 @@ namespace ICSharpCode.Reports.Core
 		}
 		
 		
-		public override object Current {
+		public override object Current
+		{
 			get {
 				try {
 					int cr = base.CurrentPosition;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs
index c423c6a198..db9414c4b3 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs
@@ -18,7 +18,8 @@ namespace ICSharpCode.Reports.Core{
 		
 		IndexList IndexList {get;}
 		//test
-        object myCurrent(int pos);
+        object CurrentFromPosition(int pos);
+        
 		CurrentItemsCollection FillDataRow();
         CurrentItemsCollection FillDataRow(int pos);
 		//