Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java @ 2423:ac528b883b47
Picked rev 4070,4074,4076,4080 from trunk.
flys-artifacts/tags/2.6.1@4083 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 17 Feb 2012 12:59:56 +0000 |
parents | 44dc117aa2b7 |
children | 8490faba00e7 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java Fri Feb 17 11:29:41 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java Fri Feb 17 12:59:56 2012 +0000 @@ -163,7 +163,7 @@ /** * This method returns an WQ_MODE enum which is based on the parameters - * stored in <i>flys</i> Artifact. If there is no <i>wq_mode</i> parameter + * stored in <i>flys</i> Artifact. If there is no <i>wq_isq</i> parameter * existing, WQ_MODE.NONE is returned. * * @param flys The FLYSArtifact that stores wq mode relevant parameters. @@ -176,13 +176,13 @@ } String values = flys.getDataAsString("wq_values"); - Boolean isQ = flys.getDataAsBoolean("wq_mode"); + Boolean isQ = flys.getDataAsBoolean("wq_isq"); if (values != null) { return isQ ? WQ_MODE.QGAUGE : WQ_MODE.WGAUGE; } - Boolean isFree = flys.getDataAsBoolean("wq_free"); + Boolean isFree = flys.getDataAsBoolean("wq_isfree"); if (isQ) { return isFree ? WQ_MODE.QFREE : WQ_MODE.QGAUGE; @@ -201,7 +201,7 @@ return WQ_INPUT.NONE; } - Boolean selection = flys.getDataAsBoolean("wq_selection"); + Boolean selection = flys.getDataAsBoolean("wq_isrange"); String adapted = flys.getDataAsString("wq_values"); if(adapted != null && adapted.length() > 0) { @@ -345,11 +345,9 @@ * @return the Qs. */ public static double[] getQs(FLYSArtifact flys) { - double[] kmRange = getKmRange(flys); - // XXX this is not nice! if (flys instanceof WINFOArtifact) { - return ((WINFOArtifact) flys).getQs(kmRange); + return ((WINFOArtifact) flys).getQs(); } logger.warn("This method currently supports WINFOArtifact only!");