Project

General

Profile

« Previous | Next » 

Revision 8422c0cd

Added by Andreas Müller almost 8 years ago

Remove generics from Reference in cdmlib-app #5830

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/edaphobase/EdaphobaseTaxonImport.java
167 167

  
168 168
        //nomRef
169 169
        if (nomRefId != null){
170
            Reference<?> nomRef = state.getRelatedObject(REFERENCE_NAMESPACE, String.valueOf(nomRefId), Reference.class);
170
            Reference nomRef = state.getRelatedObject(REFERENCE_NAMESPACE, String.valueOf(nomRefId), Reference.class);
171 171
            if (nomRef == null){
172 172
                logger.warn("Reference " + nomRefId + " could not be found");
173 173
            }
......
176 176
        name.setNomenclaturalMicroReference(StringUtils.isBlank(pages)? null : pages);
177 177

  
178 178

  
179
        Reference<?> secRef = state.getRelatedObject(REFERENCE_NAMESPACE, state.getConfig().getSecUuid().toString(), Reference.class);
179
        Reference secRef = state.getRelatedObject(REFERENCE_NAMESPACE, state.getConfig().getSecUuid().toString(), Reference.class);
180 180
        if (secRef == null){
181 181
            secRef = makeSecRef(state);
182 182
        }
......
200 200
     * @param state
201 201
     * @return
202 202
     */
203
    private Reference<?> makeSecRef(EdaphobaseImportState state) {
204
        Reference<?> ref = ReferenceFactory.newDatabase();
203
    private Reference makeSecRef(EdaphobaseImportState state) {
204
        Reference ref = ReferenceFactory.newDatabase();
205 205
        ref.setTitle(state.getConfig().getEdaphobaseSecundumTitle());
206 206
        ref.setUuid(state.getConfig().getSecUuid());
207 207
        state.addRelatedObject(REFERENCE_NAMESPACE, ref.getUuid().toString(), ref);
......
250 250
        String nameSpace = REFERENCE_NAMESPACE;
251 251
        Class<?> cdmClass = Reference.class;
252 252
        Set<String> idSet = referenceIdSet;
253
        Map<String, Reference<?>> referenceMap = (Map<String, Reference<?>>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
253
        Map<String, Reference> referenceMap = (Map<String, Reference>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
254 254
        result.put(nameSpace, referenceMap);
255 255

  
256 256
        //secundum
257 257
        UUID secUuid = state.getConfig().getSecUuid();
258
        Reference<?> secRef = getReferenceService().find(secUuid);
258
        Reference secRef = getReferenceService().find(secUuid);
259 259
        referenceMap.put(secUuid.toString(), secRef);
260 260

  
261 261
        return result;

Also available in: Unified diff