Author: bleny Date: 2011-05-04 09:39:53 +0000 (Wed, 04 May 2011) New Revision: 1257 Log: rename WaoUtils#translate to WaoUtils#_ to ease detection of the keys Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/LocationType.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObsProgram.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObservationType.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UserParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UsersParserFormatter.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 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -134,7 +134,7 @@ context.sendEmail(to, subject, msg); } - public static String translate(String i18nKey, Object... args) { + public static String _(String i18nKey, Object... args) { return l_(context.getLocale(), i18nKey, args); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -58,7 +58,7 @@ @Override public String toString() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } /** Values for ObsVente. Refused is removed due to the fact that Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -144,7 +144,7 @@ @Override public String toString() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } /** Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -71,6 +71,6 @@ @Override public String toString() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -53,6 +53,6 @@ @Override public String toString() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/LocationType.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/LocationType.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/LocationType.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -48,6 +48,6 @@ @Override public String toString() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObsProgram.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObsProgram.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObsProgram.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -47,6 +47,6 @@ @Override public String toString() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObservationType.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObservationType.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObservationType.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -26,7 +26,7 @@ @Override public String toString() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } public static ObservationType valueOf(Integer observationTypeOrdinal) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -48,6 +48,6 @@ @Override public String toString() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -77,6 +77,6 @@ } public String toString() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -74,7 +74,7 @@ // an Enum.valueOf exception. It seems that Tapestry use toString() // instead of name() to know witch value is chosen public String getTranslation() { - return WaoUtils.translate(i18nKey); + return WaoUtils._(i18nKey); } /** for a given program, return the roles that can be assigned by someone Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -41,7 +41,7 @@ @Override public String getDescription() { - return WaoUtils.translate(FishingGearDCF.class.getName() + "." + getCode()); + return WaoUtils._(FishingGearDCF.class.getName() + "." + getCode()); } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -41,7 +41,7 @@ @Override public String getDescription() { - return WaoUtils.translate(TargetSpeciesDCF.class.getName() + "." + getCode()); + return WaoUtils._(TargetSpeciesDCF.class.getName() + "." + getCode()); } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -45,7 +45,7 @@ public String getDistrictName() { String districtName = super.getDistrictName(); if (districtName == null) { - districtName = WaoUtils.translate(n_("wao.business.other")); + districtName = WaoUtils._("wao.business.other"); } return districtName; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -125,10 +125,10 @@ if (getCanWrite() == null) { program = "<no write access specified>"; } else if (isReadOnly()) { - readOnly = WaoUtils.translate(n_("wao.business.readOnly")); + readOnly = WaoUtils._("wao.business.readOnly"); } - String result = WaoUtils.translate(n_("wao.business.entity.UserProfile.description"), + String result = WaoUtils._("wao.business.entity.UserProfile.description", role, program, readOnly); return result; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -136,8 +136,8 @@ for (ImportableColumn importableColumn : model.getColumnsForImport()) { validHeaderNames.add(importableColumn.getHeaderName()); } - String validationMessage = WaoUtils.translate( - n_("csv.import.error.unrecognizedHeaders"), + String validationMessage = WaoUtils._( + "csv.import.error.unrecognizedHeaders", StringUtil.join(csvHeaders, ", " ,true), StringUtil.join(validHeaderNames, ", " ,true)); csvValidationResult.setMessage(validationMessage); @@ -154,8 +154,8 @@ if ( ! mandatoryHeadersNames.isEmpty()) { csvValidationResult.setSuccess(false); - String validationMessage = WaoUtils.translate( - n_("csv.import.error.missingMandatoryHeaders"), + String validationMessage = WaoUtils._( + "csv.import.error.missingMandatoryHeaders", StringUtil.join(mandatoryHeadersNames, ", " , true)); csvValidationResult.setMessage(validationMessage); } @@ -210,7 +210,7 @@ value = reader.get(field.getHeaderName()); } catch (IOException e) { reader.close(); - throw new RuntimeException(WaoUtils.translate(n_("csv.import.error.unableToReadField"), field.getHeaderName(), lineNumber), e); + throw new RuntimeException(WaoUtils._("csv.import.error.unableToReadField", field.getHeaderName(), lineNumber), e); } time = timeLog.log(time, "readValue", "end read"); @@ -219,7 +219,7 @@ try { parsedValue = field.parseValue(value); } catch (Exception e) { - String message = WaoUtils.translate(n_("csv.import.error.unableToParseValue"), value, field.getHeaderName(), lineNumber) + String message = WaoUtils._("csv.import.error.unableToParseValue", value, field.getHeaderName(), lineNumber) + "\n" + e.getMessage(); throw new RuntimeException(message, e); } @@ -229,7 +229,7 @@ try { field.setValue(element, parsedValue); } catch (Exception e) { - throw new RuntimeException(WaoUtils.translate(n_("csv.import.error.unableToSetValue"), parsedValue, element.toString(), lineNumber), e); + throw new RuntimeException(WaoUtils._("csv.import.error.unableToSetValue", parsedValue, element.toString(), lineNumber), e); } time = timeLog.log(time, "setValue"); @@ -241,7 +241,7 @@ hasNext = reader.readRecord(); } catch (IOException e) { reader.close(); - throw new RuntimeException(WaoUtils.translate(n_("csv.import.error.unableToReadLine"), lineNumber + 1), e); + throw new RuntimeException(WaoUtils._("csv.import.error.unableToReadLine", lineNumber + 1), e); } if (log.isTraceEnabled()) { @@ -269,7 +269,7 @@ } } catch (IOException e) { reader.close(); - throw new RuntimeException(WaoUtils.translate(n_("csv.import.error.unableToReadLine"), 1), e); + throw new RuntimeException(WaoUtils._("csv.import.error.unableToReadLine", 1), e); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -92,7 +92,7 @@ } } if (StringUtils.isEmpty(code)) { - throw new IllegalArgumentException(WaoUtils.translate(n_("wao.import.contact.failure.terrestrialLocationMissing"))); + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.terrestrialLocationMissing")); } LocationType locationType; try { @@ -101,11 +101,11 @@ throw new RuntimeException(e); } if (locationType == null) { - throw new IllegalArgumentException(WaoUtils.translate(n_("wao.import.contact.failure.locationTypeMissing"))); + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.locationTypeMissing")); } TerrestrialLocation terrestrialLocation = indexedLocations.get(locationType).get(code); if (terrestrialLocation == null) { - throw new IllegalArgumentException(WaoUtils.translate(n_("wao.import.contact.failure.wrongTerrestrialLocation"), + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongTerrestrialLocation", locationType.toString(), code)); } return terrestrialLocation; @@ -129,11 +129,11 @@ public SampleRow parse(String sampleRowCode) throws ParseException { String trimmedCode = sampleRowCode.trim(); if (StringUtils.isEmpty(trimmedCode)) { - throw new IllegalArgumentException(WaoUtils.translate(n_("wao.import.contact.failure.sampleRowCodeMissing"))); + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.sampleRowCodeMissing")); } SampleRow sampleRow = indexedSampleRows.get(sampleRowCode); if (sampleRow == null) { - throw new IllegalArgumentException(WaoUtils.translate(n_("wao.import.contact.failure.wrongSampleRowCode"), sampleRowCode)); + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongSampleRowCode", sampleRowCode)); } return sampleRow; } @@ -156,12 +156,12 @@ public Boat parse(String value) throws ParseException { String trimmedValue = value.trim(); if (trimmedValue.isEmpty()) { - throw new IllegalArgumentException(WaoUtils.translate(n_("wao.import.contact.failure.boatMissing"))); + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.boatMissing")); } Integer key = Integer.valueOf(trimmedValue); Boat boat = indexedBoats.get(key); if (boat == null) { - throw new IllegalArgumentException(WaoUtils.translate(n_("wao.import.contact.failure.wrongBoat"), value)); + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongBoat", value)); } return boat; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UserParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UserParserFormatter.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UserParserFormatter.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -53,7 +53,7 @@ public WaoUser parse(String login) throws ParseException { WaoUser user = indexedWaoUsers.get(login.trim()); if (user == null) { - throw new IllegalArgumentException(WaoUtils.translate(n_("wao.import.failure.wrongUser"), login)); + throw new IllegalArgumentException(WaoUtils._("wao.import.failure.wrongUser", login)); } return user; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UsersParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UsersParserFormatter.java 2011-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UsersParserFormatter.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -62,7 +62,7 @@ String trimmedLogin = login.trim(); WaoUser user = indexedWaoUsers.get(trimmedLogin); if (user == null) { - throw new IllegalArgumentException(WaoUtils.translate(n_("wao.import.failure.wrongUser"), login)); + throw new IllegalArgumentException(WaoUtils._("wao.import.failure.wrongUser", login)); } users.add(user); } 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-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -405,11 +405,11 @@ if (contact.getDataReliability() == null || contact.getDataReliability() == DataReliability.UNKNOWN) { success = false; - message = WaoUtils.translate(n_("wao.business.contact.validation.dataReliabilityMissingForValidation")); + message = WaoUtils._("wao.business.contact.validation.dataReliabilityMissingForValidation"); } else if (contact.getDataReliability() != DataReliability.RELIABLE && StringUtils.isEmpty(contact.getCommentAdmin())) { success = false; - message = WaoUtils.translate(n_("wao.business.contact.validation.commentAdminNecessaryForDataReliability"), + message = WaoUtils._("wao.business.contact.validation.commentAdminNecessaryForDataReliability", contact.getDataReliability().toString()); } } @@ -585,7 +585,7 @@ //Le programme Obsmer //http://www.ifremer.fr/wao - String object = WaoUtils.translate(n_("wao.business.mammalsCapture.mail.subject")); + String object = WaoUtils._("wao.business.mammalsCapture.mail.subject"); // building 2 string, components of the body @@ -612,7 +612,7 @@ + " " + sampleRow.getProfession().getSpecies(); // constructing the whole mail - String body = WaoUtils.translate(n_("wao.business.mammalsCapture.mail.message"), + String body = WaoUtils._("wao.business.mammalsCapture.mail.message", time, profession, contact.getMammalsInfo()); if (log.isDebugEnabled()) { 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-05-04 09:20:20 UTC (rev 1256) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-05-04 09:39:53 UTC (rev 1257) @@ -1060,7 +1060,7 @@ long startUpdateDatabase = timeLog.log(startReadLine, "end read csv line"); SampleRowLog sampleRowLog = executeGetNewSampleRowLog(sampleRow, connectedUser); - String logComment = WaoUtils.translate(n_("csv.import.logComment")); + String logComment = WaoUtils._("csv.import.logComment"); sampleRowLog.setComment(logComment); executeCreateUpdateSampleRow(transaction, sampleRow, new ArrayList<Boat>(), sampleRowLog, connectedUser); result.incNbImported(); @@ -1538,7 +1538,7 @@ if ( ! conflictingSampleRows.isEmpty()) { validationResult.setSuccess(false); - message += WaoUtils.translate(n_("wao.validation.sampleRow.conflictOnObserver"), + message += WaoUtils._("wao.validation.sampleRow.conflictOnObserver", observer.getFullName(), sampleRow.getCode(), conflictingSampleRows.get(0).getCode()); } } @@ -1581,7 +1581,7 @@ } for (SampleRow sampleRow : samplingPlan) { net.fortuna.ical4j.model.Date day = new net.fortuna.ical4j.model.Date(sampleRow.getDay()); - String eventTitle = WaoUtils.translate(n_("wao.export.ical.title")); + String eventTitle = WaoUtils._("wao.export.ical.title"); String eventPlace = sampleRow.getObservationUnit().getDescription(); // liste des noms des observateurs (sauf le connected user) dans Property.Attendee Collection<WaoUser> observers = sampleRow.getObservers(); @@ -1599,7 +1599,7 @@ }, ", ", true); - eventDescription = WaoUtils.translate(n_("wao.export.ical.desc"), observersNames); + eventDescription = WaoUtils._("wao.export.ical.desc", observersNames); } // au pire, tout mettre dans la description