# HG changeset patch # User Felix Wolfsteller # Date 1352278064 -3600 # Node ID e8a4d2fd25ccdf7f553ce8d9e9dd2a86e408f8ee # Parent 83fe6eeba83a701b63e072725d5c6add4b2c2d17# Parent 6e01499bfbdfd5a0d685e80f931bb96ee94ab5ae Merged. diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/doc/conf/artifacts/minfo.xml --- a/flys-artifacts/doc/conf/artifacts/minfo.xml Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/doc/conf/artifacts/minfo.xml Wed Nov 07 09:47:44 2012 +0100 @@ -421,6 +421,7 @@ + diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/doc/conf/meta-data.xml --- a/flys-artifacts/doc/conf/meta-data.xml Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/doc/conf/meta-data.xml Wed Nov 07 09:47:44 2012 +0100 @@ -666,7 +666,7 @@ - + @@ -687,6 +687,9 @@ + + + @@ -727,8 +730,9 @@ - + > + @@ -749,6 +753,9 @@ + + + diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/doc/conf/themes.xml --- a/flys-artifacts/doc/conf/themes.xml Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/doc/conf/themes.xml Wed Nov 07 09:47:44 2012 +0100 @@ -1,8 +1,8 @@ - - + + + ]> &default-themes; @@ -256,7 +256,7 @@ - + diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Wed Nov 07 09:47:44 2012 +0100 @@ -542,6 +542,7 @@ inBackground.setTextContent(message.getMessage()); } + /** * Append output mode nodes to a document. */ diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java Wed Nov 07 09:47:44 2012 +0100 @@ -130,6 +130,7 @@ DischargeZone zone = model.getDischargeZone(); String lo = zone.getLowerDischarge(); String hi = zone.getUpperDischarge(); + // TODO make discharge available, should be shown in diagram. if (lo.equals(hi)) { data.setZone(lo); @@ -141,7 +142,7 @@ protected CalculationResult buildCalculationResult( - FlowVelocityAccess access, + FlowVelocityAccess access, List models ) { double kmLo = access.getLowerKM(); diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java Wed Nov 07 09:47:44 2012 +0100 @@ -83,6 +83,7 @@ */ @Override public Object getData(Artifact artifact, CallContext context) { + logger.debug("MainValuesWFacet.getData()"); MainValuesArtifact mvArtifact = (MainValuesArtifact) artifact; List ws = mvArtifact.getMainValuesW(isAtGauge); @@ -102,6 +103,7 @@ context); } + logger.debug("MainValuesWFacet: Will give " + ws.size() + " annotations."); for (NamedDouble w: ws) { StickyAxisAnnotation annotation = new StickyAxisAnnotation( diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java Wed Nov 07 09:47:44 2012 +0100 @@ -245,12 +245,14 @@ continue; } + // TODo add max and percent? Curve curve = new Curve( wqs[1], wqs[0], function.getName(), coeffs, chiSqr[0]); + log.debug("iC Adding Curve at " + km); curves.add(km, curve); double [] values = range.getValues(); diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadFactory.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadFactory.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadFactory.java Wed Nov 07 09:47:44 2012 +0100 @@ -27,7 +27,7 @@ public static final String LOADS_CACHE_NAME = "sedimentloads"; public static final String LOAD_DATA_CACHE_NAME = "sedimentload-data"; - /** Query to get km and ws for wst_id and column_pos. */ + /** Query to get description and start year, given name and a km range. */ public static final String SQL_SELECT_SINGLES = "SELECT DISTINCT " + " sy.description AS description, " + @@ -40,7 +40,7 @@ " AND ti.stop_time IS NULL " + " AND syv.station BETWEEN :startKm AND :endKm"; - /** Query to get name for wst_id and column_pos. */ + /** Query to get start time, stop time and description. */ public static final String SQL_SELECT_EPOCHS = "SELECT DISTINCT " + " sy.description AS description, " + @@ -92,9 +92,7 @@ private SedimentLoadFactory() { } - /** - * - */ + public static SedimentLoad[] getLoads( String river, String type, @@ -278,6 +276,7 @@ List results = sqlQuery.list(); SedimentLoad load = new SedimentLoad(); Object[] row = results.get(0); + // TODO Handle empty result. load = new SedimentLoad( (String) row[0], (Date) row[1], @@ -374,3 +373,4 @@ } } } +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java Wed Nov 07 09:47:44 2012 +0100 @@ -76,8 +76,9 @@ protected Document buildDocument(Gauge gauge) { Document result = XMLUtils.newDocument(); - List tables =gauge.getDischargeTables(); - Collections.sort(tables); + List tables = gauge.getDischargeTables(); + //Collections.sort(tables); + //tables.sort(); Element all = result.createElement("discharges"); for (DischargeTable dt: tables) { diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java Wed Nov 07 09:47:44 2012 +0100 @@ -102,6 +102,8 @@ // TODO ADD PDF FACET + // TODO ADD FACETS FOR DISCHARGE AND MEASURED SPEED (point) + newFacets.add(csv); logger.debug("Created " + newFacets.size() + " new Facets."); diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/QSectorSingleState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/QSectorSingleState.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/QSectorSingleState.java Wed Nov 07 09:47:44 2012 +0100 @@ -55,7 +55,7 @@ QSectorFacet qfacet = new QSectorFacet( 0, QSECTOR, - Resources.getMsg(meta, "qsectors", "Q Sectors")); + Resources.getMsg(meta, QSECTOR, "Q Sectors")); facets.add(qfacet); diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java Wed Nov 07 09:47:44 2012 +0100 @@ -34,7 +34,7 @@ { River river = FLYSUtils.getRiver((FLYSArtifact) artifact); List gauges = river.getGauges(); - Collections.sort(gauges); + //Collections.sort(gauges); int num = gauges != null ? gauges.size() : 0; diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java Wed Nov 07 09:47:44 2012 +0100 @@ -176,6 +176,7 @@ } catch (NumberFormatException nfe) { logger.error("Index is not a valid integer!", nfe); + // return false? } return true; diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Wed Nov 07 09:47:44 2012 +0100 @@ -81,6 +81,7 @@ Facet facet, String output ) { + log.debug("Registry:is active? " + output + "/" + facet.getName()); if (output.contains(FacetTypes.ChartType.FLSC.toString())) { // Longitudinal section chart String name = facet.getName(); @@ -91,14 +92,21 @@ || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_DWT) || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_LS) || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_WQ) + // Wrong palace! Go to AnnotationArtifact. + || name.contains(FacetTypes.LONGITUDINAL_ANNOTATION) ) { return Boolean.FALSE; } } - if (output.contains(FacetTypes.ChartType.FDWC.toString()) + else if (output.contains(FacetTypes.ChartType.FDWC.toString()) && facet.getName().contains(FacetTypes.FIX_SECTOR_AVERAGE_DWT)) { return Boolean.FALSE; } + else if (output.contains(FacetTypes.ChartType.LS.toString()) + && facet.getName().contains(FacetTypes.LONGITUDINAL_ANNOTATION)) { + + return Boolean.FALSE; + } return Boolean.TRUE; } diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java --- a/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java Wed Nov 07 09:47:44 2012 +0100 @@ -211,6 +211,7 @@ boolean isActive = registry.isInitialActive( flys.getName(), flys, newMF, outputName); + logger.debug("FacetActivityRegistry: " + flys.getName() + " out: " + outputName + " F: " + newMF.getName() + " c " + flys.getClass().toString() + " = " + isActive); newMF.setActive(isActive ? 1 : 0); } diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Wed Nov 07 09:47:44 2012 +0100 @@ -200,6 +200,7 @@ int rendererIndex = 0; if (annotation.atX()) { + logger.debug("ChartGenerator: Sticky at X."); textAnnotation = new CollisionFreeXYTextAnnotation( annotation.getText(), annotation.getPos(), area.ofGround(TEXT_OFF)); // OPTIMIZE externalize the calculation involving PI. @@ -214,6 +215,7 @@ // There is one nasty case (duration curves, where annotations // might stick to the second y-axis). // FIXME: Remove dependency to XYChartGenerator here + logger.debug("ChartGenerator: Sticky at no-X."); AxisDataset dataset = getAxisDataset( new Integer(annotation.getAxisSymbol())); if (dataset == null) { @@ -434,6 +436,8 @@ return; } + logger.debug("addAnnotationsToRenderer: " + annotations.size()); + // OPTMIMIZE: Pre-calculate positions ChartArea area = new ChartArea( plot.getDomainAxis(0).getRange(), @@ -441,7 +445,7 @@ // Walk over all Annotation sets. for (FLYSAnnotation fa: annotations) { - + // Access text styling, if any. Document theme = fa.getTheme(); TextStyle textStyle = null; @@ -1506,11 +1510,12 @@ XPathConstants.NODE, ArtifactNamespaceContext.INSTANCE); + // unter -aft liegt eine XML java mit toString + System.err.println(XMLUtils.toString(request)); if (yrange == null) { return null; } - String uri = ArtifactNamespaceContext.NAMESPACE_URI; String lower = yrange.getAttributeNS(uri, "from"); diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java Wed Nov 07 09:47:44 2012 +0100 @@ -69,6 +69,7 @@ Element chartinfo = cr.create("chartinfo"); + // Debug me, issue842 chartinfo.appendChild(createAxesElements(cr, chart)); chartinfo.appendChild(createTransformationElements(cr, chart, info)); diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/exports/OutputHelper.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/OutputHelper.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/OutputHelper.java Wed Nov 07 09:47:44 2012 +0100 @@ -352,6 +352,8 @@ return dataProviders; } + + /** * Returns a concrete Artifact of this collection specified by its uuid. * diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java Wed Nov 07 09:47:44 2012 +0100 @@ -82,6 +82,7 @@ return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT); } + @Override protected String getDefaultChartSubtitle() { Object[] args = new Object[] { @@ -115,6 +116,8 @@ return msg(getInCm(1) ? I18N_Y_AXIS_IN_CM : I18N_Y_AXIS_IN_M); } + + /** Probably to be overridden? */ protected String facetName() { return REFERENCE_CURVE; } @@ -172,6 +175,8 @@ } } + + /** Probably also there to be overridden. */ protected boolean doNormalize() { return false; } diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java Wed Nov 07 09:47:44 2012 +0100 @@ -273,6 +273,7 @@ protected void writeCSVData(CSVWriter writer) { logger.info("WaterlevelExporter.writeData"); + // avoid NPE here. WQ_MODE mode = FLYSUtils.getWQMode((FLYSArtifact)master); boolean atGauge = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.WGAUGE; boolean isQ = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.QFREE; diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Wed Nov 07 09:47:44 2012 +0100 @@ -254,6 +254,8 @@ * axis could be inverted. */ protected double getLeftX() { + // TODO if the range null... + //return (Double)getDomainAxisRange().getLowerBound(); return (Double)getXBounds(0).getLower(); } @@ -264,12 +266,27 @@ * axis could be inverted. */ protected double getRightX() { - return (Double)getXBounds(0).getUpper(); + return (Double)getXBounds(0).getLower(); + //return (Double)getDomainAxisRange().getUpperBound(); } + protected double getBottomY() { + Range zoomedRange = getValueAxisRange(); + return (zoomedRange != null) + ? zoomedRange.getLowerBound() + : (Double)getYBounds(0).getLower(); + } + + protected double getTopY() { + Range zoomedRange = getValueAxisRange(); + return (zoomedRange != null) + ? zoomedRange.getUpperBound() + : (Double)getYBounds(0).getUpper(); + } /** Add a logo as background annotation to plot. */ protected void addLogo(XYPlot plot) { + // TODO getValue/DomainAxisRange, so that the current zoom level is respected String logo = showLogo(); if (logo == null) { logger.debug("No logo to show chosen"); @@ -299,7 +316,6 @@ } imageIcon = new ImageIcon(imageURL); - double xPos = 0d, yPos = 0d; String placeh = logoHPlace(); @@ -309,13 +325,13 @@ placev = "top"; } if (placev.equals("top")) { - yPos = (Double)getYBounds(0).getUpper(); + yPos = getTopY(); } else if (placev.equals("bottom")) { - yPos = (Double)getYBounds(0).getLower(); + yPos = getBottomY(); } else if (placev.equals("center")) { - yPos = ((Double)getYBounds(0).getUpper() + (Double)getYBounds(0).getLower())/2d; + yPos = (getTopY() + getBottomY())/2d; } else { logger.debug("Unknown place-v value: " + placev); @@ -331,7 +347,9 @@ xPos = getRightX(); } else if (placeh.equals("center")) { + // TODO: Hier noch xPos = ((Double)getXBounds(0).getUpper() + (Double)getXBounds(0).getLower())/2d; + // ->->-> (getDomainAxisRange().getUpperBound() + getDomainAxisRange().getLowerBound())/2d; } else { logger.debug("Unknown place-h value: " + placeh); @@ -685,6 +703,7 @@ } + /** Return range of domain axis. */ protected Range getDomainAxisRange() { String[] ranges = getDomainAxisRangeFromRequest(); @@ -724,7 +743,9 @@ String[] ranges = getValueAxisRangeFromRequest(); if (ranges == null || ranges.length < 2) { - logger.debug("No range specified. Lower and upper Y == 0"); + logger.warn("No range (or not enogh) specified."); + if (ranges == null) logger.warn("ranges is null here"); + else logger.warn("ranges has just one element."); return null; } @@ -747,6 +768,7 @@ } } + logger.warn("One of the range elements is zero length text."); return null; } @@ -1034,6 +1056,5 @@ return hash; } - } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/exports/extreme/ExtremeWQCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/extreme/ExtremeWQCurveGenerator.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/extreme/ExtremeWQCurveGenerator.java Wed Nov 07 09:47:44 2012 +0100 @@ -151,6 +151,7 @@ @Override protected String getDefaultChartSubtitle() { + // TODO resolve. We are in extreme wq world here (not fication). FixAnalysisAccess access = new FixAnalysisAccess(artifact); DateRange dateRange = access.getDateRange(); DateRange refRange = access.getReferencePeriod(); diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java Wed Nov 07 09:47:44 2012 +0100 @@ -211,5 +211,5 @@ addAxisSeries(series, YAXIS.L.idx, visible); } - } +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java Wed Nov 07 09:47:44 2012 +0100 @@ -88,6 +88,7 @@ int transparency = ThemeUtil.parseTransparency(theme); if (transparency > 0) { + if (paint == null) paint = new Color(30,30,30); paint = new Color( paint.getRed(), paint.getGreen(), diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-artifacts/src/main/java/de/intevation/flys/utils/DoubleUtil.java --- a/flys-artifacts/src/main/java/de/intevation/flys/utils/DoubleUtil.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/DoubleUtil.java Wed Nov 07 09:47:44 2012 +0100 @@ -158,7 +158,8 @@ /** Call callback for every string split by colon. - * Expected format FROM:TO:VALUE1,VALUE2,VALUE3*/ + * Expected format FROM:TO:VALUE1,VALUE2,VALUE3 + * from;to;value:from2;to2;value2:...*/ public static final void parseSegments( String input, SegmentCallback callback diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Wed Nov 07 09:47:44 2012 +0100 @@ -800,6 +800,8 @@ String annotations(); + String all_annotations(); + String additionals(); String differences(); diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Wed Nov 07 09:47:44 2012 +0100 @@ -408,6 +408,7 @@ columns = Columns annotation = Annotations annotations = Annotations +all_annotations = All Annotations additionals = Additional Longitudinal Section Curves differences = Differences kilometrage = Kilometrage diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Wed Nov 07 09:47:44 2012 +0100 @@ -409,6 +409,7 @@ columns = Spalten annotation = Streckenfavoriten annotation = Streckenfavoriten - Typen +all_annotations = Alle Streckenfavoriten additionals = Zus\u00e4tzliche L\u00e4ngsschnitte differences = Differenzen kilometrage = Kilometrierung diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Wed Nov 07 09:47:44 2012 +0100 @@ -409,6 +409,7 @@ columns = Columns annotation = Annotations annotations = Annotations +all_annotations = All Annotations additionals = Additional Longitudinal Section Curves differences = Differences kilometrage = Kilometrage diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java Wed Nov 07 09:47:44 2012 +0100 @@ -6,6 +6,7 @@ import com.smartgwt.client.util.SC; import com.smartgwt.client.widgets.Button; import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.Window; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; @@ -141,6 +142,7 @@ f.setColWidths("40%", "60%"); layout.addMember(f); + layout.addMember(new Label(facet.getTheme().getFacet())); init(); initPanels(); } diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-client/src/main/java/de/intevation/flys/client/shared/model/ArtifactDescription.java --- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/ArtifactDescription.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/ArtifactDescription.java Wed Nov 07 09:47:44 2012 +0100 @@ -4,7 +4,8 @@ /** - * The artifact description describes a state of an artifact. There are + * The artifact description describes the current being of an artifact. + * There are * operations defined that return former inserted data, possible input values * and output targets that are available in the current state of the artifact. * diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultArtifact.java --- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultArtifact.java Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultArtifact.java Wed Nov 07 09:47:44 2012 +0100 @@ -82,6 +82,7 @@ } + /** Get the description how it came from server. */ public ArtifactDescription getArtifactDescription() { return artifactDescription; } diff -r 6e01499bfbdf -r e8a4d2fd25cc flys-client/src/main/webapp/WEB-INF/web.xml --- a/flys-client/src/main/webapp/WEB-INF/web.xml Tue Nov 06 15:36:52 2012 +0100 +++ b/flys-client/src/main/webapp/WEB-INF/web.xml Wed Nov 07 09:47:44 2012 +0100 @@ -18,7 +18,7 @@ authentication - GGInA + plain