Browse Source

cleanup

pull/15/head^2
peterforstmeier 15 years ago
parent
commit
a69d65fa5f
  1. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs
  2. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs
  3. 15
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs
  4. 3
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs
  5. 5
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs
  6. 3
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs

@ -70,7 +70,7 @@ namespace ICSharpCode.Reports.Core
public object Current { public object Current {
get { get {
return dataStore.myCurrent(this.indexList[CurrentRow].ListIndex); return dataStore.CurrentFromPosition(this.indexList[CurrentRow].ListIndex);
} }
} }

4
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 by - Forstmeier Peter
/// created on - 10.11.2005 23:41:04 /// created on - 10.11.2005 23:41:04
/// </remarks> /// </remarks>
namespace ICSharpCode.Reports.Core { namespace ICSharpCode.Reports.Core
{
public class BaseComparer : System.IComparable { public class BaseComparer : System.IComparable {
private int listIndex; private int listIndex;
private object[] objectArray; private object[] objectArray;
// Collection<AbstractColumn> columnCollection;
ColumnCollection columnCollection; ColumnCollection columnCollection;
/// <summary> /// <summary>
/// Default constructor - initializes all fields to default values /// Default constructor - initializes all fields to default values

15
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 IndexList indexList;
private AvailableFieldsCollection availableFields; private AvailableFieldsCollection availableFields;
@ -181,11 +182,11 @@ namespace ICSharpCode.Reports.Core {
return new CurrentItemsCollection(); return new CurrentItemsCollection();
} }
public virtual object myCurrent(int pos) public virtual object CurrentFromPosition (int pos)
{ {
return null; throw new NotImplementedException();
} }
public virtual CurrentItemsCollection FillDataRow(int pos) public virtual CurrentItemsCollection FillDataRow(int pos)
{ {
@ -292,5 +293,7 @@ namespace ICSharpCode.Reports.Core {
} }
#endregion #endregion
} }
} }

3
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs

@ -272,9 +272,8 @@ namespace ICSharpCode.Reports.Core {
#region test #region test
public override object myCurrent(int pos) public override object CurrentFromPosition (int pos)
{ {
// return this.IndexList[pos];
return this.IndexList[this.CurrentPosition]; return this.IndexList[this.CurrentPosition];
} }

5
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]; return this.table.Rows[pos];
} }
@ -246,7 +246,8 @@ namespace ICSharpCode.Reports.Core
} }
public override object Current { public override object Current
{
get { get {
try { try {
int cr = base.CurrentPosition; int cr = base.CurrentPosition;

3
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs

@ -18,7 +18,8 @@ namespace ICSharpCode.Reports.Core{
IndexList IndexList {get;} IndexList IndexList {get;}
//test //test
object myCurrent(int pos); object CurrentFromPosition(int pos);
CurrentItemsCollection FillDataRow(); CurrentItemsCollection FillDataRow();
CurrentItemsCollection FillDataRow(int pos); CurrentItemsCollection FillDataRow(int pos);
// //

Loading…
Cancel
Save