Move property name to FieldSet so we can use it to set values

1 files changed, 13 insertions, 27 deletions

diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
index 77bc62b..6343d66 100644
--- a/src/contacts-contact-pane.vala
+++ b/src/contacts-contact-pane.vala
@@ -551,6 +551,7 @@ public class Contacts.FieldRow : Contacts.Row {
 
 public abstract class Contacts.FieldSet : Grid {
   public class string label_name;
+  public class string property_name;
 
   public PersonaSheet sheet { get; construct; }
   public int row_nr { get; construct; }
@@ -559,7 +560,6 @@ public abstract class Contacts.FieldSet : Grid {
   ArrayList<DataFieldRow> data_rows = new ArrayList<DataFieldRow>();
 
   public abstract void populate ();
-  public abstract bool reads_param (string param);
 
   construct {
     this.set_orientation (Orientation.VERTICAL);
@@ -583,6 +583,10 @@ public abstract class Contacts.FieldSet : Grid {
     }
   }
 
+  public bool reads_param (string param) {
+    return param == property_name;
+  }
+
   public bool is_empty () {
     return get_children ().length () == 1;
   }
@@ -698,6 +702,7 @@ class Contacts.LinkFieldRow : DataFieldRow {
 class Contacts.LinkFieldSet : FieldSet {
   class construct {
     label_name = _("Links");
+    property_name = "urls";
   }
 
   public override void populate () {
@@ -711,10 +716,6 @@ class Contacts.LinkFieldSet : FieldSet {
       add_row (row);
     }
   }
-
-  public override bool reads_param (string param) {
-    return param == "urls";
-  }
 }
 
 class Contacts.EmailFieldRow : DataFieldRow {
@@ -737,6 +738,7 @@ class Contacts.EmailFieldRow : DataFieldRow {
 class Contacts.EmailFieldSet : FieldSet {
   class construct {
     label_name = _("Email");
+    property_name = "email-addresses";
   }
 
   public override void populate () {
@@ -749,10 +751,6 @@ class Contacts.EmailFieldSet : FieldSet {
       add_row (row);
     }
   }
-
-  public override bool reads_param (string param) {
-    return param == "email-addresses";
-  }
 }
 
 class Contacts.PhoneFieldRow : DataFieldRow {
@@ -776,6 +774,7 @@ class Contacts.PhoneFieldRow : DataFieldRow {
 class Contacts.PhoneFieldSet : FieldSet {
   class construct {
     label_name = _("Phone");
+    property_name = "phone-numbers";
   }
   public override void populate () {
     var details = sheet.persona as PhoneDetails;
@@ -787,9 +786,6 @@ class Contacts.PhoneFieldSet : FieldSet {
       add_row (row);
     }
   }
-  public override bool reads_param (string param) {
-    return param == "phone-numbers";
-  }
 }
 
 class Contacts.ChatFieldRow : DataFieldRow {
@@ -814,6 +810,7 @@ class Contacts.ChatFieldRow : DataFieldRow {
 class Contacts.ChatFieldSet : FieldSet {
   class construct {
     label_name = _("Chat");
+    property_name = "im-addresses";
   }
   public override void populate () {
     var details = sheet.persona as ImDetails;
@@ -828,9 +825,6 @@ class Contacts.ChatFieldSet : FieldSet {
       }
     }
   }
-  public override bool reads_param (string param) {
-    return param == "im-addresses";
-  }
 }
 
 class Contacts.BirthdayFieldRow : DataFieldRow {
@@ -859,6 +853,7 @@ class Contacts.BirthdayFieldRow : DataFieldRow {
 class Contacts.BirthdayFieldSet : FieldSet {
   class construct {
     label_name = _("Birthday");
+    property_name = "birthday";
   }
   public override void populate () {
     var details = sheet.persona as BirthdayDetails;
@@ -871,9 +866,6 @@ class Contacts.BirthdayFieldSet : FieldSet {
       add_row (row);
     }
   }
-  public override bool reads_param (string param) {
-    return param == "birthday";
-  }
 }
 
 class Contacts.NicknameFieldRow : DataFieldRow {
@@ -895,6 +887,7 @@ class Contacts.NicknameFieldRow : DataFieldRow {
 class Contacts.NicknameFieldSet : FieldSet {
   class construct {
     label_name = _("Nickname");
+    property_name = "nickname";
   }
   public override void populate () {
     var details = sheet.persona as NameDetails;
@@ -906,9 +899,6 @@ class Contacts.NicknameFieldSet : FieldSet {
       add_row (row);
     }
   }
-  public override bool reads_param (string param) {
-    return param == "nickname";
-  }
 }
 
 class Contacts.NoteFieldRow : DataFieldRow {
@@ -930,6 +920,7 @@ class Contacts.NoteFieldRow : DataFieldRow {
 class Contacts.NoteFieldSet : FieldSet {
   class construct {
     label_name = _("Note");
+    property_name = "notes";
   }
   public override void populate () {
     var details = sheet.persona as NoteDetails;
@@ -941,9 +932,6 @@ class Contacts.NoteFieldSet : FieldSet {
       add_row (row);
     }
   }
-  public override bool reads_param (string param) {
-    return param == "notes";
-  }
 }
 
 class Contacts.AddressFieldRow : DataFieldRow {
@@ -980,6 +968,7 @@ class Contacts.AddressFieldRow : DataFieldRow {
 class Contacts.AddressFieldSet : FieldSet {
   class construct {
     label_name = _("Addresses");
+    property_name = "postal-addresses";
   }
   public override void populate () {
     var details = sheet.persona as PostalAddressDetails;
@@ -991,9 +980,6 @@ class Contacts.AddressFieldSet : FieldSet {
       add_row (row);
     }
   }
-  public override bool reads_param (string param) {
-    return param == "postal-addresses";
-  }
 }
 
 public class Contacts.PersonaSheet : Grid {