comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/CharDiameter.java @ 3785:a5f65e8983be

Merged revisions 5501-5502,5504-5508,5511-5513,5516-5519 via svnmerge from file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk ........ r5501 | felix | 2012-09-18 11:49:45 +0200 (Di, 18 Sep 2012) | 1 line fix issue865 - missing showarea theme prop. ........ r5502 | clins | 2012-09-18 12:18:30 +0200 (Di, 18 Sep 2012) | 1 line Add robustness checks to prevent NPEs ........ r5504 | felix | 2012-09-18 14:03:15 +0200 (Di, 18 Sep 2012) | 1 line i18n for area label (fix issue487). ........ r5505 | clins | 2012-09-18 16:19:59 +0200 (Di, 18 Sep 2012) | 1 line Update themes to show point descriptions ........ r5506 | rrenkert | 2012-09-18 17:00:30 +0200 (Di, 18 Sep 2012) | 3 lines Removed incorrect characteristic diameter. ........ r5507 | rrenkert | 2012-09-18 17:03:20 +0200 (Di, 18 Sep 2012) | 3 lines Fixed some stupid bugs in bed quality data factory and calculation. ........ r5508 | teichmann | 2012-09-18 17:45:49 +0200 (Di, 18 Sep 2012) | 1 line The usual whitespace and import cleanups. ........ r5511 | teichmann | 2012-09-18 18:24:51 +0200 (Di, 18 Sep 2012) | 1 line Use generics aware Collections.emptyList(). ........ r5512 | teichmann | 2012-09-18 20:36:52 +0200 (Di, 18 Sep 2012) | 1 line Some more little steps towards "Auslagerung extremer Wasserspiegellagen". ........ r5513 | clins | 2012-09-18 23:38:19 +0200 (Di, 18 Sep 2012) | 1 line A and B facets of fix analyis are now deactivated by default ........ r5516 | bricks | 2012-09-19 10:45:51 +0200 (Mi, 19 Sep 2012) | 2 lines Add the gauge station to the GaugeOverviewInfoService xml response ........ r5517 | rrenkert | 2012-09-19 10:50:23 +0200 (Mi, 19 Sep 2012) | 3 lines Added CSV export to bed quality calculation. ........ r5518 | bricks | 2012-09-19 11:04:04 +0200 (Mi, 19 Sep 2012) | 2 lines Fix date in changelog entry ........ r5519 | teichmann | 2012-09-19 11:17:14 +0200 (Mi, 19 Sep 2012) | 1 line Removed trailing whitespace. ........ flys-artifacts/tags/2.9.1@5531 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 19 Sep 2012 14:58:31 +0000
parents 9d12526c1933
children
comparison
equal deleted inserted replaced
3784:9f9d5ada96ca 3785:a5f65e8983be
18 18
19 public static final String UI_PROVIDER = "parameter-matrix"; 19 public static final String UI_PROVIDER = "parameter-matrix";
20 20
21 private static final String CHAR_DIAMETER_MIN = "calc.bed.dmin"; 21 private static final String CHAR_DIAMETER_MIN = "calc.bed.dmin";
22 private static final String CHAR_DIAMETER_MAX = "calc.bed.dmax"; 22 private static final String CHAR_DIAMETER_MAX = "calc.bed.dmax";
23 private static final String CHAR_DIAMETER_MID = "calc.bed.dmid";
24 private static final String CHAR_DIAMETER_90 = "calc.bed.d90"; 23 private static final String CHAR_DIAMETER_90 = "calc.bed.d90";
25 private static final String CHAR_DIAMETER_84 = "calc.bed.d84"; 24 private static final String CHAR_DIAMETER_84 = "calc.bed.d84";
26 private static final String CHAR_DIAMETER_80 = "calc.bed.d80"; 25 private static final String CHAR_DIAMETER_80 = "calc.bed.d80";
27 private static final String CHAR_DIAMETER_75 = "calc.bed.d75"; 26 private static final String CHAR_DIAMETER_75 = "calc.bed.d75";
28 private static final String CHAR_DIAMETER_70 = "calc.bed.d70"; 27 private static final String CHAR_DIAMETER_70 = "calc.bed.d70";
48 CHAR_DIAMETER_75, 47 CHAR_DIAMETER_75,
49 CHAR_DIAMETER_80, 48 CHAR_DIAMETER_80,
50 CHAR_DIAMETER_84, 49 CHAR_DIAMETER_84,
51 CHAR_DIAMETER_90, 50 CHAR_DIAMETER_90,
52 CHAR_DIAMETER_MAX, 51 CHAR_DIAMETER_MAX,
53 CHAR_DIAMETER_MID,
54 CHAR_DIAMETER_MIN 52 CHAR_DIAMETER_MIN
55 }; 53 };
56 54
57 @Override 55 @Override
58 public String getUIProvider() { 56 public String getUIProvider() {

http://dive4elements.wald.intevation.org