diff --git a/ccm-cms-types-genericorganization/application.xml b/ccm-cms-types-genericorganization/application.xml index 13799e255..f1a041067 100644 --- a/ccm-cms-types-genericorganization/application.xml +++ b/ccm-cms-types-genericorganization/application.xml @@ -8,7 +8,6 @@ - diff --git a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl index 670511f8b..3ed548118 100644 --- a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl +++ b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl @@ -19,10 +19,11 @@ model com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentItem; import com.arsdigita.kernel.ACSObject; +import com.arsdigita.cms.basetypes.Person; object type OrganizationRole extends ACSObject { String[1..1] roleName = ct_organizationroles.rolename VARCHAR(150); - Person[0..1] targetItem = join ct_organizationroles.target_item_id to ct_persons.person_id; + Person[0..1] targetItem = join ct_organizationroles.target_item_id to cms_persons.person_id; Integer[0..1] roleOrder = ct_organizationroles.role_order INTEGER; diff --git a/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.load b/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.load index 937b4956e..48f7c096d 100644 --- a/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.load +++ b/ccm-cms-types-genericorganization/src/ccm-cms-types-genericorganization.load @@ -4,7 +4,6 @@
-
diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/OrganizationRole.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/OrganizationRole.java index f2d77acea..8c3c4c709 100644 --- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/OrganizationRole.java +++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/OrganizationRole.java @@ -139,9 +139,9 @@ public class OrganizationRole extends ACSObject { * * @return The person associated with the role. */ - public Person getTargetItem() { + public com.arsdigita.cms.basetypes.Person getTargetItem() { DataObject object = (DataObject) get(TARGETITEM); - return (Person) DomainObjectFactory.newInstance(object); + return (com.arsdigita.cms.basetypes.Person) DomainObjectFactory.newInstance(object); } /** @@ -149,7 +149,7 @@ public class OrganizationRole extends ACSObject { * * @param item */ - public void setTargetItem(Person item) { + public void setTargetItem(com.arsdigita.cms.basetypes.Person item) { setAssociation(TARGETITEM, item); } @@ -177,7 +177,7 @@ public class OrganizationRole extends ACSObject { * @return The URI of the target item. */ public String getURI(PageState s) { - Person item = getTargetItem(); + com.arsdigita.cms.basetypes.Person item = getTargetItem(); if (item == null) { logger.error(getOID() + " is a link between an organization and a person, but the associated person is null"); @@ -196,7 +196,7 @@ public class OrganizationRole extends ACSObject { * @param person * @return All roles a person is associated with. */ - public static DataCollection getReferingRoles(Person person) { + public static DataCollection getReferingRoles(com.arsdigita.cms.basetypes.Person person) { Session session = SessionManager.getSession(); DataCollection roles = session.retrieve(BASE_DATA_OBJECT_TYPE); Filter filter = roles.addInSubqueryFilter("id", "com.arsdigita.cms.contenttypes.getRefferingRoles"); @@ -308,9 +308,9 @@ public class OrganizationRole extends ACSObject { return; } - Assert.isTrue(currentKey != null, methodName + " cannot be " + - "called on an object that is not currently in the " + - "list"); + Assert.isTrue(currentKey != null, methodName + " cannot be " + + "called on an object that is not currently in the " + + "list"); int key = currentKey.intValue(); logger.info(String.format("key = %d", key)); diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/OrganizationRolePropertyForm.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/OrganizationRolePropertyForm.java index 1863c5fdd..72eef6e5a 100644 --- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/OrganizationRolePropertyForm.java +++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/OrganizationRolePropertyForm.java @@ -22,7 +22,6 @@ import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.GenericOrganization; import com.arsdigita.cms.contenttypes.GenericOrganizationGlobalizationUtil; import com.arsdigita.cms.contenttypes.OrganizationRole; -import com.arsdigita.cms.contenttypes.Person; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.util.Assert; import com.arsdigita.util.UncheckedWrapperException; @@ -88,7 +87,7 @@ public class OrganizationRolePropertyForm extends FormSection implements FormIni * it to the constructor of the ItemSearchWidget. The ItemSearchWidget will only * display object of type Person or derivated types. */ - this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.contenttypes.Person")); + this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.basetypes.Person")); add(this.m_itemSearch); } @@ -182,7 +181,7 @@ public class OrganizationRolePropertyForm extends FormSection implements FormIni FormData data = e.getFormData(); role.setRolename((String) m_rolename.getValue(state)); - role.setTargetItem((Person) data.get(ITEM_SEARCH)); + role.setTargetItem((com.arsdigita.cms.basetypes.Person) data.get(ITEM_SEARCH)); role.save(); } diff --git a/ccm-cms-types-organizationalunit/application.xml b/ccm-cms-types-organizationalunit/application.xml index 5795800c5..94dcccf3c 100644 --- a/ccm-cms-types-organizationalunit/application.xml +++ b/ccm-cms-types-organizationalunit/application.xml @@ -1,24 +1,23 @@ - - - - - - - - - - - - - - - Content type for representing organizational units. - + name="ccm-cms-types-organizationalunit" + prettyName="Red Hat CCM Content Types" + version="6.6.0" + release="1" + webapp="ROOT"> + + + + + + + + + + + + + + Content type for representing organizational units. + diff --git a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/Membership.pdl b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/Membership.pdl index 736875cf3..35c921ba8 100644 --- a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/Membership.pdl +++ b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/Membership.pdl @@ -19,12 +19,13 @@ model com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentItem; import com.arsdigita.kernel.ACSObject; +import com.arsdigita.cms.basetypes.Person; object type Membership extends ACSObject { MembershipStatus[1..1] status = join ct_memberships.status_id to ct_membershipstatus.status_id; Date[0..1] memberFrom = ct_memberships.member_from DATE; Date[0..1] memberTo = ct_memberships.member_to DATE; - Person[0..1] targetItem = join ct_memberships.target_item_id to ct_persons.person_id; + Person[0..1] targetItem = join ct_memberships.target_item_id to cms_persons.person_id; reference key(ct_memberships.membership_id); aggressive load (membershipOwner.id); diff --git a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl index 45d5c565b..bab74a3e9 100644 --- a/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl +++ b/ccm-cms-types-organizationalunit/pdl/com/arsdigita/content-types/OrganizationalUnit.pdl @@ -22,6 +22,7 @@ model com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.DomainObject; +import com.arsdigita.cms.basetypes.Person; object type OrganizationalUnit extends ContentPage { String[0..1] organizationalunitName = ct_organizationalunits.organizationalunit_name VARCHAR(512); @@ -37,12 +38,12 @@ object type OrganizationalUnit extends ContentPage { association { - Person[0..1] direction = join ct_organizationalunits.direction_id to ct_persons.person_id; - OrganizationalUnit[0..n] directedUnit = join ct_persons.person_id to ct_organizationalunits.direction_id; + Person[0..1] direction = join ct_organizationalunits.direction_id to cms_persons.person_id; + OrganizationalUnit[0..n] directedUnit = join cms_persons.person_id to ct_organizationalunits.direction_id; } association { - Person[0..1] assistentDirection = join ct_organizationalunits.assistantDirection_id to ct_persons.person_id; - OrganizationalUnit[0..n] assistenedDirectedUnit = join ct_persons.person_id to ct_organizationalunits.assistantDirection_id; + Person[0..1] assistentDirection = join ct_organizationalunits.assistantDirection_id to cms_persons.person_id; + OrganizationalUnit[0..n] assistenedDirectedUnit = join cms_persons.person_id to ct_organizationalunits.assistantDirection_id; } diff --git a/ccm-cms-types-organizationalunit/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml b/ccm-cms-types-organizationalunit/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml index 44ba098fb..630a17af7 100644 --- a/ccm-cms-types-organizationalunit/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml +++ b/ccm-cms-types-organizationalunit/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml @@ -1,63 +1,63 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd"> - - - - - + - + - - - + - + - + - - - + + + + + + + + + + + - - diff --git a/ccm-cms-types-organizationalunit/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml b/ccm-cms-types-organizationalunit/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml index b6fc66249..506cd7d3b 100644 --- a/ccm-cms-types-organizationalunit/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml +++ b/ccm-cms-types-organizationalunit/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/OrganizationalUnit.xml @@ -1,31 +1,31 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd"> - + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-cms-types-organizationalunit/src/ccm-cms-types-organizationalunit.load b/ccm-cms-types-organizationalunit/src/ccm-cms-types-organizationalunit.load index 86c656544..8fe3d4dab 100644 --- a/ccm-cms-types-organizationalunit/src/ccm-cms-types-organizationalunit.load +++ b/ccm-cms-types-organizationalunit/src/ccm-cms-types-organizationalunit.load @@ -3,7 +3,6 @@
-
diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/Membership.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/Membership.java index 0aed2c1d9..f571fc6bc 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/Membership.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/Membership.java @@ -2,6 +2,7 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.bebop.PageState; import com.arsdigita.cms.ContentSection; +import com.arsdigita.cms.basetypes.Person; import com.arsdigita.cms.dispatcher.ItemResolver; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.ACSObject; @@ -117,21 +118,21 @@ public class Membership extends ACSObject { public void setMembershipOwner(OrganizationalUnit ou) { Assert.exists(ou, OrganizationalUnit.class); logger.debug("Setting membership owner to " + ou.getOrganizationalUnitName()); - setAssociation(MEMBERSHIP_OWNER, ou); + setAssociation(MEMBERSHIP_OWNER, ou); } - public Member getTargetItem() { + public Person getTargetItem() { DataObject obj = (DataObject) get(TARGET_ITEM); - return (Member) DomainObjectFactory.newInstance(obj); + return (Person) DomainObjectFactory.newInstance(obj); } - public void setTargetItem(Member person) { - Assert.exists(person, Member.class); + public void setTargetItem(Person person) { + Assert.exists(person, Person.class); setAssociation(TARGET_ITEM, person); } public String getURI(PageState state) { - Member person = this.getTargetItem(); + Person person = this.getTargetItem(); if (person == null) { logger.error(getOID() + " is a link between a OrganizationalUnit and a Person, but the associated Person is null"); @@ -145,7 +146,7 @@ public class Membership extends ACSObject { return URL.there(state.getRequest(), url).toString(); } - public static DataCollection getReferingPersons(Member person) { + public static DataCollection getReferingPersons(Person person) { Session session = SessionManager.getSession(); DataCollection memberships = session.retrieve(BASE_DATA_OBJECT_TYPE); Filter filter = memberships.addInSubqueryFilter("id", "com.arsdigita.cms.contenttypes.getReferingPersons"); @@ -159,5 +160,5 @@ public class Membership extends ACSObject { DataCollection dc = session.retrieve(BASE_DATA_OBJECT_TYPE); dc.addEqualsFilter(MEMBERSHIP_OWNER + ".id", ou.getID()); return dc; - } + } } diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrganizationalUnit.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrganizationalUnit.java index 79c568aef..0fc91d859 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrganizationalUnit.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/OrganizationalUnit.java @@ -19,6 +19,7 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentPage; +import com.arsdigita.cms.basetypes.Person; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; @@ -83,32 +84,32 @@ public class OrganizationalUnit extends ContentPage{ set(ORGANIZATIONALUNIT_DESCRIPTION, description); } - public Member getDirection() { + public Person getDirection() { DataObject dobj = (DataObject) get(DIRECTION); if (dobj != null) { - return (Member) DomainObjectFactory.newInstance(dobj); + return (Person) DomainObjectFactory.newInstance(dobj); } else { return null; } } - public void setDirection(Member person) { + public void setDirection(Person person) { logger.debug("Setting direction..."); - Assert.exists(person, Member.class); + Assert.exists(person, Person.class); setAssociation(DIRECTION, person); } - public Member getAssistentDirection() { + public Person getAssistentDirection() { DataObject dobj = (DataObject) get(ASSISTENT_DIRECTION); if (dobj != null) { - return (Member) DomainObjectFactory.newInstance(dobj); + return (Person) DomainObjectFactory.newInstance(dobj); } else { return null; } } - public void setAssistentDirection(Member person) { - Assert.exists(person, Member.class); + public void setAssistentDirection(Person person) { + Assert.exists(person, Person.class); setAssociation(ASSISTENT_DIRECTION, person); } diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipPropertyForm.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipPropertyForm.java index 8a5d189c2..8cb9128ad 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipPropertyForm.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipPropertyForm.java @@ -22,11 +22,11 @@ import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.bebop.util.GlobalizationUtil; import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.basetypes.Person; import com.arsdigita.cms.contenttypes.Membership; import com.arsdigita.cms.contenttypes.MembershipStatus; import com.arsdigita.cms.contenttypes.OrganizationalUnit; import com.arsdigita.cms.contenttypes.OrganizationalUnitGlobalizationUtil; -import com.arsdigita.cms.contenttypes.Member; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; @@ -77,7 +77,7 @@ public class MembershipPropertyForm extends FormSection implements FormInitListe logger.debug("adding widgets..."); add(new Label(OrganizationalUnitGlobalizationUtil.globalize("cms.contenttypes.ui.orgnizationalunit.membership.Person"))); - this.m_personSearch = new ItemSearchWidget(PERSON_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.contenttypes.Person")); + this.m_personSearch = new ItemSearchWidget(PERSON_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.basetypes.Person")); add(this.m_personSearch); add(new Label(OrganizationalUnitGlobalizationUtil.globalize("cms.contenttypes.ui.orgnizationalunit.membership.Status"))); @@ -166,7 +166,7 @@ public class MembershipPropertyForm extends FormSection implements FormInitListe PageState state = event.getPageState(); FormData data = event.getFormData(); - membership.setTargetItem((Member) data.get(PERSON_SEARCH)); + membership.setTargetItem((Person) data.get(PERSON_SEARCH)); MembershipStatus status = new MembershipStatus(new BigDecimal((String) this.m_status.getValue(state))); logger.debug("this.m_status.getValues() = " + this.m_status.getValue(state)); diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTableModelBuilder.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTableModelBuilder.java index b07400cfe..c8d944187 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTableModelBuilder.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTableModelBuilder.java @@ -6,12 +6,10 @@ import com.arsdigita.bebop.table.TableModel; import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.MembershipStatus; -import com.arsdigita.cms.contenttypes.MembershipStatusCollection; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.util.Assert; import com.arsdigita.util.LockableImpl; import org.apache.log4j.Logger; diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipTable.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipTable.java index 7352dd516..e5c08431a 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipTable.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipTable.java @@ -16,10 +16,10 @@ import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.SecurityManager; import org.apache.log4j.Logger; import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.basetypes.Person; import com.arsdigita.cms.contenttypes.Membership; import com.arsdigita.cms.contenttypes.MembershipStatus; import com.arsdigita.cms.contenttypes.OrganizationalUnitGlobalizationUtil; -import com.arsdigita.cms.contenttypes.Member; import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; @@ -96,7 +96,7 @@ public class MembershipTable extends Table { String url = membership.getURI(state); if (column == m_personCol.getModelIndex()) { - Member person = membership.getTargetItem(); + Person person = membership.getTargetItem(); StringBuilder fullNameBuilder = new StringBuilder(); if(person.getTitlePre() != null) { diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseAssistentDirectorTable.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseAssistentDirectorTable.java index 82432101e..6243ac9ee 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseAssistentDirectorTable.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseAssistentDirectorTable.java @@ -32,9 +32,9 @@ import com.arsdigita.bebop.table.TableModel; import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.basetypes.Person; import com.arsdigita.cms.contenttypes.OrganizationalUnit; import com.arsdigita.cms.contenttypes.OrganizationalUnitGlobalizationUtil; -import com.arsdigita.cms.contenttypes.Member; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.OID; @@ -78,7 +78,7 @@ public class OrganizationalUnitChooseAssistentDirectorTable extends Table implem public TableModel makeModel(Table t, PageState s) { t.getRowSelectionModel().clearSelection(s); - DataCollection m_persons = SessionManager.getSession().retrieve(Member.BASE_DATA_OBJECT_TYPE); + DataCollection m_persons = SessionManager.getSession().retrieve(Person.BASE_DATA_OBJECT_TYPE); m_persons.addEqualsFilter(ContentItem.VERSION, ContentItem.DRAFT); return new OrganizationalUnitChooseAssistentDirectorTableModel(t, m_persons); } @@ -88,7 +88,7 @@ public class OrganizationalUnitChooseAssistentDirectorTable extends Table implem private Table m_table; private DataCollection m_persons; - private Member m_person; + private Person m_person; private OrganizationalUnitChooseAssistentDirectorTableModel(Table t, DataCollection persons) { m_table = t; @@ -101,7 +101,7 @@ public class OrganizationalUnitChooseAssistentDirectorTable extends Table implem public boolean nextRow() { if (m_persons.next()) { - m_person = (Member) DomainObjectFactory.newInstance(m_persons.getDataObject()); + m_person = (Person) DomainObjectFactory.newInstance(m_persons.getDataObject()); return true; } else { return false; @@ -163,7 +163,7 @@ public class OrganizationalUnitChooseAssistentDirectorTable extends Table implem m_parent.showDisplayPane(state); BigDecimal personID = new BigDecimal (e.getRowKey().toString()); OrganizationalUnit orgaunit = (OrganizationalUnit) this.m_selOrgaUnit.getSelectedObject(state); - Member person = (Member) DomainObjectFactory.newInstance(new OID(Member.BASE_DATA_OBJECT_TYPE, personID)); + Person person = (Person) DomainObjectFactory.newInstance(new OID(Person.BASE_DATA_OBJECT_TYPE, personID)); orgaunit.setAssistentDirection(person); } } diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseDirectorTable.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseDirectorTable.java index c315fb6a8..379182d51 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseDirectorTable.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/OrganizationalUnitChooseDirectorTable.java @@ -32,8 +32,8 @@ import com.arsdigita.bebop.table.TableModel; import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.basetypes.Person; import com.arsdigita.cms.contenttypes.OrganizationalUnit; -import com.arsdigita.cms.contenttypes.Member; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.OID; @@ -79,7 +79,7 @@ public class OrganizationalUnitChooseDirectorTable extends Table implements Tabl public TableModel makeModel(Table t, PageState s) { t.getRowSelectionModel().clearSelection(s); - DataCollection m_persons = SessionManager.getSession().retrieve(Member.BASE_DATA_OBJECT_TYPE); + DataCollection m_persons = SessionManager.getSession().retrieve(Person.BASE_DATA_OBJECT_TYPE); m_persons.addEqualsFilter(ContentItem.VERSION, ContentItem.DRAFT); return new OrganizationalUnitChooseDirectorTableModel(t, m_persons); } @@ -89,7 +89,7 @@ public class OrganizationalUnitChooseDirectorTable extends Table implements Tabl private Table m_table; private DataCollection m_persons; - private Member m_person; + private Person m_person; private OrganizationalUnitChooseDirectorTableModel(Table t, DataCollection persons) { m_table = t; @@ -102,7 +102,7 @@ public class OrganizationalUnitChooseDirectorTable extends Table implements Tabl public boolean nextRow() { if (m_persons.next()) { - m_person = (Member) DomainObjectFactory.newInstance(m_persons.getDataObject()); + m_person = (Person) DomainObjectFactory.newInstance(m_persons.getDataObject()); return true; } else { return false; @@ -167,7 +167,7 @@ public class OrganizationalUnitChooseDirectorTable extends Table implements Tabl m_parent.showDisplayPane(state); BigDecimal personID = new BigDecimal (e.getRowKey().toString()); OrganizationalUnit orgaunit = (OrganizationalUnit) this.m_selOrgaUnit.getSelectedObject(state); - Member person = (Member) DomainObjectFactory.newInstance(new OID(Member.BASE_DATA_OBJECT_TYPE, personID)); + Person person = (Person) DomainObjectFactory.newInstance(new OID(Person.BASE_DATA_OBJECT_TYPE, personID)); orgaunit.setDirection(person); } }