Revision a784f00f
Added by Katja Luther over 14 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java | ||
---|---|---|
62 | 62 |
"protectedNomenclaturalTitleCache", |
63 | 63 |
"teamMembers" |
64 | 64 |
}) |
65 |
@XmlRootElement |
|
65 |
@XmlRootElement(name = "Team")
|
|
66 | 66 |
@Entity |
67 | 67 |
@Indexed(index = "eu.etaxonomy.cdm.model.agent.AgentBase") |
68 | 68 |
@Audited |
... | ... | |
76 | 76 |
|
77 | 77 |
//An abreviated name for the team (e. g. in case of nomenclatural authorteams). A non abreviated name for the team (e. g. |
78 | 78 |
//in case of some bibliographical references) |
79 |
@XmlElementWrapper(name = "TeamMembers") |
|
79 |
@XmlElementWrapper(name = "TeamMembers", nillable = true)
|
|
80 | 80 |
@XmlElement(name = "TeamMember") |
81 | 81 |
@XmlIDREF |
82 | 82 |
@XmlSchemaType(name = "IDREF") |
... | ... | |
84 | 84 |
@ManyToMany(fetch = FetchType.LAZY) |
85 | 85 |
@Cascade(CascadeType.SAVE_UPDATE) |
86 | 86 |
@Match(MatchMode.MATCH) |
87 |
@NotNull |
|
88 |
private List<Person> teamMembers = new ArrayList<Person>(); |
|
87 |
private List<Person> teamMembers; |
|
89 | 88 |
|
90 | 89 |
|
91 | 90 |
/** |
... | ... | |
115 | 114 |
return this.teamMembers; |
116 | 115 |
} |
117 | 116 |
|
117 |
protected void setTeamMembers(List<Person> teamMembers) { |
|
118 |
this.teamMembers = teamMembers; |
|
119 |
} |
|
120 |
|
|
118 | 121 |
/** |
119 | 122 |
* Adds a new {@link Person person} to <i>this</i> team at the end of the members' list. |
120 | 123 |
* |
... | ... | |
123 | 126 |
* @see Person |
124 | 127 |
*/ |
125 | 128 |
public void addTeamMember(Person person){ |
126 |
this.teamMembers.add(person);
|
|
129 |
getTeamMembers().add(person);
|
|
127 | 130 |
} |
128 | 131 |
|
129 | 132 |
/** |
... | ... | |
141 | 144 |
public void addTeamMember(Person person, int index){ |
142 | 145 |
// TODO is still not fully implemented (range for index!) |
143 | 146 |
logger.warn("not yet fully implemented (range for index!)"); |
144 |
int oldIndex = teamMembers.indexOf(person);
|
|
147 |
int oldIndex = getTeamMembers().indexOf(person);
|
|
145 | 148 |
if (oldIndex != -1 ){ |
146 |
teamMembers.remove(person);
|
|
149 |
getTeamMembers().remove(person);
|
|
147 | 150 |
} |
148 |
this.teamMembers.add(index, person);
|
|
151 |
getTeamMembers().add(index, person);
|
|
149 | 152 |
} |
150 | 153 |
|
151 | 154 |
/** |
... | ... | |
155 | 158 |
* @see #getTeamMembers() |
156 | 159 |
*/ |
157 | 160 |
public void removeTeamMember(Person person){ |
158 |
this.teamMembers.remove(person);
|
|
161 |
getTeamMembers().remove(person);
|
|
159 | 162 |
} |
160 | 163 |
|
161 | 164 |
/** |
Also available in: Unified diff
merge cate-development2 branch with trunk