Index: Core/Common/src/Core.Common.Base/Workflow/IActivity.cs =================================================================== diff -u -rc916ecc557054b7f260d2757200dbd3cd99b7d0b -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Common/src/Core.Common.Base/Workflow/IActivity.cs (.../IActivity.cs) (revision c916ecc557054b7f260d2757200dbd3cd99b7d0b) +++ Core/Common/src/Core.Common.Base/Workflow/IActivity.cs (.../IActivity.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -12,6 +12,9 @@ /// public interface IActivity { + /// + /// Name of the activity that displayed in porgress dialog. NOTE: not to be used as a current progress discription. + /// string Name { get; set; } /// @@ -23,7 +26,7 @@ /// Event to be fired on every change. /// event EventHandler StatusChanged; - + /// /// Returns current status of the activity (executing, cancelling, etc.) /// Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -32,19 +32,12 @@ public Chart() { - Name = "chart1"; - chart = new Steema.TeeChart.Chart(); Series = new EventedList(); SetDefaultValues(); } - /// - /// Name of the chart. - /// - public string Name { get; set; } - public bool TitleVisible { get Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewNodePresenterBase.cs =================================================================== diff -u -ree0b95b2a1a34d8e81a21c8d05ef1354169af50c -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewNodePresenterBase.cs (.../TreeViewNodePresenterBase.cs) (revision ee0b95b2a1a34d8e81a21c8d05ef1354169af50c) +++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewNodePresenterBase.cs (.../TreeViewNodePresenterBase.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -3,7 +3,6 @@ using System.ComponentModel; using System.Linq; using System.Windows.Forms; -using Core.Common.Utils; using Core.Common.Utils.Collections; namespace Core.Common.Controls.Swf.TreeViewControls Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs =================================================================== diff -u -ree0b95b2a1a34d8e81a21c8d05ef1354169af50c -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs (.../ValidationReportControl.cs) (revision ee0b95b2a1a34d8e81a21c8d05ef1354169af50c) +++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs (.../ValidationReportControl.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -6,7 +6,6 @@ using System.Windows.Forms.VisualStyles; using Core.Common.Controls; using Core.Common.Gui.Swf.Properties; -using Core.Common.Utils; using Core.Common.Utils.Validation; namespace Core.Common.Gui.Swf.Validation @@ -211,7 +210,7 @@ { foreach (var issue in issues) { - var name = issue.Subject.GetType().Name; // todo: does every subject a name? + var name = issue.SubjectName; var node = CreateIssueNode(name + issue.Message, issue); nodeCollection.Add(node); } Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs =================================================================== diff -u -ree0b95b2a1a34d8e81a21c8d05ef1354169af50c -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs (.../ValidationView.cs) (revision ee0b95b2a1a34d8e81a21c8d05ef1354169af50c) +++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs (.../ValidationView.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -4,7 +4,6 @@ using System.Windows.Forms; using Core.Common.Base; using Core.Common.Controls; -using Core.Common.Utils; using Core.Common.Utils.Validation; namespace Core.Common.Gui.Swf.Validation @@ -52,7 +51,6 @@ Gui = null; } - SetViewText(); RefreshReport(); } } @@ -61,17 +59,6 @@ public void EnsureVisible(object item) {} - private void SetViewText() - { - if (data == null) - { - return; - } - - var dataName = data.ToString(); - Text = dataName + " Validation Report"; - } - private bool RefreshReport() { if (Data == null || OnValidate == null) @@ -91,8 +78,6 @@ // TextChanged triggers avalondock to update the image ;-) Text = "Refreshing..."; - SetViewText(); - // end TextChanged } stopwatch.Stop(); Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs =================================================================== diff -u -r4c48f1a98dc77cdb66e4dc3ac80060713e6051a6 -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 4c48f1a98dc77cdb66e4dc3ac80060713e6051a6) +++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -889,16 +889,7 @@ private static string GetViewName(IView view) { - var name = view.ViewInfo != null ? view.ViewInfo.GetViewName(view, view.Data) : null; - if (name != null) - { - return name; - } - - var enumerable = view.Data as IEnumerable; - var data = enumerable == null ? view.Data : enumerable.Cast().FirstOrDefault(); - - return view.Data == null ? "" : view.Data.ToString(); + return (view.ViewInfo != null ? view.ViewInfo.GetViewName(view, view.Data) : null) ?? ""; } private void UpdateViewName(IView view) Index: Core/Common/src/Core.Common.Utils/IO/FileUtils.cs =================================================================== diff -u -ree0b95b2a1a34d8e81a21c8d05ef1354169af50c -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Common/src/Core.Common.Utils/IO/FileUtils.cs (.../FileUtils.cs) (revision ee0b95b2a1a34d8e81a21c8d05ef1354169af50c) +++ Core/Common/src/Core.Common.Utils/IO/FileUtils.cs (.../FileUtils.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -563,10 +563,5 @@ var info2 = new FileInfo(path2); return info1.FullName == info2.FullName; } - - private class FileName - { - public string Name { get; set; } - } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Utils/Validation/ValidationIssue.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Common/src/Core.Common.Utils/Validation/ValidationIssue.cs (.../ValidationIssue.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/Validation/ValidationIssue.cs (.../ValidationIssue.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -4,18 +4,22 @@ { private object viewData; - public ValidationIssue(object subject, ValidationSeverity severity, string message, object viewdata = null) + public ValidationIssue(object subject, string subjectName, ValidationSeverity severity, string message, object viewdata = null) { Severity = severity; Message = message; Subject = subject; ViewData = viewdata; + SubjectName = subjectName; } + public string SubjectName { get; set; } + public ValidationSeverity Severity { get; private set; } public string Message { get; private set; } public object Subject { get; set; } + public object ViewData { Index: Core/Common/test/Core.Common.Utils.Tests/Validation/ValidationReportTest.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Common/test/Core.Common.Utils.Tests/Validation/ValidationReportTest.cs (.../ValidationReportTest.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/test/Core.Common.Utils.Tests/Validation/ValidationReportTest.cs (.../ValidationReportTest.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -43,11 +43,11 @@ private static ValidationReport CreateValidationReport() { - var issue1 = new ValidationIssue("", ValidationSeverity.Warning, ""); - var issue2 = new ValidationIssue("", ValidationSeverity.Info, ""); - var issue3 = new ValidationIssue("", ValidationSeverity.None, ""); - var issue4 = new ValidationIssue("", ValidationSeverity.Warning, ""); - var issue5 = new ValidationIssue("", ValidationSeverity.Error, ""); + var issue1 = new ValidationIssue("", "somename", ValidationSeverity.Warning, ""); + var issue2 = new ValidationIssue("", "somename", ValidationSeverity.Info, ""); + var issue3 = new ValidationIssue("", "somename", ValidationSeverity.None, ""); + var issue4 = new ValidationIssue("", "somename", ValidationSeverity.Warning, ""); + var issue5 = new ValidationIssue("", "somename", ValidationSeverity.Error, ""); var subReport1 = new ValidationReport("q", new[] { issue1, Index: Core/GIS/src/Core.GIS.GeoAPI.Extensions/Feature/IFeature.cs =================================================================== diff -u -ree0b95b2a1a34d8e81a21c8d05ef1354169af50c -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/GIS/src/Core.GIS.GeoAPI.Extensions/Feature/IFeature.cs (.../IFeature.cs) (revision ee0b95b2a1a34d8e81a21c8d05ef1354169af50c) +++ Core/GIS/src/Core.GIS.GeoAPI.Extensions/Feature/IFeature.cs (.../IFeature.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -5,7 +5,11 @@ { public interface IFeature : ICloneable { + /// + /// The Name of the feature. + /// string Name { get; set; } + IGeometry Geometry { get; set; } IFeatureAttributeCollection Attributes { get; set; } Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartTreeNodePresenter.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartTreeNodePresenter.cs (.../ChartTreeNodePresenter.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartTreeNodePresenter.cs (.../ChartTreeNodePresenter.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -24,6 +24,16 @@ node.Image = Resources.Chart; } + public override void OnNodeRenamed(IChart chart, string newName) + { + if (chart == null || chart.Title == newName) + { + return; + } + + chart.Title = newName; + } + public override IEnumerable GetChildNodeObjects(IChart chart, ITreeNode node) { return chart.Series.Cast(); Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/NodePresenters/ProjectNodePresenter.cs =================================================================== diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -r125002b7df54bc7ec7190146cd9b23458999c60e --- Core/Plugins/src/Core.Plugins.ProjectExplorer/NodePresenters/ProjectNodePresenter.cs (.../ProjectNodePresenter.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/NodePresenters/ProjectNodePresenter.cs (.../ProjectNodePresenter.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) @@ -16,19 +16,6 @@ GuiPlugin = guiPlugin; } - public override bool CanRenameNode(ITreeNode node) - { - return false; - } - - public override void OnNodeRenamed(Project project, string newName) - { - if (project.Name != newName) - { - project.Name = newName; - } - } - public override IEnumerable GetChildNodeObjects(Project project, ITreeNode node) { return project.Items;