Issue #539 (ResourceEditor): Fixed some issues with creating new entries, filtering, handling of invalid names + code cleanup.

Author: Rpinski

src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/AddStringEntryCommand.cs

@@ -17,32 +17,36 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Windows.Forms;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop;
+using System.Linq;
 using ResourceEditor.ViewModels;
 
 namespace ResourceEditor.Commands
 {
 	class AddStringCommand : ResourceItemCommand
 	{
-		public override void ExecuteWithResourceItems(System.Collections.Generic.IEnumerable<ResourceEditor.ViewModels.ResourceItem> resourceItems)
+		public override void ExecuteWithResourceItems(System.Collections.Generic.IEnumerable<ResourceItem> resourceItems)
 		{
 //			if(editor.ResourceList.WriteProtected) {
 //				return;
 //			}
 //			
 			var editor = ResourceEditor;
 			int count = 1;
-			string newNameBase = " new string entry ";
+			string newNameBase = "New string entry ";
 			string newName = newNameBase + count;
 
 			while (editor.ContainsResourceName(newName)) {
 				count++;
 				newName = newNameBase + count;
 			}
 
+			var selectedItem = GetSelectedItems().FirstOrDefault();
 			ResourceItem item = new ResourceItem(editor, newName, "");
+			item.IsNew = true;
+			if (selectedItem != null)
+				item.SortingCriteria = selectedItem.Name;
+			else
+				item.SortingCriteria = item.Name;
 			editor.ResourceItems.Add(item);
 			editor.SelectedItems.Clear();
 			editor.SelectedItems.Add(item);

src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/ResourceItemCommand.cs

@@ -67,7 +67,7 @@ public override bool CanExecute(object parameter)
 		/// </summary>
 		/// <param name="resourceItems">List of selected resource items. Will always contain at least one element.</param>
 		/// <returns><c>True</c>, when command can be executed, <c>false</c> otherwise.</returns>
-		public virtual bool CanExecuteWithResourceItems(IEnumerable<ResourceEditor.ViewModels.ResourceItem> resourceItems)
+		public virtual bool CanExecuteWithResourceItems(IEnumerable<ResourceItem> resourceItems)
 		{
 			return true;
 		}
@@ -86,7 +86,7 @@ public override void Execute(object parameter)
 		/// Executes command for the given set of selected resource items.
 		/// </summary>
 		/// <param name="resourceItems">List of selected resource items. Will always contain at least one element.</param>
-		public virtual void ExecuteWithResourceItems(IEnumerable<ResourceEditor.ViewModels.ResourceItem> resourceItems)
+		public virtual void ExecuteWithResourceItems(IEnumerable<ResourceItem> resourceItems)
 		{
 		}
 
@@ -96,12 +96,12 @@ public ResourceEditorViewModel ResourceEditor {
 			}
 		}
 
-		IEnumerable<ResourceEditor.ViewModels.ResourceItem> GetSelectedItems()
+		protected IEnumerable<ResourceItem> GetSelectedItems()
 		{
 			var editor = ResourceEditor;
 			if (editor != null)
-				return editor.SelectedItems.OfType<ResourceEditor.ViewModels.ResourceItem>() ?? new ResourceEditor.ViewModels.ResourceItem[0];
-			return new ResourceEditor.ViewModels.ResourceItem[0];
+				return editor.SelectedItems.OfType<ResourceItem>() ?? new ResourceItem[0];
+			return new ResourceItem[0];
 		}
 	}
 }