Project

General

Profile

« Previous | Next » 

Revision 92fdeae1

Added by Andreas Müller almost 4 years ago

rename ImageInfo to CdmImageInfo and replace CdmUtils.str2uri

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameFactsImport.java
32 32
import org.springframework.stereotype.Component;
33 33

  
34 34
import eu.etaxonomy.cdm.common.CdmUtils;
35
import eu.etaxonomy.cdm.common.media.ImageInfo;
35
import eu.etaxonomy.cdm.common.media.CdmImageInfo;
36 36
import eu.etaxonomy.cdm.io.berlinModel.in.validation.BerlinModelNameFactsImportValidator;
37 37
import eu.etaxonomy.cdm.io.common.IOValidator;
38 38
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner;
......
49 49
import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
50 50
import eu.etaxonomy.cdm.model.reference.Reference;
51 51

  
52

  
53 52
/**
54 53
 * @author a.mueller
55 54
 * @since 20.03.2008
......
252 251
		return result;
253 252
	}
254 253

  
255

  
256 254
	//FIXME gibt es da keine allgemeine Methode in common?
257 255
	public Media getMedia(String nameFact, URL mediaUrl, File mediaPath){
258 256
		if (mediaUrl == null){
......
375 373
		return media;
376 374
	}
377 375

  
378

  
379 376
	private ImageFile makeImage(String imageUri, Integer size, File file){
380
		ImageInfo imageMetaData = null;
377
		CdmImageInfo imageMetaData = null;
381 378
		URI uri;
382 379
		try {
383 380
			uri = new URI(imageUri);
384 381
			try {
385
				imageMetaData = ImageInfo.NewInstance(uri, 0);
382
				imageMetaData = CdmImageInfo.NewInstance(uri, 0);
386 383
			} catch (IOException e) {
387 384
				logger.error("IOError reading image metadata." , e);
388 385
			} catch (HttpException e) {
......
397 394

  
398 395
	}
399 396

  
400

  
401
	/* (non-Javadoc)
402
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IoStateBase)
403
	 */
404 397
	@Override
405 398
	protected boolean doCheck(BerlinModelImportState state){
406 399
		IOValidator<BerlinModelImportState> validator = new BerlinModelNameFactsImportValidator();
407 400
		return validator.validate(state);
408 401
	}
409 402

  
410

  
411
	/* (non-Javadoc)
412
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
413
	 */
414 403
	@Override
415 404
    protected boolean isIgnore(BerlinModelImportState state){
416 405
		return ! state.getConfig().isDoNameFacts();
417 406
	}
418 407

  
419

  
420

  
421 408
	//for testing only
422 409
	public static void main(String[] args) {
423 410

  

Also available in: Unified diff