Author: bleny Date: 2010-11-02 19:59:41 +0000 (Tue, 02 Nov 2010) New Revision: 726 Log: add square brackets to show bound inclusions in UI Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-11-02 19:38:31 UTC (rev 725) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-11-02 19:59:41 UTC (rev 726) @@ -70,6 +70,7 @@ return containsValue; } + @Override public boolean isUpperBoundIncluded() { return upperBoundIncluded; } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-02 19:38:31 UTC (rev 725) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-02 19:59:41 UTC (rev 726) @@ -51,9 +51,15 @@ ${indicatorLevel.upperBound} <p:else> <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> - ${indicatorLevel.upperBound} et plus + ] ${indicatorLevel.upperBound} et plus <p:else> - ${indicatorLevel.lowerBound} à ${indicatorLevel.upperBound} + [ ${indicatorLevel.lowerBound} à ${indicatorLevel.upperBound} + <t:if test="indicatorLevel.upperBoundIncluded"> + ] + <p:else> + [ + </p:else> + </t:if> </p:else> </t:if> </p:else>