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/markup/MarkupImportBase.java
290 290
		}else if (cdmBase.isInstanceOf(DescriptionElementBase.class)){
291 291
			docImport.getDescriptionService().saveDescriptionElement((DescriptionElementBase)cdmBase);
292 292
		}else if (cdmBase.isInstanceOf(Reference.class)){
293
			docImport.getReferenceService().saveOrUpdate((Reference<?>)cdmBase);
293
			docImport.getReferenceService().saveOrUpdate((Reference)cdmBase);
294 294
		}else{
295 295
			String message = "Unknown cdmBase type to save: " + cdmBase.getClass();
296 296
			fireWarningEvent(message, "Unknown location", 8);
......
1002 1002
		return StringUtils.isBlank(str);
1003 1003
	}
1004 1004

  
1005
	protected TaxonDescription getTaxonDescription(Taxon taxon, Reference<?> ref, boolean isImageGallery, boolean createNewIfNotExists) {
1005
	protected TaxonDescription getTaxonDescription(Taxon taxon, Reference ref, boolean isImageGallery, boolean createNewIfNotExists) {
1006 1006
		return docImport.getTaxonDescription(taxon, isImageGallery, createNewIfNotExists);
1007 1007
	}
1008 1008

  
......
1665 1665
				if (StringUtils.isNotBlank(numString)) {
1666 1666
					// TODO use concrete source (e.g. DAPHNIPHYLLACEAE in FM
1667 1667
					// vol.13)
1668
					Reference<?> citation = state.getConfig().getSourceReference();
1668
					Reference citation = state.getConfig().getSourceReference();
1669 1669
					media.addSource(OriginalSourceType.Import, numString, "num", citation, null);
1670 1670
					// TODO name used in source if available
1671 1671
				}
......
1834 1834
	}
1835 1835

  
1836 1836
	private String handleInLineReference(MarkupImportState state,XMLEventReader reader, XMLEvent parentEvent, MarkupNomenclatureImport nomenclatureImport)throws XMLStreamException {
1837
		Reference<?> reference = nomenclatureImport.handleReference(state, reader, parentEvent);
1837
		Reference reference = nomenclatureImport.handleReference(state, reader, parentEvent);
1838 1838
		String result = "<cdm:ref uuid='%s'>%s</ref>";
1839 1839
		result = String.format(result, reference.getUuid(), reference.getTitleCache());
1840 1840
		save(reference, state);
......
2027 2027

  
2028 2028
		Taxon taxon = state.getCurrentTaxon();
2029 2029
		// TODO which ref to take?
2030
		Reference<?> ref = state.getConfig().getSourceReference();
2030
		Reference ref = state.getConfig().getSourceReference();
2031 2031

  
2032 2032
		String text = "";
2033 2033
		while (reader.hasNext()) {

Also available in: Unified diff