Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsFilterBuilder.java @ 3121:0b86b005bb9a
FixA: Respect the selected events and reference period correctly.
flys-artifacts/trunk@4722 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Wed, 20 Jun 2012 11:25:21 +0000 |
| parents | 9e0500d64524 |
| children | f12a8ed8d973 |
comparison
equal
deleted
inserted
replaced
| 3120:e52a3b62fc20 | 3121:0b86b005bb9a |
|---|---|
| 5 import de.intevation.flys.artifacts.model.FixingsOverview.DateRangeFilter; | 5 import de.intevation.flys.artifacts.model.FixingsOverview.DateRangeFilter; |
| 6 | 6 |
| 7 import de.intevation.flys.artifacts.model.FixingsOverview.Fixing.Filter; | 7 import de.intevation.flys.artifacts.model.FixingsOverview.Fixing.Filter; |
| 8 | 8 |
| 9 import de.intevation.flys.artifacts.model.FixingsOverview.IdFilter; | 9 import de.intevation.flys.artifacts.model.FixingsOverview.IdFilter; |
| 10 import de.intevation.flys.artifacts.model.FixingsOverview.IdsFilter; | |
| 10 import de.intevation.flys.artifacts.model.FixingsOverview.KmFilter; | 11 import de.intevation.flys.artifacts.model.FixingsOverview.KmFilter; |
| 11 import de.intevation.flys.artifacts.model.FixingsOverview.NotFilter; | 12 import de.intevation.flys.artifacts.model.FixingsOverview.NotFilter; |
| 12 import de.intevation.flys.artifacts.model.FixingsOverview.OrFilter; | 13 import de.intevation.flys.artifacts.model.FixingsOverview.OrFilter; |
| 13 import de.intevation.flys.artifacts.model.FixingsOverview.Range; | 14 import de.intevation.flys.artifacts.model.FixingsOverview.Range; |
| 14 import de.intevation.flys.artifacts.model.FixingsOverview.SectorFilter; | 15 import de.intevation.flys.artifacts.model.FixingsOverview.SectorFilter; |
| 162 } | 163 } |
| 163 catch (NumberFormatException nfe) { | 164 catch (NumberFormatException nfe) { |
| 164 log.warn(nfe); | 165 log.warn(nfe); |
| 165 } | 166 } |
| 166 } | 167 } |
| 168 } | |
| 169 else if ("columns".equals(name)) { | |
| 170 String cidsS = element.getAttribute("cids").trim(); | |
| 171 String [] parts = cidsS.split("\\s+"); | |
| 172 List<Integer> ids = new ArrayList<Integer>(); | |
| 173 for (String part: parts) { | |
| 174 try { | |
| 175 ids.add(Integer.valueOf(part)); | |
| 176 } | |
| 177 catch (NumberFormatException nfe) { | |
| 178 log.warn(nfe); | |
| 179 } | |
| 180 } | |
| 181 int [] cids = new int[ids.size()]; | |
| 182 for (int j = 0; j < cids.length; ++j) { | |
| 183 cids[i] = ids.get(j); | |
| 184 } | |
| 185 filters.add(new IdsFilter(cids)); | |
| 167 } | 186 } |
| 168 else if ("date".equals(name)) { | 187 else if ("date".equals(name)) { |
| 169 String when = element.getAttribute("when").trim(); | 188 String when = element.getAttribute("when").trim(); |
| 170 if (when.length() > 0) { | 189 if (when.length() > 0) { |
| 171 Date date = parseDate(when); | 190 Date date = parseDate(when); |