- Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r1385 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 26 Jul '11

26 Jul '11

Author: bleny Date: 2011-07-26 07:59:59 +0000 (Tue, 26 Jul 2011) New Revision: 1385 Log: import of motives in ObsMer, not ObsDeb Modified: trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2011-07-21 15:50:33 UTC (rev 1384) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2011-07-26 07:59:59 UTC (rev 1385) @@ -181,7 +181,7 @@ <t:importFieldSet t:label="${message:wao.ui.import.terrestrialLocationsLabel}" t:engine="terrestrialLocationsImportEngine" /> - <t:if test="currentUser.obsDeb"> + <t:if test="currentUser.obsMer"> <t:importFieldSet t:label="${message:wao.ui.import.contactStateMotivesLabel}" t:engine="contactStateMotivesImportEngine" /> </t:if>

1 0

[Suiviobsmer-commits] r1384 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 21 Jul '11

21 Jul '11

Author: bleny Date: 2011-07-21 15:50:33 +0000 (Thu, 21 Jul 2011) New Revision: 1384 Log: change version to 3.0.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-21 15:41:49 UTC (rev 1383) +++ trunk/pom.xml 2011-07-21 15:50:33 UTC (rev 1384) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> <modules> <module>wao-ui</module> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-07-21 15:41:49 UTC (rev 1383) +++ trunk/wao-business/pom.xml 2011-07-21 15:50:33 UTC (rev 1384) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-07-21 15:41:49 UTC (rev 1383) +++ trunk/wao-ui/pom.xml 2011-07-21 15:50:33 UTC (rev 1384) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r1383 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 21 Jul '11

21 Jul '11

