Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java @ 8039:3a769d5fb733
Use GF_UNKNOWN constant instead of -1 to identify unknown grain fractions.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 16 Jul 2014 15:53:11 +0200 |
| parents | b6e7cfcabf2c |
| children | c835f3cf098e |
comparison
equal
deleted
inserted
replaced
| 8038:aa622bddfdac | 8039:3a769d5fb733 |
|---|---|
| 108 .addScalar("ms_type", StandardBasicTypes.STRING); | 108 .addScalar("ms_type", StandardBasicTypes.STRING); |
| 109 | 109 |
| 110 sqlQuery.setString("river", river); | 110 sqlQuery.setString("river", river); |
| 111 | 111 |
| 112 SedimentLoadData.Load load = null; | 112 SedimentLoadData.Load load = null; |
| 113 int grainFractionIndex = -1; | 113 int grainFractionIndex = SedimentLoadData.GF_UNKNOWN; |
| 114 | 114 |
| 115 HashMap<Integer, SedimentLoadData.Station> id2station | 115 HashMap<Integer, SedimentLoadData.Station> id2station |
| 116 = new HashMap<Integer, SedimentLoadData.Station>(); | 116 = new HashMap<Integer, SedimentLoadData.Station>(); |
| 117 | 117 |
| 118 for (Iterator iter = sqlQuery.iterate(); iter.hasNext();) { | 118 for (Iterator iter = sqlQuery.iterate(); iter.hasNext();) { |
| 134 | 134 |
| 135 // Grain fractions only change when a new sediment load starts. | 135 // Grain fractions only change when a new sediment load starts. |
| 136 grainFractionIndex = | 136 grainFractionIndex = |
| 137 SedimentLoadData.grainFractionIndex(gf_name); | 137 SedimentLoadData.grainFractionIndex(gf_name); |
| 138 | 138 |
| 139 if (grainFractionIndex == -1) { | 139 if (grainFractionIndex == SedimentLoadData.GF_UNKNOWN) { |
| 140 log.error("Unknown grain fraction type: " + gf_name); | 140 log.error("Unknown grain fraction type: " + gf_name); |
| 141 break; | 141 break; |
| 142 } | 142 } |
| 143 } | 143 } |
| 144 | 144 |