From f2cb30fabbb50b002597cf5acb7852fa6db91237 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Wed, 12 Aug 2015 10:05:50 +0200
Subject: [PATCH] Fix FormatElement labels if no content.

---
 zaaReloaded2/Controller/Elements/CustomText.cs    | 12 +++++++++++-
 zaaReloaded2/Controller/Elements/Items.cs         | 12 +++++++++++-
 zaaReloaded2/ViewModels/ElementPickerViewModel.cs |  7 +++----
 zaaReloaded2/ViewModels/ElementViewModel.cs       | 15 +++++++++++----
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/zaaReloaded2/Controller/Elements/CustomText.cs b/zaaReloaded2/Controller/Elements/CustomText.cs
index e6bd78c..afc1d22 100755
--- a/zaaReloaded2/Controller/Elements/CustomText.cs
+++ b/zaaReloaded2/Controller/Elements/CustomText.cs
@@ -31,7 +31,17 @@ namespace zaaReloaded2.Controller.Elements
     {
         public override string Label
         {
-            get { return String.Format("\"{0}\"", Content); }
+            get
+            {
+                if (String.IsNullOrEmpty(Content))
+                {
+                    return "Beliebiger Text";
+                }
+                else
+                {
+                    return String.Format("\"{0}\"", Content);
+                }
+            }
         }
 
         public override void Run(Formatter.Formatter formatter)
diff --git a/zaaReloaded2/Controller/Elements/Items.cs b/zaaReloaded2/Controller/Elements/Items.cs
index 880795d..151237e 100755
--- a/zaaReloaded2/Controller/Elements/Items.cs
+++ b/zaaReloaded2/Controller/Elements/Items.cs
@@ -38,7 +38,17 @@ namespace zaaReloaded2.Controller.Elements
 
         public override string Label
         {
-            get { return Content; }
+            get
+            {
+                if (String.IsNullOrEmpty(Content))
+                {
+                    return "Laborparameter";
+                }
+                else
+                {
+                    return Content;
+                }
+            }
         }
 
         public override void Run(zaaReloaded2.Formatter.Formatter formatter)
diff --git a/zaaReloaded2/ViewModels/ElementPickerViewModel.cs b/zaaReloaded2/ViewModels/ElementPickerViewModel.cs
index e00ff57..f5f48e3 100755
--- a/zaaReloaded2/ViewModels/ElementPickerViewModel.cs
+++ b/zaaReloaded2/ViewModels/ElementPickerViewModel.cs
@@ -151,8 +151,8 @@ namespace zaaReloaded2.ViewModels
                     Properties.Settings.Default.FormatElementLabel,
                     new Collection<ViewModelBase>()
                         {
-                            CreateFormatElementViewModel("Laborparameter", new Items()),
-                            CreateFormatElementViewModel("Beliebiger Text", new CustomText()),
+                            CreateFormatElementViewModel(new Items()),
+                            CreateFormatElementViewModel(new CustomText()),
                         }
                 )
             );
@@ -191,10 +191,9 @@ namespace zaaReloaded2.ViewModels
         /// object and has a custom display string. The custom display string
         /// is necessary because format elements do not have a canonical label.
         /// </summary>
-        ViewModelBase CreateFormatElementViewModel(string name, FormatElementBase element)
+        ViewModelBase CreateFormatElementViewModel(FormatElementBase element)
         {
             FormatElementViewModel vm = new FormatElementViewModel(element);
-            vm.DisplayString = name;
             vm.PropertyChanged += ElementViewModel_PropertyChanged;
             return vm;
         }
diff --git a/zaaReloaded2/ViewModels/ElementViewModel.cs b/zaaReloaded2/ViewModels/ElementViewModel.cs
index f67274c..c56b175 100755
--- a/zaaReloaded2/ViewModels/ElementViewModel.cs
+++ b/zaaReloaded2/ViewModels/ElementViewModel.cs
@@ -30,12 +30,13 @@ namespace zaaReloaded2.ViewModels
     {
         #region Properties
 
+        /// <summary>
+        /// Returns the wrapped Element's label or an explicitly
+        /// set display string.
+        /// </summary>
         public override string DisplayString
         {
-            get
-            {
-                return Element.Label;
-            }
+            get { return Element.Label;  }
         }
 
         #endregion
@@ -71,5 +72,11 @@ namespace zaaReloaded2.ViewModels
         public abstract object Clone();
 
         #endregion
+
+        #region Fields
+
+        string _displayString;
+
+        #endregion
     }
 }