[Aplaws-commit] r2320 - in trunk/ccm-cms: pdl/com/arsdigita/content-types src/com/arsdigita/cms/contenttypes

[<pb...@fe...>]

Author: pboy
Date: 2012-05-16 10:35:05 +0000 (Wed, 16 May 2012)
New Revision: 2320

Modified:
   trunk/ccm-cms/pdl/com/arsdigita/content-types/GenericPerson.pdl
   trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericPerson.java
Log:
Removed unnecessary property. (sync hb r1661)

Modified: trunk/ccm-cms/pdl/com/arsdigita/content-types/GenericPerson.pdl
===================================================================
--- trunk/ccm-cms/pdl/com/arsdigita/content-types/GenericPerson.pdl	2012-05-16 08:41:18 UTC (rev 2319)
+++ trunk/ccm-cms/pdl/com/arsdigita/content-types/GenericPerson.pdl	2012-05-16 10:35:05 UTC (rev 2320)
@@ -34,8 +34,6 @@
     GenericPerson[0..1] alias = join cms_persons.alias_id 
                                   to cms_persons.person_id;
 
-    Integer[0..1] dabinId = cms_persons.dabin_id INTEGER;                                  
-
     reference key (cms_persons.person_id);
 }
 

Modified: trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericPerson.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericPerson.java	2012-05-16 08:41:18 UTC (rev 2319)
+++ trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericPerson.java	2012-05-16 10:35:05 UTC (rev 2320)
@@ -54,8 +54,7 @@
     public static final String CONTACTS = "contacts";
     public static final String CONTACTS_KEY = "linkKey";
     public static final String CONTACTS_ORDER = "linkOrder";
-    public static final String ALIAS = "alias";
-    public static final String DABIN_ID = "dabinId";
+    public static final String ALIAS = "alias";    
     private static final String RELATION_ATTRIBUTES =
                                 "contacts.link_key:GenericContactType";
     /**
@@ -166,15 +165,7 @@
     public void unsetAlias() {
         set(ALIAS, null);
     }
-
-    public Integer getDabinId() {
-        return (Integer) get(DABIN_ID);
-    }
-
-    public void setDabinId(final Integer dabinId) {
-        set(DABIN_ID, dabinId);
-    }
-
+   
     /**
      * A convenient method which combines {@code titlePre}, {@code givenName),
      * {@code surname} and {@code titlePost}.