Project

General

Profile

Revision 66122abe

ID66122abe92af9eb5435a68da4d80a7aa782b877e
Parent 5291e4cf
Child 1d3d01a7

Added by Andreas Müller over 3 years ago

cleanup

View differences:

cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
84 84
    private IReferenceDao referenceDao;
85 85

  
86 86
    @SpringBeanByType
87
    IDefinedTermDao definedTermDao;
87
    private IDefinedTermDao definedTermDao;
88 88

  
89 89
    private UUID uuid;
90 90
    private UUID sphingidae;
......
102 102

  
103 103
    private UUID northernAmericaUuid;
104 104
    private UUID southernAmericaUuid;
105
    private UUID antarcticaUuid;
106 105

  
107 106
    private UUID classificationUuid;
108 107

  
......
150 149

  
151 150
        northernAmericaUuid = UUID.fromString("2757e726-d897-4546-93bd-7951d203bf6f");
152 151
        southernAmericaUuid = UUID.fromString("6310b3ba-96f4-4855-bb5b-326e7af188ea");
153
        antarcticaUuid = UUID.fromString("791b3aa0-54dd-4bed-9b68-56b4680aad0c");
154 152

  
155 153
        classificationUuid = UUID.fromString("aeee7448-5298-4991-b724-8d5b75a0a7a9");
156 154
        includeUnpublished = true;
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
205 205
        }else if (name != null && typeDesignation != null){
206 206
            removeSingleDesignation(name, typeDesignation);
207 207
        }else if (name != null){
208
            @SuppressWarnings("rawtypes")
208 209
            Set<TypeDesignationBase> designationSet = new HashSet<>(name.getTypeDesignations());
209
            for (TypeDesignationBase<?> o : designationSet){
210
                TypeDesignationBase<?> desig = CdmBase.deproxy(o);
210
            for (TypeDesignationBase<?> desig : designationSet){
211
                desig = CdmBase.deproxy(desig);
211 212
                removeSingleDesignation(name, desig);
212 213
            }
213 214
        }else if (typeDesignation != null){
214 215
            @SuppressWarnings("unchecked")
215 216
            Set<TaxonName> nameSet = new HashSet<>(typeDesignation.getTypifiedNames());
216
            for (Object o : nameSet){
217
                TaxonName singleName = CdmBase.deproxy(o, TaxonName.class);
217
            for (TaxonName singleName : nameSet){
218
                singleName = CdmBase.deproxy(singleName);
218 219
                removeSingleDesignation(singleName, typeDesignation);
219 220
            }
220 221
        }

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)