Project

General

Profile

« Previous | Next » 

Revision edc8c14e

Added by Andreas Müller almost 2 years ago

replace LinkedHashMap by Map where possible

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RegistrationDTO.java
12 12
import java.util.Arrays;
13 13
import java.util.Collection;
14 14
import java.util.HashSet;
15
import java.util.LinkedHashMap;
16 15
import java.util.List;
16
import java.util.Map;
17 17
import java.util.Set;
18 18
import java.util.UUID;
19 19

  
......
258 258
        return name;
259 259
    }
260 260

  
261
    public LinkedHashMap<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> getOrderedTypeDesignationWorkingSets() {
261
    public Map<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> getOrderedTypeDesignationWorkingSets() {
262 262
        return typeDesignationManager != null ? typeDesignationManager.getOrderedTypeDesignationWorkingSets() : null;
263 263
    }
264 264

  
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatter.java
10 10

  
11 11
import java.util.ArrayList;
12 12
import java.util.Collections;
13
import java.util.LinkedHashMap;
14 13
import java.util.List;
14
import java.util.Map;
15 15
import java.util.UUID;
16 16

  
17 17
import org.apache.commons.lang3.StringUtils;
......
94 94
        }
95 95

  
96 96
        int typeSetCount = 0;
97
        LinkedHashMap<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> orderedByTypesByBaseEntity
97
        Map<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> orderedByTypesByBaseEntity
98 98
                    = manager.getOrderedTypeDesignationWorkingSets();
99 99
        TypeDesignationWorkingSetType lastWsType = null;
100 100
        if (orderedByTypesByBaseEntity != null){
......
111 111
    private void buildTaggedTextForSingleTypeSet(TypeDesignationSetManager manager, boolean withBrackets,
112 112
            TaggedTextBuilder finalBuilder, int typeSetCount, TypedEntityReference<?> baseEntityRef, TypeDesignationWorkingSetType lastWsType) {
113 113

  
114
        LinkedHashMap<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet>
114
        Map<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet>
115 115
                orderedByTypesByBaseEntity = manager.getOrderedTypeDesignationWorkingSets();
116 116
        TypeDesignationWorkingSet typeDesignationWorkingSet = orderedByTypesByBaseEntity.get(baseEntityRef);
117 117

  
......
278 278
     * or if it has a single working set but this workingset has multiple type designations.
279 279
     */
280 280
    private boolean hasMultipleTypes(
281
            LinkedHashMap<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> typeWorkingSets) {
281
            Map<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> typeWorkingSets) {
282 282
        if (typeWorkingSets == null || typeWorkingSets.isEmpty()){
283 283
            return false;
284 284
        }else if (typeWorkingSets.keySet().size() > 1) {
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManager.java
405 405
        return this.typeDesignations.get(uuid);
406 406
    }
407 407

  
408
    public LinkedHashMap<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> getOrderedTypeDesignationWorkingSets() {
408
    public Map<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> getOrderedTypeDesignationWorkingSets() {
409 409
        return orderedByTypesByBaseEntity;
410 410
    }
411 411

  
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManagerTest.java
13 13

  
14 14
import java.util.ArrayList;
15 15
import java.util.Iterator;
16
import java.util.LinkedHashMap;
17 16
import java.util.List;
17
import java.util.Map;
18 18

  
19 19
import org.junit.Assert;
20 20
import org.junit.Before;
......
213 213
                    , result
214 214
                    );
215 215

  
216
            LinkedHashMap<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> orderedTypeDesignations =
216
            Map<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> orderedTypeDesignations =
217 217
                    typeDesignationManager.getOrderedTypeDesignationWorkingSets();
218 218
            Iterator<TypeDesignationWorkingSet> byStatusMapIterator = orderedTypeDesignations.values().iterator();
219 219
            Iterator<TypeDesignationStatusBase<?>> keyIt_1 = byStatusMapIterator.next().keySet().iterator();

Also available in: Unified diff