comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadCalculate.java @ 7928:5b3c795385ef

This guess was not always correct.
author "Tom Gottfried <tom@intevation.de>"
date Thu, 12 Jun 2014 12:26:05 +0200
parents 7302d2af815f
children 86f5a1577cc6
comparison
equal deleted inserted replaced
7927:07cc4cd9233e 7928:5b3c795385ef
30 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadFactory; 30 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadFactory;
31 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadResult; 31 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadResult;
32 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadUnknownFacet; 32 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadUnknownFacet;
33 import org.dive4elements.river.artifacts.resources.Resources; 33 import org.dive4elements.river.artifacts.resources.Resources;
34 import org.dive4elements.river.artifacts.states.DefaultState; 34 import org.dive4elements.river.artifacts.states.DefaultState;
35 import org.dive4elements.river.utils.DateGuesser; 35 import org.dive4elements.river.utils.DateUtil;
36 36
37 /** State in which Sediment Load(s) are calculated/retrieved. */ 37 /** State in which Sediment Load(s) are calculated/retrieved. */
38 public class SedimentLoadCalculate 38 public class SedimentLoadCalculate
39 extends DefaultState 39 extends DefaultState
40 implements FacetTypes 40 implements FacetTypes
101 } 101 }
102 } 102 }
103 for (int[] date: dates) { 103 for (int[] date: dates) {
104 try { 104 try {
105 Date s = 105 Date s =
106 DateGuesser.guessDate(String.valueOf(date[0])); 106 DateUtil.getStartDateFromYear(date[0]);
107 Date e = 107 Date e =
108 DateGuesser.guessDate(String.valueOf(date[1])); 108 DateUtil.getEndDateFromYear(date[0]);
109 if (!(s.after(load.getEnd()) || 109 if (!(s.after(load.getEnd()) ||
110 e.before(load.getStart()))) { 110 e.before(load.getStart()))) {
111 return Boolean.TRUE; 111 return Boolean.TRUE;
112 } 112 }
113 } 113 }

http://dive4elements.wald.intevation.org