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/model/registration/RegistrationWorkingSet.java
14 14
import java.util.List;
15 15
import java.util.Optional;
16 16
import java.util.Set;
17
import java.util.UUID;
17 18

  
18 19
import org.joda.time.DateTime;
19 20

  
......
33 34

  
34 35
    private List<RegistrationDTO> registrationDTOs = new ArrayList<>();
35 36

  
36
    private Integer citationId = null;
37
    private UUID citationUuid = null;
37 38

  
38 39
    private DateTime created = null;
39 40

  
......
43 44
     * Creates an empty working set
44 45
     */
45 46
    public RegistrationWorkingSet(Reference citation) {
46
        citationId = citation.getId();
47
        citationUuid = citation.getUuid();
47 48
        this.citationString= citation.getTitleCache();
48 49

  
49 50
    }
......
83 84
        }
84 85
        for(RegistrationDTO regDto : candidates){
85 86
                Reference citation = publicationUnit(regDto);
86
                if(citationId == null){
87
                    citationId = citation.getId();
87
                if(citationUuid == null){
88
                    citationUuid = citation.getUuid();
88 89
                    citationString = citation.getTitleCache();
89 90
                } else {
90
                    if(citation.getId() != citationId.intValue()){
91
                    if(!citation.getUuid().equals(citationUuid)){
91 92
                        problems.add("Removing Registration " + regDto.getSummary() + " from set since this refers to a different citationString.");
92 93
                        continue;
93 94
                    }
......
180 181
        return registrationDTOs;
181 182
    }
182 183

  
183
    public Optional<RegistrationDTO> getRegistrationDTO(int registrationId) {
184
        return registrationDTOs.stream().filter(r -> r.getId() == registrationId).findFirst();
184
    public Optional<RegistrationDTO> getRegistrationDTO(UUID registrationUuid) {
185
        return registrationDTOs.stream().filter(r -> r.getUuid().equals(registrationUuid) ).findFirst();
185 186
    }
186 187

  
187 188
    /**
188 189
     * @return the citationId
189 190
     */
190
    public Integer getCitationId() {
191
        return citationId;
191
    public UUID getCitationUuid() {
192
        return citationUuid;
192 193
    }
193 194

  
194 195
    /**

Also available in: Unified diff