Index: Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj
===================================================================
diff -u -r3346898aade52e3f45cb80b5452129133084e68b -rd074ae083b5fff2532fd5d0bbf63df83365ee7db
--- Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj (.../Core.Common.Controls.Swf.csproj) (revision 3346898aade52e3f45cb80b5452129133084e68b)
+++ Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj (.../Core.Common.Controls.Swf.csproj) (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -248,6 +248,8 @@
ImageResolutionDialog.cs
+
+
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableSelectionChangedEventArgs.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableSelectionChangedEventArgs.cs (revision 0)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableSelectionChangedEventArgs.cs (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace Core.Common.Controls.Swf.Table
+{
+ public class TableSelectionChangedEventArgs : EventArgs
+ {
+ ///
+ /// Selection Changed EventArgs
+ ///
+ public TableSelectionChangedEventArgs(IList cells)
+ {
+ Cells = cells;
+ }
+
+ public IList Cells { get; private set; }
+ }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -rd074ae083b5fff2532fd5d0bbf63df83365ee7db
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs (.../TableView.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs (.../TableView.cs) (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
-using System.Diagnostics;
using System.Drawing;
using System.Globalization;
using System.IO;
@@ -39,7 +38,7 @@
///
/// Graphical representation of tabular data.
///
- public partial class TableView : UserControl, ITableView, ISupportInitialize
+ public partial class TableView : UserControl, IView, ISupportInitialize
{
public enum ValidationExceptionMode
{
@@ -52,7 +51,7 @@
private static readonly ILog Log = LogManager.GetLogger(typeof(TableView));
private readonly EventedList selectedCells;
private readonly TableViewValidator tableViewValidator;
- private readonly EventedList columns;
+ private readonly EventedList columns;
private bool isPasting;
private bool isSelectionChanging;
private bool updatingSelection;
@@ -69,7 +68,7 @@
{
InitializeComponent();
- columns = new EventedList();
+ columns = new EventedList();
ColumnMenuItems = new List();
selectedCells = new EventedList();
tableViewValidator = new TableViewValidator(this);
@@ -295,7 +294,7 @@
return value;
}
- private ITableViewColumn GetColumnByDxColumn(GridColumn dxGridColumn)
+ private TableViewColumn GetColumnByDxColumn(GridColumn dxGridColumn)
{
return Columns.FirstOrDefault(c => c.AbsoluteIndex == dxGridColumn.AbsoluteIndex);
}
@@ -684,7 +683,7 @@
return dxGridView.Columns[Columns.First(c => c.DisplayIndex == displayIndex).AbsoluteIndex];
}
- private void UpdateColumnHeaderMenu(GridMenuEventArgs e, ITableViewColumn viewColumn)
+ private void UpdateColumnHeaderMenu(GridMenuEventArgs e, TableViewColumn viewColumn)
{
//show grid menu is handled to remove menu-items. For grouping etc.
//No way to do this in a setting :(
@@ -1244,7 +1243,7 @@
// when something changes in columns designers becomes mad because of broken resx files
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
- public IList Columns
+ public IList Columns
{
get
{
@@ -1450,7 +1449,7 @@
dxGridView.EndUpdate();
}
- public ITableViewColumn GetColumnByName(string columnName)
+ public TableViewColumn GetColumnByName(string columnName)
{
return Columns.FirstOrDefault(c => c.Name == columnName);
}
@@ -1524,7 +1523,7 @@
refreshRequired = true;
}
- public bool CellIsReadOnly(int rowHandle, ITableViewColumn column)
+ public bool CellIsReadOnly(int rowHandle, TableViewColumn column)
{
// Tableview readonly?
if (ReadOnly)
@@ -1884,7 +1883,7 @@
public event EventHandler> CellChanged;
- public event EventHandler> ColumnFilterChanged;
+ public event EventHandler> ColumnFilterChanged;
#endregion
@@ -1919,7 +1918,7 @@
return new TableViewCell(dxGridView.FocusedRowHandle, GetColumnByDxColumn(dxGridView.FocusedColumn));
}
- internal void SetColumnError(ITableViewColumn tableColumn, string errorText)
+ internal void SetColumnError(TableViewColumn tableColumn, string errorText)
{
var dxGridColumn = tableColumn != null ? dxGridView.Columns[tableColumn.AbsoluteIndex] : null;
dxGridView.SetColumnError(dxGridColumn, errorText);
@@ -1949,7 +1948,7 @@
}
}
- internal ITableViewColumn GetColumnByDisplayIndex(int i)
+ internal TableViewColumn GetColumnByDisplayIndex(int i)
{
return Columns.FirstOrDefault(c => c.DisplayIndex == i);
}
@@ -2068,7 +2067,7 @@
var selectedColumn = Columns.OfType()
.FirstOrDefault(c => c.DxColumn == dxGridView.FocusedColumn);
- ColumnFilterChanged(sender, new EventArgs(selectedColumn));
+ ColumnFilterChanged(sender, new EventArgs(selectedColumn));
}
private void DxGridViewCustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e)
@@ -2098,7 +2097,7 @@
if (e.MenuType == GridMenuType.Column)
{
- ITableViewColumn tableViewColumn = null;
+ TableViewColumn tableViewColumn = null;
if (e.HitInfo.Column != null) //on a column
{
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableViewCell.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableViewCell.cs (revision 0)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableViewCell.cs (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -0,0 +1,21 @@
+namespace Core.Common.Controls.Swf.Table
+{
+ public class TableViewCell
+ {
+ public TableViewCell(int rowIndex, TableViewColumn column)
+ {
+ RowIndex = rowIndex;
+ Column = column;
+ }
+
+ ///
+ /// Row index of the cell
+ ///
+ public int RowIndex { get; set; }
+
+ ///
+ /// Column of the cell
+ ///
+ public TableViewColumn Column { get; set; }
+ }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableViewCellStyle.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd074ae083b5fff2532fd5d0bbf63df83365ee7db
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableViewCellStyle.cs (.../TableViewCellStyle.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableViewCellStyle.cs (.../TableViewCellStyle.cs) (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -4,7 +4,7 @@
{
public class TableViewCellStyle : TableViewCell
{
- public TableViewCellStyle(int rowIndex, ITableViewColumn column, bool selected) : base(rowIndex, column)
+ public TableViewCellStyle(int rowIndex, TableViewColumn column, bool selected) : base(rowIndex, column)
{
Selected = selected;
}
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableViewColumn.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -rd074ae083b5fff2532fd5d0bbf63df83365ee7db
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableViewColumn.cs (.../TableViewColumn.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableViewColumn.cs (.../TableViewColumn.cs) (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -11,19 +11,19 @@
namespace Core.Common.Controls.Swf.Table
{
- public class TableViewColumn : ITableViewColumn
+ public class TableViewColumn
{
private readonly GridView dxGridView;
private readonly GridColumn dxColumn;
- private readonly ITableView tableView;
+ private readonly TableView tableView;
private readonly GridControl dxGridControl;
private ITypeEditor editor;
private string displayFormat = "";
private int visibleIndex;
private ICustomFormatter customFormatter;
- public TableViewColumn(GridView view, GridControl control, GridColumn column, ITableView tableView, bool unbound)
+ public TableViewColumn(GridView view, GridControl control, GridColumn column, TableView tableView, bool unbound)
{
dxGridView = view;
dxGridControl = control;
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableViewColumnMenuItem.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd074ae083b5fff2532fd5d0bbf63df83365ee7db
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableViewColumnMenuItem.cs (.../TableViewColumnMenuItem.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableViewColumnMenuItem.cs (.../TableViewColumnMenuItem.cs) (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -46,7 +46,7 @@
}
}
- public bool ShouldShow(ITableViewColumn column)
+ public bool ShouldShow(TableViewColumn column)
{
if (Showing != null)
{
Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r9df3dc4632e7821cb36847336c6d90654e40ece9 -rd074ae083b5fff2532fd5d0bbf63df83365ee7db
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj (.../Core.Common.Controls.csproj) (revision 9df3dc4632e7821cb36847336c6d90654e40ece9)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj (.../Core.Common.Controls.csproj) (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -84,10 +84,6 @@
-
-
-
-
Fisheye: Tag d074ae083b5fff2532fd5d0bbf63df83365ee7db refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/ITableView.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag d074ae083b5fff2532fd5d0bbf63df83365ee7db refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/ITableViewColumn.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag d074ae083b5fff2532fd5d0bbf63df83365ee7db refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/TableSelectionChangedEventArgs.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag d074ae083b5fff2532fd5d0bbf63df83365ee7db refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/TableViewCell.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs
===================================================================
diff -u -rdc06f24147cb5d1f94cec6f3705d07dc3142d175 -rd074ae083b5fff2532fd5d0bbf63df83365ee7db
--- Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs (.../TableViewTest.cs) (revision dc06f24147cb5d1f94cec6f3705d07dc3142d175)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs (.../TableViewTest.cs) (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -1598,7 +1598,7 @@
};
var filterChangedCount = 0;
- ITableViewColumn selectedColumn = null;
+ TableViewColumn selectedColumn = null;
tableView.ColumnFilterChanged += (s, e) =>
{
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -rd074ae083b5fff2532fd5d0bbf63df83365ee7db
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs (.../VectorLayerAttributeTableView.cs) (revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs (.../VectorLayerAttributeTableView.cs) (revision d074ae083b5fff2532fd5d0bbf63df83365ee7db)
@@ -477,7 +477,7 @@
{
var attributes = layer.DataSource.Features.Cast().Where(f => f.Attributes != null).SelectMany(f => f.Attributes.Keys);
- var column = sender as ITableViewColumn;
+ var column = sender as TableViewColumn;
//only show delete option if its a custom attribute
if (column != null && attributes.Any(a => a == column.Name))