Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoad.java @ 7013:998a9710007e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
issue1465: Do not allow null ranges for fraction values, logger.error instead.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 13 Sep 2013 16:07:46 +0200
parents 2b022ca95b3b
children
comparison
equal deleted inserted replaced
7012:9f45c17e8fda 7013:998a9710007e
15 15
16 import org.dive4elements.river.artifacts.model.NamedObjectImpl; 16 import org.dive4elements.river.artifacts.model.NamedObjectImpl;
17 import org.dive4elements.river.artifacts.model.Range; 17 import org.dive4elements.river.artifacts.model.Range;
18 import org.dive4elements.river.utils.EpsilonComparator; 18 import org.dive4elements.river.utils.EpsilonComparator;
19 19
20 import org.apache.log4j.Logger;
21
20 22
21 /** Gives access to Fractions (at kms). */ 23 /** Gives access to Fractions (at kms). */
22 public class SedimentLoad 24 public class SedimentLoad
23 extends NamedObjectImpl 25 extends NamedObjectImpl
24 { 26 {
27 /** Private logger. */
28 private static final Logger logger = Logger
29 .getLogger(SedimentLoad.class);
30
25 protected String description; 31 protected String description;
26 protected Date start; 32 protected Date start;
27 protected Date end; 33 protected Date end;
28 protected boolean isEpoch; 34 protected boolean isEpoch;
29 protected String unit; 35 protected String unit;
97 } 103 }
98 return f; 104 return f;
99 } 105 }
100 106
101 public void setCoarse(double km, double coarse, Range range) { 107 public void setCoarse(double km, double coarse, Range range) {
108 if (range == null) {
109 logger.error("coarse/range is null!");
110 return;
111 }
102 SedimentLoadFraction f = getFraction(km); 112 SedimentLoadFraction f = getFraction(km);
103 f.setCoarse(coarse); 113 f.setCoarse(coarse);
104 f.setCoarseRange(range); 114 f.setCoarseRange(range);
105 } 115 }
106 116
107 public void setFineMiddle(double km, double fine_middle, Range range) { 117 public void setFineMiddle(double km, double fine_middle, Range range) {
118 if (range == null) {
119 logger.error("finemiddle/range is null!");
120 return;
121 }
108 SedimentLoadFraction f = getFraction(km); 122 SedimentLoadFraction f = getFraction(km);
109 f.setFineMiddle(fine_middle); 123 f.setFineMiddle(fine_middle);
110 f.setFineMiddleRange(range); 124 f.setFineMiddleRange(range);
111 } 125 }
112 126
113 127
114 public void setSand(double km, double sand, Range range) { 128 public void setSand(double km, double sand, Range range) {
129 if (range == null) {
130 logger.error("sand/range is null!");
131 return;
132 }
115 SedimentLoadFraction f = getFraction(km); 133 SedimentLoadFraction f = getFraction(km);
116 f.setSand(sand); 134 f.setSand(sand);
117 f.setSandRange(range); 135 f.setSandRange(range);
118 } 136 }
119 137
120 public void setSuspSand(double km, double susp_sand, Range range) { 138 public void setSuspSand(double km, double susp_sand, Range range) {
139 if (range == null) {
140 logger.error("suspsand/range is null!");
141 return;
142 }
121 SedimentLoadFraction f = getFraction(km); 143 SedimentLoadFraction f = getFraction(km);
122 f.setSuspSand(susp_sand); 144 f.setSuspSand(susp_sand);
123 f.setSuspSandRange(range); 145 f.setSuspSandRange(range);
124 } 146 }
125 147
126 public void setSuspSandBed(double km, double susp_sand_bed, Range range) { 148 public void setSuspSandBed(double km, double susp_sand_bed, Range range) {
149 if (range == null) {
150 logger.error("suspsandbed/range is null!");
151 return;
152 }
127 SedimentLoadFraction f = getFraction(km); 153 SedimentLoadFraction f = getFraction(km);
128 f.setSuspSandBed(susp_sand_bed); 154 f.setSuspSandBed(susp_sand_bed);
129 f.setSuspSandBedRange(range); 155 f.setSuspSandBedRange(range);
130 } 156 }
131 157
132 public void setSuspSediment(double km, double susp_sediment, Range range) { 158 public void setSuspSediment(double km, double susp_sediment, Range range) {
159 if (range == null) {
160 logger.error("suspsed/range is null!");
161 return;
162 }
133 SedimentLoadFraction f = getFraction(km); 163 SedimentLoadFraction f = getFraction(km);
134 f.setSuspSediment(susp_sediment); 164 f.setSuspSediment(susp_sediment);
135 f.setSuspSedimentRange(range); 165 f.setSuspSedimentRange(range);
136 } 166 }
137 167
138 public void setLoadTotal(double km, double total) { 168 public void setLoadTotal(double km, double total) {
139 setLoadTotal(km, total, null); 169 setLoadTotal(km, total, null);
140 } 170 }
141 171
142 public void setLoadTotal(double km, double total, Range range) { 172 public void setLoadTotal(double km, double total, Range range) {
173 if (range == null) {
174 logger.error("loadtotal/range is null!");
175 return;
176 }
143 SedimentLoadFraction f = getFraction(km); 177 SedimentLoadFraction f = getFraction(km);
144 f.setLoadTotal(total); 178 f.setLoadTotal(total);
145 f.setLoadTotalRange(range); 179 f.setLoadTotalRange(range);
146 } 180 }
147 181
148 public void setTotal(double km, double total, Range range) { 182 public void setTotal(double km, double total, Range range) {
183 if (range == null) {
184 logger.error("total/range is null!");
185 return;
186 }
149 SedimentLoadFraction f = getFraction(km); 187 SedimentLoadFraction f = getFraction(km);
150 f.setTotal(total); 188 f.setTotal(total);
151 f.setTotalRange(range); 189 f.setTotalRange(range);
152 } 190 }
153 191
154 public void setUnknown(double km, double unknown, Range range) { 192 public void setUnknown(double km, double unknown, Range range) {
193 if (range == null) {
194 logger.error("unknown/range is null!");
195 return;
196 }
155 SedimentLoadFraction f = getFraction(km); 197 SedimentLoadFraction f = getFraction(km);
156 f.setUnknown(unknown); 198 f.setUnknown(unknown);
157 f.setUnknownRange(range); 199 f.setUnknownRange(range);
158 } 200 }
159 201
http://dive4elements.wald.intevation.org