Author: bleny Date: 2011-07-21 15:41:49 +0000 (Thu, 21 Jul 2011) New Revision: 1383 Log: more contact validation for ObsDeb Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-07-21 10:32:18 UTC (rev 1382) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-07-21 15:41:49 UTC (rev 1383) @@ -273,6 +273,25 @@ if (contact.getObsProgram() == ObsProgram.OBSDEB) { + if (contact.getLandingDate() != null) { + if (success && contact.getObservationBeginDate() != null) { + Date dayBeforeObservation = DateUtils.addDays(contact.getObservationBeginDate(), -1); + boolean landingDateIsValid = + DateUtils.isSameDay(contact.getObservationBeginDate(), contact.getLandingDate()) + || DateUtils.isSameDay(dayBeforeObservation, contact.getLandingDate()); + if ( ! landingDateIsValid) { + success = false; + message = "La date de débarquement doit être la veille ou le jour de l'observation"; + } + } + + if (success && contact.getObservationEndDate() != null + && contact.getObservationEndDate().before(contact.getLandingDate())) { + success = false; + message = "La débarquement ne peut avoir eu lieu après le fin de l'observation"; + } + } + if (contact.getContactState() == ContactState.OBSERVATION_DONE) { if (success && contact.getTerrestrialLocation() == null) {

1 0

[Suiviobsmer-commits] r1382 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components
by bleny＠users.labs.libre-entreprise.org 21 Jul '11

21 Jul '11

Author: bleny Date: 2011-07-21 10:32:18 +0000 (Thu, 21 Jul 2011) New Revision: 1382 Log: prevent infinite loop when user select two dates in anti-chronological order in filters Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2011-07-21 10:31:31 UTC (rev 1381) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2011-07-21 10:32:18 UTC (rev 1382) @@ -31,10 +31,12 @@ import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.annotations.Inject; +import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Date; /** * @author sletellier <letellier at codelutin.com> @@ -156,6 +158,17 @@ resetFilter(); } + // if user entered a non-chronological time interval, invert it + PeriodDates period = getFilter().getPeriod(); + if (period != null) { + Date fromDate = period.getFromDate(); + Date thruDate = period.getThruDate(); + if (thruDate.before(fromDate)) { + period.setFromDate(thruDate); + period.setThruDate(fromDate); + } + } + // Limite search panel updateSearchFields();

1 0

[Suiviobsmer-commits] r1381 - trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2
by bleny＠users.labs.libre-entreprise.org 21 Jul '11

21 Jul '11

Author: bleny Date: 2011-07-21 10:31:31 +0000 (Thu, 21 Jul 2011) New Revision: 1381 Log: add trace when a formatter return null, it should never occur Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Export.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Export.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Export.java 2011-07-21 10:30:39 UTC (rev 1380) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Export.java 2011-07-21 10:31:31 UTC (rev 1381) @@ -67,6 +67,13 @@ for (ExportableColumn column : model.getColumnsForExport()) { Object value = column.getValue(object); String formattedValue = column.formatValue(value); + if (formattedValue == null) { + formattedValue = ""; + if (log.isWarnEnabled()) { + log.warn("column for header " + column.getHeaderName() + + " returned a null value." + column.toString()); + } + } boolean valueNeedQuotes = formattedValue.contains(separator) || formattedValue.contains("\n") || formattedValue.contains(";")

1 0

[Suiviobsmer-commits] r1380 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org 21 Jul '11

21 Jul '11

Author: bleny Date: 2011-07-21 10:30:39 +0000 (Thu, 21 Jul 2011) New Revision: 1380 Log: prevent generation of bad syntax in query when sorting boats Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-07-21 10:15:51 UTC (rev 1379) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-07-21 10:30:39 UTC (rev 1380) @@ -416,7 +416,17 @@ query.addEquals(sampleRowProperty.observationTypeOrdinal(), filter.getExpectedObservationType().ordinal()); } - if (filter.getOrderBy() != null) { + // a fix to prevent adding of orderBy when filtering on Boats. This prevent + // a bad query to be generated if user is on page Boats, select a + // sample row in filter, run the search and finally click on the header + // of a column, to sort on boat name for example. + // Without this condition, generated query would end by + // "Order by name, B.name", the first term should not have been added + // the second is added in applyBoatFilter. The following boolean assure + // that first term is not added when filtering on boats and the query + // ends only with "Order By B.name" + boolean applyOrder = ! (filter instanceof BoatFilter); + if (applyOrder && filter.getOrderBy() != null) { query.addOrder(filter.getOrderBy()); }

1 0

[Suiviobsmer-commits] r1379 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 21 Jul '11

21 Jul '11

Author: bleny Date: 2011-07-21 10:15:51 +0000 (Thu, 21 Jul 2011) New Revision: 1379 Log: only a single final commit when importing sampling plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-07-19 13:24:33 UTC (rev 1378) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-07-21 10:15:51 UTC (rev 1379) @@ -262,7 +262,11 @@ @Override protected void executeCreateUpdateSampleRow(TopiaContext transaction, SampleRow row, List<Boat> boats, SampleRowLog rowLog, ConnectedUser connectedUser) throws TopiaException, WaoBusinessException { + createUpdateSampleRowWithoutCommit(transaction, row, boats, rowLog, connectedUser); + transaction.commitTransaction(); + } + protected void createUpdateSampleRowWithoutCommit(TopiaContext transaction, SampleRow row, List<Boat> boats, SampleRowLog rowLog, ConnectedUser connectedUser) throws TopiaException, WaoBusinessException { // prepare some stuffs for persistence if (row.getSampleMonth() != null) { for (SampleMonth sampleMonth : row.getSampleMonth()) { @@ -441,9 +445,6 @@ dao.update(oldRow); } - - transaction.commitTransaction(); - } /** @@ -1117,7 +1118,7 @@ SampleRowLog sampleRowLog = executeGetNewSampleRowLog(sampleRow, connectedUser); String logComment = WaoUtils._("csv.import.logComment"); sampleRowLog.setComment(logComment); - executeCreateUpdateSampleRow(transaction, sampleRow, new ArrayList<Boat>(), sampleRowLog, connectedUser); + createUpdateSampleRowWithoutCommit(transaction, sampleRow, new ArrayList<Boat>(), sampleRowLog, connectedUser); result.incNbImported(); timeLog.log(startUpdateDatabase, "end update database");

1 0

[Suiviobsmer-commits] r1378 - in trunk: wao-business/src/main/filters wao-ui/src/main/resources/fr/ifremer/wao/ui/components wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 19 Jul '11

19 Jul '11

Author: bleny Date: 2011-07-19 13:24:33 +0000 (Tue, 19 Jul 2011) New Revision: 1378 Log: fix wao explosion Modified: trunk/wao-business/src/main/filters/Wao.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/webapp/Cartography.tml trunk/wao-ui/src/main/webapp/Connexion.tml trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2011-07-18 14:15:21 UTC (rev 1377) +++ trunk/wao-business/src/main/filters/Wao.properties 2011-07-19 13:24:33 UTC (rev 1378) @@ -31,6 +31,7 @@ hibernate.connection.driver_class=org.h2.Driver ## Database location in user home hibernate.connection.url=jdbc:h2:file:~/.local/wao/h2data +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider ## Logs for activityCalendar in wao.log.home ## wao.log.home must be defined when starting server Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-07-18 14:15:21 UTC (rev 1377) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-07-19 13:24:33 UTC (rev 1378) @@ -53,8 +53,8 @@ </t:unless> <div id="so-session" class="clearfix"> <div class="fleft"> - <a t:type="pagelink" t:page="index" title="{$mesage:wao.ui.page.Index.title}"> - <img src="${asset:context:img/logo-wao-48px.png}" alt="{$mesage:wao.ui.page.Index.title}" title="{$mesage:wao.ui.page.Index.title}"/> + <a t:type="pagelink" t:page="index" title="${message:wao.ui.page.Index.title}"> + <img src="${asset:context:img/logo-wao-48px.png}" alt="${message:wao.ui.page.Index.title}" /> </a>  </div> <t:if test="connectedUser.obsMer"> Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2011-07-18 14:15:21 UTC (rev 1377) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2011-07-19 13:24:33 UTC (rev 1378) @@ -112,7 +112,7 @@ <t:if test="user.obsMer"> <div class="acenter mtop30"> <a href="mailto:obsmer at ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> - <img style="height: 22px;" src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> + <img src="${asset:context:img/MiniLogo.jpg}" style="height: 22px;" alt="Obsmer logo"/> </a> </div> </t:if> Modified: trunk/wao-ui/src/main/webapp/Connexion.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Connexion.tml 2011-07-18 14:15:21 UTC (rev 1377) +++ trunk/wao-ui/src/main/webapp/Connexion.tml 2011-07-19 13:24:33 UTC (rev 1378) @@ -55,8 +55,8 @@ <p><label t:for="email">${message:wao.ui.field.WaoUser.login}</label> : </p> <p> <input t:type="textfield" t:id="login" t:value="login" t:validate="required"/>  - <img class="hidden" id="loginValid" src="${asset:context:img/valid-16px.png}" alt="${message:wao.ui.validLogin}" title="${message:wao.ui.validLogin}" /> - <img class="hidden" id="loginInvalid" src="${asset:context:img/invalid-16px.png}" alt="${message:wao.ui.invalidLogin}" title="${message:wao.ui.invalidLogin}" /> + <img src="${asset:context:img/valid-16px.png}" class="hidden" id="loginValid" alt="${message:wao.ui.validLogin}" title="${message:wao.ui.validLogin}" /> + <img src="${asset:context:img/invalid-16px.png}" class="hidden" id="loginInvalid" alt="${message:wao.ui.invalidLogin}" title="${message:wao.ui.invalidLogin}" /> </p> <p><label for="password">${message:wao.ui.field.WaoUser.password}</label> : </p> <p><input t:type="passwordfield" t:id="password" t:value="password" t:validate="required"/></p> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-07-18 14:15:21 UTC (rev 1377) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-07-19 13:24:33 UTC (rev 1378) @@ -62,155 +62,7 @@ t:visibleOnStartup="false" t:user="user" t:serviceContact="serviceContact"/> - - +  <div t:type="zone" class="so-filters" t:id="importExportZone" t:update="show" t:visible="false" id="so-contacts-importexport"> <fieldset>

1 0

[Suiviobsmer-commits] r1377 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org 18 Jul '11

18 Jul '11

Author: bleny Date: 2011-07-18 14:15:21 +0000 (Mon, 18 Jul 2011) New Revision: 1377 Log: deal with having 0 instead of null values in sampling plan Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-07-18 09:49:08 UTC (rev 1376) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-07-18 14:15:21 UTC (rev 1377) @@ -345,11 +345,14 @@ } public String getTotalPercentage() { - double result = 0; + String result; if (row.getTotalTidesExpected() > 0) { - result = (double)row.getTotalTidesReal() / (double)row.getTotalTidesExpected(); + double percentage = (double)row.getTotalTidesReal() / (double)row.getTotalTidesExpected(); + result = NumberFormat.getPercentInstance().format(percentage); + } else { + result = "- %"; } - return NumberFormat.getPercentInstance().format(result); + return result; } public NumberFormat getNumberFormat() { @@ -380,8 +383,7 @@ for (Date month : getMonths()) { this.month = month; - Integer totalExpected = 0, totalReal = 0; - + Integer totalExpected = null, totalReal = null; for (SampleRow row : getData()) { this.row = row; @@ -392,9 +394,15 @@ } if (expected != null) { + if (totalExpected == null) { + totalExpected = 0; + } totalExpected += expected; } if (real != null && canDisplayTidesReal()) { + if (totalReal == null) { + totalReal = 0; + } totalReal += real; } } @@ -407,8 +415,12 @@ getDateFormat().format(month), totalExpected, totalReal)); } - highTotalExpected += totalExpected; - highTotalReal += totalReal; + if (totalExpected != null) { + highTotalExpected += totalExpected; + } + if (totalReal != null) { + highTotalReal += totalReal; + } } @@ -443,8 +455,10 @@ } public String getRatioForMonth() { - String ratio = ""; - if (getTotalExpectedForMonth() > 0) { + String ratio = "-"; + if (getTotalExpectedForMonth() == null || getTotalRealForMonth() == null) { + // + } else if (getTotalExpectedForMonth() > 0 && getTotalRealForMonth() > 0) { double percent = ((double) getTotalRealForMonth() / getTotalExpectedForMonth()); ratio = NumberFormat.getPercentInstance().format(percent); } @@ -542,7 +556,9 @@ public String getRealTidesClassForTotal() { String result = "real-warning"; - if (getTotalRealForMonth() < getTotalExpectedForMonth()) { + if (getTotalRealForMonth() == null || getTotalExpectedForMonth() == null) { + // + } else if (getTotalRealForMonth() < getTotalExpectedForMonth()) { result += "-inf"; } else if (getTotalExpectedForMonth() > getTotalRealForMonth()) { result += "-sup"; Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-07-18 09:49:08 UTC (rev 1376) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-07-18 14:15:21 UTC (rev 1377) @@ -331,12 +331,10 @@  </td> <td class="width50 acenter bright" style="border-top: solid 2px #000000;"> - <span t:type="ck/Tooltip" title="Infos" t:value="Total sur la période du mois ${dateFormat.format(month)}" t:effect="appear"> - ${highTotalExpected} - <t:unless t:test="user.guest"> - <em>(${highTotalReal})</em><br /><strong>${highTotalRatio}</strong> - </t:unless> - </span> + ${highTotalExpected} + <t:unless t:test="user.guest"> + <em>(${highTotalReal})</em><br /><strong>${highTotalRatio}</strong> + </t:unless> </td> <td colspan="${nbColumnsForOther}" style="border: solid 2px #000000;" /> </tr>

1 0

[Suiviobsmer-commits] r1376 - in trunk: wao-business wao-business/src/license wao-business/src/main/java/fr/ifremer/wao wao-ui/src/license wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 18 Jul '11

18 Jul '11

Author: bleny Date: 2011-07-18 09:49:08 +0000 (Mon, 18 Jul 2011) New Revision: 1376 Log: fix boat immatriculation and ship owner filter Modified: trunk/wao-business/pom.xml trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-ui/src/license/THIRD-PARTY.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-07-04 15:01:52 UTC (rev 1375) +++ trunk/wao-business/pom.xml 2011-07-18 09:49:08 UTC (rev 1376) @@ -16,7 +16,6 @@ <groupId>fr.ifremer.wao</groupId> <artifactId>wao-business</artifactId> - <dependencies> <dependency> <groupId>commons-collections</groupId> Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2011-07-04 15:01:52 UTC (rev 1375) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2011-07-18 09:49:08 UTC (rev 1376) @@ -9,23 +9,25 @@ # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - GNU General Public Library -# - GNU Lesser General Public License # - GNU Library or Lesser General Public License # - GPL2 w/ CPE -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - The MIT License +# - iCal4j License http://m2.modularity.net.au/projects/ical4j/license.html +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Apr 13 14:31:37 CEST 2011 +#Mon Jul 04 16:12:18 CEST 2011 antlr--antlr--2.7.6--jar=BSD commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD -ical4j--ical4j--0.9.20--jar=iCal4j License http://m2.modularity.net.au/projects/ical4j/license.html -javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +ical4j--ical4j--0.9.20--jar=iCal4j License http\://m2.modularity.net.au/projects/ical4j/license.html javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-07-04 15:01:52 UTC (rev 1375) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-07-18 09:49:08 UTC (rev 1376) @@ -27,7 +27,6 @@ import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.DataReliability; -import fr.ifremer.wao.bean.LocationType; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.bean.UserRole; Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-07-04 15:01:52 UTC (rev 1375) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-07-18 09:49:08 UTC (rev 1376) @@ -16,14 +16,13 @@ # - GNU General Public Library # - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 # - GNU Lesser General Public Licence -# - GNU Lesser General Public License # - GNU Lesser General Public License version 2.1 # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL # - GPL2 w/ CPE -# - LGPL 2.1 -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 # - Public Domain @@ -32,18 +31,20 @@ # - The H2 License, Version 1.0 # - The MIT License # - The OpenSymphony Software License, Version 1.1 +# - iCal4j license http://m2.modularity.net.au/projects/ical4j/license.html +# - Bah alors on vérifie pas ce qu'on commite ? +# - license.txt # - no licence (see http://tapestry.formos.com/nightly/tapestry-testify/license.html) #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Apr 13 14:45:24 CEST 2011 +#Mon Jul 04 16:21:07 CEST 2011 antlr--antlr--2.7.6--jar=BSD -com.formos.tapestry--tapestry-testify--1.0.3--jar=no licence (see http://tapestry.formos.com/nightly/tapestry-testify/license.html) +com.formos.tapestry--tapestry-testify--1.0.3--jar=no licence (see http\://tapestry.formos.com/nightly/tapestry-testify/license.html) commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD -ical4j--ical4j--0.9.20--jar=iCal4j license http://m2.modularity.net.au/projects/ical4j/license.html -javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +ical4j--ical4j--0.9.20--jar=iCal4j license http\://m2.modularity.net.au/projects/ical4j/license.html javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 jetty--org.mortbay.jetty--5.1.12--jar=ASL 2.0 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-07-04 15:01:52 UTC (rev 1375) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-07-18 09:49:08 UTC (rev 1376) @@ -155,10 +155,14 @@ boatSelectedImmatriculation = null; companyBoatInfos = null; - getBoatFilter().setBoatImmatriculation( - waoActivationContext.getBoatImmatriculation()); - getBoatFilter().setShipOwnerName( - waoActivationContext.getShipOwnerName()); + if (waoActivationContext.getBoatImmatriculation() != null) { + getBoatFilter().setBoatImmatriculation( + waoActivationContext.getBoatImmatriculation()); + } + if (waoActivationContext.getShipOwnerName() != null) { + getBoatFilter().setShipOwnerName( + waoActivationContext.getShipOwnerName()); + } String sampleRowContextId = waoActivationContext.getSampleRowCode(); if (sampleRowContextId != null) {

1 0