# HG changeset patch # User Felix Wolfsteller # Date 1351081750 -7200 # Node ID 50273de4cf6306456689248be08bfecf12141af0 # Parent 640adb7bced54f5d714403181db32ec97d63c344 flys/issue825/2 Fix labeling of Analysisperiods (like A1, A2....) diff -r 640adb7bced5 -r 50273de4cf63 flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java Wed Oct 24 14:27:21 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java Wed Oct 24 14:29:10 2012 +0200 @@ -162,23 +162,18 @@ String analysisTemplate = getAnalysisTemplate(); - int analysisCount = 1; - for (KMIndex periods: analysisPeriods) { - // Typically resulting in A1,A2... - String analyisS = MessageFormat.format( - analysisTemplate, analysisCount); - for (KMIndex.Entry kmEntry: periods) { - + String kmS = kmF.format(kmEntry.getKm()); + int analysisCount = 1; for (AnalysisPeriod period: kmEntry.getValue()) { + // Typically resulting in A1,A2... + String analyisS = MessageFormat.format(analysisTemplate, + analysisCount); QWD [] qwds = period.getQWDs(); - /* issue825 - km; Ereignis, Abfluss, GEMESSENER Wasserstand; Status (RECHTSBÜNDIG), del W - */ if (qwds != null) { for (QWD qwd: qwds) { @@ -196,9 +191,9 @@ deltaWS }); } } + ++analysisCount; } } - ++analysisCount; } writer.flush(); }