Author: bleny Date: 2013-05-16 15:07:49 +0200 (Thu, 16 May 2013) New Revision: 1662 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1662 Log: remove usages of guava Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictNamesFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictNamesFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictNamesFormatter.java 2013-05-16 12:17:42 UTC (rev 1661) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictNamesFormatter.java 2013-05-16 13:07:49 UTC (rev 1662) @@ -23,8 +23,8 @@ */ package fr.ifremer.wao.io.csv2.models.operations; -import com.google.common.base.Joiner; import fr.ifremer.wao.entity.TerrestrialLocation; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.csv.ValueFormatter; import java.util.Collection; @@ -41,7 +41,7 @@ districtNames.add(terrestrialLocation.getDistrictName()); } } - String value = Joiner.on(", ").join(districtNames); + String value = StringUtils.join(districtNames, ", "); return value; } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java 2013-05-16 12:17:42 UTC (rev 1661) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java 2013-05-16 13:07:49 UTC (rev 1662) @@ -23,7 +23,6 @@ */ package fr.ifremer.wao.io.csv2.models.operations; -import com.google.common.base.Splitter; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.TerrestrialLocation; import org.apache.commons.lang3.StringUtils; @@ -67,10 +66,10 @@ if (StringUtils.isBlank(value)) { throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.districtMissing")); } - Iterable<String> districtCodes = Splitter.on(',').trimResults().split(value); + String[] districtCodes = StringUtils.split(value, ','); Collection<TerrestrialLocation> districts = new LinkedList<TerrestrialLocation>(); for (String districtCode : districtCodes) { - TerrestrialLocation district = indexedDistricts.get(districtCode); + TerrestrialLocation district = indexedDistricts.get(districtCode.trim()); if (district == null) { throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongDistrict", value)); } 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 2013-05-16 12:17:42 UTC (rev 1661) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-05-16 13:07:49 UTC (rev 1662) @@ -24,7 +24,6 @@ package fr.ifremer.wao.service; -import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; @@ -1144,10 +1143,8 @@ boolean addBoatToObserversAllegroWallet = false; if (obsProgram == ObsProgram.OBSMER) { - addBoatToObserversAllegroWallet = - ImmutableSet.of( - ContactState.OBSERVATION_DONE, - ContactState.OBSERVATION_EXPECTED).contains(contactState); + addBoatToObserversAllegroWallet = contactState == ContactState.OBSERVATION_DONE + || contactState == ContactState.OBSERVATION_EXPECTED; } else if (obsProgram == ObsProgram.OBSVENTE) { addBoatToObserversAllegroWallet = ContactState.OBSERVATION_DONE == contactState; }