*/
public class NewTeamWizard extends AbstractNewEntityWizard<Team> {
-
+ private boolean isNomenclaturalTeam = false;
+
public NewTeamWizard() {}
-
+
public NewTeamWizard(boolean b) {
- //FIXME somethings needs to be done here
+ setNomenclaturalTeam(b);
}
/** {@inheritDoc} */
@Override
public void addPages() {
- addPage(new TeamWizardPage(formFactory, getConversationHolder(), getEntity()));
+ addPage(new TeamWizardPage(formFactory, getConversationHolder(), getEntity(), isNomenclaturalTeam));
}
/* (non-Javadoc)
protected String getEntityName() {
return "Team";
}
+
+ /**
+ * @return the isNomenclaturalTeam
+ */
+ public boolean isNomenclaturalTeam() {
+ return isNomenclaturalTeam;
+ }
+
+ /**
+ * @param isNomenclaturalTeam the isNomenclaturalTeam to set
+ */
+ public void setNomenclaturalTeam(boolean isNomenclaturalTeam) {
+ this.isNomenclaturalTeam = isNomenclaturalTeam;
+ }
}
/**
*
*/
- private static final String PERSON = "Person";
+ protected static final String PERSON = "Person";
/**
*
*/
- private static final String TEAM = "Team";
+ protected static final String TEAM = "Team";
/**
* <p>select</p>
@Override
protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
if(TEAM.equals(parameter)){
- return new NewTeamWizard(false);
+ return new NewTeamWizard();
}
else if(PERSON.equals(parameter)){
return new NewPersonWizard();
* dialog gets all items when opening the dialog and then apply the filter on all items.
* In our case we need a possibility to filter the items already when getting them from the DB, so we adapt the
* original class
+ * the abstract method initMOdel was added and the method applyFilter was modified
* original description:
* Shows a list of items to the user with a text entry field for a string
* pattern used to filter the list of items.
}
/**
+ * CDM IMPLEMENTATION
* we have to call the initModel() method in the applyFilter method, so we had to add this abstract method (moved from AbstractFilteredCdmResourceSelectionDialog)
* <p>initModel</p>
*/
*/
package eu.etaxonomy.taxeditor.ui.dialog.selection;
+
+
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.cdm.model.agent.AgentBase;
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewPersonWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewTeamWizard;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
@Override
protected void initModel() {
- model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(null, null, null);
+ Control control = getPatternControl();
+ String pattern = null;
+ if (control != null){
+ pattern = ((Text)control).getText();
+ }
+
+ model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(limitOfInitialElements, pattern, null);
}
+ /** {@inheritDoc} */
+ @Override
+ protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
+ if(TEAM.equals(parameter)){
+ return new NewTeamWizard(true);
+ }
+ else if(PERSON.equals(parameter)){
+ return new NewPersonWizard();
+ }
+ else{
+ throw new IllegalArgumentException("Could not determine the desired wizard.");
+ }
+ }
+
+
/**
* <p>select</p>
*
import java.util.UUID;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IAgentService;
+import eu.etaxonomy.cdm.model.agent.AgentBase;
import eu.etaxonomy.cdm.model.agent.Team;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
* @version 1.0
*/
public class NomenclaturalAuthorTeamSelectionDialog extends
- AbstractFilteredCdmResourceSelectionDialog<Team> {
+ AbstractFilteredCdmResourceSelectionDialog<AgentBase> {
/**
* <p>select</p>
public static Team select(Shell shell, ConversationHolder conversation, Team team){
NomenclaturalAuthorTeamSelectionDialog dialog = new NomenclaturalAuthorTeamSelectionDialog(shell, conversation,
"Choose Author Team", false, NomenclaturalAuthorTeamSelectionDialog.class.getCanonicalName(), team);
- return getSelectionFromDialog(dialog);
+ return (Team)getSelectionFromDialog(dialog);
}
/**
/** {@inheritDoc} */
@Override
protected void initModel() {
- model = CdmStore.getService(IAgentService.class).getTeamUuidAndNomenclaturalTitle();
+ Control control = getPatternControl();
+ String pattern = null;
+ if (control != null){
+ pattern = ((Text)control).getText();
+ }
+
+ model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(limitOfInitialElements, pattern, Team.class);
}
/** {@inheritDoc} */
import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
import eu.etaxonomy.cdm.model.common.Group;
import eu.etaxonomy.cdm.model.common.ICdmBase;
-import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.common.User;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.description.FeatureTree;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.IEntityElement;
import eu.etaxonomy.taxeditor.ui.section.agent.TeamMemberElement;
return (T) AgentSelectionDialog.select(shell, conversation, (AgentBase) currentSelection);
}
if(clazz.equals(Person.class) && parentElement instanceof TeamMemberElement){
- return (T) NomenclaturalAuthorSelectionDialog.select(shell, conversation, (AgentBase) currentSelection);
+ return (T) NomenclaturalPersonAuthorSelectionDialog.select(shell, conversation, (AgentBase) currentSelection);
}
if(clazz.equals(AgentBase.class)){
return (T) AgentSelectionDialog.select(shell, conversation, (AgentBase) currentSelection);
return element;
}
- public TeamDetailElement createTeamDetailElement(ICdmFormElement parentElement, int style){
- TeamDetailElement element = new TeamDetailElement(this, parentElement, style);
+ public TeamDetailElement createTeamDetailElement(ICdmFormElement parentElement, int style, boolean isNomenclatural){
+ TeamDetailElement element = new TeamDetailElement(this, parentElement, style, isNomenclatural);
addAndAdaptElement(parentElement, element);
return element;
}
}
//--------EntityCollectionSection----------
- public TeamMemberSection createTeamMemberSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){
- TeamMemberSection section = new TeamMemberSection(this, conversation, parentElement, style);
+ public TeamMemberSection createTeamMemberSection(ConversationHolder conversation, ICdmFormElement parentElement, int style, boolean isNomenclatural){
+ TeamMemberSection section = new TeamMemberSection(this, conversation, parentElement, style, isNomenclatural);
addAndAdaptSection(parentElement, section);
return section;
}
if (entity instanceof Annotation) {
element = new AnnotationElement(this, parentElement, (Annotation) entity, removeListener, style);
- }else if (entity instanceof Person) {
- element = new TeamMemberElement(this, parentElement, (Person) entity, removeListener, style);
+ }else if (entity instanceof Person ) {
+ boolean isNomenclatural = false;
+ if (parentElement instanceof TeamMemberSection){
+ isNomenclatural = ((TeamMemberSection) parentElement).isNomenclaturalTeam();
+ }
+ element = new TeamMemberElement(this, parentElement, (Person) entity, removeListener, style, isNomenclatural);
} else if (entity instanceof Credit) {
element = new CreditElement(this, parentElement, (Credit) entity, removeListener, style);
} else if (entity instanceof Extension) {
return element;
}
- public NomenclaturalAuthorTeamSelectionElement createNomenclaturalAuthorTeamSelectionElement(
- ConversationHolder conversation, ICdmFormElement parentElement, String labelString, Team selection,
- int mode, int style) {
- NomenclaturalAuthorTeamSelectionElement element = new NomenclaturalAuthorTeamSelectionElement(this,
- conversation, parentElement, labelString, selection, mode, style);
- adapt(element);
- parentElement.addElement(element);
- return element;
- }
+// public NomenclaturalAuthorTeamSelectionElement createNomenclaturalAuthorTeamSelectionElement(
+// ConversationHolder conversation, ICdmFormElement parentElement, String labelString, Team selection,
+// int mode, int style) {
+// NomenclaturalAuthorTeamSelectionElement element = new NomenclaturalAuthorTeamSelectionElement(this,
+// conversation, parentElement, labelString, selection, mode, style);
+// adapt(element);
+// parentElement.addElement(element);
+// return element;
+// }
/** {@inheritDoc} */
public LabelElement createLabel(ICdmFormElement parentElement, String text) {
private CheckboxElement hasAdditionalMembers;
private TeamMemberSection section_teamMembers;
+ private final boolean isNomenclaturalTeam;
/**
* <p>
* a int.
*/
public TeamDetailElement(CdmFormFactory cdmFormFactory,
- ICdmFormElement formElement, int style) {
+ ICdmFormElement formElement, int style, boolean isNomenclatural) {
super(cdmFormFactory, formElement);
+ this.isNomenclaturalTeam = isNomenclatural;
}
/** {@inheritDoc} */
toggleable_cache = formFactory.createToggleableTextField(formElement, "Title Cache", entity.getTitleCache(), entity.isProtectedTitleCache(), style);
toggleable_nomenclaturalTitleCache = formFactory.createToggleableTextField(formElement, "Abbrev. Title", entity.getNomenclaturalTitle(), entity.isProtectedNomenclaturalTitleCache(), style);
hasAdditionalMembers = formFactory.createCheckbox(formElement, "Additional Members", entity.isHasMoreMembers(), style);
- section_teamMembers = formFactory.createTeamMemberSection(getConversationHolder(), formElement, ExpandableComposite.EXPANDED);
+ section_teamMembers = formFactory.createTeamMemberSection(getConversationHolder(), formElement, ExpandableComposite.EXPANDED, isNomenclaturalTeam);
section_teamMembers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
}
getEntity().setNomenclaturalTitle(toggleable_nomenclaturalTitleCache.getText(), pushedState);
setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache }));
-
+
if (!getEntity().isProtectedNomenclaturalTitleCache()) {
toggleable_nomenclaturalTitleCache.setText(getEntity().getNomenclaturalTitle());
}
*/
public class TeamDetailSection extends AbstractCdmDetailSection<Team>{
+ private boolean isNomenclaturalTeam;
+
/**
* <p>Constructor for TeamDetailSection.</p>
*
*/
@Override
protected AbstractCdmDetailElement<Team> createCdmDetailElement(AbstractCdmDetailSection<Team> parentElement, int style) {
- return formFactory.createTeamDetailElement(parentElement, style);
+ return formFactory.createTeamDetailElement(parentElement, style, isNomenclaturalTeam);
+ }
+
+ public boolean isNomenclaturalTeam(){
+ return isNomenclaturalTeam;
+ }
+
+ public void setIsNomenclaturalTeam(boolean isNomenclaturalTeam){
+ this.isNomenclaturalTeam = isNomenclaturalTeam;
}
}
public class TeamMemberElement extends AbstractEntityCollectionElement<Person> {
private EntitySelectionElement<Person> selection_person;
+ private final boolean isNomenclatural;
public TeamMemberElement(CdmFormFactory cdmFormFactory,
AbstractFormSection section, Person entity,
- SelectionListener removeListener, int style) {
+ SelectionListener removeListener, int style, boolean isNomenclatural) {
super(cdmFormFactory, section, entity, removeListener, null, style);
+ this.isNomenclatural =isNomenclatural;
+
}
/** {@inheritDoc} */
*/
public class TeamMemberSection extends AbstractUnboundEntityCollectionSection<Team, Person> {
+ private boolean isNomenclaturalTeam = false;
+
/**
* <p>Constructor for TeamMemberSection.</p>
*
* @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
* @param style a int.
*/
- public TeamMemberSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {
+ public TeamMemberSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style, boolean isNomenclatural) {
super(cdmFormFactory, conversation, parentElement, null, style);
+ isNomenclaturalTeam = isNomenclatural;
}
/** {@inheritDoc} */
return getEntity().getTeamMembers();
}
+ /**
+ * @return
+ */
+ public boolean isNomenclaturalTeam() {
+ return isNomenclaturalTeam;
+ }
+
}
*/
public class TeamWizardPage extends AbstractCdmEntityWizardPage<Team> {
+ private boolean isNomenclaturalTeam = false;
+
/**
* <p>
* Constructor for TeamWizardPage.
* a {@link eu.etaxonomy.cdm.model.agent.Team} object.
*/
public TeamWizardPage(CdmFormFactory formFactory,
- ConversationHolder conversation, Team entity) {
+ ConversationHolder conversation, Team entity, boolean isNomenclaturalTeam) {
super(formFactory, conversation, entity);
setTitle("Team");
+ setIsNomenclaturalTeam(isNomenclaturalTeam);
}
/** {@inheritDoc} */
@Override
public AbstractCdmDetailElement<Team> createElement(
ICdmFormElement rootElement) {
- TeamDetailElement teamElement = formFactory.createTeamDetailElement(rootElement, SWT.NULL);
+ TeamDetailElement teamElement = formFactory.createTeamDetailElement(rootElement, SWT.NULL, isNomenclaturalTeam);
teamElement.setEntity(entity);
return teamElement;
}
+
+ /**
+ * @return the isNomenclaturalTeam
+ */
+ public boolean isNomenclaturalTeam() {
+ return isNomenclaturalTeam;
+ }
+
+ public void setIsNomenclaturalTeam(boolean isNomenclaturalTeam){
+ this.isNomenclaturalTeam = isNomenclaturalTeam;
+ }
}
addPage(new ReferenceWizardPage(formFactory,
selectionElement.getConversationHolder(),
(HibernateProxyHelper.deproxy(rootElement, Reference.class))));
- } else if (rootElement.isInstanceOf(Team.class)) {
+ } else if (rootElement.isInstanceOf(Team.class) && selectionElement instanceof EntitySelectionElementWithAbbreviatedTitle<?>) {
addPage(new TeamWizardPage(formFactory,
- selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Team.class)));
- } else if (rootElement.isInstanceOf(Person.class)) {
+ selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Team.class), true));
+ } else if (rootElement.isInstanceOf(Team.class) && !(selectionElement instanceof EntitySelectionElementWithAbbreviatedTitle<?>)) {
+ addPage(new TeamWizardPage(formFactory,
+ selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Team.class), false));
+ } else if (rootElement.isInstanceOf(Person.class)) {
addPage(new PersonWizardPage(formFactory,
selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Person.class)));
} else if (rootElement.isInstanceOf(NonViralName.class)) {
BGBM BDI Projects / taxeditor.git / commitdiff