LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix for SciProject etc. for a bug when editing the association between a organizational unit and a person 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4814 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2017-06-26 16:42:34 +00:00
parent 068796c3fc
commit 7efbf47fb9
7 changed files with 187 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java
View File

@ -83,7 +83,8 @@ public class GenericOrganizationalUnitPersonAddForm
// add(new Label(ContenttypesGlobalizationUtil.globalize( // add(new Label(ContenttypesGlobalizationUtil.globalize(
// "cms.contenttypes.ui.genericorgaunit.select_person"))); // "cms.contenttypes.ui.genericorgaunit.select_person")));
m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType. m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.
findByAssociatedObjectType(getPersonType())); findByAssociatedObjectType(
getPersonType()));
/*m_itemSearch.getItemField().addValidationListener( /*m_itemSearch.getItemField().addValidationListener(
new NotNullValidationListener());*/ new NotNullValidationListener());*/
m_itemSearch.setLabel(ContenttypesGlobalizationUtil.globalize( m_itemSearch.setLabel(ContenttypesGlobalizationUtil.globalize(
@ -114,9 +115,11 @@ public class GenericOrganizationalUnitPersonAddForm
new Label(ContenttypesGlobalizationUtil new Label(ContenttypesGlobalizationUtil
.globalize("cms.ui.select_one")))); .globalize("cms.ui.select_one"))));
final RelationAttributeCollection roles = new RelationAttributeCollection( final RelationAttributeCollection roles
getRoleAttributeName()); = new RelationAttributeCollection(
roles.addLanguageFilter(Kernel.getConfig().getDefaultLanguage()); getRoleAttributeName());
roles.addLanguageFilter(Kernel.getConfig()
.getDefaultLanguage());
while (roles.next()) { while (roles.next()) {
RelationAttribute role; RelationAttribute role;
role = roles.getRelationAttribute(); role = roles.getRelationAttribute();
@ -124,15 +127,16 @@ public class GenericOrganizationalUnitPersonAddForm
target.addOption(new Option( target.addOption(new Option(
role.getKey(), role.getKey(),
new Label(new GlobalizedMessage( new Label(new GlobalizedMessage(
role.getKey(), role.getKey(),
getRoleAttributeName(), getRoleAttributeName(),
new RelationAttributeResourceBundleControl())))); new RelationAttributeResourceBundleControl()))));
} }
} }
}); });
} catch (TooManyListenersException ex) { } catch (TooManyListenersException ex) {
throw new UncheckedWrapperException("Something has gone terribly wrong...", ex); throw new UncheckedWrapperException(
"Something has gone terribly wrong...", ex);
} }
add(roleSelect); add(roleSelect);
@ -151,12 +155,16 @@ public class GenericOrganizationalUnitPersonAddForm
target.clearOptions(); target.clearOptions();
target.addOption(new Option("", target.addOption(new Option("",
new Label(ContenttypesGlobalizationUtil. new Label(
globalize("cms.ui.select_one")))); ContenttypesGlobalizationUtil
.globalize(
"cms.ui.select_one"))));
RelationAttributeCollection statusColl = new RelationAttributeCollection( RelationAttributeCollection statusColl
getStatusAttributeName()); = new RelationAttributeCollection(
statusColl.addLanguageFilter(Kernel.getConfig().getDefaultLanguage()); getStatusAttributeName());
statusColl.addLanguageFilter(Kernel.getConfig()
.getDefaultLanguage());
while (statusColl.next()) { while (statusColl.next()) {
RelationAttribute status; RelationAttribute status;
status = statusColl.getRelationAttribute(); status = statusColl.getRelationAttribute();
@ -164,32 +172,29 @@ public class GenericOrganizationalUnitPersonAddForm
target.addOption(new Option( target.addOption(new Option(
status.getKey(), status.getKey(),
new Label(new GlobalizedMessage( new Label(new GlobalizedMessage(
status.getKey(), status.getKey(),
getStatusAttributeName(), getStatusAttributeName(),
new RelationAttributeResourceBundleControl())))); new RelationAttributeResourceBundleControl()))));
} }
} }
}); });
} catch (TooManyListenersException ex) { } catch (TooManyListenersException ex) {
throw new UncheckedWrapperException("Somethin has gone terribly wrong", ex); throw new UncheckedWrapperException(
"Somethin has gone terribly wrong", ex);
} }
add(statusSelect); add(statusSelect);
} }
@Override @Override
public void init(FormSectionEvent fse) throws FormProcessException { public void init(final FormSectionEvent fse) throws FormProcessException {
FormData data = fse.getFormData(); final FormData data = fse.getFormData();
PageState state = fse.getPageState(); final PageState state = fse.getPageState();
GenericPerson person; final GenericPerson person = selector.getSelectedPerson(state);
String role; final String role = selector.getSelectedPersonRole(state);
String status; final String status = selector.getSelectedPersonStatus(state);
person = selector.getSelectedPerson();
role = selector.getSelectedPersonRole();
status = selector.getSelectedPersonStatus();
if (person == null) { if (person == null) {
m_itemSearch.setVisible(state, true); m_itemSearch.setVisible(state, true);
@ -213,16 +218,18 @@ public class GenericOrganizationalUnitPersonAddForm
public void process(FormSectionEvent fse) throws FormProcessException { public void process(FormSectionEvent fse) throws FormProcessException {
FormData data = fse.getFormData(); FormData data = fse.getFormData();
PageState state = fse.getPageState(); PageState state = fse.getPageState();
GenericOrganizationalUnit orga = (GenericOrganizationalUnit) getItemSelectionModel(). GenericOrganizationalUnit orga
getSelectedObject(state); = (GenericOrganizationalUnit) getItemSelectionModel()
.getSelectedObject(state);
if (this.getSaveCancelSection().getSaveButton().isSelected(state)) { if (this.getSaveCancelSection().getSaveButton().isSelected(state)) {
GenericPerson person; GenericPerson person;
person = selector.getSelectedPerson(); person = selector.getSelectedPerson(state);
if (person == null) { if (person == null) {
GenericPerson personToAdd = (GenericPerson) data.get(ITEM_SEARCH); GenericPerson personToAdd = (GenericPerson) data
.get(ITEM_SEARCH);
logger.debug(String.format("Adding person %s", logger.debug(String.format("Adding person %s",
personToAdd.getFullName())); personToAdd.getFullName()));
@ -248,9 +255,9 @@ public class GenericOrganizationalUnitPersonAddForm
persons.setStatus((String) data.get( persons.setStatus((String) data.get(
GenericOrganizationalUnitPersonCollection.STATUS)); GenericOrganizationalUnitPersonCollection.STATUS));
selector.setSelectedPerson(null); selector.setSelectedPerson(state, null);
selector.setSelectedPersonRole(null); selector.setSelectedPersonRole(state, null);
selector.setSelectedPersonStatus(null); selector.setSelectedPersonStatus(state, null);
persons.close(); persons.close();
} }
@ -259,12 +266,16 @@ public class GenericOrganizationalUnitPersonAddForm
init(fse); init(fse);
} }
@Override
public void submitted(FormSectionEvent fse) throws FormProcessException { public void submitted(FormSectionEvent fse) throws FormProcessException {
if (this.getSaveCancelSection().getCancelButton().isSelected(
fse.getPageState())) { final PageState state = fse.getPageState();
selector.setSelectedPerson(null);
selector.setSelectedPersonRole(null); if (getSaveCancelSection().getCancelButton().isSelected(state)) {
selector.setSelectedPersonStatus(null);
selector.setSelectedPerson(state, null);
selector.setSelectedPersonRole(state, null);
selector.setSelectedPersonStatus(state, null);
init(fse); init(fse);
} }
@ -275,7 +286,7 @@ public class GenericOrganizationalUnitPersonAddForm
final PageState state = fse.getPageState(); final PageState state = fse.getPageState();
final FormData data = fse.getFormData(); final FormData data = fse.getFormData();
if ((selector.getSelectedPerson() == null) if ((selector.getSelectedPerson(state) == null)
&& (data.get(ITEM_SEARCH) == null)) { && (data.get(ITEM_SEARCH) == null)) {
data.addError( data.addError(
ContenttypesGlobalizationUtil.globalize( ContenttypesGlobalizationUtil.globalize(
@ -283,9 +294,10 @@ public class GenericOrganizationalUnitPersonAddForm
return; return;
} }
if (selector.getSelectedPerson() == null) { if (selector.getSelectedPerson(state) == null) {
GenericOrganizationalUnit orga = (GenericOrganizationalUnit) getItemSelectionModel(). GenericOrganizationalUnit orga
getSelectedObject(state); = (GenericOrganizationalUnit) getItemSelectionModel()
.getSelectedObject(state);
GenericPerson person = (GenericPerson) data.get(ITEM_SEARCH); GenericPerson person = (GenericPerson) data.get(ITEM_SEARCH);
@ -299,7 +311,8 @@ public class GenericOrganizationalUnitPersonAddForm
return; return;
}*/ }*/
final ContentBundle bundle = person.getContentBundle(); final ContentBundle bundle = person.getContentBundle();
final GenericOrganizationalUnitPersonCollection persons = orga.getPersons(); final GenericOrganizationalUnitPersonCollection persons = orga
.getPersons();
persons.addFilter(String.format("id = %s", persons.addFilter(String.format("id = %s",
bundle.getID().toString())); bundle.getID().toString()));

24
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonPropertiesStep.java
View File

@ -37,7 +37,8 @@ public class GenericOrganizationalUnitPersonPropertiesStep
implements GenericOrganizationalUnitPersonSelector { implements GenericOrganizationalUnitPersonSelector {
public static final String ADD_PERSON_SHEET_NAME = "addPerson"; public static final String ADD_PERSON_SHEET_NAME = "addPerson";
private GenericPerson selectedPerson; public static final String SELECTED_PERSON = "selected-person";
private final ItemSelectionModel selectedPerson;
private String selectedPersonRole; private String selectedPersonRole;
private String selectedPersonStatus; private String selectedPersonStatus;
@ -65,35 +66,40 @@ public class GenericOrganizationalUnitPersonPropertiesStep
GenericOrganizationalUnitPersonsTable personsTable = new GenericOrganizationalUnitPersonsTable personsTable = new
GenericOrganizationalUnitPersonsTable(itemModel,this); GenericOrganizationalUnitPersonsTable(itemModel,this);
setDisplayComponent(personsTable); setDisplayComponent(personsTable);
selectedPerson = new ItemSelectionModel(SELECTED_PERSON);
} }
@Override @Override
public GenericPerson getSelectedPerson() { public GenericPerson getSelectedPerson(final PageState state) {
return selectedPerson; return (GenericPerson) selectedPerson.getSelectedItem(state);
} }
@Override @Override
public void setSelectedPerson(GenericPerson selectedPerson) { public void setSelectedPerson(final PageState state,
this.selectedPerson = selectedPerson; final GenericPerson selectedPerson) {
this.selectedPerson.setSelectedObject(state, selectedPerson);
} }
@Override @Override
public String getSelectedPersonRole() { public String getSelectedPersonRole(final PageState state) {
return selectedPersonRole; return selectedPersonRole;
} }
@Override @Override
public void setSelectedPersonRole(String selectedPersonRole) { public void setSelectedPersonRole(final PageState state,
final String selectedPersonRole) {
this.selectedPersonRole = selectedPersonRole; this.selectedPersonRole = selectedPersonRole;
} }
@Override @Override
public String getSelectedPersonStatus() { public String getSelectedPersonStatus(final PageState state) {
return selectedPersonStatus; return selectedPersonStatus;
} }
@Override @Override
public void setSelectedPersonStatus(String selectedPersonStatus) { public void setSelectedPersonStatus(final PageState state,
final String selectedPersonStatus) {
this.selectedPersonStatus = selectedPersonStatus; this.selectedPersonStatus = selectedPersonStatus;
} }

15
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonSelector.java
View File

@ -27,17 +27,20 @@ import com.arsdigita.cms.contenttypes.GenericPerson;
*/ */
public interface GenericOrganizationalUnitPersonSelector { public interface GenericOrganizationalUnitPersonSelector {
public GenericPerson getSelectedPerson(); public GenericPerson getSelectedPerson(PageState state);
public void setSelectedPerson(GenericPerson selectedPerson); public void setSelectedPerson(PageState state,
GenericPerson selectedPerson);
public String getSelectedPersonRole(); public String getSelectedPersonRole(PageState state);
public void setSelectedPersonRole(String selectedPersonRole); public void setSelectedPersonRole(PageState state,
String selectedPersonRole);
public String getSelectedPersonStatus(); public String getSelectedPersonStatus(PageState state);
public void setSelectedPersonStatus(String selectedPersonStatus); public void setSelectedPersonStatus(PageState state,
String selectedPersonStatus);
public void showEditComponent(PageState state); public void showEditComponent(PageState state);
} }

6
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonsTable.java
View File

@ -377,9 +377,9 @@ public class GenericOrganizationalUnitPersonsTable extends Table implements
} }
} }
personSelector.setSelectedPerson(person); personSelector.setSelectedPerson(state, person);
personSelector.setSelectedPersonRole(persons.getRoleName()); personSelector.setSelectedPersonRole(state, persons.getRoleName());
personSelector.setSelectedPersonStatus(persons.getStatus()); personSelector.setSelectedPersonStatus(state, persons.getStatus());
persons.close(); persons.close();

53
ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMembersStep.java
View File

@ -18,6 +18,7 @@
*/ */
package com.arsdigita.cms.contenttypes.ui; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.GenericPerson;
@ -28,17 +29,18 @@ import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
/** /**
* Authoring step for editing the memberships of the SciDepartment. * Authoring step for editing the memberships of the SciDepartment.
* *
* @author Jens Pelzetter * @author Jens Pelzetter
* @version $Id$ * @version $Id$
*/ */
public class SciDepartmentMembersStep public class SciDepartmentMembersStep
extends SimpleEditStep extends SimpleEditStep
implements GenericOrganizationalUnitPersonSelector { implements GenericOrganizationalUnitPersonSelector {
private static final String ADD_DEPARTMENT_MEMBER_SHEET_NAME = private static final String ADD_DEPARTMENT_MEMBER_SHEET_NAME
"SciDepartmentAddMember"; = "SciDepartmentAddMember";
private GenericPerson selectedPerson; private static final String SELECTED_PERSON = "selected-person";
private final ItemSelectionModel selectedPerson;
private String selectedPersonRole; private String selectedPersonRole;
private String selectedPersonStatus; private String selectedPersonStatus;
@ -53,45 +55,58 @@ public class SciDepartmentMembersStep
super(itemModel, parent, prefix); super(itemModel, parent, prefix);
final BasicItemForm addMemberSheet = new SciDepartmentMemberAddForm( final BasicItemForm addMemberSheet = new SciDepartmentMemberAddForm(
itemModel, this); itemModel, this);
add(ADD_DEPARTMENT_MEMBER_SHEET_NAME, add(ADD_DEPARTMENT_MEMBER_SHEET_NAME,
SciDepartmentGlobalizationUtil.globalize("scidepartment.ui.members.add"), SciDepartmentGlobalizationUtil.globalize(
"scidepartment.ui.members.add"),
new WorkflowLockedComponentAccess(addMemberSheet, itemModel), new WorkflowLockedComponentAccess(addMemberSheet, itemModel),
addMemberSheet.getSaveCancelSection().getCancelButton()); addMemberSheet.getSaveCancelSection().getCancelButton());
final SciDepartmentMemberTable memberTable = final SciDepartmentMemberTable memberTable
new SciDepartmentMemberTable( = new SciDepartmentMemberTable(
itemModel, this); itemModel, this);
setDisplayComponent(memberTable); setDisplayComponent(memberTable);
selectedPerson = new ItemSelectionModel(SELECTED_PERSON);
} }
@Override @Override
public GenericPerson getSelectedPerson() { public void register(final Page page) {
return selectedPerson; super.register(page);
page.addGlobalStateParam(selectedPerson.getStateParameter());
} }
@Override @Override
public void setSelectedPerson(final GenericPerson selectedPerson) { public GenericPerson getSelectedPerson(final PageState state) {
this.selectedPerson = selectedPerson; return (GenericPerson) selectedPerson.getSelectedItem(state);
} }
@Override @Override
public String getSelectedPersonRole() { public void setSelectedPerson(final PageState state,
final GenericPerson selectedPerson) {
this.selectedPerson.setSelectedObject(state, selectedPerson);
}
@Override
public String getSelectedPersonRole(final PageState state) {
return selectedPersonRole; return selectedPersonRole;
} }
@Override @Override
public void setSelectedPersonRole(final String selectedPersonRole) { public void setSelectedPersonRole(final PageState state,
final String selectedPersonRole) {
this.selectedPersonRole = selectedPersonRole; this.selectedPersonRole = selectedPersonRole;
} }
@Override @Override
public String getSelectedPersonStatus() { public String getSelectedPersonStatus(final PageState state) {
return selectedPersonStatus; return selectedPersonStatus;
} }
@Override @Override
public void setSelectedPersonStatus(final String selectedPersonStatus) { public void setSelectedPersonStatus(final PageState state,
final String selectedPersonStatus) {
this.selectedPersonStatus = selectedPersonStatus; this.selectedPersonStatus = selectedPersonStatus;
} }

32
ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteMembersStep.java
View File

@ -1,5 +1,6 @@
package com.arsdigita.cms.contenttypes.ui; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.GenericPerson;
@ -19,7 +20,8 @@ public class SciInstituteMembersStep
implements GenericOrganizationalUnitPersonSelector { implements GenericOrganizationalUnitPersonSelector {
private String ADD_INSTITUTE_MEMBER_STEP = "SciInstituteAddMember"; private String ADD_INSTITUTE_MEMBER_STEP = "SciInstituteAddMember";
private GenericPerson selectedPerson; public static final String SELECTED_PERSON = "selected-person";
private final ItemSelectionModel selectedPerson;
private String selectedPersonRole; private String selectedPersonRole;
private String selectedPersonStatus; private String selectedPersonStatus;
@ -45,35 +47,47 @@ public class SciInstituteMembersStep
new SciInstituteMembersTable(itemModel, new SciInstituteMembersTable(itemModel,
this); this);
setDisplayComponent(memberTable); setDisplayComponent(memberTable);
selectedPerson = new ItemSelectionModel(SELECTED_PERSON);
} }
@Override @Override
public GenericPerson getSelectedPerson() { public void register(final Page page) {
return selectedPerson; super.register(page);
page.addGlobalStateParam(selectedPerson.getStateParameter());
}
@Override
public GenericPerson getSelectedPerson(final PageState state) {
return (GenericPerson) selectedPerson.getSelectedItem(state);
} }
@Override @Override
public void setSelectedPerson(final GenericPerson selectedPerson) { public void setSelectedPerson(final PageState state,
this.selectedPerson = selectedPerson; final GenericPerson selectedPerson) {
this.selectedPerson.setSelectedObject(state, selectedPerson);
} }
@Override @Override
public String getSelectedPersonRole() { public String getSelectedPersonRole(final PageState state) {
return selectedPersonRole; return selectedPersonRole;
} }
@Override @Override
public void setSelectedPersonRole(final String selectedPersonRole) { public void setSelectedPersonRole(final PageState state,
final String selectedPersonRole) {
this.selectedPersonRole = selectedPersonRole; this.selectedPersonRole = selectedPersonRole;
} }
@Override @Override
public String getSelectedPersonStatus() { public String getSelectedPersonStatus(final PageState state) {
return selectedPersonStatus; return selectedPersonStatus;
} }
@Override @Override
public void setSelectedPersonStatus(final String selectedPersonStatus) { public void setSelectedPersonStatus(final PageState state,
final String selectedPersonStatus) {
this.selectedPersonStatus = selectedPersonStatus; this.selectedPersonStatus = selectedPersonStatus;
} }

74
ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectMembersStep.java
View File

@ -4,76 +4,93 @@
*/ */
package com.arsdigita.cms.contenttypes.ui; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.GenericPerson;
import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.cms.ui.authoring.BasicItemForm;
import com.arsdigita.cms.ui.authoring.SimpleEditStep; import com.arsdigita.cms.ui.authoring.SimpleEditStep;
import com.arsdigita.cms.ui.item.ContentItemRequestLocal;
import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
/** /**
* *
* @author Jens Pelzetter * @author Jens Pelzetter
*/ */
public class SciProjectMembersStep public class SciProjectMembersStep
extends SimpleEditStep extends SimpleEditStep
implements GenericOrganizationalUnitPersonSelector{ implements GenericOrganizationalUnitPersonSelector {
private static final String ADD_PROJECT_MEMBER_SHEET_NAME = "SciProjectAddMember"; private static final String ADD_PROJECT_MEMBER_SHEET_NAME
private GenericPerson selectedPerson; = "SciProjectAddMember";
public static final String SELECTED_PERSON = "selected-person";
private final ItemSelectionModel selectedPerson;
// private GenericPerson selectedPerson;
private String selectedPersonRole; private String selectedPersonRole;
private String selectedPersonStatus; private String selectedPersonStatus;
public SciProjectMembersStep(final ItemSelectionModel itemModel, public SciProjectMembersStep(final ItemSelectionModel itemModel,
final AuthoringKitWizard parent) { final AuthoringKitWizard parent) {
this(itemModel, parent, null); this(itemModel, parent, null);
} }
public SciProjectMembersStep(final ItemSelectionModel itemModel, public SciProjectMembersStep(final ItemSelectionModel itemModel,
final AuthoringKitWizard parent, final AuthoringKitWizard parent,
final String prefix) { final String prefix) {
super(itemModel, parent, prefix); super(itemModel, parent, prefix);
final BasicItemForm addMemberSheet = new SciProjectMemberAddForm( final BasicItemForm addMemberSheet = new SciProjectMemberAddForm(
itemModel, this); itemModel, this);
add(ADD_PROJECT_MEMBER_SHEET_NAME, add(ADD_PROJECT_MEMBER_SHEET_NAME,
SciProjectGlobalizationUtil.globalize("sciproject.ui.members.add"), SciProjectGlobalizationUtil.globalize("sciproject.ui.members.add"),
new WorkflowLockedComponentAccess(addMemberSheet, itemModel), new WorkflowLockedComponentAccess(addMemberSheet, itemModel),
addMemberSheet.getSaveCancelSection().getCancelButton()); addMemberSheet.getSaveCancelSection().getCancelButton());
final SciProjectMemberTable memberTable = new SciProjectMemberTable( final SciProjectMemberTable memberTable = new SciProjectMemberTable(
itemModel, this); itemModel, this);
setDisplayComponent(memberTable); setDisplayComponent(memberTable);
selectedPerson = new ItemSelectionModel(SELECTED_PERSON);
} }
@Override @Override
public GenericPerson getSelectedPerson() { public void register(final Page page) {
return selectedPerson; super.register(page);
page.addGlobalStateParam(selectedPerson.getStateParameter());
} }
@Override @Override
public void setSelectedPerson(final GenericPerson selectedPerson) { public GenericPerson getSelectedPerson(final PageState state) {
this.selectedPerson = selectedPerson; return (GenericPerson) selectedPerson.getSelectedItem(state);
} }
@Override @Override
public String getSelectedPersonRole() { public void setSelectedPerson(final PageState state,
final GenericPerson selectedPerson) {
this.selectedPerson.setSelectedObject(state, selectedPerson);
}
@Override
public String getSelectedPersonRole(final PageState state) {
return selectedPersonRole; return selectedPersonRole;
} }
@Override @Override
public void setSelectedPersonRole(final String selectedPersonRole) { public void setSelectedPersonRole(final PageState state,
final String selectedPersonRole) {
this.selectedPersonRole = selectedPersonRole; this.selectedPersonRole = selectedPersonRole;
} }
@Override @Override
public String getSelectedPersonStatus() { public String getSelectedPersonStatus(final PageState state) {
return selectedPersonStatus; return selectedPersonStatus;
} }
@Override @Override
public void setSelectedPersonStatus(final String selectedPersonStatus) { public void setSelectedPersonStatus(final PageState state,
final String selectedPersonStatus) {
this.selectedPersonStatus = selectedPersonStatus; this.selectedPersonStatus = selectedPersonStatus;
} }
@ -81,4 +98,5 @@ implements GenericOrganizationalUnitPersonSelector{
public void showEditComponent(final PageState state) { public void showEditComponent(final PageState state) {
showComponent(state, ADD_PROJECT_MEMBER_SHEET_NAME); showComponent(state, ADD_PROJECT_MEMBER_SHEET_NAME);
} }
} }