Author: bleny Date: 2011-04-01 09:36:07 +0000 (Fri, 01 Apr 2011) New Revision: 1124 Log: fix concurrent modification exception Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/webapp/Boats.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-04-01 08:55:06 UTC (rev 1123) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-04-01 09:36:07 UTC (rev 1124) @@ -75,6 +75,7 @@ import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -726,6 +727,10 @@ /** /////////////////////// FOR EACH ELLIGIBLEBOAT ROW ///////////////// **/ + public List<ElligibleBoat> getElligibleBoatsValues() { + return new ArrayList<ElligibleBoat>(getCompanyBoatInfos().getElligibleBoatsValues()); + } + public String getElligibleRowInfos() { return manager.getTooltipSampleRow(elligibleBoat.getSampleRow()); } Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-01 08:55:06 UTC (rev 1123) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-01 09:36:07 UTC (rev 1124) @@ -320,32 +320,14 @@ <div> <p><label for="dup">${message:wao.ui.field.BoatInfos.dup} :</label> <input t:type="textfield" t:id="dup" class="dup" value="boatInfos.dup" /></p> <p class="sep"> </p> -<!-- <p> - <t:label t:for="fromDate"/> : - <input t:type="datefield" t:id="fromDate" value="boardingFromDate" /> - <input t:type="submit" class="ico refresh" t:id="refreshBoardings" value="Refresh" title="Recalculer les embarquements"/> - </p> - <p> - <strong>${boatInfos.getNbBoarding(boardingFromDate)}</strong> embarquements - dont <strong>${boatInfos.getNbBoardingForCompany(boardingFromDate)}</strong> dans votre société - </p>--> - <p class="sep"> </p> <label>${message:wao.ui.boats.associatedLine}</label> <ul> - <li t:type="loop" t:source="companyBoatInfos.elligibleBoatsValues" volatile="true" t:value="elligibleBoat"> + <li t:type="loop" t:source="elligibleBoatsValues" volatile="true" t:value="elligibleBoat"> <span t:type="ck/Tooltip" title="Infos" t:value="prop:elligibleRowInfos" t:effect="appear"> <span class="${elligibleRowStyle}"> ${elligibleBoat.sampleRow.code} </span> </span> - <!--t:if t:test="elligibleBoatCompanyActiveFalse"> - <input t:type="submitContext" t:defer="false" t:id="activeBoatInfosSampleRow" class="ico add" - t:context="elligibleBoat.sampleRow.code" /> - <p:else> - <input t:type="submitContext" t:defer="false" t:id="removeBoatInfosSampleRow" class="ico remove" value="Remove" - t:context="elligibleBoat.sampleRow.code" /> - </p:else> - </t:if--> <t:if t:test="elligibleBoatCompanyActiveFalse"> <input t:type="submit" t:defer="false" t:id="activeBoatInfosSampleRow" class="ico add" t:context="elligibleBoat.sampleRow.code" />