Author: tchemit Date: 2014-04-22 16:50:28 +0200 (Tue, 22 Apr 2014) New Revision: 1014 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1014 Log: fixes #4984 Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -314,7 +314,7 @@ } protected <O> Decorator<O> getDecorator(Class<O> type) { - return decoratorService.getDecorator(getLocale(), type, null); + return decoratorService.getDecorator(type, null); } @@ -753,11 +753,11 @@ // replace by the decorate value if (sourceValue != null) { sourceValue = decoratorService.decorate( - l, sourceValue, null); + sourceValue, null); } if (targetValue != null) { targetValue = decoratorService.decorate( - l, targetValue, null); + targetValue, null); } } buffer.append("\n "); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -96,7 +96,7 @@ import java.util.Locale; import java.util.Map; -import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.l; /** * Service to decorate entities. @@ -114,11 +114,10 @@ decoratorProvider = new EchoBaseDecoratorProvider(); } - public <O> Decorator<O> getDecorator(Locale locale, - Class<O> type, + public <O> Decorator<O> getDecorator(Class<O> type, String context) { Preconditions.checkNotNull(type, "Decorator type can not be null!"); - Decorator<O> decorator = decoratorProvider.getDecoratorByType(locale, type, context); + Decorator<O> decorator = decoratorProvider.getDecoratorByType(getLocale(), type, context); Preconditions.checkNotNull( decorator, "Could not find decorator for type " + type + @@ -127,34 +126,34 @@ return decorator; } - public String decorate(Locale locale, Object o, String context) { - Decorator<?> decorator = getDecorator(locale, o.getClass(), context); + public String decorate(Object o, String context) { + Decorator<?> decorator = getDecorator(o.getClass(), context); String result = decorator.toString(o); return result; } public final <E extends Enum<E> & I18nAble> Map<String, String> decorateEnums(E... enumValues) { + Locale locale = getLocale(); Map<String, String> result = Maps.newLinkedHashMap(); for (E enumValue : enumValues) { - result.put(enumValue.name(), t(enumValue.getI18nKey())); + result.put(enumValue.name(), l(locale, enumValue.getI18nKey())); } return result; } - public <O> List<O> sortToList(Locale locale, Collection<O> beans, String context) { - Preconditions.checkNotNull(beans); - List<O> list = Lists.newArrayList(beans); - getDecoratorAndSort(locale, context, list); - return list; - } +// public <O> List<O> sortToList(Locale locale, Collection<O> beans, String context) { +// Preconditions.checkNotNull(beans); +// List<O> list = Lists.newArrayList(beans); +// getDecoratorAndSort(locale, context, list); +// return list; +// } - public <E extends TopiaEntity> Map<String, String> sortAndDecorate(Locale locale, - Collection<E> beans, + public <E extends TopiaEntity> Map<String, String> sortAndDecorate(Collection<E> beans, String context) { Preconditions.checkNotNull(beans); List<E> list = Lists.newArrayList(beans); - Decorator<E> decorator = getDecoratorAndSort(locale, context, list); + Decorator<E> decorator = getDecoratorAndSort(context, list); Map<String, String> result = Maps.newLinkedHashMap(); for (E bean : list) { result.put(bean.getTopiaId(), decorator.toString(bean)); @@ -168,19 +167,18 @@ E entity, String decoratorContext) { - String voyageToString = decorate(getLocale(), entity, decoratorContext); + String voyageToString = decorate(entity, decoratorContext); data.put(property + "_lbl", voyageToString); } - protected <O> Decorator<O> getDecoratorAndSort(Locale locale, - String context, + protected <O> Decorator<O> getDecoratorAndSort(String context, List<O> list) { Decorator<O> decorator = null; if (CollectionUtils.isNotEmpty(list)) { O object = list.get(0); Preconditions.checkNotNull(object); - decorator = decoratorProvider.getDecorator(locale, object, context); + decorator = decoratorProvider.getDecorator(getLocale(), object, context); Preconditions.checkNotNull( decorator, "Could not find decorator for type " + object.getClass() + Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -27,7 +27,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.entities.EntityModificationLog; @@ -738,7 +737,7 @@ public <E extends TopiaEntity> Map<String, String> loadSortAndDecorate(Class<E> beanType) { List<E> beans = persistenceContext.getDao(beanType).findAll(); - return decoratorService.sortAndDecorate(getLocale(), beans, null); + return decoratorService.sortAndDecorate(beans, null); } public <E extends TopiaEntity, K> Map<K, E> getEntitiesMap( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -172,7 +172,7 @@ // export decorated foreign key value Decorator<TopiaEntity> decorator = - decoratorService.getDecorator(getLocale(), entityType, null); + decoratorService.getDecorator(entityType, null); model.addDecoratedForeignKeyForExport(propertyName, propertyName, decorator); } else { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -164,7 +164,7 @@ public <E extends TopiaEntity> Map<String, String> loadSortAndDecorate(Class<E> beanType) { List<E> beans = echoBaseInternalPersistenceContext.getDao(beanType).findAll(); - return decoratorService.sortAndDecorate(getLocale(), beans, null); + return decoratorService.sortAndDecorate(beans, null); } protected String getSafeSql(String sql) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -90,10 +90,10 @@ Map<String, String> result = Maps.newLinkedHashMap(); - Decorator<Transit> transitDecorator = decoratorService.getDecorator(getLocale(), Transit.class, null); - Decorator<Transect> transectDecorator = decoratorService.getDecorator(getLocale(), Transect.class, null); - Decorator<DataAcquisition> dataAcquisitionDecorator = decoratorService.getDecorator(getLocale(), DataAcquisition.class, null); - Decorator<DataProcessing> dataProcessingDecorator = decoratorService.getDecorator(getLocale(), DataProcessing.class, null); + Decorator<Transit> transitDecorator = decoratorService.getDecorator(Transit.class, null); + Decorator<Transect> transectDecorator = decoratorService.getDecorator(Transect.class, null); + Decorator<DataAcquisition> dataAcquisitionDecorator = decoratorService.getDecorator(DataAcquisition.class, null); + Decorator<DataProcessing> dataProcessingDecorator = decoratorService.getDecorator(DataProcessing.class, null); if (!voyage.isTransitEmpty()) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -70,7 +70,7 @@ Date date = newDate(); Decorator<Voyage> decorator = decoratorService.getDecorator( - getLocale(), Voyage.class, null); + Voyage.class, null); for (Voyage importedVoyage : importedVoyages) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -269,7 +269,7 @@ EchoBaseUser user) { Decorator<ImportLog> decorator = decoratorService. - getDecorator(getLocale(), ImportLog.class, null); + getDecorator(ImportLog.class, null); StringBuilder buffer = new StringBuilder(); buffer.append("Suppression import "); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -29,7 +29,6 @@ import javax.inject.Inject; import java.util.List; -import java.util.Locale; /** * To test the {@link DecoratorService}. @@ -49,25 +48,23 @@ @Test public void getDecoratorForReferences() throws Exception { - Locale locale = serviceContext.getLocale(); List<EchoBaseUserEntityEnum> expectedTypes = serviceContext.getDbMeta().getReferenceTypes(); for (EchoBaseUserEntityEnum type : expectedTypes) { Decorator<?> decorator = - decoratorService.getDecorator(locale, type.getContract(), null); + decoratorService.getDecorator(type.getContract(), null); Assert.assertNotNull("Missing decorator for type : " + type, decorator); } } @Test public void getDecoratorForData() throws Exception { - Locale locale = serviceContext.getLocale(); List<EchoBaseUserEntityEnum> expectedTypes = serviceContext.getDbMeta().getDataTypes(); for (EchoBaseUserEntityEnum type : expectedTypes) { Decorator<?> decorator = - decoratorService.getDecorator(locale, type.getContract(), null); + decoratorService.getDecorator(type.getContract(), null); Assert.assertNotNull("Missing decorator for type : " + type, decorator); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -142,7 +142,7 @@ Decorator<ImportLog> importLogDecorator = decoratorService.getDecorator( - getLocale(), ImportLog.class, DecoratorService.DATE_ONLY); + ImportLog.class, DecoratorService.DATE_ONLY); Multimap<String, ImportLog> importLogsByVoyage = Multimaps.index( userDbPersistenceService.getImportLogs(), Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -160,7 +160,7 @@ Set<String> indicatorNames = coserApiService.getIndicators(); List<DataMetadata> dataMetadatas = userDbPersistenceService.getDataMetadatasInName(indicatorNames); - populationIndicators = decoratorService.sortAndDecorate(getLocale(), dataMetadatas, null); - communityIndicators = decoratorService.sortAndDecorate(getLocale(), dataMetadatas, null); + populationIndicators = decoratorService.sortAndDecorate(dataMetadatas, null); + communityIndicators = decoratorService.sortAndDecorate(dataMetadatas, null); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -71,9 +71,7 @@ if (!voyage.isTransitEmpty()) { Decorator<Vessel> decorator = - decoratorService.getDecorator(getLocale(), - Vessel.class, - null); + decoratorService.getDecorator(Vessel.class, null); Set<Vessel> allVessels = voyage.getAllVessels(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -78,7 +78,7 @@ importLogs = Lists.newArrayList(); - Decorator<Voyage> decorator = decoratorService.getDecorator(getLocale(), Voyage.class, null); + Decorator<Voyage> decorator = decoratorService.getDecorator(Voyage.class, null); for (String id : model.getImportLogIds()) { if (log.isInfoEnabled()) {