import java.io.File;\r
import java.io.IOException;\r
import java.net.MalformedURLException;\r
-import java.net.URI;\r
import java.net.URL;\r
import java.util.ArrayList;\r
import java.util.HashMap;\r
import java.util.List;\r
import java.util.Map;\r
-import java.util.Set;\r
import java.util.Map.Entry;\r
+import java.util.Set;\r
\r
import org.apache.log4j.Logger;\r
import org.apache.sanselan.ImageInfo;\r
import org.springframework.stereotype.Component;\r
\r
import eu.etaxonomy.cdm.app.images.AbstractImageImporter;\r
-import eu.etaxonomy.cdm.app.images.ImageImportConfigurator;\r
+import eu.etaxonomy.cdm.app.images.ImageImportState;\r
import eu.etaxonomy.cdm.model.agent.AgentBase;\r
import eu.etaxonomy.cdm.model.agent.Person;\r
import eu.etaxonomy.cdm.model.common.CdmBase;\r
import eu.etaxonomy.cdm.model.media.Media;\r
import eu.etaxonomy.cdm.model.media.MediaRepresentation;\r
import eu.etaxonomy.cdm.model.media.Rights;\r
-import eu.etaxonomy.cdm.model.media.RightsType;\r
+import eu.etaxonomy.cdm.model.media.RightsTerm;\r
import eu.etaxonomy.cdm.model.reference.Reference;\r
import eu.etaxonomy.cdm.model.taxon.Taxon;\r
import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
\r
\r
\r
- protected boolean invokeImageImport (ImageImportConfigurator config){\r
+ protected void invokeImageImport (ImageImportState state){\r
\r
- logger.info("Importing images from directory: " + config.getSourceNameString());\r
+ logger.info("Importing images from directory: " + state.getConfig().getSourceNameString());\r
\r
- File sourceFolder = new File(config.getSource());\r
+ File sourceFolder = new File(state.getConfig().getSource());\r
String taxonName;\r
if(sourceFolder.isDirectory()){\r
int count = 0;\r
\r
\r
\r
- Reference sec = referenceService.find(config.getSecUuid());\r
+ Reference sec = referenceService.find(state.getConfig().getSecUuid());\r
\r
List<TaxonBase> taxa = new ArrayList<TaxonBase>();\r
if (taxonName != null){\r
// URL for this image\r
URL url = null;\r
try {\r
- url = new URL(config.getMediaUrlString() + file.getName());\r
+ url = new URL(state.getConfig().getMediaUrlString() + file.getName());\r
} catch (MalformedURLException e) {\r
logger.warn("URL is malformed: "+ url);\r
}\r
if (metaData.containsKey(MetaData.COPYRIGHT)){\r
//TODO: maybe search for the identic right... \r
Rights copyright = Rights.NewInstance();\r
- copyright.setType(RightsType.COPYRIGHT());\r
+ copyright.setType(RightsTerm.COPYRIGHT());\r
Person copyrightOwner;\r
if (artist != null && !artist.getLastname().equalsIgnoreCase(getLastName(metaData.get(MetaData.COPYRIGHT)))){\r
copyrightOwner = Person.NewInstance();\r
media.addRights(copyright);\r
}\r
\r
- Reference sourceRef = config.getSourceReference();\r
+ Reference sourceRef = state.getConfig().getSourceReference();\r
TaxonDescription description = taxon.getOrCreateImageGallery(sourceRef == null ? null :sourceRef.getTitleCache());\r
\r
\r
}else{\r
logger.error("given source folder is not a directory");\r
}\r
- return true;\r
+ return;\r
}\r
\r
private String getFirstName(String artist){\r