Revision a6035e28
Added by Katja Luther almost 8 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java | ||
|---|---|---|
| 39 | 39 |
import org.hibernate.search.annotations.ContainedIn; |
| 40 | 40 |
import org.hibernate.search.annotations.FieldBridge; |
| 41 | 41 |
|
| 42 |
import eu.etaxonomy.cdm.hibernate.HHH_9751_Util; |
|
| 42 | 43 |
import eu.etaxonomy.cdm.hibernate.search.DescriptionBaseClassBridge; |
| 43 | 44 |
import eu.etaxonomy.cdm.hibernate.search.GroupByTaxonClassBridge; |
| 44 | 45 |
import eu.etaxonomy.cdm.hibernate.search.NotNullAwareIdBridge; |
| ... | ... | |
| 221 | 222 |
* @see #getDescriptionSources() |
| 222 | 223 |
*/ |
| 223 | 224 |
public void addElement(DescriptionElementBase element) {
|
| 224 |
removeNullValue();
|
|
| 225 |
HHH_9751_Util.removeAllNull(this.descriptionElements);
|
|
| 225 | 226 |
if (element.getInDescription() != null){
|
| 226 | 227 |
element.getInDescription().removeElement(element); |
| 227 | 228 |
} |
| ... | ... | |
| 234 | 235 |
* @param elements |
| 235 | 236 |
*/ |
| 236 | 237 |
public void addElements(DescriptionElementBase ... elements) {
|
| 237 |
removeNullValue();
|
|
| 238 |
HHH_9751_Util.removeAllNull(this.descriptionElements);
|
|
| 238 | 239 |
for (DescriptionElementBase element : elements){
|
| 239 | 240 |
addElement(element); |
| 240 | 241 |
} |
| ... | ... | |
| 249 | 250 |
* @see #addElement(DescriptionElementBase) |
| 250 | 251 |
*/ |
| 251 | 252 |
public void removeElement(DescriptionElementBase element) {
|
| 252 |
removeNullValue();
|
|
| 253 |
HHH_9751_Util.removeAllNull(this.descriptionElements);
|
|
| 253 | 254 |
this.descriptionElements.remove(element); |
| 254 | 255 |
element.setInDescription(null); |
| 255 | 256 |
} |
| 256 | 257 |
|
| 257 |
private void removeNullValue(){
|
|
| 258 |
while(this.descriptionElements.contains(null)){
|
|
| 259 |
this.descriptionElements.remove(null); |
|
| 260 |
} |
|
| 261 |
} |
|
| 258 |
|
|
| 262 | 259 |
|
| 263 | 260 |
/** |
| 264 | 261 |
* Returns the number of {@link DescriptionElementBase elementary description data} which constitute
|
Also available in: Unified diff
#5536