Project

General

Profile

« Previous | Next » 

Revision 531fc7bc

Added by Andreas Müller almost 8 years ago

Remove generics from Reference in cdmlib (except for cdmlib-model) #5830

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonStreamItem2CdmTaxonConverter.java
120 120
		List<MappedCdmBase> resultList = new ArrayList<MappedCdmBase>();
121 121

  
122 122
		//TODO what if not transactional?
123
		Reference<?> sourceReference = state.getTransactionalSourceReference();
123
		Reference sourceReference = state.getTransactionalSourceReference();
124 124
		String sourceReferenceDetail = null;
125 125

  
126 126
		//taxon
......
253 253
		String idNamespace = item.get(TermUri.CDM_SOURCE_IDNAMESPACE);
254 254
		String reference = item.get(TermUri.CDM_SOURCE_REFERENCE);
255 255
		if(StringUtils.isNotBlank(id) && StringUtils.isNotBlank(idNamespace) && StringUtils.isNotBlank(reference)){
256
			Reference<?> ref = ReferenceFactory.newGeneric();
256
			Reference ref = ReferenceFactory.newGeneric();
257 257
			ref.setTitle(reference);
258 258
			Taxon taxon = (Taxon) taxonBase;
259 259
			taxon.addSource(OriginalSourceType.Import, id, idNamespace, ref, null);
......
394 394
	}
395 395

  
396 396

  
397
	private void handleDataset(StreamItem item, TaxonBase<?> taxonBase, List<MappedCdmBase> resultList, Reference<?> sourceReference, String sourceReferecenDetail) {
397
	private void handleDataset(StreamItem item, TaxonBase<?> taxonBase, List<MappedCdmBase> resultList, Reference sourceReference, String sourceReferecenDetail) {
398 398
		TermUri idTerm = TermUri.DWC_DATASET_ID;
399 399
		TermUri strTerm = TermUri.DWC_DATASET_NAME;
400 400

  
......
436 436
		}else if (config.isDatasetsAsSecundumReference() || config.isDatasetsAsOriginalSource()){
437 437
			MappedCdmBase<Reference> mappedCitation = getReference(item, resultList, idTerm, strTerm, true);
438 438
			if (mappedCitation != null){
439
				Reference<?> ref = mappedCitation.getCdmBase();
439
				Reference ref = mappedCitation.getCdmBase();
440 440
				if (config.isDatasetsAsSecundumReference()){
441 441
					//dataset as secundum reference
442 442
					taxonBase.setSec(ref);
......
573 573
	 * @return
574 574
	 */
575 575
	private MappedCdmBase<Reference> getReference(StreamItem item, List<MappedCdmBase> resultList, TermUri idTerm, TermUri strTerm, boolean idIsInternal) {
576
		Reference<?> newRef = null;
577
		Reference<?> sourceCitation = null;
576
		Reference newRef = null;
577
		Reference sourceCitation = null;
578 578

  
579 579
		MappedCdmBase<Reference> result = null;
580 580
		if (exists(idTerm, item) || exists(strTerm, item)){
......
692 692
	 */
693 693
	private TaxonBase<?> getTaxonBase(StreamItem item) {
694 694
		TaxonNameBase<?,?> name = null;
695
		Reference<?> sec = null;
695
		Reference sec = null;
696 696
		TaxonBase<?> result;
697 697
		String taxStatus = item.get(TermUri.DWC_TAXONOMIC_STATUS);
698 698
		String status = "";

Also available in: Unified diff