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