comparison backend/src/main/java/org/dive4elements/river/importer/sinfo/parsers/CollisionParser.java @ 9578:3dfcb6e1c4d6

Use of SessionHolder replaced by ImporterSession if query executed in the importer
author mschaefer
date Tue, 11 Dec 2018 14:40:36 +0100
parents abe069eb180c
children 67a42c9c46a7
comparison
equal deleted inserted replaced
9577:ca19b7186294 9578:3dfcb6e1c4d6
22 import java.util.regex.Pattern; 22 import java.util.regex.Pattern;
23 23
24 import org.apache.log4j.Logger; 24 import org.apache.log4j.Logger;
25 import org.dive4elements.river.importer.Config; 25 import org.dive4elements.river.importer.Config;
26 import org.dive4elements.river.importer.ImportRiver; 26 import org.dive4elements.river.importer.ImportRiver;
27 import org.dive4elements.river.importer.ImporterSession;
27 import org.dive4elements.river.importer.common.AbstractParser; 28 import org.dive4elements.river.importer.common.AbstractParser;
28 import org.dive4elements.river.importer.common.ParsingState; 29 import org.dive4elements.river.importer.common.ParsingState;
29 import org.dive4elements.river.importer.sinfo.importitem.CollisionKmLineImport; 30 import org.dive4elements.river.importer.sinfo.importitem.CollisionKmLineImport;
30 import org.dive4elements.river.importer.sinfo.importitem.CollisionSeriesImport; 31 import org.dive4elements.river.importer.sinfo.importitem.CollisionSeriesImport;
31 import org.dive4elements.river.importer.sinfo.importitem.CollisionTypeImport; 32 import org.dive4elements.river.importer.sinfo.importitem.CollisionTypeImport;
74 /***** CONSTRUCTORS *****/ 75 /***** CONSTRUCTORS *****/
75 76
76 public CollisionParser(final File importPath, final File rootRelativePath, final ImportRiver river) { 77 public CollisionParser(final File importPath, final File rootRelativePath, final ImportRiver river) {
77 super(importPath, rootRelativePath, river); 78 super(importPath, rootRelativePath, river);
78 this.types = new HashMap<>(); 79 this.types = new HashMap<>();
79 for (final CollisionType type : CollisionType.getTypes()) 80 for (final CollisionType type : CollisionType.getTypes(ImporterSession.getInstance().getDatabaseSession()))
80 this.types.put(type.getName().trim().toLowerCase(), new CollisionTypeImport(type.getName())); 81 this.types.put(type.getName().trim().toLowerCase(), new CollisionTypeImport(type.getName()));
81 } 82 }
82 83
83 84
84 /***** METHODS *****/ 85 /***** METHODS *****/

http://dive4elements.wald.intevation.org