Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/ImportBedHeight.java @ 8856:5e38e2924c07 3.2.x
Fix code style.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Thu, 18 Jan 2018 20:12:01 +0100 |
| parents | 6fcf4717605f |
| children | a0a0a7f912ab 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8855:d7c005e12af0 | 8856:5e38e2924c07 |
|---|---|
| 131 | 131 |
| 132 public BedHeight getPeer(River river) { | 132 public BedHeight getPeer(River river) { |
| 133 if (peer == null) { | 133 if (peer == null) { |
| 134 BedHeightType theType = type != null ? type.getPeer() : null; | 134 BedHeightType theType = type != null ? type.getPeer() : null; |
| 135 ElevationModel theCurModel = curElevationModel.getPeer(); | 135 ElevationModel theCurModel = curElevationModel.getPeer(); |
| 136 Range theRange = range != null ? range.getPeer(river) : null; | 136 Range theRange = range != null |
| 137 ? range.getPeer(river) | |
| 138 : null; | |
| 137 | 139 |
| 138 if (theType == null) { | 140 if (theType == null) { |
| 139 log.warn("BHS: No bed height type given. Skip file '" + | 141 log.warn("BHS: No bed height type given. Skip file '" + |
| 140 description + "'"); | 142 description + "'"); |
| 141 return null; | 143 return null; |
| 150 if (theRange == null) { | 152 if (theRange == null) { |
| 151 log.warn("BHS: No km-range given: '" + | 153 log.warn("BHS: No km-range given: '" + |
| 152 description + "'"); | 154 description + "'"); |
| 153 } | 155 } |
| 154 | 156 |
| 155 Session session = ImporterSession.getInstance().getDatabaseSession(); | 157 Session session = ImporterSession.getInstance() |
| 158 .getDatabaseSession(); | |
| 156 | 159 |
| 157 Query query = session.createQuery( | 160 Query query = session.createQuery( |
| 158 "from BedHeight where " + | 161 "from BedHeight where " + |
| 159 "river=:river and year=:year " + | 162 "river=:river and year=:year " + |
| 160 "and type=:type and locationSystem=:locationSystem and " + | 163 "and type=:type and locationSystem=:locationSystem and " + |
| 175 river, | 178 river, |
| 176 year, | 179 year, |
| 177 theType, | 180 theType, |
| 178 locationSystem.getPeer(), | 181 locationSystem.getPeer(), |
| 179 theCurModel, | 182 theCurModel, |
| 180 oldElevationModel != null ? oldElevationModel.getPeer() : null, | 183 oldElevationModel != null |
| 184 ? oldElevationModel.getPeer() | |
| 185 : null, | |
| 181 range.getPeer(river), | 186 range.getPeer(river), |
| 182 evaluationBy, | 187 evaluationBy, |
| 183 description | 188 description |
| 184 ); | 189 ); |
| 185 | 190 |