Author: bleny Date: 2011-03-24 12:03:31 +0000 (Thu, 24 Mar 2011) New Revision: 1088 Log: code clean up ; use nuiton-utils Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-03-24 11:52:31 UTC (rev 1087) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-03-24 12:03:31 UTC (rev 1088) @@ -166,15 +166,6 @@ return dateFormat.format(date); } - /** - * - * @deprecated should be replaced by StringUtil.isEmail - */ - @Deprecated - public static boolean isEmail(String str) { - return str.matches("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9\\-]*[a-z0-9])?$"); - } - /** Cut a collection of beans by divide them depending of the value * of a given property. * 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-03-24 11:52:31 UTC (rev 1087) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-03-24 12:03:31 UTC (rev 1088) @@ -582,7 +582,7 @@ // sending the same e-mail to all of them for (WaoUser waoUser : waoUsers) { String userLogin = waoUser.getLogin(); - if (WaoUtils.isEmail(userLogin)) { + if (StringUtil.isEmail(userLogin)) { try { WaoUtils.sendEmail(userLogin, object, body); } catch (EmailException e) { 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-03-24 11:52:31 UTC (rev 1087) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-24 12:03:31 UTC (rev 1088) @@ -381,164 +381,6 @@ transaction.commitTransaction(); -// TopiaContext transaction2 = null; -// try { -// -// SampleRowLogDAO logDAO = WaoDAOHelper.getSampleRowLogDAO(transaction); -// context.prepareTopiaId(SampleRowLog.class, rowLog); -// logDAO.update(rowLog); -// -// boolean isNewRow = context.prepareTopiaId(SampleRow.class, row); -// -// if (log.isDebugEnabled()) { -// log.debug("new sampleRow : " + isNewRow); -// log.debug("samplRow topiaId : " + row.getTopiaId()); -// } -// -// String pattern = DateUtil.MONTH_PATTERN; -// DateFormat dateFormat = new SimpleDateFormat(pattern); -// -// SampleRow oldRow = null; -// Profession oldProfession = null; -// Company oldCompany = null; -// Map<String, SampleMonth> oldMonths = new HashMap<String, SampleMonth>(); -// List<FishingZone> oldZones = new ArrayList<FishingZone>(); -// transaction2 = context.beginTransaction(); -// // UPDATE -// if (!isNewRow) { -// // Prepare data for logging or deleting oldMonths -// SampleRowDAO oldDAO = WaoDAOHelper.getSampleRowDAO(transaction2); -// oldRow = oldDAO.findByTopiaId(row.getTopiaId()); -// oldCompany = oldRow.getCompany(); -// oldProfession = oldRow.getProfession(); -// for (SampleMonth month : oldRow.getSampleMonth()) { -// oldMonths.put(month.getTopiaId(), month); -// } -// oldZones = oldRow.getFishingZone(); -// -// // NbObservants -// if (oldRow.getNbObservants() != row.getNbObservants()) { -// rowLog.addChange("Le nombre d'observateurs est passé de " + oldRow.getNbObservants() + " à " + row.getNbObservants()); -// } -// // AverageTideTime -// if (oldRow.getAverageTideTime() != row.getAverageTideTime()) { -// rowLog.addChange("La durée moyenne d'une marée est passé de " + oldRow.getAverageTideTime() + " jours à " + row.getAverageTideTime()); -// } -// -// if (ObjectUtils.notEqual(oldRow.getTerrestrialLocation(), row.getTerrestrialLocation())) { -// rowLog.addChange("Le lieu est passé de " + oldRow.getTerrestrialLocation().getDescription() + " à " -// + row.getTerrestrialLocation().getDescription()); -// } -// } else { -// rowLog.addChange("Le nombre d'observateurs est " + row.getNbObservants()); -// rowLog.addChange("La durée moyenne d'une marée est " + row.getAverageTideTime()); -// } -// // ChangeLog Company -// rowLog.addChangeCompany(oldCompany, row.getCompany()); -// // ChangeLog Program -// String oldProgram = oldRow != null ? oldRow.getProgramName() : null; -// rowLog.addChangeProgram(oldProgram, row.getProgramName()); -// // ChangeLog Period -// PeriodDates oldPeriod = null; -// if (oldRow != null) { -// oldPeriod = new PeriodDates(oldRow.getPeriodBegin(), oldRow.getPeriodEnd()); -// } -// PeriodDates newPeriod = new PeriodDates(row.getPeriodBegin(), row.getPeriodEnd()); -// rowLog.addChangePeriod(oldPeriod, newPeriod, pattern); -// -// // before saving profession -// if (row.getDCF5Code() != null) { -// row.setDCF5Code(insertOrSelect(transaction, row.getDCF5Code())); -// } -// -// // Save Profession -// ProfessionDAO professionDAO = WaoDAOHelper.getProfessionDAO(transaction); -// context.prepareTopiaId(Profession.class, row.getProfession()); -// rowLog.addChangeProfession(oldRow, row); -// professionDAO.update(row.getProfession()); -// -// // Save sampleMonth -// SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); -// -// // Delete oldMonths -// List<SampleMonth> newMonths = row.getSampleMonth(); -// for (SampleMonth oldMonth : oldMonths.values()) { -// if (!newMonths.contains(oldMonth)) { -// String date = dateFormat.format(oldMonth.getPeriodDate()); -// // Delete old month : add to log -// monthDAO.delete(oldMonth); -// rowLog.addChange("Le mois " + date + " a été supprimé, " + -// "l'ancienne valeur d'effort était " + oldMonth.getExpectedTidesValue()); -// } -// } -// // Create or update months -// for (SampleMonth month : newMonths) { -// boolean monthCreated = context.prepareTopiaId(SampleMonth.class, month); -// String date = dateFormat.format(month.getPeriodDate()); -// if (monthCreated) { -// // log create month -// rowLog.addChange("Le mois " + date + " a été créé avec un nombre de marées de " + month.getExpectedTidesValue()); -// } else { -// SampleMonth oldMonth = oldMonths.get(month.getTopiaId()); -// if (oldMonth.getExpectedTidesValue() != month.getExpectedTidesValue()) { -// // log change month value -// rowLog.addChange("Le nombre de marées du mois " + date + " est passé de " + -// oldMonth.getExpectedTidesValue() + " à " + month.getExpectedTidesValue()); -// } -// } -// monthDAO.update(month); -// } -// -// List<List<Integer>> immatriculations = -// updateElligibleBoats(transaction, row, boats); -// -// // ChangeLog boats (index=0 for removed, index=1 for new) -// rowLog.addRemoveBoats(immatriculations.get(0)); -// rowLog.addNewBoats(immatriculations.get(1)); -// -//// String oldBoats = oldRow != null ? oldRow.getMainElligibleBoatsAsString() : ""; -//// rowLog.addNewBoats(immatriculations.get(1)); -// -// -// // Remove no longer linked FishingZone -// List<FishingZone> newZones = row.getFishingZone(); -// for (FishingZone oldZone : oldZones) { -// if (!newZones.contains(oldZone)) { -//// updateFishingZones(transaction, oldZone.getTopiaId(), row, true); -// rowLog.addChange("La zone de pêche " + oldZone.getCode() + " a été dissociée de la ligne"); -// } -// } -// // Add new linked FishingZone -// // ConcurrentModificationException ???? -// for (FishingZone zone : new ArrayList<FishingZone>(newZones)) { -// if (!oldZones.contains(zone)) { -//// updateFishingZones(transaction, zone.getTopiaId(), row, false); -// rowLog.addChange("La zone de pêche " + zone.getCode() + " a été associée à la ligne"); -// } -// } -// -// // Save sampleRow : create or update -// SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); -// if (log.isDebugEnabled()) { -// log.debug("update row : " + row); -// } -// // Not useful, sampleRowLog is instantiate using getNewSampleRowLog(SampleRow, ConnectedUser); -// rowLog.setSampleRow(row); -// rowLog.setFromAdmin(true); -// -// rowDAO.update(row); -// -// if (log.isDebugEnabled()) { -// log.debug("Change log : " + rowLog.getLogText()); -// log.debug("commit transaction !"); -// } -// transaction.commitTransaction(); -// -// } catch (Exception eee) { -// throw eee; -// } finally { -// transaction2.closeContext(); -// } } /** Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-03-24 11:52:31 UTC (rev 1087) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-03-24 12:03:31 UTC (rev 1088) @@ -254,7 +254,7 @@ transaction.commitTransaction(); try { - if (WaoUtils.isEmail(user.getLogin()) && user.isPasswordChanged()) { + if (StringUtil.isEmail(user.getLogin()) && user.isPasswordChanged()) { String subject = "[WAO] "; String msg = "Bonjour,\n\n"; if (isNewUser) {