Mercurial > dive4elements > river
changeset 3442:cd5eb8f5f6f1
Cosmetics, docs.
flys-artifacts/trunk@5105 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Mon, 23 Jul 2012 14:57:27 +0000 |
| parents | bfbd478bd607 |
| children | ee2ae91c96e5 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java |
| diffstat | 9 files changed, 23 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Mon Jul 23 14:19:07 2012 +0000 +++ b/flys-artifacts/ChangeLog Mon Jul 23 14:57:27 2012 +0000 @@ -1,3 +1,16 @@ +2012-07-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * doc/conf/artifacts/winfo.xml, + src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java, + src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java, + src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java, + src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java, + src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java, + src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java, + src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java, + src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: + Cosmetics, docs. + 2012-07-23 Christian Lins <christian.lins@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/Segment.java,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java Mon Jul 23 14:19:07 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java Mon Jul 23 14:57:27 2012 +0000 @@ -26,7 +26,6 @@ /** House logger. */ private static Logger logger = Logger.getLogger(HYKFacet.class); - /** Trivial constructor, set (maybe localized) description. */ public HYKFacet(int idx, String description) { super(idx, HYK, description, ComputeType.FEED, null, null);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java Mon Jul 23 14:19:07 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java Mon Jul 23 14:57:27 2012 +0000 @@ -33,6 +33,7 @@ /** Do we want MainValues at Gauge (not interpolated)? */ protected boolean isAtGauge; + /** Trivial Constructor. */ public MainValuesQFacet(String name, String description, boolean atGauge) { this.description = description; @@ -41,6 +42,7 @@ this.isAtGauge = atGauge; } + /** * Set the hit-point in Q where a line drawn from the axis would hit the * curve in WQDay (if hit).
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java Mon Jul 23 14:19:07 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/RelativePointFacet.java Mon Jul 23 14:57:27 2012 +0000 @@ -41,7 +41,7 @@ // TODO here and in reference curve calc: Do warn if more than 1 // provider found or (way better) handle it. Object wqdays = null; - double km = 0d; + double km = 0d; List<DataProvider> providers = context. getDataProvider(DurationCurveFacet.BB_DURATIONCURVE); if (providers.size() < 1) { @@ -93,7 +93,7 @@ double day = 0d; int mod = (wIncreases) ? -1 : +1; if (idx != 0 && idx <= wqday.size()-1) { - day = Linear.linear(w, wqday.getW(idx +mod), wqday.getW(idx), + day = Linear.linear(w, wqday.getW(idx+mod), wqday.getW(idx), wqday.getDay(idx+mod), wqday.getDay(idx)); } @@ -102,7 +102,6 @@ logger.warn("not wqkms / w / day found"); // TODO better signal failure. return new Point2D.Double(0d, 0d); - //return null; }
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java Mon Jul 23 14:19:07 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java Mon Jul 23 14:57:27 2012 +0000 @@ -16,12 +16,14 @@ import de.intevation.flys.backend.SessionHolder; + /** * Factory to access ready-made WKms for other (than computed) 'kinds' of * WST-data. */ public class WKmsFactory { + /** Private logger to use here. */ private static Logger log = Logger.getLogger(WKmsFactory.class); /** Query to get km and ws for wst_id and column_pos. */
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java Mon Jul 23 14:19:07 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java Mon Jul 23 14:57:27 2012 +0000 @@ -20,6 +20,7 @@ } + /** Show Q Select Panel in clients. */ @Override protected String getUIProvider() { return "fix.qselect_panel";
--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java Mon Jul 23 14:19:07 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java Mon Jul 23 14:57:27 2012 +0000 @@ -220,7 +220,7 @@ * Merge the recommendations which have already been loaded from the old * attribute document into the new attribute document. This is necessary, * because mergeAttributes() only merges the art:outputs nodes - all - * other nodes are skiped. + * other nodes are skipped. */ protected Node getLoadedRecommendations(Document oldAttrs) { Element loadedRecoms = (Element) XMLUtils.xpath( @@ -604,7 +604,5 @@ } - - } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java Mon Jul 23 14:19:07 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java Mon Jul 23 14:57:27 2012 +0000 @@ -37,6 +37,7 @@ } } + /** Local logger. */ private static Logger logger = Logger.getLogger(DurationCurveGenerator.class);
--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java Mon Jul 23 14:19:07 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java Mon Jul 23 14:57:27 2012 +0000 @@ -86,7 +86,7 @@ /** - * Blindly (for now) apply the postiviepaint of renderer. + * Blindly (for now) apply the positivepaint of renderer. */ protected void applyFillColor(StableXYDifferenceRenderer renderer) { // Get color.