# HG changeset patch # User Sascha L. Teichmann # Date 1379683742 -7200 # 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 @@ - org.dive4elements.river.exports.DischargeCurveGenerator - org.dive4elements.river.exports.DischargeCurveInfoGenerator - org.dive4elements.river.exports.CrossSectionGenerator - org.dive4elements.river.exports.CrossSectionInfoGenerator - org.dive4elements.river.exports.ComputedDischargeCurveGenerator - org.dive4elements.river.exports.ComputedDischargeCurveInfoGenerator - - org.dive4elements.river.exports.DiagramGenerator + + + + + + + < @@ -306,95 +305,95 @@ - org.dive4elements.river.exports.LongitudinalSectionInfoGenerator - org.dive4elements.river.exports.DurationCurveGenerator - org.dive4elements.river.exports.DurationCurveInfoGenerator - org.dive4elements.river.exports.DischargeLongitudinalSectionGenerator - org.dive4elements.river.exports.DischargeLongitudinalSectionInfoGenerator - org.dive4elements.river.exports.WaterlevelExporter - org.dive4elements.river.exports.extreme.ExtremeWQCurveGenerator - org.dive4elements.river.exports.WaterlevelExporter - org.dive4elements.river.exports.extreme.ExtremeWQCurveInfoGenerator - org.dive4elements.river.exports.fixings.FixWQCurveGenerator - org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator - org.dive4elements.river.exports.DurationCurveExporter - org.dive4elements.river.exports.ComputedDischargeCurveExporter - org.dive4elements.river.exports.DischargeLongitudinalSectionExporter - org.dive4elements.river.exports.WDifferencesCurveGenerator - org.dive4elements.river.exports.WDifferencesCurveInfoGenerator - org.dive4elements.river.exports.WDifferencesExporter - org.dive4elements.river.exports.MapGenerator - org.dive4elements.river.exports.MapGenerator - org.dive4elements.river.exports.ReferenceCurveGenerator - org.dive4elements.river.exports.NormalizedReferenceCurveGenerator - org.dive4elements.river.exports.NormalizedReferenceCurveInfoGenerator - org.dive4elements.river.exports.ReferenceCurveInfoGenerator - org.dive4elements.river.exports.ReferenceCurveExporter - org.dive4elements.river.exports.HistoricalDischargeCurveGenerator - org.dive4elements.river.exports.HistoricalDischargeCurveInfoGenerator - org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator - org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator - org.dive4elements.river.exports.HistoricalDischargeCurveExporter - org.dive4elements.river.exports.FlowVelocityGenerator - org.dive4elements.river.exports.FlowVelocityInfoGenerator - org.dive4elements.river.exports.FlowVelocityExporter - org.dive4elements.river.exports.MiddleBedHeightGenerator - org.dive4elements.river.exports.MiddleBedHeightInfoGenerator - org.dive4elements.river.exports.MiddleBedHeightExporter - org.dive4elements.river.exports.minfo.BedQualityGenerator - org.dive4elements.river.exports.minfo.BedQualityInfoGenerator - org.dive4elements.river.exports.minfo.BedQualityExporter - org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator - org.dive4elements.river.exports.minfo.BedDiffYearInfoGenerator - org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator - org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator - org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator - org.dive4elements.river.exports.minfo.BedDiffHeightYearInfoGenerator - org.dive4elements.river.exports.minfo.BedDifferenceExporter - org.dive4elements.river.exports.sq.SQRelationGeneratorA - org.dive4elements.river.exports.sq.SQRelationGeneratorB - org.dive4elements.river.exports.sq.SQRelationGeneratorC - org.dive4elements.river.exports.sq.SQRelationGeneratorD - org.dive4elements.river.exports.sq.SQRelationGeneratorE - org.dive4elements.river.exports.sq.SQRelationGeneratorF - org.dive4elements.river.exports.sq.SQRelationInfoGenerator - org.dive4elements.river.exports.sq.SQRelationInfoGenerator - org.dive4elements.river.exports.sq.SQRelationInfoGenerator - org.dive4elements.river.exports.sq.SQRelationInfoGenerator - org.dive4elements.river.exports.sq.SQRelationInfoGenerator - org.dive4elements.river.exports.sq.SQRelationInfoGenerator - org.dive4elements.river.exports.sq.SQRelationExporter - org.dive4elements.river.exports.sq.SQOverviewGenerator - org.dive4elements.river.exports.fixings.ParametersExporter - org.dive4elements.river.exports.fixings.DeltaWtExporter - org.dive4elements.river.exports.fixings.FixDeltaWtGenerator - org.dive4elements.river.exports.fixings.FixDeltaWtInfoGenerator - org.dive4elements.river.exports.fixings.FixLongitudinalSectionGenerator - org.dive4elements.river.exports.fixings.FixLongitudinalSectionInfoGenerator - org.dive4elements.river.exports.fixings.FixDerivedCurveGenerator - org.dive4elements.river.exports.fixings.FixDerivedCurveInfoGenerator - org.dive4elements.river.exports.WaterlevelExporter - org.dive4elements.river.exports.fixings.FixWQCurveGenerator - org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator - org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator - org.dive4elements.river.exports.minfo.SedimentLoadExporter - org.dive4elements.river.exports.minfo.SedimentLoadLSInfoGenerator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - org.dive4elements.river.exports.ReportGenerator - org.dive4elements.river.exports.ReportGenerator - org.dive4elements.river.exports.ReportGenerator - org.dive4elements.river.exports.ReportGenerator - org.dive4elements.river.exports.ReportGenerator - org.dive4elements.river.exports.ReportGenerator - org.dive4elements.river.exports.ReportGenerator - org.dive4elements.river.exports.ReportGenerator - org.dive4elements.river.exports.ReportGenerator - org.dive4elements.river.exports.ReportGenerator + + + + + + + + + + - org.dive4elements.river.exports.ATExporter - org.dive4elements.river.exports.ATExporter - org.dive4elements.river.exports.fixings.FixATExport - org.dive4elements.river.exports.ShapeExporter + + + + 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; }