Author: bleny Date: 2010-11-26 14:14:35 +0000 (Fri, 26 Nov 2010) New Revision: 805 Log: add property prefix in entities ; changelog Modified: trunk/changelog.txt trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/changelog.txt 2010-11-26 14:14:35 UTC (rev 805) @@ -3,6 +3,19 @@ Historique des versions +1.6 +--- + +Evolution ++++++++++ + +- [bleny] Evo #2562 : ajout de la synthèse globale +- [bleny] Evo #2561 : factorisation des filtres de la synthèse +- [bleny] Evo #2556 : ajout du critère qualité de la donnée +- [bleny] Evo #2563 : mise en valeur des lignes modifiées dans le plan d'échantillonage +- [bleny] Evo #2365 : Amélioration cartographie des contacts +- [bleny] Evo #2353 : Décomposition code métier DCF + 1.5.4 ----- Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-26 14:14:35 UTC (rev 805) @@ -570,7 +570,7 @@ filter.setPeriod(period); if (filter.isSortedByBoardingDate()) { - query.addOrder(contactProperty.$property(Contact.TIDE_BEGIN_DATE + " DESC")); + query.addOrder(contactProperty.$property(Contact.PROPERTY_TIDE_BEGIN_DATE + " DESC")); } // ORDER_BY Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-11-26 14:14:35 UTC (rev 805) @@ -255,8 +255,8 @@ period.initDayOfMonthExtremities(); // Bind sampleMonth.sampleRow with contact sampleRow - query.addEquals(SampleMonth.SAMPLE_ROW, sampleRow). - addBetween(SampleMonth.PERIOD_DATE, period.getFromDate(), period.getThruDate()); + query.addEquals(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow). + addBetween(SampleMonth.PROPERTY_PERIOD_DATE, period.getFromDate(), period.getThruDate()); //add(SampleMonth.PERIOD_DATE, period); SampleMonth result = monthDAO.findByQuery(query); if (result == null) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -72,7 +72,7 @@ dao.createQueryDoneContactsFromDate(getBoat(), fromDate); String companyProperty = - TopiaQuery.getProperty(query.getMainAlias(), Contact.OBSERVER, WaoUser.COMPANY); + TopiaQuery.getProperty(query.getMainAlias(), Contact.PROPERTY_OBSERVER, WaoUser.PROPERTY_COMPANY); query.addEquals(companyProperty, getCompany()); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-11-26 14:14:35 UTC (rev 805) @@ -98,7 +98,7 @@ throw new ImportRefusedException( "Etat du contact invalide '" + state + "', " + "valeurs possibles : " + - ContactState.availableStates(), rowNumber, STATE); + ContactState.availableStates(), rowNumber, PROPERTY_STATE); } setContactState(contactState); } @@ -117,7 +117,7 @@ WaoUser user = userDAO.findByLogin(observerLogin); if (user == null) { throw new ImportRefusedException("Utilisateur inexistant avec " + - "l'identifiant : " + observerLogin, rowNumber, OBSERVER); + "l'identifiant : " + observerLogin, rowNumber, PROPERTY_OBSERVER); } setObserver(user); } @@ -145,7 +145,7 @@ "L'observateur avec pour login '" + observer.getLogin() + "' n'appartient pas à votre société !", rowNumber, - WaoUser.COMPANY); + WaoUser.PROPERTY_COMPANY); } } } @@ -179,12 +179,12 @@ } SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow rowFound = dao.findByProperties( - SampleRow.CODE, sampleRowCode, - SampleRow.COMPANY, company); + SampleRow.PROPERTY_CODE, sampleRowCode, + SampleRow.PROPERTY_COMPANY, company); if(rowFound == null) { throw new ImportRefusedException("Ligne d'échantillon inexistante" + " ou incompatible avec la société pour le code : " + - sampleRowCode, rowNumber, SAMPLE_ROW); + sampleRowCode, rowNumber, PROPERTY_SAMPLE_ROW); } setSampleRow(rowFound); } @@ -203,7 +203,7 @@ if(boatFound == null) { throw new ImportRefusedException("Navire inexistant avec" + " l'immatriculation : " + boatImmatriculation, - rowNumber, BOAT); + rowNumber, PROPERTY_BOAT); } setBoat(boatFound); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-11-26 14:14:35 UTC (rev 805) @@ -197,8 +197,8 @@ if (calendar == null) { calendar = calendarDAO.findByProperties( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, year); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, year); // Create it if not exist in Database if (calendar == null) { @@ -207,9 +207,9 @@ int fiability = ImportHelper.readInt(reader, ACTIVITY_CALENDAR.INDQ_COD); calendar = calendarDAO.create( - ActivityCalendar.BOAT, key.boat(), - ActivityCalendar.YEAR, key.year(), - ActivityCalendar.FIABILITY, fiability); + ActivityCalendar.PROPERTY_BOAT, key.boat(), + ActivityCalendar.PROPERTY_YEAR, key.year(), + ActivityCalendar.PROPERTY_FIABILITY, fiability); calendar.setActivityMonth(new ArrayList<ActivityMonth>()); } @@ -231,8 +231,8 @@ if (month == null) { month = monthDAO.create( - ActivityMonth.ACTIVITY_CALENDAR, calendar, - ActivityMonth.MONTH, monthNum); + ActivityMonth.PROPERTY_ACTIVITY_CALENDAR, calendar, + ActivityMonth.PROPERTY_MONTH, monthNum); month.setActivityProfession(new ArrayList<ActivityProfession>()); @@ -268,8 +268,8 @@ if (profession == null) { profession = professionDAO.create( - ActivityProfession.ACTIVITY_MONTH, month, - ActivityProfession.PROFESSION_ORDER, professionOrder); + ActivityProfession.PROPERTY_ACTIVITY_MONTH, month, + ActivityProfession.PROPERTY_PROFESSION_ORDER, professionOrder); profession.setActivityZone(new ArrayList<ActivityZone>()); @@ -290,8 +290,8 @@ if (zone == null) { zone = zoneDAO.create( - ActivityZone.ZONE_CODE, zoneCode, - ActivityZone.ACTIVITY_PROFESSION, profession); + ActivityZone.PROPERTY_ZONE_CODE, zoneCode, + ActivityZone.PROPERTY_ACTIVITY_PROFESSION, profession); profession.addActivityZone(zone); } 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -131,14 +131,14 @@ TopiaQuery query = builder.applyBoatFilter(filter); - query.addLoad(Boat.ACTIVITY_CALENDAR); + query.addLoad(Boat.PROPERTY_ACTIVITY_CALENDAR); if (logger.isDebugEnabled()) { logger.debug("Query : " + query); } Map<Integer, Boat> results = dao.findAllMappedByQuery(query, - Boat.IMMATRICULATION, Integer.class); + Boat.PROPERTY_IMMATRICULATION, Integer.class); return results; } @@ -196,7 +196,7 @@ BoatInfosDAO boatInfosDAO = WaoDAOHelper.getBoatInfosDAO(transaction); BoatInfos boatInfos = boatInfosDAO.findByProperties( - BoatInfos.BOAT, boat, BoatInfos.COMPANY, company); + BoatInfos.PROPERTY_BOAT, boat, BoatInfos.PROPERTY_COMPANY, company); if (boatInfos == null) { boatInfos = new BoatInfosImpl(); boatInfos.setBoat(boat); @@ -229,7 +229,7 @@ // Last contact ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); TopiaQuery query = contactDAO.createQueryLastContactForBoat(boat, company). - addLoad(Contact.SAMPLE_ROW, Contact.OBSERVER); + addLoad(Contact.PROPERTY_SAMPLE_ROW, Contact.PROPERTY_OBSERVER); Contact contact = contactDAO.findByQuery(query); @@ -332,8 +332,8 @@ List<String> boatNames = dao.createQuery(). addDistinct(). - setSelect(Boat.NAME). - addWhere(Boat.NAME, Op.LIKE, input + "%"). + setSelect(Boat.PROPERTY_NAME). + addWhere(Boat.PROPERTY_NAME, Op.LIKE, input + "%"). execute(transaction); return boatNames; @@ -446,7 +446,7 @@ if (boat == null) { boat = boatDAO.create( - Boat.IMMATRICULATION, immatriculation); + Boat.PROPERTY_IMMATRICULATION, immatriculation); result[1]++; } boat.setName(boatName); @@ -464,7 +464,7 @@ if (district == null) { district = districtDAO.findByCode(districtCode); if (district == null) { - district = districtDAO.create(BoatDistrict.CODE, districtCode); + district = districtDAO.create(BoatDistrict.PROPERTY_CODE, districtCode); } availableDistricts.put(districtCode, district); } @@ -481,7 +481,7 @@ // If not exist yet, create it if (shipOwner == null) { shipOwner = shipOwnerDAO.create( - ShipOwner.CODE, shipOwnerCode); + ShipOwner.PROPERTY_CODE, shipOwnerCode); } availableShipOwners.put(shipOwnerCode, shipOwner); 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 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -141,8 +141,8 @@ // addLoad(contactProperty.observerProperty().company(), // contactProperty.sampleRowProperty().sampleMonth()); // TODO-fdesbois-2010-06-18 : manage aliases in addLoad - addLoad(TopiaQuery.getProperty(Contact.OBSERVER, WaoUser.COMPANY), - TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.SAMPLE_MONTH) + addLoad(TopiaQuery.getProperty(Contact.PROPERTY_OBSERVER, WaoUser.PROPERTY_COMPANY), + TopiaQuery.getProperty(Contact.PROPERTY_SAMPLE_ROW, SampleRow.PROPERTY_SAMPLE_MONTH) // TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.PROFESSION, Profession.DCF5CODE) ); @@ -282,8 +282,8 @@ } destination = dao.create( - Contact.BOAT, source.getBoat(), - Contact.SAMPLE_ROW, source.getSampleRow(), + Contact.PROPERTY_BOAT, source.getBoat(), + Contact.PROPERTY_SAMPLE_ROW, source.getSampleRow(), // FIXME-FD20100415 : don't use the topiaCreateDate as a business field TopiaEntity.TOPIA_CREATE_DATE, source.getTopiaCreateDate() ); @@ -300,8 +300,8 @@ //BinderProvider.getBinder(Contact.class).copy(source, destination); WaoBinderHelper.getSimpleTopiaBinder(Contact.class). copyExcluding(source, destination, - Contact.BOAT, - Contact.SAMPLE_ROW + Contact.PROPERTY_BOAT, + Contact.PROPERTY_SAMPLE_ROW ); // Update the change @@ -543,15 +543,15 @@ // Retrieve the existing contact String companyProperty = - TopiaQuery.getProperty(Contact.OBSERVER, - WaoUser.COMPANY); + TopiaQuery.getProperty(Contact.PROPERTY_OBSERVER, + WaoUser.PROPERTY_COMPANY); Contact contact = dao.findByProperties( TopiaEntity.TOPIA_CREATE_DATE, contactCsv.getTopiaCreateDate(), companyProperty, contactCsv.getCompany(), - Contact.BOAT, contactCsv.getBoat(), - Contact.SAMPLE_ROW, contactCsv.getSampleRow()); + Contact.PROPERTY_BOAT, contactCsv.getBoat(), + Contact.PROPERTY_SAMPLE_ROW, contactCsv.getSampleRow()); // Seems to have a problem with companyProperty ?!? using // DAOLegacy (criteria) @@ -559,7 +559,7 @@ // addEquals(TopiaEntity.TOPIA_CREATE_DATE, // contactCsv.getTopiaCreateDate()). // addEquals(companyProperty, contactCsv.getCompany()). -// addEquals(Contact.BOAT, contactCsv.getBoat()). +// addEquals(Contact.PROPERTY_BOAT, contactCsv.getBoat()). // addEquals(Contact.SAMPLE_ROW, // contactCsv.getSampleRow()); // Contact contact = dao.findByQuery(query); @@ -570,7 +570,7 @@ throw new ImportRefusedException("Le contact est" + " déjà validé dans l'application" + " et ne peut pas être importé", currRow, - Contact.VALIDATION_COMPANY); + Contact.PROPERTY_VALIDATION_COMPANY); } // Create elligibleBoat if needed before saving the contact @@ -592,7 +592,7 @@ dateFormat.format(contact.getTideBeginDate()) + " pour la ligne du plan " + contactCsv.getSampleRow().getCode(), currRow, - Contact.TIDE_BEGIN_DATE, eee); + Contact.PROPERTY_TIDE_BEGIN_DATE, eee); } result.incNbImported(); @@ -853,14 +853,14 @@ WaoDAOHelper.getElligibleBoatDAO(transaction); ElligibleBoat elligible = elligibleDAO.findByProperties( - ElligibleBoat.BOAT, contact.getBoat(), - ElligibleBoat.SAMPLE_ROW, contact.getSampleRow()); + ElligibleBoat.PROPERTY_BOAT, contact.getBoat(), + ElligibleBoat.PROPERTY_SAMPLE_ROW, contact.getSampleRow()); if (elligible == null) { // Create new elligible boat not active in a global way elligible = elligibleDAO.create( - ElligibleBoat.BOAT, boat, - ElligibleBoat.SAMPLE_ROW, row); + ElligibleBoat.PROPERTY_BOAT, boat, + ElligibleBoat.PROPERTY_SAMPLE_ROW, row); if (log.isTraceEnabled()) { log.trace("Create elligibleBoat for : " + boat.getImmatriculation() + " - " + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -85,7 +85,7 @@ String newsAlias = "N"; String companyProperty = - TopiaQuery.getProperty(newsAlias, News.COMPANY); + TopiaQuery.getProperty(newsAlias, News.PROPERTY_COMPANY); String createDateProperty = TopiaQuery.getProperty(newsAlias, News.TOPIA_CREATE_DATE); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -42,7 +42,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.topia.framework.TopiaQuery.Op; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -194,7 +193,7 @@ FishingZone zone = dao.findByDistrictCode(districtCode); if (zone == null) { - zone = dao.create(FishingZone.DISTRICT_CODE, districtCode); + zone = dao.create(FishingZone.PROPERTY_DISTRICT_CODE, districtCode); } zone.setFacadeName(facadeName); zone.setSectorName(sectorName); 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 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -180,10 +180,10 @@ // DCF5 code to be considered equals. targetSpecies as to be null // if asked TopiaQuery query = dao.createQuery() - .addEquals(DCF5Code.FISHING_GEAR_DCF, foundGearCode) + .addEquals(DCF5Code.PROPERTY_FISHING_GEAR_DCF, foundGearCode) // next line may result in a "IS NULL", exactly what we want - .addEquals(DCF5Code.TARGET_SPECIES_DCF, foundSpeciesCode); + .addEquals(DCF5Code.PROPERTY_TARGET_SPECIES_DCF, foundSpeciesCode); DCF5Code foundCode = dao.findByQuery(query); @@ -493,10 +493,10 @@ SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); TopiaQuery query = dao.createQuery(). addDistinct(). - setSelect(SampleRow.PROGRAM_NAME); + setSelect(SampleRow.PROPERTY_PROGRAM_NAME); if (company != null) { - query.addEquals(SampleRow.COMPANY, company); + query.addEquals(SampleRow.PROPERTY_COMPANY, company); } List<String> programs = transaction.findByQuery(query); @@ -569,13 +569,13 @@ SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); TopiaQuery query = dao.createQuery(). - addEquals(SampleRow.CODE, sampleRowCode); + addEquals(SampleRow.PROPERTY_CODE, sampleRowCode); if (!user.isAdmin() && !user.isGuest()) { - query.addEquals(SampleRow.COMPANY, user.getCompany()); + query.addEquals(SampleRow.PROPERTY_COMPANY, user.getCompany()); } - query.addLoad(SampleRow.SAMPLE_ROW_LOG); + query.addLoad(SampleRow.PROPERTY_SAMPLE_ROW_LOG); SampleRow result = dao.findByQuery(query); if (result == null) { @@ -597,7 +597,7 @@ // Check if contacts exists linked with this sampleRow, no delete permitted in this case. ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); - if (contactDAO.existByProperties(Contact.SAMPLE_ROW, sampleRow)) { + if (contactDAO.existByProperties(Contact.PROPERTY_SAMPLE_ROW, sampleRow)) { throw new WaoBusinessException("Des contacts liés à cette ligne" + " existent, aucune suppression n'est possible."); } @@ -626,8 +626,8 @@ String maxCode = dao.createQuery(). - addWhere(SampleRow.CODE, Op.LIKE, year + "_%"). - executeToString(transaction, "MAX(" + SampleRow.CODE + ")"); + addWhere(SampleRow.PROPERTY_CODE, Op.LIKE, year + "_%"). + executeToString(transaction, "MAX(" + SampleRow.PROPERTY_CODE + ")"); if (log.isDebugEnabled()) { log.debug("Max code found : " + maxCode); @@ -922,7 +922,7 @@ result.addError(currRow, "[CODE = " + code + "] refusé : Zone de pêche non renseigné"); result.incNbRefused(); //nbRefused++; } else { - row = dao.create(SampleRow.CODE, code); + row = dao.create(SampleRow.PROPERTY_CODE, code); String companyName = ImportHelper.read(reader, SAMPLING.SOCIETE_NOM); @@ -1130,8 +1130,8 @@ if (month == null) { month = dao.create( - SampleMonth.SAMPLE_ROW, sampleRow, - SampleMonth.PERIOD_DATE, monthDate); + SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow, + SampleMonth.PROPERTY_PERIOD_DATE, monthDate); sampleRow.addSampleMonth(month); } month.setExpectedTidesValue(monthValue); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -410,19 +410,19 @@ // Prepare properties for query String contactAlias = query.getMainAlias(); String sampleRowProperty = - TopiaQuery.getProperty(contactAlias, Contact.SAMPLE_ROW); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_SAMPLE_ROW); String nbObservantsRealProperty = - TopiaQuery.getProperty(contactAlias, Contact.NB_OBSERVANTS); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_NB_OBSERVANTS); String sampleRowEndProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.PERIOD_END); + TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_PERIOD_END); String companyProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.COMPANY); + TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_COMPANY); String nbObservantsExpectedProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.NB_OBSERVANTS); + TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_NB_OBSERVANTS); String companyNameProperty = - TopiaQuery.getProperty(companyProperty, Company.NAME); + TopiaQuery.getProperty(companyProperty, Company.PROPERTY_NAME); // Only for unfinished sampleRows query.addWhere(sampleRowEndProperty, Op.GE, context.getCurrentDate()); @@ -600,13 +600,13 @@ String contactAlias = query.getMainAlias(); String companyProperty = - TopiaQuery.getProperty(contactAlias, Contact.OBSERVER, WaoUser.COMPANY); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_OBSERVER, WaoUser.PROPERTY_COMPANY); String companyNameProperty = - TopiaQuery.getProperty(companyProperty, Company.NAME); + TopiaQuery.getProperty(companyProperty, Company.PROPERTY_NAME); String tideBeginDateProperty = - TopiaQuery.getProperty(contactAlias, Contact.TIDE_BEGIN_DATE); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_TIDE_BEGIN_DATE); String dataInputProperty = - TopiaQuery.getProperty(contactAlias, Contact.DATA_INPUT_DATE); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_DATA_INPUT_DATE); Company company = filter.getCompany(); if (company != null) { @@ -970,7 +970,7 @@ protected GlobalSynthesisParameters executeGetGlobalSynthesisParameters(TopiaContext transaction) throws Exception { IndicatorDAO indicatorDAO = WaoDAOHelper.getIndicatorDAO(transaction); - List<Indicator> indicators = indicatorDAO.findAllWithOrder(Indicator.INDICATOR_ID); + List<Indicator> indicators = indicatorDAO.findAllWithOrder(Indicator.PROPERTY_INDICATOR_ID); Indicator globalIndicator = null; // will be found in the list 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 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-11-26 14:14:35 UTC (rev 805) @@ -95,8 +95,8 @@ String passwordEncoded = context.encodeString(password); WaoUser user = dao.findByProperties( - WaoUser.LOGIN, login, - WaoUser.PASSWORD, passwordEncoded); + WaoUser.PROPERTY_LOGIN, login, + WaoUser.PROPERTY_PASSWORD, passwordEncoded); if (user == null) { throw new WaoBusinessException(Type.BAD_CONNECTION, @@ -344,10 +344,10 @@ CompanyDAO dao = WaoDAOHelper.getCompanyDAO(transaction); - TopiaQuery query = dao.createQuery().addOrder(Company.NAME); + TopiaQuery query = dao.createQuery().addOrder(Company.PROPERTY_NAME); if (activeOnly) { - query.addEquals(Company.ACTIVE, activeOnly); + query.addEquals(Company.PROPERTY_ACTIVE, activeOnly); } results = dao.findAllByQuery(query); @@ -365,8 +365,8 @@ TopiaQuery query = dao.createQuery(). - addEquals(WaoUser.COMPANY, company). - addOrder(WaoUser.FIRST_NAME, WaoUser.LAST_NAME); + addEquals(WaoUser.PROPERTY_COMPANY, company). + addOrder(WaoUser.PROPERTY_FIRST_NAME, WaoUser.PROPERTY_LAST_NAME); return dao.findAllByQuery(query); } @@ -382,15 +382,15 @@ UserRole.getMatchCodes(UserRole.OBSERVER, UserRole.COORDINATOR); TopiaQuery query = dao.createQuery(). - addEquals(WaoUser.ROLE, (Object[])matchCodes). - addOrder(WaoUser.FIRST_NAME, WaoUser.LAST_NAME); + addEquals(WaoUser.PROPERTY_ROLE, (Object[])matchCodes). + addOrder(WaoUser.PROPERTY_FIRST_NAME, WaoUser.PROPERTY_LAST_NAME); if (company != null) { - query.addEquals(WaoUser.COMPANY, company); + query.addEquals(WaoUser.PROPERTY_COMPANY, company); } if (activeOnly) { - query.addEquals(WaoUser.ACTIVE, Boolean.TRUE); + query.addEquals(WaoUser.PROPERTY_ACTIVE, Boolean.TRUE); } return dao.findAllByQuery(query); @@ -429,17 +429,17 @@ } Company company = companyDAO.create( - Company.ACTIVE, false, Company.NAME, "ADMIN"); + Company.PROPERTY_ACTIVE, false, Company.PROPERTY_NAME, "ADMIN"); String password = context.encodeString("password"); WaoUser user = dao.create( - WaoUser.ROLE, UserRole.ADMIN.toInt(), - WaoUser.ACTIVE, true, - WaoUser.LOGIN, "admin", - WaoUser.PASSWORD, password, - WaoUser.FIRST_NAME, "Super", - WaoUser.LAST_NAME, "Admin"); + WaoUser.PROPERTY_ROLE, UserRole.ADMIN.toInt(), + WaoUser.PROPERTY_ACTIVE, true, + WaoUser.PROPERTY_LOGIN, "admin", + WaoUser.PROPERTY_PASSWORD, password, + WaoUser.PROPERTY_FIRST_NAME, "Super", + WaoUser.PROPERTY_LAST_NAME, "Admin"); user.setCompany(company); transaction.commitTransaction(); 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-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-26 14:14:35 UTC (rev 805) @@ -1,128 +1,128 @@ -fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00e9cifi\u00e9 -fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00e9es par bateau -fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00e0 main -fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00e8ges a\u00e9riens -fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00c9perviers -fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00e8ges (non-sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00e8ges fixes non couverts +fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00E9cifi\u00E9 +fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00E9es par bateau +fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00E0 main +fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00E8ges a\u00E9riens +fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00C9perviers +fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00E8ges (non-sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00E8ges fixes non couverts fr.ifremer.wao.entity.FishingGearDCF.FPO=Nasses (casiers) -fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00e0 l'\u00e9talage (diables) +fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00E0 l'\u00E9talage (diables) fr.ifremer.wao.entity.FishingGearDCF.FWR=Barrages, parcs, bordigues, etc. fr.ifremer.wao.entity.FishingGearDCF.FYK=Verveux -fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00e9lants (non sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00e0 civelles -fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00E9lants (non sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00E0 civelles +fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.GNC=Filets maillants encerclants -fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00e9rivants (filets d\u00e9rivants) +fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00E9rivants (filets d\u00E9rivants) fr.ifremer.wao.entity.FishingGearDCF.GNF=Filets maillants fixes (sur perches) -fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00e9s (ancr\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00e9mailleurs -fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00e9mails et filets maillants combin\u00e9s -fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00e9mails +fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00E9s (ancr\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00E9mailleurs +fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00E9mails et filets maillants combin\u00E9s +fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00E9mails fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpons -fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00e9canis\u00e9es +fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00E9canis\u00E9es fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes -fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00e9colte (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00E9colte (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo) -fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00e0 main et lignes avec cannes -fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00e0 main et lignes \u00e0 cannes -fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00e9cifi\u00e9es) -fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00e9rivantes -fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00e9es ou semi-flottantes -fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00e9s (non sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00e9s man\u0153uvr\u00e9es du bateau -fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00e9s portatifs -fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00e9s fixes man\u0153uvr\u00e9es du rivage -fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00eene -fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00e7ons et lignes (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00E0 main et lignes avec cannes +fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00E0 main et lignes \u00E0 cannes +fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00E9cifi\u00E9es) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00E9rivantes +fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00E9es ou semi-flottantes +fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00E9s (non sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00E9s man\u0153uvr\u00E9es du bateau +fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00E9s portatifs +fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00E9s fixes man\u0153uvr\u00E9es du rivage +fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00EEne +fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00E7ons et lignes (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.MIS=Divers -fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00e9cifi\u00e9s -fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00e0 panneaux (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00e0 panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00e9lagiques \u00e0 panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00E9cifi\u00E9s +fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00E0 panneaux (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00E0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00E9lagiques \u00E0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00E0 panneaux fr.ifremer.wao.entity.FishingGearDCF.PS=Filets tournants avec coulisse (sennes coulissantes) -fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par un bateau -fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par un bateau +fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00E9cifi\u00E9) fr.ifremer.wao.entity.FishingGearDCF.PTB=Chalut-b\u0153ufs de fond -fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00e9lagiques -fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00eache r\u00e9vr\u00e9ative +fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00E9lagiques +fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00EAche r\u00E9vr\u00E9ative fr.ifremer.wao.entity.FishingGearDCF.SB=Sennes de plages fr.ifremer.wao.entity.FishingGearDCF.SDN=Sennes danoises -fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00e9es par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00e9cossaises -fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00e9es \u00e0 bord -fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00e9cifi\u00e9es) -fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00e0 perche -fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00e0 langoustines -fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00e0 crevettes -fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00e9lagique (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00e0 crevettes -fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00e9cifi\u00e9 +fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00E9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00E9cossaises +fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00E9es \u00E0 bord +fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00E9cifi\u00E9es) +fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00E0 perche +fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00E0 langoustines +fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00E0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00E9lagique (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00E0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00E9cifi\u00E9 fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues -fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00e8ces catadromes -fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00e9s +fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00E8ces catadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00E9s fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques -fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00e8ces d\u00e9mersales -fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00e8ces d'eaux profondes +fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00E8ces d\u00E9mersales +fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00E8ces d'eaux profondes fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats -fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00e9lagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00E9lagiques fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques -fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00e9lagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00E9lagiques wao.business.bean.DataReliability.doubtful=douteuse -wao.business.bean.DataReliability.not_provided=non renseign\u00e9e +wao.business.bean.DataReliability.not_provided=non renseign\u00E9e wao.business.bean.DataReliability.not_reliable=non exploitable wao.business.bean.DataReliability.reliable=exploitable wao.business.bean.DataReliability.unknown=inconnue -wao.business.bean.GlobalIndicatorValue.bad=P\u00e9nalit\u00e9 de niveau 1 +wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 de niveau 1 wao.business.bean.GlobalIndicatorValue.good=Bonus de niveau 1 wao.business.bean.GlobalIndicatorValue.neutral=Conforme au cahier des charges -wao.business.bean.GlobalIndicatorValue.very_bad=P\u00e9nalit\u00e9 de niveau 2 +wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 de niveau 2 wao.business.bean.GlobalIndicatorValue.very_good=Bonus de niveau 2 -wao.business.bean.SynthesisId.allegro_reactivity=D\u00e9lais de transmission des donn\u00e9es -wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00e9s -wao.business.bean.SynthesisId.contact_state=\u00c9tats des contacts -wao.business.bean.SynthesisId.data_reliability=Qualit\u00e9 de la donn\u00e9e -wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00eame navire conforme aux exigences -wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00e9alisation du plan d'\u00e9chantillonage -wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00e9s -wao.error.boat.canCreateContact=Impossible de cr\u00e9er un nouveau contact pour la soci\u00e9t\u00e9 %1$s et le navire %2$s (%3$d) -wao.error.boat.getNbBoarding=Impossible de r\u00e9cup\u00e9rer le nombre d'embarquements r\u00e9els depuis le %1$s -wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00e9cup\u00e9rer le nombre d'embarquements r\u00e9els depuis le %1$s pour la soci\u00e9t\u00e9 %2$s +wao.business.bean.SynthesisId.allegro_reactivity=D\u00E9lais de transmission des donn\u00E9es +wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00E9s +wao.business.bean.SynthesisId.contact_state=\u00C9tats des contacts +wao.business.bean.SynthesisId.data_reliability=Qualit\u00E9 de la donn\u00E9e +wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00EAme navire conforme aux exigences +wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00E9alisation du plan d'\u00E9chantillonage +wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00E9s +wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) +wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s +wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA wao.error.context.encodeString= -wao.error.context.getRootContext=Une erreur est survenue pour la r\u00e9cup\u00e9ration du contexte principale de ToPIA +wao.error.context.getRootContext=Une erreur est survenue pour la r\u00E9cup\u00E9ration du contexte principale de ToPIA wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante -wao.error.context.start=Une erreur est survenue pendant le d\u00e9marrage de l'application +wao.error.context.start=Une erreur est survenue pendant le d\u00E9marrage de l'application wao.error.context.stop=Une erreur est survenue pendant la fermeture de l'application -wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00e9es r\u00e9els pour le mois de %1$s [ligne \: %2$s] -wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00e9crit par %1$s -wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00e9er ou modifier les informations li\u00e9s au navire %1$d pour la soci\u00e9t\u00e9 %2$s -wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00e9lectionn\u00e9s +wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00E9es r\u00E9els pour le mois de %1$s [ligne \: %2$s] +wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00E9crit par %1$s +wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00E9er ou modifier les informations li\u00E9s au navire %1$d pour la soci\u00E9t\u00E9 %2$s +wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00E9lectionn\u00E9s wao.error.serviceBoat.getActivityCalendarLogAccessFile= wao.error.serviceBoat.getActivityCalendarLogFile= wao.error.serviceBoat.getBoat=Impossible de charger le navire -wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00e9cup\u00e9rer les navires avec un nom commencant par '%1$s' +wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00E9cup\u00E9rer les navires avec un nom commencant par '%1$s' wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires -wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00eene d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00e9der 6 chiffres -wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00e9cup\u00e9rer les informations du navire immatricul\u00e9 %1$d pour la soci\u00e9t\u00e9 %2$s -wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00e9 du navire %1$s (%2$d) +wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00EEne d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00E9der 6 chiffres +wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00E9cup\u00E9rer les informations du navire immatricul\u00E9 %1$d pour la soci\u00E9t\u00E9 %2$s +wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00E9 du navire %1$s (%2$d) wao.error.serviceBoat.getNbBoatsByFilter=Impossible de filtrer la liste des navires wao.error.serviceBoat.getShipOwnerNamesContains= -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.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.serviceCartography.exportContactStatisticsKml= -wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00e9es des quartiers des navires. V\u00e9rifiez la documentation pour le bon format du fichier Kml. +wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00E9es des quartiers des navires. V\u00E9rifiez la documentation pour le bon format du fichier Kml. wao.error.serviceChart.getContactPieChartData= wao.error.serviceChart.getContactPieChartUrl= wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts -wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00e9s +wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts wao.error.serviceContact.saveComment= @@ -130,54 +130,54 @@ wao.error.serviceContact.sendContactDoneEmail= wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceNews.getNewNews= -wao.error.serviceNews.getNews=Impossible de r\u00e9cup\u00e9rer l'ensemble des news +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.serviceReferential.getCodesDCF5Contains= 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.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.serviceSampling.createSampleRowLog= -wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00e9chantillon -wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00e9chantillon \: %1$s -wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00e9chantillonnage sur la p\u00e9riode du %1$s au %2$s +wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00E9chantillon +wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00E9chantillon \: %1$s +wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00E9chantillonnage sur la p\u00E9riode du %1$s au %2$s wao.error.serviceSampling.getDCFGears= wao.error.serviceSampling.getDCFSpecies= wao.error.serviceSampling.getNewProfession= wao.error.serviceSampling.getNewSampleMonth= wao.error.serviceSampling.getNewSampleRow= -wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00e9cup\u00e9rer un nouveau code pour une ligne d'\u00e9chantillonnage +wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00E9cup\u00E9rer un nouveau code pour une ligne d'\u00E9chantillonnage wao.error.serviceSampling.getNewSampleRowLog= wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes -wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00e9chantillon ayant pour identifiant \: %1$s -wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00e9chantillon ayant pour code %1$s -wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage -wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage -wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00e0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00E9chantillon ayant pour identifiant \: %1$s +wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00E9chantillon ayant pour code %1$s +wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage +wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage +wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] wao.error.serviceSynthesis.getAllIndicatorLogs= -wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es du graphique concernant les embarquements sur les navires +wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= -wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00e9cup\u00e9rer l'indicateur de r\u00e9activit\u00e9 sur les dates de saisies dans Allegro +wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00E9cup\u00E9rer l'indicateur de r\u00E9activit\u00E9 sur les dates de saisies dans Allegro wao.error.serviceSynthesis.getContactPieChartData= wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00e9cup\u00e9rer les statistiques sur les \u00e9tats des contacts +wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts wao.error.serviceSynthesis.getDataReliability= -wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es pour le graphique dynamique des efforts de mar\u00e9es -wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es concernant les indicateurs pour la synth\u00e8se globale +wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es pour le graphique dynamique des efforts de mar\u00E9es +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= -wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00e9cup\u00e9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00e9s -wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00e0 jour les param\u00e8tres de la synth\u00e8se globale +wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion -wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00e9er l'administrateur par d\u00e9faut -wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00e9er ou de mettre \u00e0 jour la soci\u00e9t\u00e9 -wao.error.serviceUser.createUpdateUser=Impossible de cr\u00e9er ou de mettre \u00e0 jour l'utilisateur +wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut +wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9 +wao.error.serviceUser.createUpdateUser=Impossible de cr\u00E9er ou de mettre \u00E0 jour l'utilisateur wao.error.serviceUser.deleteUser=Impossible de supprimer l'utilisateur wao.error.serviceUser.existLogin= wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe -wao.error.serviceUser.getCompanies=Impossible de r\u00e9cup\u00e9rer la liste des soci\u00e9t\u00e9s +wao.error.serviceUser.getCompanies=Impossible de r\u00E9cup\u00E9rer la liste des soci\u00E9t\u00E9s wao.error.serviceUser.getCompany= wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur -wao.error.serviceUser.getObservers=Impossible de r\u00e9cup\u00e9rer la liste des observateurs +wao.error.serviceUser.getObservers=Impossible de r\u00E9cup\u00E9rer la liste des observateurs wao.error.serviceUser.getUserRolesByLogin= -wao.error.serviceUser.getUsersByCompany=Impossible de r\u00e9cup\u00e9rer la liste des utilisateurs de la soci\u00e9t\u00e9 %1$s +wao.error.serviceUser.getUsersByCompany=Impossible de r\u00E9cup\u00E9rer la liste des utilisateurs de la soci\u00E9t\u00E9 %1$s Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-26 14:14:35 UTC (rev 805) @@ -2,6 +2,7 @@ model.tagvalue.java.lang.String=text model.tagvalue.exceptionClass=fr.ifremer.wao.WaoException model.tagvalue.notGenerateToString=true +model.tagvalue.constantPrefix=PROPERTY_ #model.tagvalue.useLegacyDAO=true Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -137,11 +137,11 @@ try { WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.COMPANY, findDefaultCompany(), - WaoUser.LOGIN, OBSERVER_DEFAULT_LOGIN, - WaoUser.FIRST_NAME, OBSERVER_DEFAULT_FIRST_NAME, - WaoUser.LAST_NAME, OBSERVER_DEFAULT_LAST_NAME, - WaoUser.ROLE, UserRole.OBSERVER.ordinal()); + WaoUser.PROPERTY_COMPANY, findDefaultCompany(), + WaoUser.PROPERTY_LOGIN, OBSERVER_DEFAULT_LOGIN, + WaoUser.PROPERTY_FIRST_NAME, OBSERVER_DEFAULT_FIRST_NAME, + WaoUser.PROPERTY_LAST_NAME, OBSERVER_DEFAULT_LAST_NAME, + WaoUser.PROPERTY_ROLE, UserRole.OBSERVER.ordinal()); if (log.isDebugEnabled()) { log.debug("Create default observer : " + observer); } @@ -176,11 +176,11 @@ try { WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.COMPANY, company, - WaoUser.LOGIN, login, - WaoUser.FIRST_NAME, null, - WaoUser.LAST_NAME, null, - WaoUser.ROLE, role.ordinal()); + WaoUser.PROPERTY_COMPANY, company, + WaoUser.PROPERTY_LOGIN, login, + WaoUser.PROPERTY_FIRST_NAME, null, + WaoUser.PROPERTY_LAST_NAME, null, + WaoUser.PROPERTY_ROLE, role.ordinal()); if (log.isDebugEnabled()) { log.debug("Create observer : " + observer); @@ -467,7 +467,7 @@ if (row != null) { // Load properties for (String property : properties) { - if (property.equals(SampleRow.ELLIGIBLE_BOAT)) { + if (property.equals(SampleRow.PROPERTY_ELLIGIBLE_BOAT)) { row.sizeElligibleBoat(); } } @@ -545,11 +545,11 @@ TopiaContext transaction = manager.getContext().beginTransaction(); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company1); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company1); company1.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-11-26 14:14:35 UTC (rev 805) @@ -123,9 +123,9 @@ TopiaQuery query = dao.createQueryDoneContactsFromDate(null, null); String contact = query.getMainAlias(); - String tideBegin = contact + "." + Contact.TIDE_BEGIN_DATE; + String tideBegin = contact + "." + Contact.PROPERTY_TIDE_BEGIN_DATE; - String sampleRow = contact + "." + Contact.SAMPLE_ROW; + String sampleRow = contact + "." + Contact.PROPERTY_SAMPLE_ROW; query.addEquals(sampleRow, curr); query.addGroup(sampleRow); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -109,9 +109,9 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); transaction.commitTransaction(); @@ -188,23 +188,23 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); transaction.commitTransaction(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -87,7 +87,7 @@ SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); - SampleMonth month = monthDAO.create(SampleMonth.SAMPLE_ROW, row); + SampleMonth month = monthDAO.create(SampleMonth.PROPERTY_SAMPLE_ROW, row); Calendar calendar = new GregorianCalendar(2009, 3, 1); month.setPeriodDate(calendar.getTime()); row.addSampleMonth(month); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -229,7 +229,7 @@ CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); manager.getContext().prepareTopiaId(Company.class, company); companyDAO.update(company); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); ServiceSampling serviceSampling = manager.getServiceSampling(); @@ -378,22 +378,22 @@ BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); Boat boat = boatDAO.create( - Boat.NAME, "TESTBOAT", - Boat.IMMATRICULATION, 174592); + Boat.PROPERTY_NAME, "TESTBOAT", + Boat.PROPERTY_IMMATRICULATION, 174592); ActivityCalendarDAO dao = WaoDAOHelper.getActivityCalendarDAO(transaction); ActivityCalendar calendar1 = dao.create( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, 2008); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, 2008); ActivityCalendar calendar2 = dao.create( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, 2007); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, 2007); ActivityCalendar calendar3 = dao.create( - ActivityCalendar.BOAT, boat, - ActivityCalendar.YEAR, 2009); + ActivityCalendar.PROPERTY_BOAT, boat, + ActivityCalendar.PROPERTY_YEAR, 2009); transaction.commitTransaction(); transaction.closeContext(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -140,15 +140,15 @@ if (needObserver) { CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - company = companyDAO.create(Company.NAME, "TARTANPION"); + company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.COMPANY, company, - WaoUser.LOGIN, "jmichmuche", - WaoUser.FIRST_NAME, "Jean", - WaoUser.LAST_NAME, "Michmuche", - WaoUser.ROLE, UserRole.OBSERVER.ordinal()); + WaoUser.PROPERTY_COMPANY, company, + WaoUser.PROPERTY_LOGIN, "jmichmuche", + WaoUser.PROPERTY_FIRST_NAME, "Jean", + WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_ROLE, UserRole.OBSERVER.ordinal()); when(contact.getObserver()).thenReturn(observer); } @@ -156,18 +156,18 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); log.info("SampleRow : 2010_0001"); - sampleRow = rowDAO.create(SampleRow.CODE, "2010_0001", - SampleRow.COMPANY, company); + sampleRow = rowDAO.create(SampleRow.PROPERTY_CODE, "2010_0001", + SampleRow.PROPERTY_COMPANY, company); SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); log.info("SampleMonth : 03/2010 _ row 2010_0001"); Date monthDate = DateUtil.createDate(1, 3, 2010); - sampleMonth = monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, - SampleMonth.PERIOD_DATE, monthDate); + sampleMonth = monthDAO.create(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow, + SampleMonth.PROPERTY_PERIOD_DATE, monthDate); monthDate = DateUtil.createDate(1, 4, 2010); - monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, - SampleMonth.PERIOD_DATE, monthDate); + monthDAO.create(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow, + SampleMonth.PROPERTY_PERIOD_DATE, monthDate); Date contactDate = DateUtil.createDate(18, 3, 2010); when(contact.getTideBeginDate()).thenReturn(contactDate); @@ -175,7 +175,7 @@ if (needBoat) { BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); - boat = boatDAO.create(Boat.IMMATRICULATION, 175846); + boat = boatDAO.create(Boat.PROPERTY_IMMATRICULATION, 175846); when(contact.getBoat()).thenReturn(boat); } @@ -425,7 +425,7 @@ SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); TopiaQuery query = dao.createQuery(); - query.addEquals(SampleMonth.PERIOD_DATE, DateUtil.createDate(1, 4, 2010)); + query.addEquals(SampleMonth.PROPERTY_PERIOD_DATE, DateUtil.createDate(1, 4, 2010)); SampleMonth month = dao.findByQuery(query); @@ -614,34 +614,34 @@ log.info("test 2 : Error on boat"); when(reader.get(BOAT.NAVS_COD.name())).thenReturn("2222"); - checkImportError(Contact.BOAT); + checkImportError(Contact.PROPERTY_BOAT); // Reinit boat when(reader.get(BOAT.NAVS_COD.name())). thenReturn(String.valueOf(boat.getImmatriculation())); log.info("test 3 : Error on company"); when(creator.getCompany()).thenReturn(null); - checkImportError(WaoUser.COMPANY); + checkImportError(WaoUser.PROPERTY_COMPANY); // Reinit creator company when(creator.getCompany()).thenReturn(company); log.info("test 4 : Error on observer"); when(reader.get(CONTACT.OBSERV_ID.name())).thenReturn("FAKE"); - checkImportError(Contact.OBSERVER); + checkImportError(Contact.PROPERTY_OBSERVER); // Reinit observer when(reader.get(CONTACT.OBSERV_ID.name())). thenReturn(observer.getLogin()); log.info("test 5 : Error on sampleRow"); when(reader.get(SAMPLING.PLAN_CODE.name())).thenReturn("FAKE"); - checkImportError(Contact.SAMPLE_ROW); + checkImportError(Contact.PROPERTY_SAMPLE_ROW); // Reinit sampleRow when(reader.get(SAMPLING.PLAN_CODE.name())). thenReturn(sampleRow.getCode()); log.info("test 6 : Error on state"); when(reader.get(CONTACT.CONT_ETAT.name())).thenReturn("FAKE"); - checkImportError(Contact.STATE); + checkImportError(Contact.PROPERTY_STATE); // Reinit state when(reader.get(CONTACT.CONT_ETAT.name())). thenReturn(ContactState.BOARDING_DONE.libelle()); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -169,7 +169,7 @@ assertEquals(3, result.getFishingZone().size()); assertEquals(3, result.getElligibleBoat().size()); - // TEST FOR DELETE ELLIGIBLE BOAT + // TEST FOR DELETE ELLIGIBLE PROPERTY_BOAT boats.remove(2); serviceSampling.createUpdateSampleRow(result, boats, new SampleRowLogImpl()); @@ -220,7 +220,7 @@ // Create an elligibleBoat active for company ElligibleBoat elligible = createElligibleBoat(row, boat, true); // Retrieve the sampleRow (updated with elligible) - row = findDefaultSampleRow(SampleRow.ELLIGIBLE_BOAT); + row = findDefaultSampleRow(SampleRow.PROPERTY_ELLIGIBLE_BOAT); /** EXEC METHOD **/ List<Boat> boats = new ArrayList<Boat>(); @@ -390,21 +390,21 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); Calendar begin = new GregorianCalendar(2009,8,1); Calendar end = new GregorianCalendar(2010,11,31); SampleRowDAO sampleRowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = sampleRowDAO.create( - SampleRow.CODE,"2010_178", - SampleRow.COMPANY,company, - SampleRow.PROGRAM_NAME, "DPMA-2009", - SampleRow.PERIOD_BEGIN, begin.getTime(), - SampleRow.PERIOD_END, end.getTime()); + SampleRow.PROPERTY_CODE,"2010_178", + SampleRow.PROPERTY_COMPANY,company, + SampleRow.PROPERTY_PROGRAM_NAME, "DPMA-2009", + SampleRow.PROPERTY_PERIOD_BEGIN, begin.getTime(), + SampleRow.PROPERTY_PERIOD_END, end.getTime()); transaction.commitTransaction(); @@ -457,10 +457,10 @@ ProfessionDAO dao = WaoDAOHelper.getProfessionDAO(transaction); Profession profession = dao.create( - Profession.LIBELLE, "Fileyage en barre", - Profession.MESH_SIZE, "< 80", - Profession.OTHER, "90mm", - Profession.SPECIES, "barre, lieu noir, saumon des plages"); + Profession.PROPERTY_LIBELLE, "Fileyage en barre", + Profession.PROPERTY_MESH_SIZE, "< 80", + Profession.PROPERTY_OTHER, "90mm", + Profession.PROPERTY_SPECIES, "barre, lieu noir, saumon des plages"); transaction.commitTransaction(); transaction.closeContext(); @@ -483,13 +483,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); @@ -555,13 +555,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); transaction.closeContext(); @@ -618,13 +618,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); transaction.closeContext(); @@ -645,13 +645,13 @@ TopiaContext transaction = manager.getContext().beginTransaction(); FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - companyDAO.create(Company.NAME, "TARTANPION"); - companyDAO.create(Company.NAME, "BIS"); + companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + companyDAO.create(Company.PROPERTY_NAME, "BIS"); transaction.commitTransaction(); ServiceSampling serviceSampling = manager.getServiceSampling(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-11-26 14:14:35 UTC (rev 805) @@ -123,15 +123,15 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); @@ -213,15 +213,15 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); @@ -495,15 +495,15 @@ TopiaContext transaction = manager.getContext().beginTransaction(); CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.NAME, "BIS"); + Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", - WaoUser.COMPANY, company); + WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", + WaoUser.PROPERTY_COMPANY, company); company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", - WaoUser.COMPANY, company2); + WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", + WaoUser.PROPERTY_COMPANY, company2); company2.addWaoUser(user2); transaction.commitTransaction(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 14:14:35 UTC (rev 805) @@ -305,7 +305,7 @@ getFilter().setSampleRows(rowsFiltered); sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, - SampleRow.CODE, SampleRow.TOPIA_ID, propertyAccess); + SampleRow.PROPERTY_CODE, SampleRow.TOPIA_ID, propertyAccess); } return sampleRowSelectModel; } @@ -322,7 +322,7 @@ if (companySelectModel == null) { List<Company> companies = serviceUser.getCompanies(isAvailableDataForFiltersOnly()); companySelectModel = new GenericSelectModel<Company>(companies,Company.class, - Company.NAME, Company.TOPIA_ID, propertyAccess); + Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess); } return companySelectModel; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-11-26 14:14:35 UTC (rev 805) @@ -122,7 +122,7 @@ companySelectModel = new GenericSelectModel<Company>( companies, Company.class, - Company.NAME, + Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess ); @@ -230,7 +230,7 @@ sampleRowSelectModel = new GenericSelectModel<SampleRow>( sampleRows, SampleRow.class, - SampleRow.CODE, + SampleRow.PROPERTY_CODE, SampleRow.TOPIA_ID, propertyAccess ); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-26 14:14:35 UTC (rev 805) @@ -304,7 +304,7 @@ public GenericSelectModel<Company> getCompaniesSelectModel() throws WaoException { if (companiesSelectModel == null) { companiesSelectModel = new GenericSelectModel<Company>(getCompanies(), - Company.class, Company.NAME, "id", propertyAccess); + Company.class, Company.PROPERTY_NAME, "id", propertyAccess); } return companiesSelectModel; } @@ -460,13 +460,13 @@ userModel = beanModelSource.createEditModel(WaoUser.class, messages); userModel.add("userRole", null); userModel.include( - WaoUser.FIRST_NAME, - WaoUser.LAST_NAME, - WaoUser.LOGIN, - WaoUser.PASSWORD, - WaoUser.PHONE_NUMBER, + WaoUser.PROPERTY_FIRST_NAME, + WaoUser.PROPERTY_LAST_NAME, + WaoUser.PROPERTY_LOGIN, + WaoUser.PROPERTY_PASSWORD, + WaoUser.PROPERTY_PHONE_NUMBER, "userRole", - WaoUser.ACTIVE + WaoUser.PROPERTY_ACTIVE ); } return userModel; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-26 14:14:35 UTC (rev 805) @@ -412,7 +412,7 @@ curr = serviceSampling.getNewSampleMonth(currMonth, getSampleRow()); curr.addPropertyChangeListener( - SampleMonth.EXPECTED_TIDES_VALUE, propertyChange); + SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); } sampleMonths.add(curr); } @@ -488,7 +488,7 @@ void onSelectedFromDeleteMonth(int index) throws WaoException { SampleMonth month = getSampleMonths().remove(index); month.removePropertyChangeListener( - SampleMonth.EXPECTED_TIDES_VALUE, propertyChange); + SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); edited = true; } @@ -531,7 +531,7 @@ sampleRow = serviceSampling.getSampleRow(sampleRowId); for (SampleMonth month : sampleRow.getSampleMonth()) { month.addPropertyChangeListener( - SampleMonth.EXPECTED_TIDES_VALUE, propertyChange); + SampleMonth.PROPERTY_EXPECTED_TIDES_VALUE, propertyChange); } } else { sampleRow = serviceSampling.getNewSampleRow(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-26 13:13:45 UTC (rev 804) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-26 14:14:35 UTC (rev 805) @@ -57,8 +57,8 @@ contactModel.add("createdBy", null); // contactModel.add(Contact.SAMPLE_ROW, getSampleRowPropertyConduit()); // contactModel.add(Contact.BOAT, getBoatPropertyConduit()); - contactModel.add(Contact.SAMPLE_ROW, null); - contactModel.add(Contact.BOAT, null); + contactModel.add(Contact.PROPERTY_SAMPLE_ROW, null); + contactModel.add(Contact.PROPERTY_BOAT, null); contactModel.add("mammals", null); contactModel.add("validation", null); contactModel.add("actions", null); @@ -66,35 +66,35 @@ contactModel.include( "createdBy", TopiaEntity.TOPIA_CREATE_DATE, - Contact.SAMPLE_ROW, - Contact.BOAT, - Contact.STATE, - Contact.TIDE_BEGIN_DATE, - Contact.TIDE_END_DATE, - Contact.NB_OBSERVANTS, + Contact.PROPERTY_SAMPLE_ROW, + Contact.PROPERTY_BOAT, + Contact.PROPERTY_STATE, + Contact.PROPERTY_TIDE_BEGIN_DATE, + Contact.PROPERTY_TIDE_END_DATE, + Contact.PROPERTY_NB_OBSERVANTS, "mammals", - Contact.COMMENT, - Contact.DATA_INPUT_DATE, + Contact.PROPERTY_COMMENT, + Contact.PROPERTY_DATA_INPUT_DATE, "validation", "actions"); contactModel.get(TopiaEntity.TOPIA_CREATE_DATE).sortable(false); - contactModel.get(Contact.STATE).sortable(false); - contactModel.get(Contact.TIDE_BEGIN_DATE).sortable(false); - contactModel.get(Contact.TIDE_END_DATE).sortable(false); - contactModel.get(Contact.NB_OBSERVANTS).sortable(false); - contactModel.get(Contact.DATA_INPUT_DATE).sortable(false); - contactModel.get(Contact.COMMENT).sortable(false); + contactModel.get(Contact.PROPERTY_STATE).sortable(false); + contactModel.get(Contact.PROPERTY_TIDE_BEGIN_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_TIDE_END_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_NB_OBSERVANTS).sortable(false); + contactModel.get(Contact.PROPERTY_DATA_INPUT_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_COMMENT).sortable(false); return contactModel; } public BeanModel<Contact> buildCoordinatorContactModel(BeanModelSource beanModelSource, ComponentResources resources) { BeanModel<Contact> contactModel = buildContactModel(beanModelSource, resources); - contactModel.add(RelativePosition.AFTER, "validation", Contact.COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.COMMENT_COORDINATOR, Contact.COMMENT_ADMIN, getCommentAdminPropertyConduit()); - contactModel.get(Contact.COMMENT_COORDINATOR).sortable(false); - contactModel.get(Contact.COMMENT_ADMIN).sortable(false); + contactModel.add(RelativePosition.AFTER, "validation", Contact.PROPERTY_COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_COMMENT_COORDINATOR, Contact.PROPERTY_COMMENT_ADMIN, getCommentAdminPropertyConduit()); + contactModel.get(Contact.PROPERTY_COMMENT_COORDINATOR).sortable(false); + contactModel.get(Contact.PROPERTY_COMMENT_ADMIN).sortable(false); contactModel.add(RelativePosition.BEFORE, "actions", "dataReliability", getDataReliabilityPropertyConduit()); contactModel.get("dataReliability").sortable(false); return contactModel; @@ -104,19 +104,19 @@ BeanModel<Contact> contactModel = buildCoordinatorContactModel(beanModelSource, resources); contactModel.exclude("createdBy"); contactModel.add(RelativePosition.AFTER, TopiaEntity.TOPIA_CREATE_DATE, "observer", getUserPropertyConduit()); - contactModel.add(RelativePosition.AFTER, "observer", WaoUser.COMPANY, getCompanyPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.SAMPLE_ROW, "program", getProgramPropertyConduit()); + contactModel.add(RelativePosition.AFTER, "observer", WaoUser.PROPERTY_COMPANY, getCompanyPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_SAMPLE_ROW, "program", getProgramPropertyConduit()); contactModel.add(RelativePosition.AFTER, "program", "professionCode", getProfessionCodePropertyConduit()); contactModel.add(RelativePosition.AFTER, "professionCode", "professionLibelle", getProfessionLibellePropertyConduit()); contactModel.add(RelativePosition.AFTER, "professionLibelle", "professionSpecies", getProfessionSpeciesPropertyConduit()); contactModel.add(RelativePosition.AFTER, "professionSpecies", "fishingZoneFacade", getFishingZoneFacadePropertyConduit()); contactModel.add(RelativePosition.AFTER, "fishingZoneFacade", "fishingZoneSector", getFishingZoneSectorPropertyConduit()); contactModel.add(RelativePosition.AFTER, "fishingZoneSector", "fishingZoneDivision", getFishingZoneDivisionPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); contactModel.add(RelativePosition.AFTER, "boatImmatriculation", "boatDistrictCode", getBoatDistrictCodePropertyConduit()); contactModel.get("observer").sortable(false); - contactModel.get(WaoUser.COMPANY).sortable(false); + contactModel.get(WaoUser.PROPERTY_COMPANY).sortable(false); contactModel.get("program").sortable(false); contactModel.get("professionCode").sortable(false); contactModel.get("professionLibelle").sortable(false);