Project

General

Profile

« Previous | Next » 

Revision c5aa066b

Added by Katja Luther about 8 years ago

fix move taxonnode and remove null values from childrenlists in several places

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java
221 221
     * @see    	   		#getDescriptionSources()
222 222
     */
223 223
    public void addElement(DescriptionElementBase element) {
224
        removeNullValue();
224 225
        if (element.getInDescription() != null){
225 226
            element.getInDescription().removeElement(element);
226 227
        }
......
233 234
     * @param elements
234 235
     */
235 236
    public void addElements(DescriptionElementBase ... elements) {
236
    	for (DescriptionElementBase element : elements){
237
        removeNullValue();
238
        for (DescriptionElementBase element : elements){
237 239
    		addElement(element);
238 240
    	}
239 241
    }
......
247 249
     * @see     		#addElement(DescriptionElementBase)
248 250
     */
249 251
    public void removeElement(DescriptionElementBase element) {
252
        removeNullValue();
250 253
        this.descriptionElements.remove(element);
251 254
        element.setInDescription(null);
252 255
    }
253 256

  
257
    private void removeNullValue(){
258
        while(this.descriptionElements.contains(null)){
259
            this.descriptionElements.remove(null);
260
        }
261
    }
262

  
254 263
    /**
255 264
     * Returns the number of {@link DescriptionElementBase elementary description data} which constitute
256 265
     * <i>this</i> description as a whole. This is the cardinality of the set of

Also available in: Unified diff