[Dive4elements-commits] [PATCH 2 of 3] Backed out changeset e8a4d2fd25cc
Wald Commits
scm-commit at wald.intevation.org
Wed Nov 7 13:36:56 CET 2012
# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1352287730 -3600
# Node ID 60c728e557f48f064680d4efcea47c0c554fec1e
# Parent e8a4d2fd25ccdf7f553ce8d9e9dd2a86e408f8ee
Backed out changeset e8a4d2fd25cc
diff -r e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/doc/conf/artifacts/minfo.xml
--- a/flys-artifacts/doc/conf/artifacts/minfo.xml Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/doc/conf/artifacts/minfo.xml Wed Nov 07 12:28:50 2012 +0100
@@ -421,7 +421,6 @@
<facet name="sedimentload.susp_sand_bed"/>
<facet name="sedimentload.susp_sediment"/>
<facet name="sedimentload.total"/>
- <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
</facets>
</outputmode>
</outputmodes>
diff -r e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/doc/conf/meta-data.xml Wed Nov 07 12:28:50 2012 +0100
@@ -666,7 +666,7 @@
<dc:call-macro name="mainvalues"/>
</dc:if>
<dc:if test="dc:contains($artifact-outs, 'reference_curve')">
- <!--dc:call-macro name="annotations"/-->
+ <dc:call-macro name="annotations"/>
<dc:call-macro name="mainvalues"/>
</dc:if>
<dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')">
@@ -687,9 +687,6 @@
<dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
<dc:call-macro name="annotations"/>
</dc:if>
- <dc:if test="dc:contains($artifact-outs, 'sedimentload_ls')">
- <dc:call-macro name="annotations"/>
- </dc:if>
</dc:when>
<dc:otherwise>
<dc:comment>
@@ -730,9 +727,8 @@
</dc:if>
<dc:if test="dc:contains($artifact-outs, 'reference_curve')">
- <!--dc:call-macro name="annotations"/-->>
+ <dc:call-macro name="annotations"/>
<!--dc:call-macro name="basedata_0"/-->
- <dc:call-macro name="mainvalues"/>
<dc:call-macro name="basedata_1_additionals-relative_point"/>
<dc:comment comment=" FIXATIONS ---------------------------"/>
<dc:call-macro name="basedata_2_fixations_relative_point"/>
@@ -753,9 +749,6 @@
<dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')">
<dc:call-macro name="annotations"/>
</dc:if>
- <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
- <dc:call-macro name="annotations"/>
- </dc:if>
<dc:comment comment="--- non-recommendations---"/>
</dc:otherwise>
</dc:choose>
diff -r e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/doc/conf/themes.xml
--- a/flys-artifacts/doc/conf/themes.xml Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/doc/conf/themes.xml Wed Nov 07 12:28:50 2012 +0100
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE themes [
-<!ENTITY default-themes SYSTEM "/local-vol1/felix/flys/trunk/built/server/conf/default-themes.xml">
- <!ENTITY second-themes SYSTEM "/local-vol1/felix/flys/trunk/built/server/conf/second-themes.xml">
- <!ENTITY virtual-themes SYSTEM "/local-vol1/felix/flys/trunk/built/server/conf/virtual-themes.xml">
+ <!ENTITY default-themes SYSTEM "conf/default-themes.xml">
+ <!ENTITY second-themes SYSTEM "conf/second-themes.xml">
+ <!ENTITY virtual-themes SYSTEM "conf/virtual-themes.xml">
]>
<themes>
&default-themes;
@@ -256,7 +256,7 @@
<mapping from="fix_analysis_events_dwt" to="FixingDeltaWtAnalysis" />
<mapping from="fix_analysis_periods_dwt" to="FixingDeltaWtAnalysisPeriods" />
<mapping from="fix_reference_events_dwt" to="FixingReferenceEvents" />
- <mapping from="fix_reference_period_dwt" to="FixingReferencePeriod" />
+ <mapping from="fix_reference_period_dwt" to="FixingReferencePeriod" />
<mapping from="fix_sector_average_ls_deviation_0" to="FixingSectorDeviationLS0" />
<mapping from="fix_sector_average_ls_deviation_1" to="FixingSectorDeviationLS1" />
<mapping from="fix_sector_average_ls_deviation_2" to="FixingSectorDeviationLS2" />
diff -r e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Wed Nov 07 12:28:50 2012 +0100
@@ -542,7 +542,6 @@
inBackground.setTextContent(message.getMessage());
}
-
/**
* Append output mode nodes to a document.
*/
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java Wed Nov 07 12:28:50 2012 +0100
@@ -130,7 +130,6 @@
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);
@@ -142,7 +141,7 @@
protected CalculationResult buildCalculationResult(
- FlowVelocityAccess access,
+ FlowVelocityAccess access,
List<FlowVelocityModel> models
) {
double kmLo = access.getLowerKM();
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java Wed Nov 07 12:28:50 2012 +0100
@@ -83,7 +83,6 @@
*/
@Override
public Object getData(Artifact artifact, CallContext context) {
- logger.debug("MainValuesWFacet.getData()");
MainValuesArtifact mvArtifact = (MainValuesArtifact) artifact;
List<NamedDouble> ws = mvArtifact.getMainValuesW(isAtGauge);
@@ -103,7 +102,6 @@
context);
}
- logger.debug("MainValuesWFacet: Will give " + ws.size() + " annotations.");
for (NamedDouble w: ws) {
StickyAxisAnnotation annotation =
new StickyAxisAnnotation(
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/extreme/ExtremeCalculation.java Wed Nov 07 12:28:50 2012 +0100
@@ -245,14 +245,12 @@
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 e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadFactory.java Wed Nov 07 12:28:50 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 description and start year, given name and a km range. */
+ /** Query to get km and ws for wst_id and column_pos. */
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 start time, stop time and description. */
+ /** Query to get name for wst_id and column_pos. */
public static final String SQL_SELECT_EPOCHS =
"SELECT DISTINCT " +
" sy.description AS description, " +
@@ -92,7 +92,9 @@
private SedimentLoadFactory() {
}
-
+ /**
+ *
+ */
public static SedimentLoad[] getLoads(
String river,
String type,
@@ -276,7 +278,6 @@
List<Object []> 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],
@@ -373,4 +374,3 @@
}
}
}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java Wed Nov 07 12:28:50 2012 +0100
@@ -76,9 +76,8 @@
protected Document buildDocument(Gauge gauge) {
Document result = XMLUtils.newDocument();
- List<DischargeTable> tables = gauge.getDischargeTables();
- //Collections.sort(tables);
- //tables.sort();
+ List<DischargeTable> tables =gauge.getDischargeTables();
+ Collections.sort(tables);
Element all = result.createElement("discharges");
for (DischargeTable dt: tables) {
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java Wed Nov 07 12:28:50 2012 +0100
@@ -102,8 +102,6 @@
// 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 e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/QSectorSingleState.java Wed Nov 07 12:28:50 2012 +0100
@@ -55,7 +55,7 @@
QSectorFacet qfacet = new QSectorFacet(
0,
QSECTOR,
- Resources.getMsg(meta, QSECTOR, "Q Sectors"));
+ Resources.getMsg(meta, "qsectors", "Q Sectors"));
facets.add(qfacet);
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ReferenceGaugeState.java Wed Nov 07 12:28:50 2012 +0100
@@ -34,7 +34,7 @@
{
River river = FLYSUtils.getRiver((FLYSArtifact) artifact);
List<Gauge> gauges = river.getGauges();
- //Collections.sort(gauges);
+ Collections.sort(gauges);
int num = gauges != null ? gauges.size() : 0;
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java Wed Nov 07 12:28:50 2012 +0100
@@ -176,7 +176,6 @@
}
catch (NumberFormatException nfe) {
logger.error("Index is not a valid integer!", nfe);
- // return false?
}
return true;
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Wed Nov 07 12:28:50 2012 +0100
@@ -81,7 +81,6 @@
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();
@@ -92,21 +91,14 @@
|| 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;
}
}
- else if (output.contains(FacetTypes.ChartType.FDWC.toString())
+ 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 e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java Wed Nov 07 12:28:50 2012 +0100
@@ -211,7 +211,6 @@
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 e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Wed Nov 07 12:28:50 2012 +0100
@@ -200,7 +200,6 @@
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.
@@ -215,7 +214,6 @@
// 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) {
@@ -436,8 +434,6 @@
return;
}
- logger.debug("addAnnotationsToRenderer: " + annotations.size());
-
// OPTMIMIZE: Pre-calculate positions
ChartArea area = new ChartArea(
plot.getDomainAxis(0).getRange(),
@@ -445,7 +441,7 @@
// Walk over all Annotation sets.
for (FLYSAnnotation fa: annotations) {
-
+
// Access text styling, if any.
Document theme = fa.getTheme();
TextStyle textStyle = null;
@@ -1510,12 +1506,11 @@
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 e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java Wed Nov 07 12:28:50 2012 +0100
@@ -69,7 +69,6 @@
Element chartinfo = cr.create("chartinfo");
- // Debug me, issue842
chartinfo.appendChild(createAxesElements(cr, chart));
chartinfo.appendChild(createTransformationElements(cr, chart, info));
diff -r e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/exports/OutputHelper.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/OutputHelper.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/OutputHelper.java Wed Nov 07 12:28:50 2012 +0100
@@ -352,8 +352,6 @@
return dataProviders;
}
-
-
/**
* Returns a concrete Artifact of this collection specified by its uuid.
*
diff -r e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java Wed Nov 07 12:28:50 2012 +0100
@@ -82,7 +82,6 @@
return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT);
}
-
@Override
protected String getDefaultChartSubtitle() {
Object[] args = new Object[] {
@@ -116,8 +115,6 @@
return msg(getInCm(1) ? I18N_Y_AXIS_IN_CM : I18N_Y_AXIS_IN_M);
}
-
- /** Probably to be overridden? */
protected String facetName() {
return REFERENCE_CURVE;
}
@@ -175,8 +172,6 @@
}
}
-
- /** Probably also there to be overridden. */
protected boolean doNormalize() {
return false;
}
diff -r e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java Wed Nov 07 12:28:50 2012 +0100
@@ -273,7 +273,6 @@
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 e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Wed Nov 07 12:28:50 2012 +0100
@@ -254,8 +254,6 @@
* axis could be inverted.
*/
protected double getLeftX() {
- // TODO if the range null...
- //return (Double)getDomainAxisRange().getLowerBound();
return (Double)getXBounds(0).getLower();
}
@@ -266,27 +264,12 @@
* axis could be inverted.
*/
protected double getRightX() {
- return (Double)getXBounds(0).getLower();
- //return (Double)getDomainAxisRange().getUpperBound();
+ return (Double)getXBounds(0).getUpper();
}
- 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");
@@ -316,6 +299,7 @@
}
imageIcon = new ImageIcon(imageURL);
+
double xPos = 0d, yPos = 0d;
String placeh = logoHPlace();
@@ -325,13 +309,13 @@
placev = "top";
}
if (placev.equals("top")) {
- yPos = getTopY();
+ yPos = (Double)getYBounds(0).getUpper();
}
else if (placev.equals("bottom")) {
- yPos = getBottomY();
+ yPos = (Double)getYBounds(0).getLower();
}
else if (placev.equals("center")) {
- yPos = (getTopY() + getBottomY())/2d;
+ yPos = ((Double)getYBounds(0).getUpper() + (Double)getYBounds(0).getLower())/2d;
}
else {
logger.debug("Unknown place-v value: " + placev);
@@ -347,9 +331,7 @@
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);
@@ -703,7 +685,6 @@
}
- /** Return range of domain axis. */
protected Range getDomainAxisRange() {
String[] ranges = getDomainAxisRangeFromRequest();
@@ -743,9 +724,7 @@
String[] ranges = getValueAxisRangeFromRequest();
if (ranges == null || ranges.length < 2) {
- 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.");
+ logger.debug("No range specified. Lower and upper Y == 0");
return null;
}
@@ -768,7 +747,6 @@
}
}
- logger.warn("One of the range elements is zero length text.");
return null;
}
@@ -1056,5 +1034,6 @@
return hash;
}
+
}
// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/extreme/ExtremeWQCurveGenerator.java Wed Nov 07 12:28:50 2012 +0100
@@ -151,7 +151,6 @@
@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 e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java Wed Nov 07 12:28:50 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 e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java Wed Nov 07 12:28:50 2012 +0100
@@ -88,7 +88,6 @@
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 e8a4d2fd25cc -r 60c728e557f4 flys-artifacts/src/main/java/de/intevation/flys/utils/DoubleUtil.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/DoubleUtil.java Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/DoubleUtil.java Wed Nov 07 12:28:50 2012 +0100
@@ -158,8 +158,7 @@
/** Call callback for every string split by colon.
- * Expected format FROM:TO:VALUE1,VALUE2,VALUE3
- * from;to;value:from2;to2;value2:...*/
+ * Expected format FROM:TO:VALUE1,VALUE2,VALUE3*/
public static final void parseSegments(
String input,
SegmentCallback callback
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Wed Nov 07 12:28:50 2012 +0100
@@ -800,8 +800,6 @@
String annotations();
- String all_annotations();
-
String additionals();
String differences();
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Wed Nov 07 12:28:50 2012 +0100
@@ -408,7 +408,6 @@
columns = Columns
annotation = Annotations
annotations = Annotations
-all_annotations = All Annotations
additionals = Additional Longitudinal Section Curves
differences = Differences
kilometrage = Kilometrage
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Wed Nov 07 12:28:50 2012 +0100
@@ -409,7 +409,6 @@
columns = Spalten
annotation = Streckenfavoriten
annotation = Streckenfavoriten - Typen
-all_annotations = Alle Streckenfavoriten
additionals = Zus\u00e4tzliche L\u00e4ngsschnitte
differences = Differenzen
kilometrage = Kilometrierung
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Wed Nov 07 12:28:50 2012 +0100
@@ -409,7 +409,6 @@
columns = Columns
annotation = Annotations
annotations = Annotations
-all_annotations = All Annotations
additionals = Additional Longitudinal Section Curves
differences = Differences
kilometrage = Kilometrage
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java Wed Nov 07 12:28:50 2012 +0100
@@ -6,7 +6,6 @@
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;
@@ -142,7 +141,6 @@
f.setColWidths("40%", "60%");
layout.addMember(f);
- layout.addMember(new Label(facet.getTheme().getFacet()));
init();
initPanels();
}
diff -r e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/ArtifactDescription.java Wed Nov 07 12:28:50 2012 +0100
@@ -4,8 +4,7 @@
/**
- * The artifact description describes the current being of an artifact.
- * There are
+ * The artifact description describes a state 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 e8a4d2fd25cc -r 60c728e557f4 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 Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultArtifact.java Wed Nov 07 12:28:50 2012 +0100
@@ -82,7 +82,6 @@
}
- /** Get the description how it came from server. */
public ArtifactDescription getArtifactDescription() {
return artifactDescription;
}
diff -r e8a4d2fd25cc -r 60c728e557f4 flys-client/src/main/webapp/WEB-INF/web.xml
--- a/flys-client/src/main/webapp/WEB-INF/web.xml Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-client/src/main/webapp/WEB-INF/web.xml Wed Nov 07 12:28:50 2012 +0100
@@ -18,7 +18,7 @@
<context-param>
<param-name>authentication</param-name>
- <param-value>plain</param-value>
+ <param-value>GGInA</param-value>
</context-param>
<context-param>
More information about the Dive4elements-commits
mailing list