Project

General

Profile

« Previous | Next » 

Revision d3a52997

Added by Andreas Kohlbecker almost 15 years ago

fixing bug in palmae import and removing hard coded URI from ImageImportConfigurator

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/images/ImageImportConfigurator.java
28 28
public class ImageImportConfigurator extends ImportConfiguratorBase implements IImportConfigurator {
29 29
	private static final Logger logger = Logger.getLogger(ImageImportConfigurator.class);
30 30

  
31
	public static ImageImportConfigurator NewInstance(File source, ICdmDataSource destination, String mediaUrlString, Class<? extends AbstractImageImporter> importerClass){
32
		return new ImageImportConfigurator(source, destination, mediaUrlString, importerClass);		
33
	}
34
	
35
	/**
36
	 * @param source
37
	 * @param destination
38
	 * @param importerClass
39
	 * @return
40
	 * @deprecated use {@link #NewInstance(File, ICdmDataSource, String, Class)} instead
41
	 */
42
	@Deprecated 
31 43
	public static ImageImportConfigurator NewInstance(File source, ICdmDataSource destination, Class<? extends AbstractImageImporter> importerClass){
32
		return new ImageImportConfigurator(source, destination, importerClass);		
44
		return new ImageImportConfigurator(source, destination, null, importerClass);		
33 45
	}
34 46
	
35
	private ImageImportConfigurator(File source, ICdmDataSource destination, Class<? extends AbstractImageImporter> importerClass){
47
	private ImageImportConfigurator(File source, ICdmDataSource destination, String mediaUrlString, Class<? extends AbstractImageImporter> importerClass){
36 48
		FileNotFoundException e;
37 49
		setSource(source);
38 50
		setDestination(destination);
51
		setMediaUrlString(mediaUrlString);
39 52
		ioClassList = new Class[] {importerClass};
40 53
	}
41 54
	
42
	private String mediaUrlString = "http://wp5.e-taxonomy.eu/media/palmae/images/";
55
	private String mediaUrlString = null;
43 56
	
44 57

  
45 58

  
......
73 86
	 * @return the mediaUrlString
74 87
	 */
75 88
	public String getMediaUrlString() {
89
		if(mediaUrlString == null){
90
			throw new NullPointerException("mediaUrlString has not been set");
91
		}
76 92
		return mediaUrlString;
77 93
	}
78 94

  

Also available in: Unified diff