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/berlinModel/in/BerlinModelOccurrenceImport.java
125 125 
	private TermVocabulary<NamedArea> createEuroMedAreas(BerlinModelImportState state) throws SQLException {
126 126 
		logger.warn("Start creating E+M areas");
127 127 
		Source source = state.getConfig().getSource();
128 
		Reference<?> sourceReference = state.getConfig().getSourceReference();
128 
		Reference sourceReference = state.getConfig().getSourceReference();
129 129 

  		




  130
  130
  
    
		TransactionStatus txStatus = this.startTransaction();


  		




  131
  131
  
    

  		




  ......




  269
  269
  
    
	 * @param sourceReference


  		




  270
  270
  
    
	 * @return


  		




  271
  271
  
    
	 */


  		




  272
  
  
    
	private Reference<?> getSourceReference(Reference<?> sourceReference) {


  		




  273
  
  
    
		Reference<?> persistentSourceReference = getReferenceService().find(sourceReference.getUuid());  //just to be sure


  		




  
  272
  
    
	private Reference getSourceReference(Reference sourceReference) {


  		




  
  273
  
    
		Reference persistentSourceReference = getReferenceService().find(sourceReference.getUuid());  //just to be sure


  		




  274
  274
  
    
		if (persistentSourceReference != null){


  		




  275
  275
  
    
			sourceReference = persistentSourceReference;


  		




  276
  276
  
    
		}


  		




  ......




  293
  293
  
    
			MarkerType euroMedAreaMarkerType, ExtensionType isoCodeExtType,


  		




  294
  294
  
    
			ExtensionType tdwgCodeExtType, ExtensionType mclCodeExtType,


  		




  295
  295
  
    
			NamedAreaLevel areaLevelTop, NamedAreaLevel areaLevelEm1, NamedAreaLevel areaLevelEm2,


  		




  296
  
  
    
			Reference<?> sourceReference, NamedArea euroMedArea, NamedArea level1Area) throws SQLException {


  		




  
  296
  
    
			Reference sourceReference, NamedArea euroMedArea, NamedArea level1Area) throws SQLException {


  		




  297
  297
  
    
		Integer areaId = rs.getInt("AreaId");


  		




  298
  298
  
    
		String emCode = nullSafeTrim(rs.getString("EMCode"));


  		




  299
  299
  
    
		String isoCode = nullSafeTrim(rs.getString("ISOCode"));


  		




  ......




  449
  449
  
    
						alternativeStatusString = CdmUtils.concat(",", stringArray);


  		




  450
  450
  
    
					}


  		




  451
  451
  
    

  		




  452
  
  
    
					Reference<?> sourceRef = state.getTransactionalSourceReference();


  		




  
  452
  
    
					Reference sourceRef = state.getTransactionalSourceReference();


  		




  453
  453
  
    

  		




  454
  454
  
    
					List<NamedArea> areas = makeAreaList(state, rs,	occurrenceId);


  		




  455
  455
  
    

  		




  ......




  622
  622
  
    
	 * @param taxonMap


  		




  623
  623
  
    
	 * @return


  		




  624
  624
  
    
	 */


  		




  625
  
  
    
	private TaxonDescription getTaxonDescription(int newTaxonId, int oldTaxonId, TaxonDescription oldDescription, Map<String, TaxonBase<?>> taxonMap, int occurrenceId, Reference<?> sourceSec){


  		




  
  625
  
    
	private TaxonDescription getTaxonDescription(int newTaxonId, int oldTaxonId, TaxonDescription oldDescription, Map<String, TaxonBase<?>> taxonMap, int occurrenceId, Reference sourceSec){


  		




  626
  626
  
    
		TaxonDescription result = null;


  		




  627
  627
  
    
		if (oldDescription == null || newTaxonId != oldTaxonId){


  		




  628
  628
  
    
			TaxonBase<?> taxonBase = taxonMap.get(String.valueOf(newTaxonId));


  		












Also available in:  Unified diff