Project

General

Profile

« Previous | Next » 

Revision 0844524a

Added by Andreas Kohlbecker about 6 years ago

switching vom id based to uuid based ui navigation and entity references

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationDTO.java
79 79
        if(hasName(reg)){
80 80
            citation = (Reference) reg.getName().getNomenclaturalReference();
81 81
            citationDetail = reg.getName().getNomenclaturalMicroReference();
82
            name = new EntityReference(reg.getName().getId(), reg.getName().getTitleCache());
82
            name = new EntityReference(reg.getName().getUuid(), reg.getName().getTitleCache());
83 83
        }
84 84
        if(hasTypifications(reg)){
85 85
            if(!reg.getTypeDesignations().isEmpty()){
......
192 192
    }
193 193

  
194 194

  
195
    /**
196
     * The entity ID of the Registration Item
197
     * @return
198
     */
199
    public int getId() {
200
        return reg.getId();
201
    }
202

  
203

  
204 195
    public UUID getUuid() {
205 196
        return reg.getUuid();
206 197
    }
......
245 236
        }
246 237
    }
247 238

  
248
    /**
249
     * @return the citationID
250
     */
251
    public Integer getCitationID() {
252
        return citation == null ? null : citation.getId();
239

  
240
    public UUID getCitationUuid() {
241
        return citation == null ? null : citation.getUuid();
253 242
    }
254 243

  
255 244
    public EntityReference getTypifiedNameRef() {
......
372 361
            blockedBy = new HashSet<>();
373 362
            if(reg.getBlockedBy() != null){
374 363
                for(Registration blockReg : reg.getBlockedBy()){
375
                    blockedBy.add(new TypedEntityReference<Registration>(Registration.class, blockReg.getId(), blockReg.getIdentifier()));
364
                    blockedBy.add(new TypedEntityReference<Registration>(Registration.class, blockReg.getUuid(), blockReg.getIdentifier()));
376 365
                }
377 366
            }
378 367
        }

Also available in: Unified diff