Project

General

Profile

« Previous | Next » 

Revision dc3d73f9

Added by Katja Luther almost 6 years ago

adapt propertyPath for taxonrelations with names with typespecimen

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
332 332

  
333 333
        for (Synonym syn: toSaveNewSynonym){
334 334
            for (HybridRelationship rel : syn.getName().getHybridChildRelations()){
335
                if (!rel.getParentName().isPersited()) {
335
//                if (!rel.getParentName().isPersited()) {
336 336
                    toSaveNewName.add(rel.getParentName());
337
                }
338
                if (!rel.getHybridName().isPersited()) {
337
//                }
338
//                    if (!rel.getHybridName().isPersited()) {
339 339
                    toSaveNewName.add(rel.getHybridName());
340
                }
340
//                }
341 341

  
342 342
            }
343 343
        }
344 344

  
345 345
        for (TaxonBase concept: toSaveNewConcept){
346 346
            for (HybridRelationship rel : concept.getName().getHybridChildRelations()){
347
                if (!rel.getParentName().isPersited()) {
347
//                if (!rel.getParentName().isPersited()) {
348 348
                    toSaveNewName.add(rel.getParentName());
349
                }
350
                if (!rel.getHybridName().isPersited()) {
349
//                }
350
//                if (!rel.getHybridName().isPersited()) {
351 351
                    toSaveNewName.add(rel.getHybridName());
352
                }
352
//                }
353 353

  
354 354
            }
355 355
        }
356
        CdmStore.getService(INameService.class).save(toSaveNewName);
357
        CdmStore.getService(ITaxonService.class).save(toSaveNewConcept);
356
        CdmStore.getService(INameService.class).saveOrUpdate(toSaveNewName);
357
        CdmStore.getService(ITaxonService.class).saveOrUpdate(toSaveNewConcept);
358 358

  
359 359
        toSaveNewName.clear();
360 360
        toSaveNewConcept.clear();
......
402 402
                "sources", //$NON-NLS-1$
403 403
                "identifiers",
404 404
                "descriptions", //$NON-NLS-1$
405
                "relationsToThisTaxon.relatedFrom.name",//$NON-NLS-1$
405 406
                "relationsToThisTaxon.relatedFrom.name.taxonBases.taxonNodes", //$NON-NLS-1$
406 407
                "relationsToThisTaxon.relatedFrom.name.taxonBases.relationsFromThisTaxon", //$NON-NLS-1$
407 408
                "relationsToThisTaxon.relatedFrom.name.taxonBases.relationsToThisTaxon", //$NON-NLS-1$
409
                "relationsToThisTaxon.relatedFrom.name.typeDesignations.typeSpecimen.derivedFrom.originals",//$NON-NLS-1$
410
                "relationsToThisTaxon.relatedFrom.name.typeDesignations.typeName",//$NON-NLS-1$
411
                "relationsFromThisTaxon.relatedTo.name",//$NON-NLS-1$
408 412
                "relationsFromThisTaxon.relatedTo.name.taxonBases.taxonNodes", //$NON-NLS-1$
409 413
                "relationsFromThisTaxon.relatedTo.name.taxonBases.relationsFromThisTaxon", //$NON-NLS-1$
410
                "relationsFromThisTaxon.relatedTo.name.taxonBases.relationsToThisTaxon", //$NON-NLS-1$
414
                "relationsFromThisTaxon.relatedTo.name.taxonBases.relationsToThisTaxon",
415
                "relationsFromThisTaxon.relatedTo.name.typeDesignations.typeSpecimen.derivedFrom.originals",//$NON-NLS-1$
416
                "relationsFromThisTaxon.relatedTo.name.typeDesignations.typeName",//$NON-NLS-1$
411 417
                "taxonNodes", //$NON-NLS-1$
412 418
                "descriptions.descriptionElements.feature", //$NON-NLS-1$
413 419
                "descriptions.descriptionElements.area", //$NON-NLS-1$
414 420
                "descriptions.descriptionElements.status", //$NON-NLS-1$
415 421
                "descriptions.markers", //$NON-NLS-1$
416 422
                "name.descriptions", //$NON-NLS-1$
417
                "name.typeDesignations", //$NON-NLS-1$
423
                "name.typeDesignations.typeSpecimen.derivedFrom.originals", //$NON-NLS-1$
418 424
                "name.status", //$NON-NLS-1$
419 425
                "name.nomenclaturalReference.inReference", //$NON-NLS-1$
420 426
                "name.taxonBases.taxonNodes", //$NON-NLS-1$

Also available in: Unified diff