Author: fdesbois Date: 2010-04-01 14:16:57 +0000 (Thu, 01 Apr 2010) New Revision: 405 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo Log: Clean ServiceBoatImpl to use last ServiceTransformer version (default errorArgs = false) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-01 13:55:30 UTC (rev 404) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-01 14:16:57 UTC (rev 405) @@ -75,7 +75,7 @@ @Override public Map<Integer, Boat> executeGetBoatsByFilter(TopiaContext transaction, - List<Object> errorArgs, BoatFilter filter) throws TopiaException { + BoatFilter filter) throws TopiaException { BoatDAO dao = WaoDAOHelper.getBoatDAO(transaction); TopiaQuery query = dao.createQuery("B"); @@ -94,7 +94,7 @@ @Override public int executeGetNbBoatsByFilter(TopiaContext transaction, - List<Object> errorArgs, BoatFilter filter) throws TopiaException { + BoatFilter filter) throws TopiaException { BoatDAO dao = WaoDAOHelper.getBoatDAO(transaction); TopiaQuery query = dao.createQuery("B"); @@ -249,8 +249,7 @@ @Override public List<Boat> executeGetBoatsByImmatriculations( - TopiaContext transaction, List<Object> errorArgs, - String immatriculations) + TopiaContext transaction, String immatriculations) throws TopiaException, WaoBusinessException { List<Boat> boats = new ArrayList<Boat>(); if (StringUtils.isEmpty(immatriculations)) { @@ -278,7 +277,7 @@ } @Override - public Boat executeGetBoat(TopiaContext transaction, List<Object> errorArgs, + public Boat executeGetBoat(TopiaContext transaction, String boatId) throws TopiaException { BoatDAO dao = WaoDAOHelper.getBoatDAO(transaction); @@ -317,7 +316,8 @@ * @see com.csvreader.CsvReader */ @Override - public int[] executeImportBoatCsv(TopiaContext transaction, InputStream input) + public int[] executeImportBoatCsv(TopiaContext transaction, + InputStream input) throws TopiaException, IOException, WaoBusinessException { int[] result = new int[]{0,0}; @@ -328,7 +328,8 @@ BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); ShipOwnerDAO shipOwnerDAO = WaoDAOHelper.getShipOwnerDAO(transaction); - Map<String, ShipOwner> availableShipOwners = new HashMap<String, ShipOwner>(); + Map<String, ShipOwner> availableShipOwners = + new HashMap<String, ShipOwner>(); tic = System.currentTimeMillis(); Pattern pattern = Pattern.compile("\\d{6}"); Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-04-01 13:55:30 UTC (rev 404) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-04-01 14:16:57 UTC (rev 405) @@ -18,9 +18,9 @@ wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00E8me d'import du fichier CSV des calendriers d'activit\u00E9 wao.error.serviceBoat.importBoatCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00E9tails. wao.error.serviceNews.getNews=Impossible de r\u00E9cup\u00E9rer l'ensemble des news -wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre \'%1$s\' +wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' wao.error.serviceReferential.getFacades=Impossible de charger la liste des facades wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00EAche wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00E9tiers wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00EAche -wao.error.serviceReferential.importFishingZoneCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier : [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00E9tails. +wao.error.serviceReferential.importFishingZoneCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00E9tails. Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)