[PATCH] Trim "names" and "class" attribute of out generators before using
Wald Commits
scm-commit at wald.intevation.org
Fri Sep 20 15:44:44 CEST 2013
# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1379684679 -7200
# Branch generator-refactoring
# Node ID a2abd87c0d3b0e44a4c8fdcdd7d21769c51a0b39
# Parent beb9e94f04d3a8aa3bdd5d146e24ce4a4c31d7fa
Trim "names" and "class" attribute of out generators before using.
diff -r beb9e94f04d3 -r a2abd87c0d3b artifacts/doc/conf/conf.xml
--- a/artifacts/doc/conf/conf.xml Fri Sep 20 15:42:21 2013 +0200
+++ b/artifacts/doc/conf/conf.xml Fri Sep 20 15:44:39 2013 +0200
@@ -285,13 +285,13 @@
</hooks>
<output-generators>
- <output-generator name="discharge_curve" class="org.dive4elements.river.exports.DischargeCurveGenerator"></output-generator>
- <output-generator name="discharge_curve_chartinfo" class="org.dive4elements.river.exports.DischargeCurveInfoGenerator"></output-generator>
- <output-generator name="cross_section" class="org.dive4elements.river.exports.CrossSectionGenerator"></output-generator>
- <output-generator name="cross_section_chartinfo" class="org.dive4elements.river.exports.CrossSectionInfoGenerator"></output-generator>
- <output-generator name="computed_discharge_curve" class="org.dive4elements.river.exports.ComputedDischargeCurveGenerator"></output-generator>
- <output-generator name="computed_discharge_curve_chartinfo" class="org.dive4elements.river.exports.ComputedDischargeCurveInfoGenerator"></output-generator>
- <output-generator name="longitudinal_section" class="org.dive4elements.river.exports.DiagramGenerator"><
+ <output-generator names="discharge_curve" class="org.dive4elements.river.exports.DischargeCurveGenerator"/>
+ <output-generator names="discharge_curve_chartinfo" class="org.dive4elements.river.exports.DischargeCurveInfoGenerator"/>
+ <output-generator names="cross_section" class="org.dive4elements.river.exports.CrossSectionGenerator"/>
+ <output-generator names="cross_section_chartinfo" class="org.dive4elements.river.exports.CrossSectionInfoGenerator"/>
+ <output-generator names="computed_discharge_curve" class="org.dive4elements.river.exports.ComputedDischargeCurveGenerator"/>
+ <output-generator names="computed_discharge_curve_chartinfo" class="org.dive4elements.river.exports.ComputedDischargeCurveInfoGenerator"/>
+ <output-generator names="longitudinal_section" class="org.dive4elements.river.exports.DiagramGenerator">
<axis name="W"/>
<axis name="D"/>
<axis name="Q"/>
@@ -305,95 +305,95 @@
<processor class="org.dive4elements.river.exports.process.AnnotationProcessor" axis="none"/>
<processor class="org.dive4elements.river.exports.process.WOutProcessor" axis="W"/>
</output-generator>
- <output-generator name="longitudinal_section_chartinfo" class="org.dive4elements.river.exports.LongitudinalSectionInfoGenerator"></output-generator>
- <output-generator name="duration_curve" class="org.dive4elements.river.exports.DurationCurveGenerator"></output-generator>
- <output-generator name="duration_curve_chartinfo" class="org.dive4elements.river.exports.DurationCurveInfoGenerator"></output-generator>
- <output-generator name="discharge_longitudinal_section" class="org.dive4elements.river.exports.DischargeLongitudinalSectionGenerator"></output-generator>
- <output-generator name="discharge_longitudinal_section_chartinfo" class="org.dive4elements.river.exports.DischargeLongitudinalSectionInfoGenerator"></output-generator>
- <output-generator name="waterlevel_export" class="org.dive4elements.river.exports.WaterlevelExporter"></output-generator>
- <output-generator name="extreme_wq_curve" class="org.dive4elements.river.exports.extreme.ExtremeWQCurveGenerator"></output-generator>
- <output-generator name="extreme_curve_export" class="org.dive4elements.river.exports.WaterlevelExporter"></output-generator>
- <output-generator name="extreme_wq_curve_chartinfo" class="org.dive4elements.river.exports.extreme.ExtremeWQCurveInfoGenerator"></output-generator>
- <output-generator name="fix_wq_curve" class="org.dive4elements.river.exports.fixings.FixWQCurveGenerator"></output-generator>
- <output-generator name="fix_wq_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator"></output-generator>
- <output-generator name="durationcurve_export" class="org.dive4elements.river.exports.DurationCurveExporter"></output-generator>
- <output-generator name="computed_dischargecurve_export" class="org.dive4elements.river.exports.ComputedDischargeCurveExporter"></output-generator>
- <output-generator name="discharge_longitudinal_section_export" class="org.dive4elements.river.exports.DischargeLongitudinalSectionExporter"></output-generator>
- <output-generator name="w_differences" class="org.dive4elements.river.exports.WDifferencesCurveGenerator"></output-generator>
- <output-generator name="w_differences_chartinfo" class="org.dive4elements.river.exports.WDifferencesCurveInfoGenerator"></output-generator>
- <output-generator name="w_differences_export" class="org.dive4elements.river.exports.WDifferencesExporter"></output-generator>
- <output-generator name="floodmap" class="org.dive4elements.river.exports.MapGenerator"></output-generator>
- <output-generator name="map" class="org.dive4elements.river.exports.MapGenerator"></output-generator>
- <output-generator name="reference_curve" class="org.dive4elements.river.exports.ReferenceCurveGenerator"></output-generator>
- <output-generator name="reference_curve_normalized" class="org.dive4elements.river.exports.NormalizedReferenceCurveGenerator"></output-generator>
- <output-generator name="reference_curve_normalized_chartinfo" class="org.dive4elements.river.exports.NormalizedReferenceCurveInfoGenerator"></output-generator>
- <output-generator name="reference_curve_chartinfo" class="org.dive4elements.river.exports.ReferenceCurveInfoGenerator"></output-generator>
- <output-generator name="reference_curve_export" class="org.dive4elements.river.exports.ReferenceCurveExporter"></output-generator>
- <output-generator name="historical_discharge" class="org.dive4elements.river.exports.HistoricalDischargeCurveGenerator"></output-generator>
- <output-generator name="historical_discharge_chartinfo" class="org.dive4elements.river.exports.HistoricalDischargeCurveInfoGenerator"></output-generator>
- <output-generator name="historical_discharge_wq" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator"></output-generator>
- <output-generator name="historical_discharge_wq_chartinfo" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator"></output-generator>
- <output-generator name="historical_discharge_export" class="org.dive4elements.river.exports.HistoricalDischargeCurveExporter"></output-generator>
- <output-generator name="flow_velocity" class="org.dive4elements.river.exports.FlowVelocityGenerator"></output-generator>
- <output-generator name="flow_velocity_chartinfo" class="org.dive4elements.river.exports.FlowVelocityInfoGenerator"></output-generator>
- <output-generator name="flow_velocity_export" class="org.dive4elements.river.exports.FlowVelocityExporter"></output-generator>
- <output-generator name="bedheight_middle" class="org.dive4elements.river.exports.MiddleBedHeightGenerator"></output-generator>
- <output-generator name="bedheight_middle_chartinfo" class="org.dive4elements.river.exports.MiddleBedHeightInfoGenerator"></output-generator>
- <output-generator name="bedheight_middle_export" class="org.dive4elements.river.exports.MiddleBedHeightExporter"></output-generator>
- <output-generator name="bed_longitudinal_section" class="org.dive4elements.river.exports.minfo.BedQualityGenerator"></output-generator>
- <output-generator name="bed_longitudinal_section_chartinfo" class="org.dive4elements.river.exports.minfo.BedQualityInfoGenerator"></output-generator>
- <output-generator name="bed_quality_export" class="org.dive4elements.river.exports.minfo.BedQualityExporter"></output-generator>
- <output-generator name="bed_difference_year" class="org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator"></output-generator>
- <output-generator name="bed_difference_year_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffYearInfoGenerator"></output-generator>
- <output-generator name="bed_difference_epoch" class="org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator"></output-generator>
- <output-generator name="bed_difference_epoch_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator"></output-generator>
- <output-generator name="bed_difference_height_year" class="org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator"></output-generator>
- <output-generator name="bed_difference_height_year_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffHeightYearInfoGenerator"></output-generator>
- <output-generator name="bedheight_difference_export" class="org.dive4elements.river.exports.minfo.BedDifferenceExporter"></output-generator>
- <output-generator name="sq_relation_a" class="org.dive4elements.river.exports.sq.SQRelationGeneratorA"></output-generator>
- <output-generator name="sq_relation_b" class="org.dive4elements.river.exports.sq.SQRelationGeneratorB"></output-generator>
- <output-generator name="sq_relation_c" class="org.dive4elements.river.exports.sq.SQRelationGeneratorC"></output-generator>
- <output-generator name="sq_relation_d" class="org.dive4elements.river.exports.sq.SQRelationGeneratorD"></output-generator>
- <output-generator name="sq_relation_e" class="org.dive4elements.river.exports.sq.SQRelationGeneratorE"></output-generator>
- <output-generator name="sq_relation_f" class="org.dive4elements.river.exports.sq.SQRelationGeneratorF"></output-generator>
- <output-generator name="sq_relation_a_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"></output-generator>
- <output-generator name="sq_relation_b_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"></output-generator>
- <output-generator name="sq_relation_c_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"></output-generator>
- <output-generator name="sq_relation_d_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"></output-generator>
- <output-generator name="sq_relation_e_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"></output-generator>
- <output-generator name="sq_relation_f_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"></output-generator>
- <output-generator name="sq_relation_export" class="org.dive4elements.river.exports.sq.SQRelationExporter"></output-generator>
- <output-generator name="sq_overview" class="org.dive4elements.river.exports.sq.SQOverviewGenerator"></output-generator>
- <output-generator name="fix_parameters_export" class="org.dive4elements.river.exports.fixings.ParametersExporter"></output-generator>
- <output-generator name="fix_deltawt_export" class="org.dive4elements.river.exports.fixings.DeltaWtExporter"></output-generator>
- <output-generator name="fix_deltawt_curve" class="org.dive4elements.river.exports.fixings.FixDeltaWtGenerator"></output-generator>
- <output-generator name="fix_deltawt_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixDeltaWtInfoGenerator"></output-generator>
- <output-generator name="fix_longitudinal_section_curve" class="org.dive4elements.river.exports.fixings.FixLongitudinalSectionGenerator"></output-generator>
- <output-generator name="fix_longitudinal_section_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixLongitudinalSectionInfoGenerator"></output-generator>
- <output-generator name="fix_derivate_curve" class="org.dive4elements.river.exports.fixings.FixDerivedCurveGenerator"></output-generator>
- <output-generator name="fix_derivate_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixDerivedCurveInfoGenerator"></output-generator>
- <output-generator name="fix_waterlevel_export" class="org.dive4elements.river.exports.WaterlevelExporter"></output-generator>
- <output-generator name="fix_vollmer_wq_curve" class="org.dive4elements.river.exports.fixings.FixWQCurveGenerator"></output-generator>
- <output-generator name="fix_vollmer_wq_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator"></output-generator>
- <output-generator name="sedimentload_ls" class="org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator"></output-generator>
- <output-generator name="sedimentload_ls_export" class="org.dive4elements.river.exports.minfo.SedimentLoadExporter"></output-generator>
- <output-generator name="sedimentload_ls_chartinfo" class="org.dive4elements.river.exports.minfo.SedimentLoadLSInfoGenerator"></output-generator>
+ <output-generator names="longitudinal_section_chartinfo" class="org.dive4elements.river.exports.LongitudinalSectionInfoGenerator"/>
+ <output-generator names="duration_curve" class="org.dive4elements.river.exports.DurationCurveGenerator"/>
+ <output-generator names="duration_curve_chartinfo" class="org.dive4elements.river.exports.DurationCurveInfoGenerator"/>
+ <output-generator names="discharge_longitudinal_section" class="org.dive4elements.river.exports.DischargeLongitudinalSectionGenerator"/>
+ <output-generator names="discharge_longitudinal_section_chartinfo" class="org.dive4elements.river.exports.DischargeLongitudinalSectionInfoGenerator"/>
+ <output-generator names="waterlevel_export" class="org.dive4elements.river.exports.WaterlevelExporter"/>
+ <output-generator names="extreme_wq_curve" class="org.dive4elements.river.exports.extreme.ExtremeWQCurveGenerator"/>
+ <output-generator names="extreme_curve_export" class="org.dive4elements.river.exports.WaterlevelExporter"/>
+ <output-generator names="extreme_wq_curve_chartinfo" class="org.dive4elements.river.exports.extreme.ExtremeWQCurveInfoGenerator"/>
+ <output-generator names="fix_wq_curve" class="org.dive4elements.river.exports.fixings.FixWQCurveGenerator"/>
+ <output-generator names="fix_wq_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator"/>
+ <output-generator names="durationcurve_export" class="org.dive4elements.river.exports.DurationCurveExporter"/>
+ <output-generator names="computed_dischargecurve_export" class="org.dive4elements.river.exports.ComputedDischargeCurveExporter"/>
+ <output-generator names="discharge_longitudinal_section_export" class="org.dive4elements.river.exports.DischargeLongitudinalSectionExporter"/>
+ <output-generator names="w_differences" class="org.dive4elements.river.exports.WDifferencesCurveGenerator"/>
+ <output-generator names="w_differences_chartinfo" class="org.dive4elements.river.exports.WDifferencesCurveInfoGenerator"/>
+ <output-generator names="w_differences_export" class="org.dive4elements.river.exports.WDifferencesExporter"/>
+ <output-generator names="floodmap" class="org.dive4elements.river.exports.MapGenerator"/>
+ <output-generator names="map" class="org.dive4elements.river.exports.MapGenerator"/>
+ <output-generator names="reference_curve" class="org.dive4elements.river.exports.ReferenceCurveGenerator"/>
+ <output-generator names="reference_curve_normalized" class="org.dive4elements.river.exports.NormalizedReferenceCurveGenerator"/>
+ <output-generator names="reference_curve_normalized_chartinfo" class="org.dive4elements.river.exports.NormalizedReferenceCurveInfoGenerator"/>
+ <output-generator names="reference_curve_chartinfo" class="org.dive4elements.river.exports.ReferenceCurveInfoGenerator"/>
+ <output-generator names="reference_curve_export" class="org.dive4elements.river.exports.ReferenceCurveExporter"/>
+ <output-generator names="historical_discharge" class="org.dive4elements.river.exports.HistoricalDischargeCurveGenerator"/>
+ <output-generator names="historical_discharge_chartinfo" class="org.dive4elements.river.exports.HistoricalDischargeCurveInfoGenerator"/>
+ <output-generator names="historical_discharge_wq" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator"/>
+ <output-generator names="historical_discharge_wq_chartinfo" class="org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator"/>
+ <output-generator names="historical_discharge_export" class="org.dive4elements.river.exports.HistoricalDischargeCurveExporter"/>
+ <output-generator names="flow_velocity" class="org.dive4elements.river.exports.FlowVelocityGenerator"/>
+ <output-generator names="flow_velocity_chartinfo" class="org.dive4elements.river.exports.FlowVelocityInfoGenerator"/>
+ <output-generator names="flow_velocity_export" class="org.dive4elements.river.exports.FlowVelocityExporter"/>
+ <output-generator names="bedheight_middle" class="org.dive4elements.river.exports.MiddleBedHeightGenerator"/>
+ <output-generator names="bedheight_middle_chartinfo" class="org.dive4elements.river.exports.MiddleBedHeightInfoGenerator"/>
+ <output-generator names="bedheight_middle_export" class="org.dive4elements.river.exports.MiddleBedHeightExporter"/>
+ <output-generator names="bed_longitudinal_section" class="org.dive4elements.river.exports.minfo.BedQualityGenerator"/>
+ <output-generator names="bed_longitudinal_section_chartinfo" class="org.dive4elements.river.exports.minfo.BedQualityInfoGenerator"/>
+ <output-generator names="bed_quality_export" class="org.dive4elements.river.exports.minfo.BedQualityExporter"/>
+ <output-generator names="bed_difference_year" class="org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator"/>
+ <output-generator names="bed_difference_year_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffYearInfoGenerator"/>
+ <output-generator names="bed_difference_epoch" class="org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator"/>
+ <output-generator names="bed_difference_epoch_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator"/>
+ <output-generator names="bed_difference_height_year" class="org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator"/>
+ <output-generator names="bed_difference_height_year_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffHeightYearInfoGenerator"/>
+ <output-generator names="bedheight_difference_export" class="org.dive4elements.river.exports.minfo.BedDifferenceExporter"/>
+ <output-generator names="sq_relation_a" class="org.dive4elements.river.exports.sq.SQRelationGeneratorA"/>
+ <output-generator names="sq_relation_b" class="org.dive4elements.river.exports.sq.SQRelationGeneratorB"/>
+ <output-generator names="sq_relation_c" class="org.dive4elements.river.exports.sq.SQRelationGeneratorC"/>
+ <output-generator names="sq_relation_d" class="org.dive4elements.river.exports.sq.SQRelationGeneratorD"/>
+ <output-generator names="sq_relation_e" class="org.dive4elements.river.exports.sq.SQRelationGeneratorE"/>
+ <output-generator names="sq_relation_f" class="org.dive4elements.river.exports.sq.SQRelationGeneratorF"/>
+ <output-generator names="sq_relation_a_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
+ <output-generator names="sq_relation_b_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
+ <output-generator names="sq_relation_c_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
+ <output-generator names="sq_relation_d_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
+ <output-generator names="sq_relation_e_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
+ <output-generator names="sq_relation_f_chartinfo" class="org.dive4elements.river.exports.sq.SQRelationInfoGenerator"/>
+ <output-generator names="sq_relation_export" class="org.dive4elements.river.exports.sq.SQRelationExporter"/>
+ <output-generator names="sq_overview" class="org.dive4elements.river.exports.sq.SQOverviewGenerator"/>
+ <output-generator names="fix_parameters_export" class="org.dive4elements.river.exports.fixings.ParametersExporter"/>
+ <output-generator names="fix_deltawt_export" class="org.dive4elements.river.exports.fixings.DeltaWtExporter"/>
+ <output-generator names="fix_deltawt_curve" class="org.dive4elements.river.exports.fixings.FixDeltaWtGenerator"/>
+ <output-generator names="fix_deltawt_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixDeltaWtInfoGenerator"/>
+ <output-generator names="fix_longitudinal_section_curve" class="org.dive4elements.river.exports.fixings.FixLongitudinalSectionGenerator"/>
+ <output-generator names="fix_longitudinal_section_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixLongitudinalSectionInfoGenerator"/>
+ <output-generator names="fix_derivate_curve" class="org.dive4elements.river.exports.fixings.FixDerivedCurveGenerator"/>
+ <output-generator names="fix_derivate_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixDerivedCurveInfoGenerator"/>
+ <output-generator names="fix_waterlevel_export" class="org.dive4elements.river.exports.WaterlevelExporter"/>
+ <output-generator names="fix_vollmer_wq_curve" class="org.dive4elements.river.exports.fixings.FixWQCurveGenerator"/>
+ <output-generator names="fix_vollmer_wq_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator"/>
+ <output-generator names="sedimentload_ls" class="org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator"/>
+ <output-generator names="sedimentload_ls_export" class="org.dive4elements.river.exports.minfo.SedimentLoadExporter"/>
+ <output-generator names="sedimentload_ls_chartinfo" class="org.dive4elements.river.exports.minfo.SedimentLoadLSInfoGenerator"/>
<!-- Error report generators. -->
- <output-generator name="discharge_longitudinal_section_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
- <output-generator name="waterlevel_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
- <output-generator name="computed_dischargecurve_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
- <output-generator name="durationcurve_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
- <output-generator name="wsplgen_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
- <output-generator name="historical_discharge_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
- <output-generator name="reference_curve_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
- <output-generator name="fix_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
- <output-generator name="extreme_curve_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
- <output-generator name="sedimentload_ls_report" class="org.dive4elements.river.exports.ReportGenerator"></output-generator>
+ <output-generator names="discharge_longitudinal_section_report" class="org.dive4elements.river.exports.ReportGenerator"/>
+ <output-generator names="waterlevel_report" class="org.dive4elements.river.exports.ReportGenerator"/>
+ <output-generator names="computed_dischargecurve_report" class="org.dive4elements.river.exports.ReportGenerator"/>
+ <output-generator names="durationcurve_report" class="org.dive4elements.river.exports.ReportGenerator"/>
+ <output-generator names="wsplgen_report" class="org.dive4elements.river.exports.ReportGenerator"/>
+ <output-generator names="historical_discharge_report" class="org.dive4elements.river.exports.ReportGenerator"/>
+ <output-generator names="reference_curve_report" class="org.dive4elements.river.exports.ReportGenerator"/>
+ <output-generator names="fix_report" class="org.dive4elements.river.exports.ReportGenerator"/>
+ <output-generator names="extreme_curve_report" class="org.dive4elements.river.exports.ReportGenerator"/>
+ <output-generator names="sedimentload_ls_report" class="org.dive4elements.river.exports.ReportGenerator"/>
<!-- AT exporter. -->
- <output-generator name="computed_dischargecurve_at_export" class="org.dive4elements.river.exports.ATExporter"></output-generator>
- <output-generator name="gauge_discharge_curve_at_export" class="org.dive4elements.river.exports.ATExporter"></output-generator>
- <output-generator name="fix_wq_curve_at_export" class="org.dive4elements.river.exports.fixings.FixATExport"></output-generator>
- <output-generator name="wsplgen" class="org.dive4elements.river.exports.ShapeExporter"></output-generator>
+ <output-generator names="computed_dischargecurve_at_export" class="org.dive4elements.river.exports.ATExporter"/>
+ <output-generator names="gauge_discharge_curve_at_export" class="org.dive4elements.river.exports.ATExporter"/>
+ <output-generator names="fix_wq_curve_at_export" class="org.dive4elements.river.exports.fixings.FixATExport"/>
+ <output-generator names="wsplgen" class="org.dive4elements.river.exports.ShapeExporter"/>
</output-generators>
<!-- Path to the template file of the meta data. -->
diff -r beb9e94f04d3 -r a2abd87c0d3b artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java Fri Sep 20 15:42:21 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java Fri Sep 20 15:44:39 2013 +0200
@@ -332,10 +332,10 @@
for (int i = 0; i < num; i++) {
Element item = (Element)outGenerators.item(i);
- String name = item.getAttribute("names");
- String clazz = item.getAttribute("class");
+ String names = item.getAttribute("names").trim();
+ String clazz = item.getAttribute("class").trim();
- if (name.isEmpty() || clazz.isEmpty()) {
+ if (names.isEmpty() || clazz.isEmpty()) {
continue;
}
@@ -352,7 +352,7 @@
Pair<Class<OutGenerator>, Element> pair =
new Pair<Class<OutGenerator>, Element>(generatorClass, item);
- for (String key: name.split("[\\s,]")) {
+ for (String key: names.split("[\\s,]")) {
if (!(key = key.trim()).isEmpty()) {
generators.put(key, pair);
idx++;
More information about the Dive4elements-commits
mailing list