Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingle.java @ 7340:2ce7bacc940f double-precision
Merged changes from default into double precision branch.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Tue, 15 Oct 2013 18:41:55 +0200 |
parents | c894b7b45c4c |
children | b5c54a6380e8 |
comparison
equal
deleted
inserted
replaced
7334:f7d3fc619976 | 7340:2ce7bacc940f |
---|---|
143 ElevationModel theCurModel = curElevationModel.getPeer(); | 143 ElevationModel theCurModel = curElevationModel.getPeer(); |
144 Range theRange = range != null ? range.getPeer(river) : null; | 144 Range theRange = range != null ? range.getPeer(river) : null; |
145 | 145 |
146 if (theType == null) { | 146 if (theType == null) { |
147 log.warn("BHS: No bed height type given. Skip file '" + | 147 log.warn("BHS: No bed height type given. Skip file '" + |
148 description + "'"); | 148 description + "'"); |
149 return null; | 149 return null; |
150 } | 150 } |
151 | 151 |
152 if (theCurModel == null) { | 152 if (theCurModel == null) { |
153 log.warn("BHS: No elevation model given. Skip file '" + | 153 log.warn("BHS: No elevation model given. Skip file '" + |
154 description + "'"); | 154 description + "'"); |
155 return null; | 155 return null; |
156 } | 156 } |
157 | 157 |
158 if (theRange == null) { | 158 if (theRange == null) { |
159 log.warn("BHS: No km-range given: '" + | 159 log.warn("BHS: No km-range given: '" + |
160 description + "'"); | 160 description + "'"); |
161 } | 161 } |
162 | 162 |
163 Session session = ImporterSession.getInstance().getDatabaseSession(); | 163 Session session = ImporterSession.getInstance().getDatabaseSession(); |
164 | 164 |
165 Query query = session.createQuery( | 165 Query query = session.createQuery( |