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) {